You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by er...@apache.org on 2017/12/15 09:06:16 UTC
[royale-compiler] 02/03: Fixed some merge issues
This is an automated email from the ASF dual-hosted git repository.
erikdebruin pushed a commit to branch feature/as2wasm
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
commit 1eff836025da25704eeba3dda11a73f064475bcf
Author: Erik de Bruin <er...@ixsoftware.nl>
AuthorDate: Mon Dec 11 12:47:28 2017 +0100
Fixed some merge issues
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
---
.../codegen/js/royale/TestRoyaleGlobalClasses.java | 6 ++--
.../royale/compiler/internal/test/TestBase.java | 41 ++++++++++++----------
2 files changed, 25 insertions(+), 22 deletions(-)
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleGlobalClasses.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleGlobalClasses.java
index 6e7352e..1084cd2 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleGlobalClasses.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleGlobalClasses.java
@@ -45,9 +45,9 @@ public class TestRoyaleGlobalClasses extends TestGoogGlobalClasses
public void setUp()
{
backend = createBackend();
- project = new RoyaleJSProject(workspace, backend);
- project.config = new JSGoogConfiguration();
- project.setProxyBaseClass("custom.TestProxy");
+ royaleJSProject = new RoyaleJSProject(workspace, backend);
+ royaleJSProject.config = new JSGoogConfiguration();
+ royaleJSProject.setProxyBaseClass("custom.TestProxy");
super.setUp();
}
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/TestBase.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/TestBase.java
index 0f49239..9e728bf 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/TestBase.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/TestBase.java
@@ -46,9 +46,11 @@ import org.apache.royale.compiler.codegen.as.IASEmitter;
import org.apache.royale.compiler.codegen.mxml.IMXMLEmitter;
import org.apache.royale.compiler.config.Configurator;
import org.apache.royale.compiler.driver.IBackend;
+import org.apache.royale.compiler.driver.js.IJSBackend;
import org.apache.royale.compiler.internal.codegen.as.ASFilterWriter;
import org.apache.royale.compiler.internal.projects.RoyaleJSProject;
import org.apache.royale.compiler.internal.projects.RoyaleProjectConfigurator;
+import org.apache.royale.compiler.internal.projects.RoyaleWASTProject;
import org.apache.royale.compiler.internal.projects.ISourceFileHandler;
import org.apache.royale.compiler.internal.targets.JSTarget;
import org.apache.royale.compiler.internal.tree.as.FunctionNode;
@@ -85,7 +87,8 @@ public class TestBase implements ITestBase
protected static EnvProperties env = EnvProperties.initiate();
protected static Workspace workspace = new Workspace();
- protected RoyaleJSProject project;
+ protected RoyaleJSProject royaleJSProject;
+ protected RoyaleWASTProject royaleWASTProject;
protected IBackend backend;
protected ASFilterWriter writer;
@@ -111,23 +114,23 @@ public class TestBase implements ITestBase
{
errors = new ArrayList<ICompilerProblem>();
- if (project == null)
+ if (royaleJSProject == null)
{
backend = createBackend();
- project = new RoyaleJSProject(workspace, backend);
- project.setProxyBaseClass("custom.TestProxy");
+ royaleJSProject = new RoyaleJSProject(workspace, backend);
+ royaleJSProject.setProxyBaseClass("custom.TestProxy");
}
- project.setProblems(errors);
- RoyaleProjectConfigurator.configure(project);
+ royaleJSProject.setProblems(errors);
+ RoyaleProjectConfigurator.configure(royaleJSProject);
try {
Configurator projectConfigurator = backend.createConfigurator();
- project.setTargetSettings(projectConfigurator.getTargetSettings(null));
+ royaleJSProject.setTargetSettings(projectConfigurator.getTargetSettings(null));
}
catch (UnsupportedOperationException e)
{
}
- writer = backend.createWriterBuffer(project);
+ writer = ((IJSBackend) backend).createWriterBuffer(royaleJSProject);
try
{
@@ -317,7 +320,7 @@ public class TestBase implements ITestBase
.normalize(tempFile.getAbsolutePath());
Collection<ICompilationUnit> mainFileCompilationUnits = workspace
- .getCompilationUnits(normalizedMainFileName, project);
+ .getCompilationUnits(normalizedMainFileName, royaleJSProject);
ICompilationUnit cu = null;
for (ICompilationUnit cu2 : mainFileCompilationUnits)
@@ -338,7 +341,7 @@ public class TestBase implements ITestBase
return null;
}
fileNode = result.getAST();
- project.getDependencies(cu);
+ royaleJSProject.getDependencies(cu);
}
catch (InterruptedException e)
{
@@ -366,12 +369,12 @@ public class TestBase implements ITestBase
ICompilationUnit mainCU = Iterables
.getOnlyElement(workspace.getCompilationUnits(
- FilenameNormalization.normalize(mainFileName), project));
+ FilenameNormalization.normalize(mainFileName), royaleJSProject));
- project.mainCU = mainCU;
+ royaleJSProject.mainCU = mainCU;
Configurator projectConfigurator = backend.createConfigurator();
- JSTarget target = (JSTarget) backend.createTarget(project,
+ JSTarget target = (JSTarget) ((IJSBackend) backend).createTarget(royaleJSProject,
projectConfigurator.getTargetSettings(null), null);
ArrayList<ICompilerProblem> errors = new ArrayList<ICompilerProblem>();
@@ -393,7 +396,7 @@ public class TestBase implements ITestBase
System.out.println(sb.toString());
return compiledFileNames;
}
- List<ICompilationUnit> reachableCompilationUnits = project
+ List<ICompilationUnit> reachableCompilationUnits = royaleJSProject
.getReachableCompilationUnitsInSWFOrder(ImmutableSet.of(mainCU));
for (final ICompilationUnit cu : reachableCompilationUnits)
{
@@ -415,9 +418,9 @@ public class TestBase implements ITestBase
final File outputClassFile = getOutputClassFile(qname
+ "_output", outputRootDir);
- ASFilterWriter writer = backend.createWriterBuffer(project);
+ ASFilterWriter writer = ((IJSBackend) backend).createWriterBuffer(royaleJSProject);
IASEmitter emitter = backend.createEmitter(writer);
- IASBlockWalker walker = backend.createWalker(project,
+ IASBlockWalker walker = ((IJSBackend) backend).createWalker(royaleJSProject,
errors, emitter);
walker.visitCompilationUnit(cu);
@@ -681,9 +684,9 @@ public class TestBase implements ITestBase
addLibraries(libraries);
addNamespaceMappings(namespaceMappings);
- project.setSourcePath(sourcePaths);
- project.setLibraries(libraries);
- project.setNamespaceMappings(namespaceMappings);
+ royaleJSProject.setSourcePath(sourcePaths);
+ royaleJSProject.setLibraries(libraries);
+ royaleJSProject.setNamespaceMappings(namespaceMappings);
}
protected void addLibraries(List<File> libraries)
--
To stop receiving notification emails like this one, please contact
"commits@royale.apache.org" <co...@royale.apache.org>.