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 2017/08/19 05:09:22 UTC

[1/2] git commit: [flex-falcon] [refs/heads/develop] - fix using _id instead of id for JS localId output

Repository: flex-falcon
Updated Branches:
  refs/heads/develop 1abf6439b -> 9539c83f6


fix using _id instead of id for JS localId output


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

Branch: refs/heads/develop
Commit: 9cf18a060d20036ff2015efd6803f5b6769795c6
Parents: 1abf643
Author: Alex Harui <ah...@apache.org>
Authored: Fri Aug 18 08:43:35 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Aug 18 08:43:35 2017 -0700

----------------------------------------------------------------------
 .../mxml/flexjs/MXMLDescriptorSpecifier.java    | 14 ++++++++-----
 .../codegen/mxml/flexjs/MXMLFlexJSEmitter.java  | 21 ++++++++++----------
 2 files changed, 20 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9cf18a06/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLDescriptorSpecifier.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLDescriptorSpecifier.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLDescriptorSpecifier.java
index 9eac5d5..36d6d48 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLDescriptorSpecifier.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLDescriptorSpecifier.java
@@ -88,6 +88,12 @@ public class MXMLDescriptorSpecifier extends MXMLNodeSpecifier
     public String id;
 
     //---------------------------------
+    //    effectiveId
+    //---------------------------------
+
+    public String effectiveId;
+
+    //---------------------------------
     //    isTopNode
     //---------------------------------
 
@@ -177,17 +183,15 @@ public class MXMLDescriptorSpecifier extends MXMLNodeSpecifier
                 }
             }
 
