flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gordonsm...@apache.org
Subject git commit: [flex-falcon] - Removed two obsolete MXML tokens related to state suffixes.
Date Fri, 19 Apr 2013 02:49:15 GMT
Updated Branches:
  refs/heads/develop e994ca3af -> 642c0d203


Removed two obsolete MXML tokens related to state suffixes.

TOKEN_STATE_OPERATOR and TOKEN_STATE_NAME

TOKEN_OPEN_TAG_START, TOKEN_CLOSE_TAG_START, and TOKEN_NAME
may include a state suffix.
The suffix gets split off by MXMLStateSplitter.

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

Branch: refs/heads/develop
Commit: 642c0d2038d0ffaba4c45012f74deab4a6e45007
Parents: e994ca3
Author: Gordon Smith <gordonsmith@apache.org>
Authored: Thu Apr 18 19:49:12 2013 -0700
Committer: Gordon Smith <gordonsmith@apache.org>
Committed: Thu Apr 18 19:49:12 2013 -0700

----------------------------------------------------------------------
 .../compiler/internal/parsing/mxml/MXMLToken.java  |    4 ----
 .../internal/parsing/mxml/MXMLTokenizer.java       |    3 ---
 .../apache/flex/compiler/parsing/IMXMLToken.java   |    5 -----
 .../flex/compiler/parsing/MXMLTokenTypes.java      |    2 --
 4 files changed, 0 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/642c0d20/compiler/src/org/apache/flex/compiler/internal/parsing/mxml/MXMLToken.java
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/internal/parsing/mxml/MXMLToken.java b/compiler/src/org/apache/flex/compiler/internal/parsing/mxml/MXMLToken.java
index 74c1abb..be8e24b 100644
--- a/compiler/src/org/apache/flex/compiler/internal/parsing/mxml/MXMLToken.java
+++ b/compiler/src/org/apache/flex/compiler/internal/parsing/mxml/MXMLToken.java
@@ -101,8 +101,6 @@ public class MXMLToken extends ASToken implements IMXMLToken
 				return MXMLTokenKind.CDATA;
 			case MXMLTokenTypes.TOKEN_ASDOC_COMMENT:
 				return MXMLTokenKind.COMMENT;
-			case MXMLTokenTypes.TOKEN_STATE_NAME:
-				return MXMLTokenKind.STATE_NAME;
 			case MXMLTokenTypes.TOKEN_WHITESPACE:
 			    return MXMLTokenKind.WHITESPACE;
 			default:
@@ -236,8 +234,6 @@ public class MXMLToken extends ASToken implements IMXMLToken
 				return "TOKEN_COMMENT";
 			case MXMLTokenTypes.TOKEN_MXML_BLOB :
 				return "MXML_BLOB";
-			case MXMLTokenTypes.TOKEN_STATE_NAME:
-				return "TOKEN_STATE_NAME";
             case MXMLTokenTypes.TOKEN_PROCESSING_INSTRUCTION:
             	return "TOKEN_PROCESSING_INSTRUCTION";
 			default:

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/642c0d20/compiler/src/org/apache/flex/compiler/internal/parsing/mxml/MXMLTokenizer.java
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/internal/parsing/mxml/MXMLTokenizer.java
b/compiler/src/org/apache/flex/compiler/internal/parsing/mxml/MXMLTokenizer.java
index 24dfd46..67c4ed7 100644
--- a/compiler/src/org/apache/flex/compiler/internal/parsing/mxml/MXMLTokenizer.java
+++ b/compiler/src/org/apache/flex/compiler/internal/parsing/mxml/MXMLTokenizer.java
@@ -375,7 +375,6 @@ public class MXMLTokenizer implements IMXMLTokenizer, Closeable
                 return token;
             // stuff inside tags
             case MXMLTokenTypes.TOKEN_EQUALS:
-            case MXMLTokenTypes.TOKEN_STATE_NAME:
             //outside tags
             case MXMLTokenTypes.TOKEN_MXML_BLOB:
             case MXMLTokenTypes.TOKEN_CDATA:
@@ -404,8 +403,6 @@ public class MXMLTokenizer implements IMXMLTokenizer, Closeable
                     	detector.addPrefix(prefix, ns);
                 }
                 return token;
-            case MXMLTokenTypes.TOKEN_STATE_OPERATOR:
-                return null; //we don't want this
             // stuff outside tags
             default:
             {

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/642c0d20/compiler/src/org/apache/flex/compiler/parsing/IMXMLToken.java
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/parsing/IMXMLToken.java b/compiler/src/org/apache/flex/compiler/parsing/IMXMLToken.java
index 04a994b..30821a7 100644
--- a/compiler/src/org/apache/flex/compiler/parsing/IMXMLToken.java
+++ b/compiler/src/org/apache/flex/compiler/parsing/IMXMLToken.java
@@ -80,11 +80,6 @@ public interface IMXMLToken extends ICMToken
 		CDATA, 
 		
 		/**
-		 * A state name
-		 */
-		STATE_NAME, 
-		
-		/**
 		 * A large chunk of untokenized MXML data
 		 */
 		MXML_BLOB, 

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/642c0d20/compiler/src/org/apache/flex/compiler/parsing/MXMLTokenTypes.java
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/parsing/MXMLTokenTypes.java b/compiler/src/org/apache/flex/compiler/parsing/MXMLTokenTypes.java
index 71a8d41..771edef 100644
--- a/compiler/src/org/apache/flex/compiler/parsing/MXMLTokenTypes.java
+++ b/compiler/src/org/apache/flex/compiler/parsing/MXMLTokenTypes.java
@@ -36,8 +36,6 @@ public interface MXMLTokenTypes
     public static final int TOKEN_NAME = ASTokenTypes.TOKEN_E4X_NAME;
     public static final int TOKEN_OPEN_TAG_START = ASTokenTypes.TOKEN_E4X_OPEN_TAG_START;
     public static final int TOKEN_PROCESSING_INSTRUCTION = ASTokenTypes.TOKEN_E4X_PROCESSING_INSTRUCTION;
-    public static final int TOKEN_STATE_NAME = ASTokenTypes.TOKEN_E4X_DOTTED_NAME_PART;
-    public static final int TOKEN_STATE_OPERATOR = ASTokenTypes.TOKEN_E4X_NAME_DOT;
     public static final int TOKEN_STRING = ASTokenTypes.TOKEN_E4X_STRING;
     public static final int TOKEN_TAG_END = ASTokenTypes.TOKEN_E4X_TAG_END;
     public static final int TOKEN_TEXT = ASTokenTypes.TOKEN_E4X_TEXT;


Mime
View raw message