You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ah...@apache.org on 2018/11/09 23:57:47 UTC
[royale-compiler] 02/02: don't force requires of externals (fixes
#57)
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
commit e0930d8dcb20fcfb4ed460f60580abe432c1473f
Author: Alex Harui <ah...@apache.org>
AuthorDate: Fri Nov 9 15:51:26 2018 -0800
don't force requires of externals (fixes #57)
---
.../royale/compiler/internal/graph/GoogDepsWriter.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 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 db6867e..b538f13 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
@@ -193,7 +193,7 @@ public class GoogDepsWriter {
{
for (String d : gd.fileInfo.impls)
{
- if (!restOfDeps.contains(d) && !gd.fileInfo.isExtern)
+ if (!restOfDeps.contains(d) && !gd.fileInfo.isExtern && !isExternal(d))
restOfDeps.add(d);
}
}
@@ -202,14 +202,14 @@ public class GoogDepsWriter {
ICompilationUnit unit = requireMap.get(gd.className);
if (unit == null)
{
- if (!restOfDeps.contains(gd.className) && !gd.fileInfo.isExtern)
+ if (!restOfDeps.contains(gd.className) && !gd.fileInfo.isExtern && !isExternal(gd.className))
restOfDeps.add(gd.className);
continue;
}
Set<ICompilationUnit> deps = graph.getDirectReverseDependencies(unit, dependencyTypes);
if (deps.size() == 0)
{
- if (!restOfDeps.contains(gd.className) && !gd.fileInfo.isExtern)
+ if (!restOfDeps.contains(gd.className) && !gd.fileInfo.isExtern && !isExternal(gd.className))
restOfDeps.add(gd.className);
}
}
@@ -576,8 +576,8 @@ public class GoogDepsWriter {
finalLines.add(line);
i++;
}
- if (suppressCount > 0)
- {
+ //if (suppressCount > 0)
+ //{
if (fi.suppressLine > 0)
{
if (fi.suppressLine < fi.constructorLine || fi.constructorLine == -1)
@@ -648,7 +648,7 @@ public class GoogDepsWriter {
System.out.println("Confused by @suppress in " + className);
}
}
- }
+ //}
sb.append("*/");
finalLines.add(gd.fileInfo.googProvideLine + 1, sb.toString());