flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From joshtynj...@apache.org
Subject git commit: [flex-falcon] [refs/heads/develop] - compiler: roll back previous change because public, private, protected, and internal seem to be special reserved words
Date Fri, 06 May 2016 22:38:01 GMT
Repository: flex-falcon
Updated Branches:
  refs/heads/develop 1be8600e8 -> 09e9333b0


compiler: roll back previous change because public, private, protected, and internal seem
to be special reserved words


Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/09e9333b
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/09e9333b
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/09e9333b

Branch: refs/heads/develop
Commit: 09e9333b05c9ab2bae615b791e9f6e779753b21f
Parents: 1be8600
Author: Josh Tynjala <joshtynjala@gmail.com>
Authored: Fri May 6 15:37:52 2016 -0700
Committer: Josh Tynjala <joshtynjala@gmail.com>
Committed: Fri May 6 15:37:52 2016 -0700

----------------------------------------------------------------------
 .../parsing/as/StreamingASTokenizer.java        | 16 ---------------
 compiler/src/test/java/as/ASKeywordTests.java   | 21 --------------------
 externs/node/src/main/config/externc-config.xml |  4 ++++
 3 files changed, 4 insertions(+), 37 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/09e9333b/compiler/src/main/java/org/apache/flex/compiler/internal/parsing/as/StreamingASTokenizer.java
----------------------------------------------------------------------
diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/parsing/as/StreamingASTokenizer.java
b/compiler/src/main/java/org/apache/flex/compiler/internal/parsing/as/StreamingASTokenizer.java
index d38030b..1c90e94 100644
--- a/compiler/src/main/java/org/apache/flex/compiler/internal/parsing/as/StreamingASTokenizer.java
+++ b/compiler/src/main/java/org/apache/flex/compiler/internal/parsing/as/StreamingASTokenizer.java
@@ -893,22 +893,6 @@ public class StreamingASTokenizer implements ASTokenTypes, IASTokenizer,
Closeab
                         retVal.setType(TOKEN_NAMESPACE_NAME);
                         return retVal;
                     }
-                    if (lastToken != null)
-                    {
-                        int lastTokenType = lastToken.getType();
-                        switch (lastTokenType)
-                        {
-                            case TOKEN_KEYWORD_VAR:
-                            case TOKEN_KEYWORD_FUNCTION:
-                            case TOKEN_RESERVED_WORD_GET:
-                            case TOKEN_RESERVED_WORD_SET:
-                            case TOKEN_OPERATOR_MEMBER_ACCESS:
-                            {
-                                retVal.setType(TOKEN_IDENTIFIER);
-                                return retVal;
-                            }
-                        }
-                    }
                     retVal.setType(TOKEN_NAMESPACE_ANNOTATION);
                     return retVal;
                 case TOKEN_MODIFIER_DYNAMIC:

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/09e9333b/compiler/src/test/java/as/ASKeywordTests.java
----------------------------------------------------------------------
diff --git a/compiler/src/test/java/as/ASKeywordTests.java b/compiler/src/test/java/as/ASKeywordTests.java
index d0d6a63..8223620 100644
--- a/compiler/src/test/java/as/ASKeywordTests.java
+++ b/compiler/src/test/java/as/ASKeywordTests.java
@@ -313,27 +313,6 @@ public class ASKeywordTests extends ASFeatureTestsBase
     }
 
     @Test
-    public void ASKeyword_internal_as_variable_name()
-    {
-        // all tests can assume that flash.display.Sprite
-        // flash.system.System and flash.events.Event have been imported
-        String[] imports = new String[]
-        {
-        };
-        String[] declarations = new String[]
-        {
-                "public var internal:String;",
-        };
-        String[] testCode = new String[]
-        {
-                "internal = 'bar';",
-                "assertEqual('variable named internal', internal, 'bar');",
-        };
-        String source = getAS(imports, declarations, testCode, new String[0]);
-        compileAndRun(source);
-    }
-
-    @Test
     public void ASKeyword_as_member_expression()
     {
     	// all tests can assume that flash.display.Sprite

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/09e9333b/externs/node/src/main/config/externc-config.xml
----------------------------------------------------------------------
diff --git a/externs/node/src/main/config/externc-config.xml b/externs/node/src/main/config/externc-config.xml
index ce578d2..ff497e1 100644
--- a/externs/node/src/main/config/externc-config.xml
+++ b/externs/node/src/main/config/externc-config.xml
@@ -65,6 +65,10 @@
         <class>Buffer</class>
         <name>toJSON</name>
     </exclude>
+    <exclude>
+        <class>osNetworkInterfacesInfo</class>
+        <name>internal</name>
+    </exclude>
 
     <as-root>../../../target/generated-sources/externc</as-root>
 


Mime
View raw message