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 2019/11/03 00:02:59 UTC
[royale-compiler] branch develop updated: changes to get royale
integration tests to pass again. They rotted because they don't run as part
of the normal build
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 ea97302 changes to get royale integration tests to pass again. They rotted because they don't run as part of the normal build
ea97302 is described below
commit ea9730220f432ce4e4ea4a55d105c2f81c5b79a7
Author: Alex Harui <ah...@apache.org>
AuthorDate: Sat Nov 2 17:02:41 2019 -0700
changes to get royale integration tests to pass again. They rotted because they don't run as part of the normal build
---
compiler-externc/src/test/build.xml | 18 ++-
.../internal/codegen/typedefs/TestExternES3.java | 2 +-
.../driver/js/royale/JSCSSCompilationSession.java | 117 ++++++++++---------
.../mxml/royale/TestRoyaleMXMLApplication.java | 127 +++++++++++++--------
.../mxml/sourcemaps/TestSourceMapMXMLScript.java | 2 +-
.../royale/compiler/internal/test/TestBase.java | 6 +
.../royale/files/CSSTestSource_encoded_result.txt | 29 +++--
.../royale/files/CSSTestSource_result.css | 36 +++---
.../resources/royale/files/LocalFunction_result.js | 7 +-
.../resources/royale/files/MyInitialView_result.js | 20 ++--
.../royale/files/RoyaleTest_again_result.js | 8 +-
.../files/controllers/MyController_result.js | 11 +-
.../royale/files/models/MyModel_result.js | 11 +-
.../royale/files/wildcard_import_result.js | 8 +-
14 files changed, 253 insertions(+), 149 deletions(-)
diff --git a/compiler-externc/src/test/build.xml b/compiler-externc/src/test/build.xml
index 8c79786..ec7b37f 100644
--- a/compiler-externc/src/test/build.xml
+++ b/compiler-externc/src/test/build.xml
@@ -44,7 +44,23 @@
</patternset>
</unjar>
<mkdir dir="${compiler.externc}/target/downloads" />
- <unzip src="${compiler.externc}/target/junit-temp/externs/externs.zip" dest="${compiler.externc}/target/downloads" />
+ <unzip src="${compiler.externc}/target/junit-temp/externs/externs.zip" dest="${compiler.externc}/target/downloads" >
+ <patternset>
+ <include name="**/*.js"/>
+ <exclude name="**/es3.js"/>
+ <exclude name="**/es6.js"/>
+ <exclude name="**/w3c_css.js"/>
+ <exclude name="**/gecko_dom.js"/>
+ <exclude name="**/w3c_dom2.js"/>
+ <exclude name="**/html5.js"/>
+ </patternset>
+ </unzip>
+ <get src="https://raw.githubusercontent.com/royale-extras/closure-compiler/royale/externs/es3.js" dest="${compiler.externc}/target/downloads/es3.js" ignoreerrors="true" skipexisting="false"/>
+ <get src="https://raw.githubusercontent.com/royale-extras/closure-compiler/royale/externs/es6.js" dest="${compiler.externc}/target/downloads/es6.js" ignoreerrors="true" skipexisting="false"/>
+ <get src="https://raw.githubusercontent.com/royale-extras/closure-compiler/royale/externs/browser/w3c_css.js" dest="${compiler.externc}/target/downloads/browser/w3c_css.js" ignoreerrors="true" skipexisting="false"/>
+ <get src="https://raw.githubusercontent.com/royale-extras/closure-compiler/royale/externs/browser/gecko_dom.js" dest="${compiler.externc}/target/downloads/browser/gecko_dom.js" ignoreerrors="true" skipexisting="false"/>
+ <get src="https://raw.githubusercontent.com/royale-extras/closure-compiler/royale/externs/browser/w3c_dom2.js" dest="${compiler.externc}/target/downloads/browser/w3c_dom2.js" ignoreerrors="true" skipexisting="false"/>
+ <get src="https://raw.githubusercontent.com/royale-extras/closure-compiler/royale/externs/browser/html5.js" dest="${compiler.externc}/target/downloads/browser/html5.js" ignoreerrors="true" skipexisting="false"/>
</target>
<target name="compile.unit.tests">
diff --git a/compiler-externc/src/test/java/org/apache/royale/compiler/internal/codegen/typedefs/TestExternES3.java b/compiler-externc/src/test/java/org/apache/royale/compiler/internal/codegen/typedefs/TestExternES3.java
index e2a65c1..e772892 100644
--- a/compiler-externc/src/test/java/org/apache/royale/compiler/internal/codegen/typedefs/TestExternES3.java
+++ b/compiler-externc/src/test/java/org/apache/royale/compiler/internal/codegen/typedefs/TestExternES3.java
@@ -60,7 +60,7 @@ public class TestExternES3 extends TypedefsTestBase
"Math" };
// IObject and IArrayLike are two extras
- assertEquals(24, model.getClasses().size());
+ assertEquals(25, model.getClasses().size());
for (String className : classes)
{
assertTrue(model.hasClass(className));
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/royale/JSCSSCompilationSession.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/royale/JSCSSCompilationSession.java
index 2bc1a00..26514e3 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/royale/JSCSSCompilationSession.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/royale/JSCSSCompilationSession.java
@@ -20,6 +20,7 @@ package org.apache.royale.compiler.internal.driver.js.royale;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import org.apache.royale.compiler.constants.IASLanguageConstants;
@@ -227,15 +228,21 @@ public class JSCSSCompilationSession extends CSSCompilationSession
}
result.append(" {\n");
+ ArrayList<String> listOfProps = new ArrayList<String>();
for (final ICSSProperty prop : rule.getProperties())
{
- if (!hasMediaQuery)
- result.append(" ");
-
String propString = ((CSSProperty)prop).toCSSString();
// skip class references since the won't work in CSS
if (propString.contains("ClassReference"))
continue;
+ listOfProps.add(propString);
+ }
+ Collections.sort(listOfProps);
+ for (final String propString : listOfProps)
+ {
+ if (!hasMediaQuery)
+ result.append(" ");
+
result.append(" ").append(propString).append("\n");
}
if (hasMediaQuery)
@@ -394,162 +401,159 @@ public class JSCSSCompilationSession extends CSSCompilationSession
result.append("function() {");
ImmutableList<ICSSProperty> plist = rule.getProperties();
-
- boolean firstProp = true;
- for (final ICSSProperty prop : plist)
+ ArrayList<String> listOfProps = new ArrayList<String>();
+ for (final ICSSProperty prop : rule.getProperties())
{
- if (!firstProp)
- result.append(";\n");
- firstProp = false;
- result.append("this[\"" + prop.getName() + "\"] = ");
+ StringBuilder line = new StringBuilder();
+ line.append("this[\"" + prop.getName() + "\"] = ");
ICSSPropertyValue value = prop.getValue();
if (value instanceof CSSArrayPropertyValue)
{
ImmutableList<? extends ICSSPropertyValue> values = ((CSSArrayPropertyValue)value).getElements();
- result.append("[");
+ line.append("[");
boolean firstone = true;
for (ICSSPropertyValue val : values)
{
if (firstone)
firstone = false;
else
- result.append(", ");
+ line.append(", ");
if (val instanceof CSSStringPropertyValue)
{
- result.append("\"" + escapeDoubleQuotes(((CSSStringPropertyValue)val).getValue()) + "\"");
+ line.append("\"" + escapeDoubleQuotes(((CSSStringPropertyValue)val).getValue()) + "\"");
}
else if (val instanceof CSSColorPropertyValue)
{
- result.append(new Integer(((CSSColorPropertyValue)val).getColorAsInt()));
+ line.append(new Integer(((CSSColorPropertyValue)val).getColorAsInt()));
}
else if (val instanceof CSSRgbColorPropertyValue)
{
- result.append(new Integer(((CSSRgbColorPropertyValue)val).getColorAsInt()));
+ line.append(new Integer(((CSSRgbColorPropertyValue)val).getColorAsInt()));
}
else if (value instanceof CSSRgbaColorPropertyValue)
{
//todo: handle alpha in the RGBA ?
- result.append(new Long(((CSSRgbaColorPropertyValue)value).getColorAsLong()));
+ line.append(new Long(((CSSRgbaColorPropertyValue)value).getColorAsLong()));
}
else if (val instanceof CSSKeywordPropertyValue)
{
CSSKeywordPropertyValue keywordValue = (CSSKeywordPropertyValue)val;
String keywordString = keywordValue.getKeyword();
if (IASLanguageConstants.TRUE.equals(keywordString))
- result.append("true");
+ line.append("true");
else if (IASLanguageConstants.FALSE.equals(keywordString))
- result.append("false");
+ line.append("false");
else
- result.append("\"" + ((CSSKeywordPropertyValue)val).getKeyword() + "\"");
+ line.append("\"" + ((CSSKeywordPropertyValue)val).getKeyword() + "\"");
}
else if (val instanceof CSSNumberPropertyValue)
{
- result.append(new Double(((CSSNumberPropertyValue)val).getNumber().doubleValue()));
+ line.append(new Double(((CSSNumberPropertyValue)val).getNumber().doubleValue()));
}
else if (val instanceof CSSURLAndFormatPropertyValue)
{
- result.append("\"" + escapeDoubleQuotes(((CSSURLAndFormatPropertyValue)val).toString()) + "\"");
+ line.append("\"" + escapeDoubleQuotes(((CSSURLAndFormatPropertyValue)val).toString()) + "\"");
}
else if (val instanceof CSSMultiValuePropertyValue)
{
- result.append("\"" + ((CSSMultiValuePropertyValue)val).toString() + "\"");
+ line.append("\"" + ((CSSMultiValuePropertyValue)val).toString() + "\"");
}
else
{
- result.append("unexpected value type: " + val.toString());
+ line.append("unexpected value type: " + val.toString());
}
}
- result.append("]");
+ line.append("]");
}
else if (value instanceof CSSMultiValuePropertyValue)
{
ImmutableList<? extends ICSSPropertyValue> values = ((CSSMultiValuePropertyValue)value).getElements();
- result.append("[");
+ line.append("[");
boolean firstone = true;
for (ICSSPropertyValue val : values)
{
if (firstone)
firstone = false;
else
- result.append(", ");
+ line.append(", ");
if (val instanceof CSSStringPropertyValue)
{
- result.append("\"" + escapeDoubleQuotes(((CSSStringPropertyValue)val).getValue()) + "\"");
+ line.append("\"" + escapeDoubleQuotes(((CSSStringPropertyValue)val).getValue()) + "\"");
}
else if (val instanceof CSSColorPropertyValue)
{
- result.append(new Integer(((CSSColorPropertyValue)val).getColorAsInt()));
+ line.append(new Integer(((CSSColorPropertyValue)val).getColorAsInt()));
}
else if (val instanceof CSSRgbColorPropertyValue)
{
- result.append(new Integer(((CSSRgbColorPropertyValue)val).getColorAsInt()));
+ line.append(new Integer(((CSSRgbColorPropertyValue)val).getColorAsInt()));
}
else if (val instanceof CSSRgbaColorPropertyValue)
{
//todo: handle alpha in the RGBA ?
- result.append(new Long(((CSSRgbaColorPropertyValue)val).getColorAsLong()));
+ line.append(new Long(((CSSRgbaColorPropertyValue)val).getColorAsLong()));
}
else if (val instanceof CSSKeywordPropertyValue)
{
CSSKeywordPropertyValue keywordValue = (CSSKeywordPropertyValue)val;
String keywordString = keywordValue.getKeyword();
if (IASLanguageConstants.TRUE.equals(keywordString))
- result.append("true");
+ line.append("true");
else if (IASLanguageConstants.FALSE.equals(keywordString))
- result.append("false");
+ line.append("false");
else
- result.append("\"" + ((CSSKeywordPropertyValue)val).getKeyword() + "\"");
+ line.append("\"" + ((CSSKeywordPropertyValue)val).getKeyword() + "\"");
}
else if (val instanceof CSSNumberPropertyValue)
{
- result.append(new Double(((CSSNumberPropertyValue)val).getNumber().doubleValue()));
+ line.append(new Double(((CSSNumberPropertyValue)val).getNumber().doubleValue()));
}
else if (val instanceof CSSURLAndFormatPropertyValue)
{
- result.append("\"" + escapeDoubleQuotes(((CSSURLAndFormatPropertyValue)val).toString()) + "\"");
+ line.append("\"" + escapeDoubleQuotes(((CSSURLAndFormatPropertyValue)val).toString()) + "\"");
}
else if (val instanceof CSSMultiValuePropertyValue)
{
- result.append("\"" + ((CSSMultiValuePropertyValue)val).toString() + "\"");
+ line.append("\"" + ((CSSMultiValuePropertyValue)val).toString() + "\"");
}
else
{
- result.append("unexpected value type: " + val.toString());
+ line.append("unexpected value type: " + val.toString());
}
}
- result.append("]");
+ line.append("]");
}
else if (value instanceof CSSStringPropertyValue)
{
- result.append("\"" + ((CSSStringPropertyValue)value).getValue() + "\"");
+ line.append("\"" + ((CSSStringPropertyValue)value).getValue() + "\"");
}
else if (value instanceof CSSColorPropertyValue)
{
- result.append(new Integer(((CSSColorPropertyValue)value).getColorAsInt()));
+ line.append(new Integer(((CSSColorPropertyValue)value).getColorAsInt()));
}
else if (value instanceof CSSRgbColorPropertyValue)
{
- result.append(new Integer(((CSSRgbColorPropertyValue)value).getColorAsInt()));
+ line.append(new Integer(((CSSRgbColorPropertyValue)value).getColorAsInt()));
}
else if (value instanceof CSSRgbaColorPropertyValue)
{
//todo: handle alpha in the RGBA ?
- result.append(new Long(((CSSRgbaColorPropertyValue)value).getColorAsLong()));
+ line.append(new Long(((CSSRgbaColorPropertyValue)value).getColorAsLong()));
}
else if (value instanceof CSSKeywordPropertyValue)
{
CSSKeywordPropertyValue keywordValue = (CSSKeywordPropertyValue)value;
String keywordString = keywordValue.getKeyword();
if (IASLanguageConstants.TRUE.equals(keywordString))
- result.append("true");
+ line.append("true");
else if (IASLanguageConstants.FALSE.equals(keywordString))
- result.append("false");
+ line.append("false");
else
- result.append("\"" + ((CSSKeywordPropertyValue)value).getKeyword() + "\"");
+ line.append("\"" + ((CSSKeywordPropertyValue)value).getKeyword() + "\"");
}
else if (value instanceof CSSNumberPropertyValue)
{
- result.append(new Double(((CSSNumberPropertyValue)value).getNumber().doubleValue()));
+ line.append(new Double(((CSSNumberPropertyValue)value).getNumber().doubleValue()));
}
else if (value instanceof CSSFunctionCallPropertyValue)
{
@@ -560,18 +564,18 @@ public class JSCSSCompilationSession extends CSSCompilationSession
if ("null".equals(className))
{
// ClassReference(null) resets the property's class reference.
- result.append("null");
+ line.append("null");
}
else
{
- result.append(formatQualifiedName(className));
+ line.append(formatQualifiedName(className));
requires.add(className);
}
}
else if ("url".equals(functionCall.name))
{
final String urlString = CSSFunctionCallPropertyValue.getSingleArgumentFromRaw(functionCall.rawArguments);
- result.append("\"" + urlString + "\"");
+ line.append("\"" + urlString + "\"");
}
else if ("PropertyReference".equals(functionCall.name))
{
@@ -580,7 +584,7 @@ public class JSCSSCompilationSession extends CSSCompilationSession
else if ("calc".equals(functionCall.name))
{
// TODO: implement me
- result.append("null");
+ line.append("null");
}
else if ("Embed".equals(functionCall.name))
{
@@ -594,7 +598,7 @@ public class JSCSSCompilationSession extends CSSCompilationSession
else if (otherCSSFunctions.contains(functionCall.name))
{
// ignore for now?
- result.append("null");
+ line.append("null");
}
else
{
@@ -602,6 +606,17 @@ public class JSCSSCompilationSession extends CSSCompilationSession
throw new IllegalStateException("Unexpected function call property value: " + functionCall);
}
}
+ listOfProps.add(line.toString());
+ }
+ Collections.sort(listOfProps);
+
+ boolean firstProp = true;
+ for (final String line2 : listOfProps)
+ {
+ if (!firstProp)
+ result.append(";\n");
+ firstProp = false;
+ result.append(line2);
}
result.append("}");
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/royale/TestRoyaleMXMLApplication.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/royale/TestRoyaleMXMLApplication.java
index ce53368..317a13e 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/royale/TestRoyaleMXMLApplication.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/royale/TestRoyaleMXMLApplication.java
@@ -197,8 +197,6 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" */\n" +
"AppName.prototype.ROYALE_REFLECTION_INFO = function () {\n" +
" return {\n" +
- " variables: function () {return {};},\n" +
- " accessors: function () {return {};},\n" +
" methods: function () {\n" +
" return {\n" +
" 'AppName': { type: '', declaredBy: 'AppName'}\n"+
@@ -206,6 +204,11 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" }\n" +
" };\n" +
"};\n" +
+ "/**\n" +
+ " * @const\n" +
+ " * @type {number}\n" +
+ " */\n" +
+ "AppName.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9;\n" +
"\n" +
"\n";
@@ -290,8 +293,6 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" */\n" +
"AppName.prototype.ROYALE_REFLECTION_INFO = function () {\n" +
" return {\n" +
- " variables: function () {return {};},\n" +
- " accessors: function () {return {};},\n" +
" methods: function () {\n" +
" return {\n" +
" 'AppName': { type: '', declaredBy: 'AppName'}\n"+
@@ -299,8 +300,13 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" }\n" +
" };\n" +
"};\n" +
+ "/**\n" +
+ " * @const\n" +
+ " * @type {number}\n" +
+ " */\n" +
+ "AppName.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9;\n" +
"\n" +
- "\n" ;
+ "\n";
assertOutWithMetadata(outTemplate.replaceAll("AppName", appName));
}
@@ -394,7 +400,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
"1,\n" +
"[\"org.apache.royale.net.HTTPConstants\", \"GET\"],\n" +
"null,\n" +
- "[\"$ID0\", \"text\"],\n" +
+ "[\"$ID0\", \"text\"]\n" +
"];\n" +
"/**\n" +
" * Metadata\n" +
@@ -412,8 +418,6 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" */\n" +
"AppName.prototype.ROYALE_REFLECTION_INFO = function () {\n" +
" return {\n" +
- " variables: function () {return {};},\n" +
- " accessors: function () {return {};},\n" +
" methods: function () {\n" +
" return {\n" +
" 'AppName': { type: '', declaredBy: 'AppName'}\n"+
@@ -421,6 +425,11 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" }\n" +
" };\n" +
"};\n" +
+ "/**\n" +
+ " * @const\n" +
+ " * @type {number}\n" +
+ " */\n" +
+ "AppName.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9;\n" +
"\n" +
"\n";
@@ -516,7 +525,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
"1,\n" +
"[\"org.apache.royale.net.HTTPConstants\", \"GET\"],\n" +
"null,\n" +
- "[\"$ID0\", \"text\"],\n" +
+ "[\"$ID0\", \"text\"]\n" +
"];\n" +
"/**\n" +
" * Metadata\n" +
@@ -534,8 +543,6 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" */\n" +
"AppName.prototype.ROYALE_REFLECTION_INFO = function () {\n" +
" return {\n" +
- " variables: function () {return {};},\n" +
- " accessors: function () {return {};},\n" +
" methods: function () {\n" +
" return {\n" +
" 'AppName': { type: '', declaredBy: 'AppName'}\n"+
@@ -543,6 +550,11 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" }\n" +
" };\n" +
"};\n" +
+ "/**\n" +
+ " * @const\n" +
+ " * @type {number}\n" +
+ " */\n" +
+ "AppName.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9;\n" +
"\n" +
"\n";
@@ -636,7 +648,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" * @export\n" +
" * @type {binding.ComplexValueObject}\n" +
" */\n" +
- "AppName.prototype.firstOne;\n" +
+ "AppName.prototype.firstOne = null;\n" +
"\n" +
"\n" +
"/**\n" +
@@ -688,10 +700,9 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" return {\n" +
" variables: function () {\n" +
" return {\n" +
- " 'firstOne': { type: 'binding.ComplexValueObject'}\n" +
+ " 'firstOne': { type: 'binding.ComplexValueObject', get_set: function (/** AppName */ inst, /** * */ v) {return v !== undefined ? inst.firstOne = v : inst.firstOne;}}\n" +
" };\n" +
" },\n" +
- " accessors: function () {return {};},\n" +
" methods: function () {\n" +
" return {\n" +
" 'AppName': { type: '', declaredBy: 'AppName'}\n"+
@@ -699,6 +710,11 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" }\n" +
" };\n" +
"};\n" +
+ "/**\n" +
+ " * @const\n" +
+ " * @type {number}\n" +
+ " */\n" +
+ "AppName.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9;\n" +
"\n" +
"\n";
@@ -732,8 +748,8 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
"goog.require('org.apache.royale.core.Application');\n" +
"goog.require('org.apache.royale.core.View');\n" +
"goog.require('org.apache.royale.html.Label');\n" +
- "goog.require('XML');\n" +
- "goog.require('XML');\n" +
+// "goog.require('XML');\n" +
+// "goog.require('XML');\n" +
"\n" +
"\n" +
"\n" +
@@ -793,7 +809,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" * @export\n" +
" * @type {XML}\n" +
" */\n" +
- "AppName.prototype.xml;\n" +
+ "AppName.prototype.xml = null;\n" +
"\n" +
"\n" +
"/**\n" +
@@ -814,17 +830,22 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" return {\n" +
" variables: function () {\n" +
" return {\n" +
- " 'xml': { type: 'XML'}\n" +
+ " 'xml': { type: 'XML', get_set: function (/** AppName */ inst, /** * */ v) {return v !== undefined ? inst.xml = v : inst.xml;}}\n" +
" };\n" +
" },\n" +
- " accessors: function () {return {};},\n" +
" methods: function () {\n" +
" return {\n" +
" 'AppName': { type: '', declaredBy: 'AppName'}\n"+
" };\n" +
" }\n" +
" };\n" +
- "};";
+ "};\n" +
+ "/**\n" +
+ " * @const\n" +
+ " * @type {number}\n" +
+ " */\n" +
+ "AppName.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9;";
+
assertOutMXMLPostProcess(outTemplate.replaceAll("AppName", appName), true);
}
@@ -934,17 +955,21 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" return {\n" +
" variables: function () {\n" +
" return {\n" +
- " 'foo': { type: 'String'}\n" +
+ " 'foo': { type: 'String', get_set: function (/** AppName */ inst, /** * */ v) {return v !== undefined ? inst.foo = v : inst.foo;}}\n" +
" };\n" +
" },\n" +
- " accessors: function () {return {};},\n" +
" methods: function () {\n" +
" return {\n" +
" 'AppName': { type: '', declaredBy: 'AppName'}\n"+
" };\n" +
" }\n" +
" };\n" +
- "};";
+ "};\n" +
+ "/**\n" +
+ " * @const\n" +
+ " * @type {number}\n" +
+ " */\n" +
+ "AppName.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9;";
assertOutMXMLPostProcess(outTemplate.replaceAll("AppName", appName), true);
}
@@ -1054,17 +1079,21 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" return {\n" +
" variables: function () {\n" +
" return {\n" +
- " 'foo': { type: 'Array'}\n" +
+ " 'foo': { type: 'Array', get_set: function (/** AppName */ inst, /** * */ v) {return v !== undefined ? inst.foo = v : inst.foo;}}\n" +
" };\n" +
" },\n" +
- " accessors: function () {return {};},\n" +
" methods: function () {\n" +
" return {\n" +
" 'AppName': { type: '', declaredBy: 'AppName'}\n"+
" };\n" +
" }\n" +
" };\n" +
- "};";
+ "};\n" +
+ "/**\n" +
+ " * @const\n" +
+ " * @type {number}\n" +
+ " */\n" +
+ "AppName.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9;";
assertOutMXMLPostProcess(outTemplate.replaceAll("AppName", appName), true);
}
@@ -1095,8 +1124,8 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
"goog.require('org.apache.royale.core.Application');\n" +
"goog.require('org.apache.royale.core.View');\n" +
"goog.require('org.apache.royale.html.DropDownList');\n" +
- "goog.require('XML');\n" +
- "goog.require('XML');\n" +
+// "goog.require('XML');\n" +
+// "goog.require('XML');\n" +
"\n" +
"\n" +
"\n" +
@@ -1176,17 +1205,21 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" return {\n" +
" variables: function () {\n" +
" return {\n" +
- " 'foo': { type: 'XML'}\n" +
+ " 'foo': { type: 'XML', get_set: function (/** AppName */ inst, /** * */ v) {return v !== undefined ? inst.foo = v : inst.foo;}}\n" +
" };\n" +
" },\n" +
- " accessors: function () {return {};},\n" +
" methods: function () {\n" +
" return {\n" +
" 'AppName': { type: '', declaredBy: 'AppName'}\n"+
" };\n" +
" }\n" +
" };\n" +
- "};";
+ "};\n" +
+ "/**\n" +
+ " * @const\n" +
+ " * @type {number}\n" +
+ " */\n" +
+ "AppName.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9;";
assertOutMXMLPostProcess(outTemplate.replaceAll("AppName", appName), true);
}
@@ -1217,7 +1250,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
"goog.require('org.apache.royale.core.Application');\n" +
"goog.require('org.apache.royale.core.View');\n" +
"goog.require('org.apache.royale.html.DropDownList');\n" +
- "goog.require('XMLList');\n" +
+// "goog.require('XMLList');\n" +
"\n" +
"\n" +
"\n" +
@@ -1297,17 +1330,21 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" return {\n" +
" variables: function () {\n" +
" return {\n" +
- " 'foo': { type: 'XMLList'}\n" +
+ " 'foo': { type: 'XMLList', get_set: function (/** AppName */ inst, /** * */ v) {return v !== undefined ? inst.foo = v : inst.foo;}}\n" +
" };\n" +
" },\n" +
- " accessors: function () {return {};},\n" +
" methods: function () {\n" +
" return {\n" +
" 'AppName': { type: '', declaredBy: 'AppName'}\n"+
" };\n" +
" }\n" +
" };\n" +
- "};";
+ "};\n" +
+ "/**\n" +
+ " * @const\n" +
+ " * @type {number}\n" +
+ " */\n" +
+ "AppName.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9;";
assertOutMXMLPostProcess(outTemplate.replaceAll("AppName", appName), true);
}
@@ -1425,8 +1462,6 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" */\n" +
"AppName.AppName_component0.prototype.ROYALE_REFLECTION_INFO = function () {\n" +
" return {\n" +
- " variables: function () {return {};},\n" +
- " accessors: function () {return {};},\n" +
" methods: function () {\n" +
" return {\n" +
" 'AppName_component0': { type: '', declaredBy: 'AppName_component0'}\n"+
@@ -1469,8 +1504,6 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" */\n" +
"AppName.prototype.ROYALE_REFLECTION_INFO = function () {\n" +
" return {\n" +
- " variables: function () {return {};},\n" +
- " accessors: function () {return {};},\n" +
" methods: function () {\n" +
" return {\n" +
" 'AppName': { type: '', declaredBy: 'AppName'}\n"+
@@ -1722,7 +1755,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
public void testRoyaleMainFileDual()
{
MXMLJSC mxmlc = new MXMLJSC();
- String[] args = new String[10];
+ String[] args = new String[11];
args[0] = "-compiler.targets=SWF,JSRoyale";
args[1] = "-compiler.allow-subclass-overrides";
args[2] = "-remove-circulars";
@@ -1730,12 +1763,13 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
args[4] = "-js-library-path=" + new File(FilenameNormalization.normalize(env.ASJS + "/frameworks/js/libs")).getPath();
args[5] = "-external-library-path+=" + testAdapter.getPlayerglobal().getPath();
args[6] = "-js-external-library-path+=" + new File(FilenameNormalization.normalize(env.ASJS + "/js/libs/js.swc")).getPath();
- args[7] = "-output=" + new File(testAdapter.getTempDir(), "bin-debug/RoyaleTest_again.swf").getPath();
+ args[7] = "-js-external-library-path+=" + new File(FilenameNormalization.normalize(env.ASJS + "/js/libs/GCL.swc")).getPath();
+ args[8] = "-output=" + new File(testAdapter.getTempDir(), "bin-debug/RoyaleTest_again.swf").getPath();
if (env.GOOG != null)
- args[8] = "-closure-lib=" + new File(FilenameNormalization.normalize(env.GOOG)).getPath();
+ args[9] = "-closure-lib=" + new File(FilenameNormalization.normalize(env.GOOG)).getPath();
else
- args[8] = "-define=COMPILE::temp,false";
- args[9] = new File(testAdapter.getUnitTestBaseDir(), "royale/files/RoyaleTest_again.mxml").getPath();
+ args[9] = "-define=COMPILE::temp,false";
+ args[10] = new File(testAdapter.getUnitTestBaseDir(), "royale/files/RoyaleTest_again.mxml").getPath();
ArrayList<ICompilerProblem> problems = new ArrayList<ICompilerProblem>();
int result = mxmlc.mainNoExit(args, problems, true);
@@ -1747,7 +1781,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
{
/* this should error because a Flash APi is used */
MXMLJSC mxmlc = new MXMLJSC();
- String[] args = new String[18];
+ String[] args = new String[19];
args[0] = "-compiler.targets=SWF,JSRoyale";
args[1] = "-remove-circulars";
args[2] = "-library-path=" + new File(FilenameNormalization.normalize(env.ASJS + "/frameworks/libs/Core.swc")).getPath();
@@ -1768,7 +1802,8 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
args[14] = "-compiler.js-library-path+=" + new File(FilenameNormalization.normalize(env.ASJS + "/frameworks/js/libs/CollectionsJS.swc")).getPath();
args[15] = "-compiler.js-library-path+=" + new File(FilenameNormalization.normalize(env.ASJS + "/frameworks/js/libs/BasicJS.swc")).getPath();
args[16] = "-compiler.js-external-library-path=" + new File(FilenameNormalization.normalize(env.ASJS + "/js/libs/js.swc")).getPath();
- args[17] = new File(testAdapter.getUnitTestBaseDir(), "royale/files/RoyaleTest_again_Flash.mxml").getPath();
+ args[17] = "-compiler.js-external-library-path=" + new File(FilenameNormalization.normalize(env.ASJS + "/js/libs/GCL.swc")).getPath();
+ args[18] = new File(testAdapter.getUnitTestBaseDir(), "royale/files/RoyaleTest_again_Flash.mxml").getPath();
int result = mxmlc.mainNoExit(args, errors, true);
assertThat(result, is(3));
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/sourcemaps/TestSourceMapMXMLScript.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/sourcemaps/TestSourceMapMXMLScript.java
index 7875c87..d449174 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/sourcemaps/TestSourceMapMXMLScript.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/sourcemaps/TestSourceMapMXMLScript.java
@@ -45,7 +45,7 @@ public class TestSourceMapMXMLScript extends RoyaleSourceMapTestBase
assertTrue(definitionName.startsWith(getClass().getSimpleName()));
int endColumn = definitionName.length() + 14;
///**\n * @export\n * @type {*}\n */\nRoyaleTest_A.prototype.foo
- assertMapping(node, 0, 4, 48, 0, 48, endColumn); // foo
+ assertMapping(node, 0, 4, 47, 0, 47, endColumn); // foo
}
@Test
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 c436fd9..e7ff154 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
@@ -164,6 +164,12 @@ public class TestBase implements ITestBase
protected void assertErrors(String errorReport)
{
StringBuilder actualErrors = new StringBuilder();
+
+ // switch to a different set of problems for any other
+ // threads still outputting problems. Otherwise we
+ // can get a concurrent modification exception
+ project.setProblems(new ArrayList<ICompilerProblem>());
+
for (ICompilerProblem problem : errors)
{
if (problem.toString().equals("An externally-visible definition with the name 'Array' was unexpectedly found."))
diff --git a/compiler-jx/src/test/resources/royale/files/CSSTestSource_encoded_result.txt b/compiler-jx/src/test/resources/royale/files/CSSTestSource_encoded_result.txt
index 4c8a8e5..6f9374a 100755
--- a/compiler-jx/src/test/resources/royale/files/CSSTestSource_encoded_result.txt
+++ b/compiler-jx/src/test/resources/royale/files/CSSTestSource_encoded_result.txt
@@ -18,22 +18,31 @@
//
////////////////////////////////////////////////////////////////////////////////
*/
-0,
1,
".glass",
function() {this["borderColor"] = 7763059;
this["highlightAlphas"] = [0.07000000029802322, 0.44999998807907104];
this["fillColors"] = [8947848, 15987699, 10395294, 16579836];
this["fillAlphas"] = [0.6000000238418579, 0.699999988079071, 0.800000011920929, 0.8999999761581421]},
0,
1,
".glassSlider",
function() {this["fillColors"] = [15987699, 12303291, 16579836, 13421772];
this["fillAlphas"] = [0.800000011920929, 0.699999988079071, 0.6000000238418579, 0.5]},
0,
1,
".listItem",
function() {this["borderStyle"] = "outset";
this["backgroundColor"] = 16777215;
this["verticalAlign"] = "middle";
this["horizontalGap"] = 5.0;
this["backgroundAlpha"] = 0.5;
this["paddingLeft"] = 4.0;
this["paddingRight"] = 4.0},
0,
1,
".outer.inner",
function() {this["width"] = 512.0},
0,
1,
".outer .inner",
function() {this["width"] = 512.0},
0,
1,
".outer>.innerTitle",
function() {this["height"] = 176.0;
this["color"] = 16777215;
this["background"] = ["url('assets/welcome_card.jpg')", "center"
, "/", "cover"]},
0,
1,
".outer>.innerMenu",
function() {this["color"] = 16777215},
0,
1,
"h4",
function() {this["color"] = 16777215},
0,
1,
".outerother.inner",
function() {this["height"] = 320.0;
this["width"] = 320.0},
0,
1,
".outerother-square>.innerTitle",
function() {this["color"] = 16777215;
this["background"] = ["url('assets/dog.png')", "bottom", "right", 15.0, "no-repeat", 4634284]},
0,
1,
".usescalc",
function() {this["color"] = 16777215;
this["width"] = null},
0,
1,
".FLEX35340A",
function() {this["transform"] = null;
this["background"] = null;
this["filter"] = null},
0,
1,
".FLEX35340B",
function() {this["background"] = null},
0,
1,
".FLEX35340C",
function() {this["background"] = null},
0,
1,
".FLEX35340D",
function() {this["boxShadow"] = ["0 2px 2px 0 rgba(0,0,0,.14)", "0 3px 1px -2px rgba(0,0,0,.2)", "0 1px 5px 0 rgba(0,0,0,.12)"];
this["textShadow"] = [0.0, -1.0, 0.0, 2986344448];
-this["fontFamily"] = ["Georgia", "Times New Roman", "Times", "serif"]},
+0,
1,
".glass",
function() {this["borderColor"] = 7763059;
this["fillAlphas"] = [0.6000000238418579, 0.699999988079071, 0.800000011920929, 0.8999999761581421];
+this["fillColors"] = [8947848, 15987699, 10395294, 16579836];
this["highlightAlphas"] = [0.07000000029802322, 0.44999998807907104]},
+0,
1,
".glassSlider",
function() {this["fillAlphas"] = [0.800000011920929, 0.699999988079071, 0.6000000238418579, 0.5];
+this["fillColors"] = [15987699, 12303291, 16579836, 13421772]},
0,
1,
".listItem",
function() {this["backgroundAlpha"] = 0.5;
+this["backgroundColor"] = 16777215;
+this["borderStyle"] = "outset";
this["horizontalGap"] = 5.0;
this["paddingLeft"] = 4.0;
this["paddingRight"] = 4.0;
this["verticalAlign"] = "middle"},
+0,
1,
".outer.inner",
function() {this["width"] = 512.0},
0,
1,
".outer .inner",
function() {this["width"] = 512.0},
0,
1,
".outer>.innerTitle",
function() {this["background"] = ["url('assets/welcome_card.jpg')", "center", "/", "cover"];
+this["color"] = 16777215;
+this["height"] = 176.0},
0,
1,
".outer>.innerMenu",
function() {this["color"] = 16777215},
0,
1,
"h4",
function() {this["color"] = 16777215},
0,
1,
".outerother.inner",
function() {this["height"] = 320.0;
this["width"] = 320.0},
0,
1,
".outerother-square>.innerTitle",
function() {this["background"] = ["url('assets/dog.png')", "bottom", "right", 15.0, "no-repeat", 4634284];
+this["color"] = 16777215},
0,
1,
".usescalc",
function() {this["color"] = 16777215;
this["width"] = null},
0,
1,
".FLEX35340A",
function() {this["background"] = null;
this["filter"] = null;
this["transform"] = null},
0,
1,
".FLEX35340B",
function() {this["background"] = null},
0,
1,
".FLEX35340C",
function() {this["background"] = null},
0,
1,
".FLEX35340D",
function() {this["boxShadow"] = ["0 2px 2px 0 rgba(0,0,0,.14)", "0 3px 1px -2px rgba(0,0,0,.2)", "0 1px 5px 0 rgba(0,0,0,.12)"];
this["fontFamily"] = ["Georgia", "Times New Roman", "Times", "serif"];
+this["textShadow"] = [0.0, -1.0, 0.0, 2986344448]},
0,
1,
".FLEX35346",
-function() {this["position"] = "absolute";
-this["transform"] = null;
+function() {this["WebkitTransform"] = null;
+this["border"] = 0.0;
this["height"] = 2.0;
-this["overflow"] = "hidden";
-this["width"] = null;
-this["margin"] = [0.0, 26.0];
this["left"] = 0.0;
+this["margin"] = [0.0, 26.0];
+this["overflow"] = "hidden";
this["padding"] = 0.0;
-this["border"] = 0.0;
-this["WebkitTransform"] = null;
-this["top"] = 50.0},
+this["position"] = "absolute";
+this["top"] = 50.0;
+this["transform"] = null;
+this["width"] = null},
0,
1,
"input",
function() {this["padding"] = 0.0},
0,
1,
"input[type=\"checkbox\"]",
function() {this["padding"] = 0.0},
0,
1,
".slider::-webkit-slider-thumb",
function() {this["padding"] = 0.0},
0,
1,
"input[type=\"range\"]",
function() {this["content"] = "assets/checkbox-tick.svg";
this["padding"] = 0.0},
0,
1,
"input[type=\"range\"]",
function() {this["content"] = "✔";
this["padding"] = 0.0},
0,
1,
"input+.innerMenu",
function() {this["color"] = 16777215},
0,
1,
".complex",
function() {this["background"] = ["url(\"data:image/svg+xml;utf8,<svg viewBox='0 0 16 13' version='1.1' xmlns='http://www.w3.org/2000/svg'><g transform='translate(-763, -290)'><g transform='translate(760, 285)'><g><polygon fill='#ffffff' points='3 13 9 18 19 7 16 5 9 13 6 10'></polygon></g></g></g></svg>\")", 11788282]},
diff --git a/compiler-jx/src/test/resources/royale/files/CSSTestSource_result.css b/compiler-jx/src/test/resources/royale/files/CSSTestSource_result.css
index 520ef6f..f392718 100755
--- a/compiler-jx/src/test/resources/royale/files/CSSTestSource_result.css
+++ b/compiler-jx/src/test/resources/royale/files/CSSTestSource_result.css
@@ -29,26 +29,26 @@
.glass {
border-color: #767473;
- highlight-alphas: .07, .45;
- fill-colors: #888888, #F3F3F3, #9E9E9E, #FCFCFC;
fill-alphas: .60, .70, .80, .90;
+ fill-colors: #888888, #F3F3F3, #9E9E9E, #FCFCFC;
+ highlight-alphas: .07, .45;
}
.glassSlider {
- fill-colors: #F3F3F3, #BBBBBB, #FCFCFC, #CCCCCC;
fill-alphas: .80, .70, .60, .50;
+ fill-colors: #F3F3F3, #BBBBBB, #FCFCFC, #CCCCCC;
}
.listItem {
- border-style: outset;
+ background-alpha: .5;
background-color: #FFFFFF;
- vertical-align: middle;
+ border-style: outset;
horizontal-gap: 5;
- background-alpha: .5;
padding-left: 4;
padding-right: 4;
+ vertical-align: middle;
}
@@ -63,9 +63,9 @@
.outer>.innerTitle {
- height: 176px;
- color: #fff;
background: url('assets/welcome_card.jpg') center / cover;
+ color: #fff;
+ height: 176px;
}
@@ -86,8 +86,8 @@
.outerother-square>.innerTitle {
- color: #fff;
background: url('assets/dog.png') bottom right 15% no-repeat #46B6AC;
+ color: #fff;
}
@@ -98,9 +98,9 @@
.FLEX35340A {
- transform: translateY(-50%);
background: -moz-linear-gradient(top, #ffffff 0%, #e1e1e1 100%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#e1e1e1',GradientType=0 );
+ transform: translateY(-50%);
}
@@ -116,23 +116,23 @@
.FLEX35340D {
box-shadow: 0 2px 2px 0 rgba(0,0,0,.14), 0 3px 1px -2px rgba(0,0,0,.2), 0 1px 5px 0 rgba(0,0,0,.12);
- text-shadow: 0 -1px 0 rgba(0,0,0,0.70);
font-family: Georgia, Times New Roman, Times, serif;
+ text-shadow: 0 -1px 0 rgba(0,0,0,0.70);
}
.FLEX35346 {
- position: absolute;
- transform: translate(0,-1px);
+ -webkit-transform: translate(0,-1px);
+ border: 0;
height: 2px;
- overflow: hidden;
- width: calc(100% - 22px);
- margin: 0 26px;
left: 0;
+ margin: 0 26px;
+ overflow: hidden;
padding: 0;
- border: 0;
- -webkit-transform: translate(0,-1px);
+ position: absolute;
top: 50%;
+ transform: translate(0,-1px);
+ width: calc(100% - 22px);
}
diff --git a/compiler-jx/src/test/resources/royale/files/LocalFunction_result.js b/compiler-jx/src/test/resources/royale/files/LocalFunction_result.js
index 504d25a..308cecf 100644
--- a/compiler-jx/src/test/resources/royale/files/LocalFunction_result.js
+++ b/compiler-jx/src/test/resources/royale/files/LocalFunction_result.js
@@ -52,7 +52,7 @@ LocalFunction.prototype.myMemberMethod = function(value) {
function myLocalFunction(value) {
return self.myMemberProperty + value;
};
- org.apache.royale.utils.Language.trace("WOW! :: " + myLocalFunction(value + 42));
+ org.apache.royale.utils.Language.trace("WOW! :: " + myLocalFunction((value + 42) >> 0));
};
@@ -88,4 +88,9 @@ LocalFunction.prototype.ROYALE_REFLECTION_INFO = function () {
}
};
};
+/**
+ * @const
+ * @type {number}
+ */
+LocalFunction.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9;
diff --git a/compiler-jx/src/test/resources/royale/files/MyInitialView_result.js b/compiler-jx/src/test/resources/royale/files/MyInitialView_result.js
index 0d210f8..9c7b30f 100644
--- a/compiler-jx/src/test/resources/royale/files/MyInitialView_result.js
+++ b/compiler-jx/src/test/resources/royale/files/MyInitialView_result.js
@@ -211,7 +211,7 @@ goog.exportSymbol('MyInitialView', MyInitialView);
* @private
* @type {org.apache.royale.utils.Timer}
*/
-MyInitialView.prototype.timer;
+MyInitialView.prototype.timer = null;
;
@@ -887,19 +887,17 @@ MyInitialView.prototype.ROYALE_REFLECTION_INFO = function () {
methods: function () {
return {
'startTimer': { type: 'void', declaredBy: 'MyInitialView'},
- 'timerHandler': { type: 'void', declaredBy: 'MyInitialView', parameters: function () { return [ { index: 1, type: 'org.apache.royale.events.Event', optional: false } ]; }},
- 'MyInitialView': { type: '', declaredBy: 'MyInitialView'},
- '$EH0': { type: 'void', declaredBy: 'MyInitialView'},
- '$EH1': { type: 'void', declaredBy: 'MyInitialView'},
- '$EH2': { type: 'void', declaredBy: 'MyInitialView'},
- '$EH3': { type: 'void', declaredBy: 'MyInitialView'},
- '$EH4': { type: 'void', declaredBy: 'MyInitialView'},
- '$EH5': { type: 'void', declaredBy: 'MyInitialView'},
- '$EH6': { type: 'void', declaredBy: 'MyInitialView'}
+ 'timerHandler': { type: 'void', declaredBy: 'MyInitialView', parameters: function () { return [ 'org.apache.royale.events.Event', false ]; }},
+ 'MyInitialView': { type: '', declaredBy: 'MyInitialView'}
};
}
};
};
+/**
+ * @const
+ * @type {number}
+ */
+MyInitialView.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9;
-
+
\ No newline at end of file
diff --git a/compiler-jx/src/test/resources/royale/files/RoyaleTest_again_result.js b/compiler-jx/src/test/resources/royale/files/RoyaleTest_again_result.js
index b56847b..b68fc57 100644
--- a/compiler-jx/src/test/resources/royale/files/RoyaleTest_again_result.js
+++ b/compiler-jx/src/test/resources/royale/files/RoyaleTest_again_result.js
@@ -198,12 +198,16 @@ RoyaleTest_again.prototype.ROYALE_REFLECTION_INFO = function () {
},
methods: function () {
return {
- 'RoyaleTest_again': { type: '', declaredBy: 'RoyaleTest_again'},
- '$EH0': { type: 'void', declaredBy: 'RoyaleTest_again'}
+ 'RoyaleTest_again': { type: '', declaredBy: 'RoyaleTest_again'}
};
}
};
};
+/**
+ * @const
+ * @type {number}
+ */
+RoyaleTest_again.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9;
diff --git a/compiler-jx/src/test/resources/royale/files/controllers/MyController_result.js b/compiler-jx/src/test/resources/royale/files/controllers/MyController_result.js
index 9b02257..904eafe 100644
--- a/compiler-jx/src/test/resources/royale/files/controllers/MyController_result.js
+++ b/compiler-jx/src/test/resources/royale/files/controllers/MyController_result.js
@@ -69,7 +69,7 @@ controllers.MyController.prototype.queryEnd = "%22)%0A%09%09&env=http%3A%2F%2Fda
* @private
* @type {RoyaleTest_again}
*/
-controllers.MyController.prototype.app;
+controllers.MyController.prototype.app = null;
/**
@@ -172,9 +172,14 @@ controllers.MyController.prototype.ROYALE_REFLECTION_INFO = function () {
return {
methods: function () {
return {
- 'MyController': { type: '', declaredBy: 'controllers.MyController', parameters: function () { return [ { index: 1, type: 'org.apache.royale.core.Application', optional: true } ]; }},
- 'setDocument': { type: 'void', declaredBy: 'controllers.MyController', parameters: function () { return [ { index: 1, type: 'Object', optional: false },{ index: 2, type: 'String', optional: true } ]; }}
+ 'MyController': { type: '', declaredBy: 'controllers.MyController', parameters: function () { return [ 'org.apache.royale.core.Application', true ]; }},
+ 'setDocument': { type: 'void', declaredBy: 'controllers.MyController', parameters: function () { return [ 'Object', false ,'String', true ]; }}
};
}
};
};
+/**
+ * @const
+ * @type {number}
+ */
+controllers.MyController.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9;
diff --git a/compiler-jx/src/test/resources/royale/files/models/MyModel_result.js b/compiler-jx/src/test/resources/royale/files/models/MyModel_result.js
index df44460..113ada5 100644
--- a/compiler-jx/src/test/resources/royale/files/models/MyModel_result.js
+++ b/compiler-jx/src/test/resources/royale/files/models/MyModel_result.js
@@ -49,21 +49,21 @@ goog.exportSymbol('models.MyModel', models.MyModel);
* @private
* @type {string}
*/
-models.MyModel.prototype._labelText;
+models.MyModel.prototype._labelText = null;
/**
* @private
* @type {Array}
*/
-models.MyModel.prototype._strings;
+models.MyModel.prototype._strings = null;
/**
* @private
* @type {Array}
*/
-models.MyModel.prototype._cities;
+models.MyModel.prototype._cities = null;
models.MyModel.prototype.get__labelText = function() {
@@ -139,3 +139,8 @@ models.MyModel.prototype.ROYALE_REFLECTION_INFO = function () {
}
};
};
+/**
+ * @const
+ * @type {number}
+ */
+models.MyModel.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9;
diff --git a/compiler-jx/src/test/resources/royale/files/wildcard_import_result.js b/compiler-jx/src/test/resources/royale/files/wildcard_import_result.js
index a6d93c5..faef240 100644
--- a/compiler-jx/src/test/resources/royale/files/wildcard_import_result.js
+++ b/compiler-jx/src/test/resources/royale/files/wildcard_import_result.js
@@ -59,7 +59,8 @@ goog.exportSymbol('wildcard_import', wildcard_import);
* @private
*/
wildcard_import.prototype.tmp = function() {
- var /** @type {org.apache.royale.html.Button} */ myButton;
+ var /** @type {org.apache.royale.html.Button} */ myButton = null;
+ //var /** @type {org.apache.royale.html.Button} */ myButton = null;
myButton = new org.apache.royale.html.Button();
};
@@ -87,6 +88,11 @@ wildcard_import.prototype.ROYALE_REFLECTION_INFO = function () {
}
};
};
+/**
+ * @const
+ * @type {number}
+ */
+wildcard_import.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9;