-            if (id != null)
+            if (id != null || effectiveId != null)
             {
                 write(propertySpecifiers.size() + 1 + "");
                 writeDelimiter(writeNewline);
-                boolean isEffectiveID = id.startsWith(MXMLFlexJSEmitterTokens.ID_PREFIX.getToken()) ||
-                						id.startsWith(MXMLFlexJSEmitterTokens.BINDING_PREFIX.getToken());
-                String idPropName = (isEffectiveID) ? "_id"
+                String idPropName = (effectiveId != null) ? "_id"
                         : "id";
                 writeSimpleDescriptor(idPropName, ASEmitterTokens.TRUE.getToken(),
                         ASEmitterTokens.SINGLE_QUOTE.getToken()
-                                + id + ASEmitterTokens.SINGLE_QUOTE.getToken(),
+                                + ((id != null) ? id : effectiveId) + ASEmitterTokens.SINGLE_QUOTE.getToken(),
                         writeNewline);
     
                 writeDelimiter(writeNewline);

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9cf18a06/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
index 56b49e1..77bbf52 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
@@ -948,8 +948,7 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
 
         for (MXMLDescriptorSpecifier instance : instances)
         {
-            if (!instance.id.startsWith(MXMLFlexJSEmitterTokens.ID_PREFIX
-                    .getToken()))
+            if (instance.id != null)
             {
 	        	PackageFooterEmitter.AccessorData data = asEmitter.packageFooterEmitter.new AccessorData();
 	        	accessorData.add(data);
@@ -1122,7 +1121,7 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
             writeNewline(" */");
             write(ASEmitterTokens.THIS);
             write(ASEmitterTokens.MEMBER_ACCESS);
-            write(instance.id + "_");
+            write((instance.id != null ? instance.id : instance.effectiveId) + "_");
             writeNewline(ASEmitterTokens.SEMICOLON);
         }
     }
@@ -1600,8 +1599,7 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
     	int n = 0;
         for (MXMLDescriptorSpecifier instance : instances)
         {
-            if (!instance.id.startsWith(MXMLFlexJSEmitterTokens.ID_PREFIX
-                    .getToken()))
+            if (instance.id != null)
             {
             	n++;
             }
@@ -1618,8 +1616,7 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
         int i = 0;
         for (MXMLDescriptorSpecifier instance : instances)
         {
-            if (!instance.id.startsWith(MXMLFlexJSEmitterTokens.ID_PREFIX
-                    .getToken()))
+            if (instance.id != null)
             {
                 indentPush();
     	        writeNewline("/** @export */");
@@ -1792,15 +1789,19 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
 
         MXMLDescriptorSpecifier currentPropertySpecifier = getCurrentDescriptor("ps");
 
+        String effectiveId = null;
         String id = node.getID();
         if (id == null)
-            id = node.getEffectiveID();
-        if (id == null)
-            id = MXMLFlexJSEmitterTokens.ID_PREFIX.getToken() + idCounter++;
+        {
+        	effectiveId = node.getEffectiveID();
+        	if (effectiveId == null)
+        		effectiveId = MXMLFlexJSEmitterTokens.ID_PREFIX.getToken() + idCounter++;
+        }
 
         MXMLDescriptorSpecifier currentInstance = new MXMLDescriptorSpecifier();
         currentInstance.isProperty = false;
         currentInstance.id = id;
+        currentInstance.effectiveId = effectiveId;
         currentInstance.name = formatQualifiedName(cdef.getQualifiedName());
         currentInstance.parent = currentPropertySpecifier;
 


[2/2] git commit: [flex-falcon] [refs/heads/develop] - use IModule to detect Module compilation

Posted by ah...@apache.org.
use IModule to detect Module compilation


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

Branch: refs/heads/develop
Commit: 9539c83f6d024eb04a4f7bbbc725518752691180
Parents: 9cf18a0
Author: Alex Harui <ah...@apache.org>
Authored: Fri Aug 18 08:46:22 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Aug 18 08:46:22 2017 -0700

----------------------------------------------------------------------
 .../mxml/flexjs/MXMLFlexJSPublisher.java        | 31 +-------------------
 .../internal/projects/FlexJSProject.java        | 20 +++++++++++++
 2 files changed, 21 insertions(+), 30 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9539c83f/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java
index 0683573..69167e4 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java
@@ -323,7 +323,7 @@ public class MXMLFlexJSPublisher extends JSGoogPublisher implements IJSPublisher
         // is generated here so it can be used for outputting the html templates.
         String depsFileData = gdw.generateDeps(project, problems);
 
-        if (depsFileData.contains("UIModule.js"))
+        if (project.isModule(projectName))
         {
         	// need better test someday
         	depsFileData += "\ngoog.require('" + projectName + "');\n";
@@ -796,11 +796,6 @@ public class MXMLFlexJSPublisher extends JSGoogPublisher implements IJSPublisher
         return true;
     }
     
-    private String[] reservedFunctions = {
-    		"org['apache']['flex']['core']['UIBase'] = function(){};",
-    		"org['apache']['flex']['html']['Label'] = function(){};",
-    };
-    
     private void writeExportedNames(JSClosureCompilerWrapper compilerWrapper)
     {
     	if (!googConfiguration.getExportPublicSymbols())
@@ -834,30 +829,6 @@ public class MXMLFlexJSPublisher extends JSGoogPublisher implements IJSPublisher
 	        	compilerWrapper.addJSExternsFile(exportsFile.getAbsolutePath());
 	        }
     	}
-    	else
-    	{
-        	StringBuilder sb = new StringBuilder();
-        	sb.append("/**\n");
-        	sb.append(" * generated by Apache FlexJS compiler\n");
-        	sb.append(" * @externs\n");
-        	sb.append(" */\n");
-        	for (String name : reservedFunctions)
-        	{
-        		sb.append("\n\n");
-	        	sb.append("/**\n");
-	        	sb.append(" */\n");
-	        	sb.append(name + "\n");
-        	}
-        	File exportsFile = new File(outputFolder, "dontrename.js");
-        	try {
-				writeFile(exportsFile, sb.toString(), false);
-			} catch (IOException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-        	//compilerWrapper.addJSExternsFile(exportsFile.getAbsolutePath());
-    		
-    	}
     }
 
 }

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9539c83f/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSProject.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSProject.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSProject.java
index 8c2b232..4d905bf 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSProject.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSProject.java
@@ -35,8 +35,11 @@ import org.apache.flex.compiler.config.Configurator;
 import org.apache.flex.compiler.css.ICSSMediaQueryCondition;
 import org.apache.flex.compiler.css.ICSSRule;
 import org.apache.flex.compiler.definitions.IDefinition;
+import org.apache.flex.compiler.definitions.ITypeDefinition;
 import org.apache.flex.compiler.definitions.metadata.IMetaTag;
 import org.apache.flex.compiler.definitions.metadata.IMetaTagAttribute;
+import org.apache.flex.compiler.definitions.references.IResolvedQualifiersReference;
+import org.apache.flex.compiler.definitions.references.ReferenceFactory;
 import org.apache.flex.compiler.driver.IBackend;
 import org.apache.flex.compiler.internal.codegen.mxml.flexjs.MXMLFlexJSEmitterTokens;
 import org.apache.flex.compiler.internal.css.codegen.CSSCompilationSession;
@@ -51,6 +54,7 @@ import org.apache.flex.compiler.internal.tree.mxml.MXMLDocumentNode;
 import org.apache.flex.compiler.internal.tree.mxml.MXMLFileNode;
 import org.apache.flex.compiler.internal.units.SWCCompilationUnit;
 import org.apache.flex.compiler.internal.workspaces.Workspace;
+import org.apache.flex.compiler.mxml.IMXMLTypeConstants;
 import org.apache.flex.compiler.targets.ITargetSettings;
 import org.apache.flex.compiler.tree.as.IASNode;
 import org.apache.flex.compiler.tree.as.IDefinitionNode;
@@ -443,4 +447,20 @@ public class FlexJSProject extends FlexProject
 	{
 		return exportedNames;
 	}
+	
+	public boolean isModule(String mainClass)
+	{
+        IResolvedQualifiersReference iModuleRef = ReferenceFactory.packageQualifiedReference(
+                getWorkspace(), "org.apache.flex.core.IModule");
+        ITypeDefinition moddef = (ITypeDefinition)iModuleRef.resolve(this);
+        IResolvedQualifiersReference mainRef = ReferenceFactory.packageQualifiedReference(
+                getWorkspace(), mainClass);
+        IDefinition maindef = mainRef.resolve(this);
+        if (maindef instanceof ITypeDefinition)
+        {
+        	ITypeDefinition type = (ITypeDefinition)maindef;
+        	return type.isInstanceOf(moddef, this);
+        }
+        return false;
+	}
 }