You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2013/09/06 23:23:02 UTC
git commit: [flex-falcon] [refs/heads/develop] - Apply Darrell
Loverin's patch for FLEX-33322
Updated Branches:
refs/heads/develop dd2031efd -> 0fe9d0419
Apply Darrell Loverin's patch for FLEX-33322
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/0fe9d041
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/0fe9d041
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/0fe9d041
Branch: refs/heads/develop
Commit: 0fe9d0419710a95e91eb2e68ea1ca7deb3deb87d
Parents: dd2031e
Author: Alex Harui <ah...@apache.org>
Authored: Fri Sep 6 14:21:59 2013 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Sep 6 14:22:56 2013 -0700
----------------------------------------------------------------------
.../internal/tree/mxml/MXMLCompilerDirectiveParser.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/0fe9d041/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLCompilerDirectiveParser.java
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLCompilerDirectiveParser.java b/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLCompilerDirectiveParser.java
index ebf2467..ee8df17 100644
--- a/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLCompilerDirectiveParser.java
+++ b/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLCompilerDirectiveParser.java
@@ -87,9 +87,11 @@ class MXMLCompilerDirectiveParser
FlexProject project = builder.getProject();
ITypeDefinition stringType = (ITypeDefinition)project.getBuiltinType(BuiltinType.STRING);
ITypeDefinition classType = (ITypeDefinition)project.getBuiltinType(BuiltinType.CLASS);
+ ITypeDefinition anyType = (ITypeDefinition)project.getBuiltinType(BuiltinType.ANY_TYPE);
- // @Embed requires that lvalue accept String or Class
- if (stringType.isInstanceOf(type, project) || classType.isInstanceOf(type, project))
+ // @Embed requires that lvalue accept String, Class.
+ if (stringType.isInstanceOf(type, project) || classType.isInstanceOf(type, project) ||
+ type == anyType)
{
result = new MXMLEmbedNode((MXMLNodeBase)parent);
result.initializeFromText(builder, text, location);