flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From josebarra...@apache.org
Subject [30/50] [abbrv] git commit: [flex-falcon] [refs/heads/maven] - Switching to JFLex1.5 broke the ability to send in a partial tag so now we send in a full tag
Date Thu, 24 Apr 2014 16:06:02 GMT
Switching to JFLex1.5 broke the ability to send in a partial tag so now we send in a full tag


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

Branch: refs/heads/maven
Commit: 95bc9c3f91191af8c117450ce99e8d03dae5fea5
Parents: 02d113c
Author: Alex Harui <aharui@apache.org>
Authored: Tue Apr 15 20:09:21 2014 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Tue Apr 15 20:13:26 2014 -0700

----------------------------------------------------------------------
 .../apache/flex/compiler/internal/tree/mxml/MXMLNodeBase.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/95bc9c3f/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLNodeBase.java
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLNodeBase.java b/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLNodeBase.java
index e13a0ea..2f7b018 100644
--- a/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLNodeBase.java
+++ b/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLNodeBase.java
@@ -220,10 +220,11 @@ public abstract class MXMLNodeBase extends NodeBase implements IMXMLNode
     protected static boolean isValidXMLTagName(String tagName)
     {
         String s = "<" + tagName;
-        IMXMLToken[] tokens = mxmlTokenizer.get().getTokens(s);
-        return tokens != null && tokens.length == 1 &&
+        IMXMLToken[] tokens = mxmlTokenizer.get().getTokens(s + "/>");
+        return tokens != null && tokens.length == 2 &&
                tokens[0].getType() == MXMLTokenTypes.TOKEN_OPEN_TAG_START &&
-               tokens[0].getText().equals(s);
+               tokens[0].getText().equals(s) &&
+               tokens[1].getType() == MXMLTokenTypes.TOKEN_EMPTY_TAG_END;
     }
 
     /**


Mime
View raw message