royale-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [royale-compiler] branch develop updated: sometimes the class ends up on the static dependency list. That's probably a bug, but it was easier to workaround it in GoogDepsWriter
Date Fri, 21 Sep 2018 06:53:27 GMT
This is an automated email from the ASF dual-hosted git repository.

aharui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git


The following commit(s) were added to refs/heads/develop by this push:
     new bd326b4  sometimes the class ends up on the static dependency list.  That's probably
a bug, but it was easier to workaround it in GoogDepsWriter
bd326b4 is described below

commit bd326b4231b5a7b4880f9a9d8ee0622eaf292206
Author: Alex Harui <aharui@apache.org>
AuthorDate: Thu Sep 20 23:26:13 2018 -0700

    sometimes the class ends up on the static dependency list.  That's probably a bug, but
it was easier to workaround it in GoogDepsWriter
---
 .../apache/royale/compiler/internal/graph/GoogDepsWriter.java  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/graph/GoogDepsWriter.java
b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/graph/GoogDepsWriter.java
index dc8f6cb..fabfd4a 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/graph/GoogDepsWriter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/graph/GoogDepsWriter.java
@@ -715,9 +715,15 @@ public class GoogDepsWriter {
 						    				{
 						    					c2 = line.indexOf("*/");
 						    					line = line.substring(c + token.length(), c2);
+						    					List<String> staticDeps = Arrays.asList(line.split(","));
 							        			fi.staticDeps = new ArrayList<String>();
-						    					fi.staticDeps.addAll(Arrays.asList(line.split(",")));
-						    					staticInitializers.addAll(Arrays.asList(line.split(",")));
+						    					fi.staticDeps.addAll(staticDeps);
+						    					for (String staticDep : staticDeps)
+						    					{
+						    						if (staticDep.equals(className))
+						    							continue;
+						    						staticInitializers.add(staticDep);
+						    					}
 						    				}
 						    				else
 						    				{


Mime
View raw message