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/03/01 21:03:58 UTC
[1/9] git commit: [flex-falcon] [refs/heads/dual] - use JS config for
SWF compiles as well so dual mode JS properties don't result in errors
Repository: flex-falcon
Updated Branches:
refs/heads/dual af9ebe025 -> 2641da881
use JS config for SWF compiles as well so dual mode JS properties don't result in errors
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/c2bc8d02
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/c2bc8d02
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/c2bc8d02
Branch: refs/heads/dual
Commit: c2bc8d0236123d5353edb922041303b5eab6c333
Parents: af9ebe0
Author: Alex Harui <ah...@apache.org>
Authored: Wed Feb 22 23:48:45 2017 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Feb 22 23:48:45 2017 -0800
----------------------------------------------------------------------
.../src/main/java/org/apache/flex/compiler/clients/MXMLJSC.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c2bc8d02/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSC.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSC.java b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSC.java
index e2c6486..8f30b1a 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSC.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSC.java
@@ -316,6 +316,7 @@ public class MXMLJSC implements JSCompilerEntryPoint, ProblemQueryProvider,
{
case SWF:
mxmlc = new MXMLC();
+ mxmlc.configurationClass = JSGoogConfiguration.class;
if (noLink)
result = mxmlc.mainCompileOnly(removeJSArgs(args), err);
else
[6/9] git commit: [flex-falcon] [refs/heads/dual] - ignore internal
abc errors when JS compiling
Posted by ah...@apache.org.
ignore internal abc errors when JS compiling
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/cb0275a8
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/cb0275a8
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/cb0275a8
Branch: refs/heads/dual
Commit: cb0275a82ada009f26c27db7876bcac8e0dbcf19
Parents: 07aa378
Author: Alex Harui <ah...@apache.org>
Authored: Wed Mar 1 13:00:23 2017 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Mar 1 13:00:23 2017 -0800
----------------------------------------------------------------------
.../internal/units/CompilationUnitBase.java | 23 +++++++++++++++++---
1 file changed, 20 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/cb0275a8/compiler/src/main/java/org/apache/flex/compiler/internal/units/CompilationUnitBase.java
----------------------------------------------------------------------
diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/units/CompilationUnitBase.java b/compiler/src/main/java/org/apache/flex/compiler/internal/units/CompilationUnitBase.java
index 99d656e..0ae3bc0 100644
--- a/compiler/src/main/java/org/apache/flex/compiler/internal/units/CompilationUnitBase.java
+++ b/compiler/src/main/java/org/apache/flex/compiler/internal/units/CompilationUnitBase.java
@@ -68,6 +68,7 @@ import org.apache.flex.compiler.internal.units.requests.RequestMaker;
import org.apache.flex.compiler.internal.units.requests.SyntaxTreeRequestResult;
import org.apache.flex.compiler.mxml.IXMLNameResolver;
import org.apache.flex.compiler.problems.ICompilerProblem;
+import org.apache.flex.compiler.problems.InternalCompilerProblem;
import org.apache.flex.compiler.problems.InternalCompilerProblem2;
import org.apache.flex.compiler.projects.ICompilerProject;
import org.apache.flex.compiler.projects.IFlexProject;
@@ -168,7 +169,7 @@ public abstract class CompilationUnitBase implements ICompilationUnit
{
final boolean isFlex3CSS = ((IFlexProject)project).getCSSManager().isFlex3CSS();
final ImmutableMap<ICSSSelector, String> resolvedSelectors =
- CSSSemanticAnalyzer.resolveSelectors(xmlNameResolver, cssDocument, problems, isFlex3CSS);
+ CSSSemanticAnalyzer.resolveSelectors(xmlNameResolver, cssDocument, problems, (IFlexProject) project, isFlex3CSS);
// Store resolved type selectors required by CSS code generation.
cssCompilationSession.resolvedSelectors.putAll(resolvedSelectors);
@@ -176,6 +177,8 @@ public abstract class CompilationUnitBase implements ICompilationUnit
// Store resolved embed compilation units required by CSS code generation.
for (final ICSSRule cssRule : cssDocument.getRules())
{
+ if (project instanceof IFlexProject && !((IFlexProject)project).isPlatformRule(cssRule))
+ continue;
final Map<CSSFunctionCallPropertyValue, EmbedCompilationUnit> resolvedEmbedProperties =
new HashMap<CSSFunctionCallPropertyValue, EmbedCompilationUnit>();
CSSSemanticAnalyzer.resolveDependencies(
@@ -1052,8 +1055,22 @@ public abstract class CompilationUnitBase implements ICompilationUnit
Collections.addAll(problems, getSyntaxTreeRequest().get().getProblems());
Collections.addAll(problems, getFileScopeRequest().get().getProblems());
Collections.addAll(problems, getOutgoingDependenciesRequest().get().getProblems());
- Collections.addAll(problems, getABCBytesRequest().get().getProblems());
- Collections.addAll(problems, getSWFTagsRequest().get().getProblems());
+ if (targetType == null)
+ {
+ ICompilerProblem[] probs = getABCBytesRequest().get().getProblems();
+ for (ICompilerProblem prob : probs)
+ {
+ if (!(prob instanceof InternalCompilerProblem2))
+ {
+ problems.add(prob);
+ }
+ }
+ }
+ else
+ {
+ Collections.addAll(problems, getABCBytesRequest().get().getProblems());
+ Collections.addAll(problems, getSWFTagsRequest().get().getProblems());
+ }
}
@Override
[3/9] git commit: [flex-falcon] [refs/heads/dual] - switch to built
swc
Posted by ah...@apache.org.
switch to built swc
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/a08b7b13
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/a08b7b13
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/a08b7b13
Branch: refs/heads/dual
Commit: a08b7b13f8f4023739f0539ea5986a8428b228f2
Parents: 33d2339
Author: Alex Harui <ah...@apache.org>
Authored: Wed Mar 1 12:56:38 2017 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Mar 1 12:56:38 2017 -0800
----------------------------------------------------------------------
.../internal/codegen/mxml/flexjs/TestFlexJSMXMLApplication.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a08b7b13/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/TestFlexJSMXMLApplication.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/TestFlexJSMXMLApplication.java b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/TestFlexJSMXMLApplication.java
index 6e14c10..83ccf26 100644
--- a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/TestFlexJSMXMLApplication.java
+++ b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/TestFlexJSMXMLApplication.java
@@ -824,7 +824,7 @@ public class TestFlexJSMXMLApplication extends FlexJSTestBase
args[3] = "-library-path+=" + new File(FilenameNormalization.normalize(env.ASJS + "/frameworks/libs/Binding.swc")).getPath();
args[4] = "-library-path+=" + new File(FilenameNormalization.normalize(env.ASJS + "/frameworks/libs/Network.swc")).getPath();
args[5] = "-library-path+=" + new File(FilenameNormalization.normalize(env.ASJS + "/frameworks/libs/Collections.swc")).getPath();
- args[6] = "-library-path+=" + new File(FilenameNormalization.normalize(env.ASJS + "/frameworks/projects/Basic/target/Basic.swc")).getPath();
+ args[6] = "-library-path+=" + new File(FilenameNormalization.normalize(env.ASJS + "/frameworks/libs/Basic.swc")).getPath();
args[7] = "-external-library-path+=" + testAdapter.getPlayerglobal().getPath();
args[8] = "-output=" + new File(testAdapter.getTempDir(), "bin-debug/FlexJSTest_again_Flash.swf").getPath();
if (env.GOOG != null)
[8/9] git commit: [flex-falcon] [refs/heads/dual] - part of rule
skipping fix
Posted by ah...@apache.org.
part of rule skipping fix
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/383abc88
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/383abc88
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/383abc88
Branch: refs/heads/dual
Commit: 383abc88eb24b3f6b7b80a68dec2f09aea5970bf
Parents: 0f20898
Author: Alex Harui <ah...@apache.org>
Authored: Wed Mar 1 13:02:58 2017 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Mar 1 13:02:58 2017 -0800
----------------------------------------------------------------------
.../internal/css/semantics/CSSSemanticAnalyzer.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/383abc88/compiler/src/main/java/org/apache/flex/compiler/internal/css/semantics/CSSSemanticAnalyzer.java
----------------------------------------------------------------------
diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/css/semantics/CSSSemanticAnalyzer.java b/compiler/src/main/java/org/apache/flex/compiler/internal/css/semantics/CSSSemanticAnalyzer.java
index 64dfa7f..e2f244c 100644
--- a/compiler/src/main/java/org/apache/flex/compiler/internal/css/semantics/CSSSemanticAnalyzer.java
+++ b/compiler/src/main/java/org/apache/flex/compiler/internal/css/semantics/CSSSemanticAnalyzer.java
@@ -219,12 +219,13 @@ public class CSSSemanticAnalyzer
final IXMLNameResolver xmlNameResolver,
final ICSSDocument css,
final Collection<ICompilerProblem> problems,
+ final IFlexProject project,
final boolean isCompatibilityVersion3)
{
assert xmlNameResolver != null : "Expected xmlNameResolver";
assert css != null : "Expected CSS";
- final ImmutableSet<ICSSSelector> allSelectors = getAllSelectors(css);
+ final ImmutableSet<ICSSSelector> allSelectors = getAllSelectors(css, project);
if (isCompatibilityVersion3)
return resolveSelectorsAsFlex3Style(allSelectors);
@@ -314,13 +315,15 @@ public class CSSSemanticAnalyzer
* @param document CSS document
* @return All the selectors in the CSS.
*/
- public static ImmutableSet<ICSSSelector> getAllSelectors(final ICSSDocument document)
+ public static ImmutableSet<ICSSSelector> getAllSelectors(final ICSSDocument document, final IFlexProject project)
{
assert document != null : "Expected CSS document";
final ImmutableSet.Builder<ICSSSelector> builder = new ImmutableSet.Builder<ICSSSelector>();
for (final ICSSRule rule : document.getRules())
{
+ if (!project.isPlatformRule(rule))
+ continue;
for (final ICSSSelector subject : rule.getSelectorGroup())
{
ICSSSelector selector = subject;
@@ -469,7 +472,7 @@ public class CSSSemanticAnalyzer
{
final boolean isFlex3CSS = flexProject.getCSSManager().isFlex3CSS();
final ImmutableMap<ICSSSelector, String> resolvedSelectors =
- resolveSelectors(flexProject, cssDocument, problems, isFlex3CSS);
+ resolveSelectors(flexProject, cssDocument, problems, flexProject, isFlex3CSS);
final Predicate<ICSSRule> predicate;
if (isFlex3CSS)
{
[9/9] git commit: [flex-falcon] [refs/heads/dual] - ant tasks for
dual. no need for most arg values anymore
Posted by ah...@apache.org.
ant tasks for dual. no need for most arg values anymore
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/2641da88
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/2641da88
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/2641da88
Branch: refs/heads/dual
Commit: 2641da881ac0a5da7f24a705efe31a8c0ae5ed5c
Parents: 383abc8
Author: Alex Harui <ah...@apache.org>
Authored: Wed Mar 1 13:03:46 2017 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Mar 1 13:03:46 2017 -0800
----------------------------------------------------------------------
.../flex/compiler/clients/JSConfiguration.java | 2 +-
.../apache/flex/compiler/clients/MXMLJSC.java | 26 +++++++++++++++
.../driver/js/goog/JSGoogConfiguration.java | 4 +++
flexjs-ant-tasks/build.xml | 10 +++---
.../org/apache/flex/compiler/ant/COMPCTask.java | 23 ++++++++++++--
.../org/apache/flex/compiler/ant/FlexTask.java | 8 ++---
.../org/apache/flex/compiler/ant/MXMLCTask.java | 25 +++++++++++++--
flexjs-ant-tasks/src/test/build.xml | 33 +++++++++++++++++---
8 files changed, 112 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/2641da88/compiler-jx/src/main/java/org/apache/flex/compiler/clients/JSConfiguration.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/JSConfiguration.java b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/JSConfiguration.java
index 68595e4..4427df4 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/JSConfiguration.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/JSConfiguration.java
@@ -77,7 +77,7 @@ public class JSConfiguration extends Configuration
*/
@Config(allowMultiple = true, isPath = false)
@Mapping({ "compiler", "targets" })
- @Arguments("type")
+ @Arguments("target")
@InfiniteArguments
public void setCompilerTargets(ConfigurationValue cv, String[] targetlist)
{
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/2641da88/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSC.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSC.java b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSC.java
index 8f30b1a..db96db7 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSC.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSC.java
@@ -33,6 +33,7 @@ import java.util.Set;
import java.util.TreeSet;
import org.apache.commons.io.FilenameUtils;
+import org.apache.flex.compiler.clients.MXMLC.ExitCode;
import org.apache.flex.compiler.clients.problems.ProblemPrinter;
import org.apache.flex.compiler.clients.problems.ProblemQuery;
import org.apache.flex.compiler.clients.problems.ProblemQueryProvider;
@@ -188,6 +189,11 @@ public class MXMLJSC implements JSCompilerEntryPoint, ProblemQueryProvider,
}
final int code;
+
+ int getCode()
+ {
+ return code;
+ }
}
public static JSOutputType jsOutputType;
@@ -225,6 +231,9 @@ public class MXMLJSC implements JSCompilerEntryPoint, ProblemQueryProvider,
public static int staticMainNoExit(final String[] args)
{
long startTime = System.nanoTime();
+ System.out.println("MXMLJSC");
+ for (String arg : args)
+ System.out.println(arg);
final MXMLJSC mxmlc = new MXMLJSC();
final List<ICompilerProblem> problems = new ArrayList<ICompilerProblem>();
final int exitCode = mxmlc.mainNoExit(args, problems, true);
@@ -911,4 +920,21 @@ public class MXMLJSC implements JSCompilerEntryPoint, ProblemQueryProvider,
return mxmlc.writeSWF(output);
return 0;
}
+
+ /**
+ * Determines whether an exit code should be considered
+ * a fatal failure, such as for an Ant task.
+ *
+ * @param code A numeric exit code.
+ * @return <code>true</code> if the Ant task failed.
+ */
+ public static boolean isFatalFailure(final int code)
+ {
+ // This method really belongs in ExitCode
+ // but that would complicate FlexTask.
+ return code == ExitCode.FAILED_WITH_ERRORS.getCode() ||
+ code == ExitCode.FAILED_WITH_EXCEPTIONS.getCode() ||
+ code == ExitCode.FAILED_WITH_CONFIG_PROBLEMS.getCode();
+ }
+
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/2641da88/compiler-jx/src/main/java/org/apache/flex/compiler/internal/driver/js/goog/JSGoogConfiguration.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/driver/js/goog/JSGoogConfiguration.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/driver/js/goog/JSGoogConfiguration.java
index 0c6df76..318c90b 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/driver/js/goog/JSGoogConfiguration.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/driver/js/goog/JSGoogConfiguration.java
@@ -173,6 +173,7 @@ public class JSGoogConfiguration extends JSConfiguration
@Config(allowMultiple = true)
@Mapping("sdk-js-lib")
+ @Arguments(Arguments.PATH_ELEMENT)
@InfiniteArguments
public void setSDKJSLib(ConfigurationValue cv, List<String> value)
throws ConfigurationException
@@ -193,6 +194,7 @@ public class JSGoogConfiguration extends JSConfiguration
@Config(allowMultiple = true)
@Mapping("external-js-lib")
+ @Arguments(Arguments.PATH_ELEMENT)
@InfiniteArguments
public void setExternalJSLib(ConfigurationValue cv, List<String> value)
throws ConfigurationException
@@ -306,6 +308,7 @@ public class JSGoogConfiguration extends JSConfiguration
@Config(allowMultiple = true)
@Mapping("js-compiler-option")
+ @Arguments("option")
@InfiniteArguments
public void setJSCompilerOptions(ConfigurationValue cv, List<String> value)
throws ConfigurationException
@@ -326,6 +329,7 @@ public class JSGoogConfiguration extends JSConfiguration
@Config(allowMultiple = true)
@Mapping("js-output-optimization")
+ @Arguments("optimization")
@InfiniteArguments
public void setJSOutputOptimizations(ConfigurationValue cv, List<String> value)
throws ConfigurationException
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/2641da88/flexjs-ant-tasks/build.xml
----------------------------------------------------------------------
diff --git a/flexjs-ant-tasks/build.xml b/flexjs-ant-tasks/build.xml
index 1b9258f..193db3b 100644
--- a/flexjs-ant-tasks/build.xml
+++ b/flexjs-ant-tasks/build.xml
@@ -46,8 +46,8 @@
<!-- The 'sdk' property is the absolute path, with forward slashes, to the compiler/lib directory -->
<!-- where a Falcon SDK is built -->
<!-- All output paths are expressed as absolute paths starting with ${sdk} -->
- <property name="sdk" value="${flextasks}/../compiler/lib"/>
- <property name="compiler" value="${flextasks}/../compiler"/>
+ <property name="sdk" value="${flextasks}/../compiler-jx/lib"/>
+ <property name="compiler" value="${flextasks}/../compiler-jx"/>
<property name="src.depend" value="true"/>
@@ -76,7 +76,7 @@
-->
<path id="classpath">
- <fileset dir="${compiler}/lib/external" includes="**/*.jar"/>
+ <fileset dir="${compiler}/lib" includes="**/*.jar"/>
<fileset dir="${compiler}/../compiler-build-tools/target/classes" includes="**/*.class"/>
</path>
@@ -116,7 +116,7 @@
<attribute name="Implementation-Title" value="${manifest.Implementation-Title} - ant Tasks"/>
<attribute name="Implementation-Version" value="${manifest.Implementation-Version}.${build.number}"/>
<attribute name="Implementation-Vendor" value="${manifest.Implementation-Vendor}"/>
- <attribute name="Class-Path" value="compiler.jar"/>
+ <attribute name="Class-Path" value="jsc.jar ../../compiler/lib/compiler.jar ../../lib/compiler.jar"/>
</manifest>
<fileset dir="${flextasks}/src/main/resources" includes="flexTasks.tasks"/>
<fileset dir="${flextasks}/target/classes" includes="${flextasks.ant.binaries}"/>
@@ -153,7 +153,7 @@
<target name="clean" description="clean">
<delete dir="${flextasks}/target" failonerror="false"/>
- <delete dir="${sdk}/falcon-flextasks.jar" failonerror="false"/>
+ <delete file="${sdk}/falcon-flextasks.jar" failonerror="false"/>
</target>
<target name="wipe" depends="clean" description="Wipes everything that didn't come from Git.">
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/2641da88/flexjs-ant-tasks/src/main/java/org/apache/flex/compiler/ant/COMPCTask.java
----------------------------------------------------------------------
diff --git a/flexjs-ant-tasks/src/main/java/org/apache/flex/compiler/ant/COMPCTask.java b/flexjs-ant-tasks/src/main/java/org/apache/flex/compiler/ant/COMPCTask.java
index 71ddc25..d6c251d 100644
--- a/flexjs-ant-tasks/src/main/java/org/apache/flex/compiler/ant/COMPCTask.java
+++ b/flexjs-ant-tasks/src/main/java/org/apache/flex/compiler/ant/COMPCTask.java
@@ -82,9 +82,9 @@ public final class COMPCTask extends FlexTask implements DynamicConfigurator
private static final String TASK_NAME = "compc";
- private static final String TOOL_JAR_FILE_NAME = "compiler.jar";
+ private static final String TOOL_JAR_FILE_NAME = "jsc.jar";
- private static final String TOOL_CLASS_NAME = "org.apache.flex.compiler.clients.COMPC";
+ private static final String TOOL_CLASS_NAME = "org.apache.flex.compiler.clients.COMPJSC";
private static final String TOOL_METHOD_NAME = "staticMainNoExit";
@@ -175,6 +175,7 @@ public final class COMPCTask extends FlexTask implements DynamicConfigurator
new ConfigString(new OptionSpec("compiler.locale")),
new ConfigString(new OptionSpec("compiler.minimum-supported-version", "msv")),
new ConfigString(new OptionSpec("compiler.services")),
+ new ConfigString(new OptionSpec("compiler.targets")),
new ConfigString(new OptionSpec("debug-password")),
new ConfigString(new OptionSpec("dump-config")),
new ConfigString(new OptionSpec("link-report")),
@@ -215,12 +216,18 @@ public final class COMPCTask extends FlexTask implements DynamicConfigurator
private static final OptionSpec EXTERNAL_LIBRARY_PATH =
new OptionSpec("compiler.external-library-path", "el");
+ private static final OptionSpec JS_EXTERNAL_LIBRARY_PATH =
+ new OptionSpec("compiler.js-external-library-path");
+
private static final OptionSpec INCLUDE_LIBRARIES =
new OptionSpec("compiler.include-libraries");
private static final OptionSpec LIBRARY_PATH =
new OptionSpec("compiler.library-path", "l");
+ private static final OptionSpec JS_LIBRARY_PATH =
+ new OptionSpec("compiler.js-library-path");
+
private static final OptionSpec SOURCE_PATH =
new OptionSpec("compiler.source-path", "sp");
@@ -420,6 +427,12 @@ public final class COMPCTask extends FlexTask implements DynamicConfigurator
nestedFileSets.add(fs);
return fs;
}
+ else if (JS_EXTERNAL_LIBRARY_PATH.matches(name))
+ {
+ FlexFileSet fs = new FlexSWCFileSet(JS_EXTERNAL_LIBRARY_PATH, true);
+ nestedFileSets.add(fs);
+ return fs;
+ }
else if (INCLUDE_LIBRARIES.matches(name))
{
FlexFileSet fs = new FlexSWCFileSet(INCLUDE_LIBRARIES, true);
@@ -432,6 +445,12 @@ public final class COMPCTask extends FlexTask implements DynamicConfigurator
nestedFileSets.add(fs);
return fs;
}
+ else if (JS_LIBRARY_PATH.matches(name))
+ {
+ FlexFileSet fs = new FlexSWCFileSet(JS_LIBRARY_PATH, true);
+ nestedFileSets.add(fs);
+ return fs;
+ }
else if (THEME.matches(name))
{
FlexFileSet fs = new FlexFileSet(THEME);
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/2641da88/flexjs-ant-tasks/src/main/java/org/apache/flex/compiler/ant/FlexTask.java
----------------------------------------------------------------------
diff --git a/flexjs-ant-tasks/src/main/java/org/apache/flex/compiler/ant/FlexTask.java b/flexjs-ant-tasks/src/main/java/org/apache/flex/compiler/ant/FlexTask.java
index 6b32540..fb84a89 100644
--- a/flexjs-ant-tasks/src/main/java/org/apache/flex/compiler/ant/FlexTask.java
+++ b/flexjs-ant-tasks/src/main/java/org/apache/flex/compiler/ant/FlexTask.java
@@ -237,9 +237,9 @@ public abstract class FlexTask extends Java
if (flexHomeProperty == null)
throw new BuildException("FLEX_HOME must be set to use the Flex Ant Tasks");
- String falconHomeProperty = getProject().getProperty("FALCON_HOME");
+ String falconHomeProperty = getProject().getProperty("FALCONJX_HOME");
if (falconHomeProperty == null)
- throw new BuildException("FALCON_HOME must be set to use the Flex Ant Tasks");
+ throw new BuildException("FALCONJX_HOME must be set to use the Flex Ant Tasks");
System.setProperty("FLEX_HOME", flexHomeProperty);
String flexlibProperty = flexHomeProperty.concat("/frameworks/");
@@ -361,7 +361,7 @@ public abstract class FlexTask extends Java
}
catch (ClassNotFoundException ignoredClassNotFoundException)
{
- String flexHomeProperty = getProject().getProperty("FALCON_HOME");
+ String flexHomeProperty = getProject().getProperty("FALCONJX_HOME");
if (flexHomeProperty != null)
{
@@ -408,7 +408,7 @@ public abstract class FlexTask extends Java
else
{
throw new BuildException("The class, " + className +
- ", must be in the classpath or the FALCON_HOME property must be set.",
+ ", must be in the classpath or the FALCONJX_HOME property must be set.",
getLocation());
}
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/2641da88/flexjs-ant-tasks/src/main/java/org/apache/flex/compiler/ant/MXMLCTask.java
----------------------------------------------------------------------
diff --git a/flexjs-ant-tasks/src/main/java/org/apache/flex/compiler/ant/MXMLCTask.java b/flexjs-ant-tasks/src/main/java/org/apache/flex/compiler/ant/MXMLCTask.java
index 5df9ddd..f054dda 100644
--- a/flexjs-ant-tasks/src/main/java/org/apache/flex/compiler/ant/MXMLCTask.java
+++ b/flexjs-ant-tasks/src/main/java/org/apache/flex/compiler/ant/MXMLCTask.java
@@ -80,9 +80,9 @@ public final class MXMLCTask extends FlexTask implements DynamicConfigurator
private static final String TASK_NAME = "mxmlc";
- private static final String TOOL_JAR_FILE_NAME = "compiler.jar";
+ private static final String TOOL_JAR_FILE_NAME = "jsc.jar";
- private static final String TOOL_CLASS_NAME = "org.apache.flex.compiler.clients.MXMLC";
+ private static final String TOOL_CLASS_NAME = "org.apache.flex.compiler.clients.MXMLJSC";
private static final String TOOL_METHOD_NAME = "staticMainNoExit";
@@ -158,6 +158,7 @@ public final class MXMLCTask extends FlexTask implements DynamicConfigurator
new ConfigBoolean(new OptionSpec("compiler.warn-unlikely-function-value")),
new ConfigBoolean(new OptionSpec("compiler.warn-xml-class-has-changed")),
new ConfigBoolean(new OptionSpec("static-link-runtime-shared-libraries", "static-rsls")),
+ new ConfigBoolean(new OptionSpec("skip-transpile")),
new ConfigBoolean(new OptionSpec("verify-digests")),
new ConfigBoolean(new OptionSpec("use-direct-blit")),
new ConfigBoolean(new OptionSpec("use-gpu")),
@@ -170,6 +171,8 @@ public final class MXMLCTask extends FlexTask implements DynamicConfigurator
new ConfigString(new OptionSpec("compiler.locale")),
new ConfigString(new OptionSpec("compiler.mxml.compatibility-version")),
new ConfigString(new OptionSpec("compiler.services")),
+ new ConfigString(new OptionSpec("compiler.targets")),
+ new ConfigString(new OptionSpec("closure-lib")),
new ConfigString(new OptionSpec("debug-password")),
new ConfigString(new OptionSpec("dump-config")),
new ConfigString(new OptionSpec("link-report")),
@@ -215,12 +218,18 @@ public final class MXMLCTask extends FlexTask implements DynamicConfigurator
private static final OptionSpec EXTERNAL_LIBRARY_PATH =
new OptionSpec("compiler.external-library-path", "el");
+ private static final OptionSpec JS_EXTERNAL_LIBRARY_PATH =
+ new OptionSpec("compiler.js-external-library-path");
+
private static final OptionSpec INCLUDE_LIBRARIES =
new OptionSpec("compiler.include-libraries");
private static final OptionSpec LIBRARY_PATH =
new OptionSpec("compiler.library-path", "l");
+ private static final OptionSpec JS_LIBRARY_PATH =
+ new OptionSpec("compiler.js-library-path", "l");
+
private static final OptionSpec SOURCE_PATH =
new OptionSpec("compiler.source-path", "sp");
@@ -409,6 +418,12 @@ public final class MXMLCTask extends FlexTask implements DynamicConfigurator
nestedFileSets.add(fs);
return fs;
}
+ else if (JS_EXTERNAL_LIBRARY_PATH.matches(name))
+ {
+ FlexFileSet fs = new FlexSWCFileSet(JS_EXTERNAL_LIBRARY_PATH, true);
+ nestedFileSets.add(fs);
+ return fs;
+ }
else if (INCLUDE_LIBRARIES.matches(name))
{
FlexFileSet fs = new FlexSWCFileSet(INCLUDE_LIBRARIES, true);
@@ -421,6 +436,12 @@ public final class MXMLCTask extends FlexTask implements DynamicConfigurator
nestedFileSets.add(fs);
return fs;
}
+ else if (JS_LIBRARY_PATH.matches(name))
+ {
+ FlexFileSet fs = new FlexSWCFileSet(JS_LIBRARY_PATH, true);
+ nestedFileSets.add(fs);
+ return fs;
+ }
else if (THEME.matches(name))
{
FlexFileSet fs = new FlexFileSet(THEME);
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/2641da88/flexjs-ant-tasks/src/test/build.xml
----------------------------------------------------------------------
diff --git a/flexjs-ant-tasks/src/test/build.xml b/flexjs-ant-tasks/src/test/build.xml
index f6d1c7a..4dc0989 100644
--- a/flexjs-ant-tasks/src/test/build.xml
+++ b/flexjs-ant-tasks/src/test/build.xml
@@ -31,8 +31,26 @@
<property file="../../../env.properties" />
<property name="test.timeout" value="3000000" />
<property name="maxmem" value="512" />
+
+ <condition property="GOOG_HOME" value="${env.GOOG_HOME}">
+ <and>
+ <not>
+ <isset property="GOOG_HOME" />
+ </not>
+ <available file="${env.GOOG_HOME}/closure/goog/base.js" type="file" />
+ </and>
+ </condition>
+
+ <condition property="GOOG_HOME" value="${FLEXJS_HOME}/js/lib/google/closure-library">
+ <and>
+ <not>
+ <isset property="GOOG_HOME" />
+ </not>
+ <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js" type="file" />
+ </and>
+ </condition>
- <property name="compiler" value="${flextasks.tests}/../../../compiler"/>
+ <property name="compiler" value="${flextasks.tests}/../../../compiler-jx"/>
<condition property="flexsdk" value="${FLEX_HOME}" else="${env.FLEX_HOME}">
<isset property="FLEX_HOME" />
</condition>
@@ -46,22 +64,27 @@
<path id="lib.path">
<fileset dir="${falcon}/lib" includes="falcon-flexTasks.jar"/>
- <fileset dir="${falcon}/lib" includes="compiler.jar"/>
+ <fileset dir="${falcon}/lib" includes="jsc.jar"/>
</path>
<target name="ant.tests">
<property name="FLEX_HOME" value="${flexsdk}"/>
- <property name="FALCON_HOME" value="${falcon}"/>
+ <property name="FALCONJX_HOME" value="${falcon}"/>
+ <echo message="GOOG_HOME: ${GOOG_HOME}"/>
<echo>FLEX_HOME=${flexsdk}</echo>
- <echo>FALCON_HOME=${falcon}</echo>
+ <echo>FALCONJX_HOME=${FALCONJX_HOME}</echo>
<taskdef resource="flexTasks.tasks" classpathref="lib.path"/>
<mxmlc file="${flextasks.tests}/as/Hello.as"
output="${flextasks}/target/junit/Hello.swf"
+ compiler.targets="SWF"
+ closure-lib="${GOOG_HOME}"
target-player="${playerglobal.version}">
<arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
</mxmlc>
<delete file="${flextasks}/target/junit/Hello.swf"/>
- <compc output="${flextasks}/target/junit/Hello.swc" include-classes="Hello" target-player="${playerglobal.version}">
+ <compc output="${flextasks}/target/junit/Hello.swc" include-classes="Hello"
+ compiler.targets="SWF"
+ target-player="${playerglobal.version}">
<source-path path-element="${flextasks.tests}/as"/>
<arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
</compc>
[2/9] git commit: [flex-falcon] [refs/heads/dual] - exclude new
externs that use typed array
Posted by ah...@apache.org.
exclude new externs that use typed array
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/33d2339b
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/33d2339b
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/33d2339b
Branch: refs/heads/dual
Commit: 33d2339b79c0af2dfb7ad055c97dd503ace93224
Parents: c2bc8d0
Author: Alex Harui <ah...@apache.org>
Authored: Wed Mar 1 12:55:38 2017 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Mar 1 12:55:38 2017 -0800
----------------------------------------------------------------------
.../compiler/internal/codegen/externals/ExternalsTestUtils.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/33d2339b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/ExternalsTestUtils.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/ExternalsTestUtils.java b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/ExternalsTestUtils.java
index 608aabe..d9cc4f3 100644
--- a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/ExternalsTestUtils.java
+++ b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/ExternalsTestUtils.java
@@ -100,10 +100,12 @@ public class ExternalsTestUtils
{
config.addFieldExclude("Window", "focus");
config.addClassExclude("controlRange");
+ config.addClassExclude("ITemplateArray");
config.addExclude("Array", "toSource");
config.addExclude("Date", "valueOf");
config.addExclude("String", "valueOf");
+ config.addExclude("String", "raw");
// SVG
config.addExclude("SVGStylable", "className");
[5/9] git commit: [flex-falcon] [refs/heads/dual] - skip rules that
don't apply to platform
Posted by ah...@apache.org.
skip rules that don't apply to platform
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/07aa3782
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/07aa3782
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/07aa3782
Branch: refs/heads/dual
Commit: 07aa37825e78752a1e246aeb8d6f77f1ec5527f2
Parents: 962fd89
Author: Alex Harui <ah...@apache.org>
Authored: Wed Mar 1 12:59:52 2017 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Mar 1 12:59:52 2017 -0800
----------------------------------------------------------------------
.../compiler/internal/projects/FlexJSProject.java | 16 ++++++++++++++++
.../compiler/internal/projects/FlexProject.java | 7 +++++++
.../apache/flex/compiler/projects/IFlexProject.java | 5 +++++
3 files changed, 28 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/07aa3782/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 f90d2ac..0b971f8 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
@@ -31,6 +31,8 @@ import org.apache.flex.compiler.clients.JSConfiguration;
import org.apache.flex.compiler.common.DependencyType;
import org.apache.flex.compiler.config.Configuration;
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.metadata.IMetaTag;
import org.apache.flex.compiler.definitions.metadata.IMetaTagAttribute;
@@ -53,6 +55,8 @@ import org.apache.flex.compiler.tree.as.IASNode;
import org.apache.flex.compiler.tree.as.IDefinitionNode;
import org.apache.flex.compiler.units.ICompilationUnit;
+import com.google.common.collect.ImmutableList;
+
/**
* @author aharui
*
@@ -414,5 +418,17 @@ public class FlexJSProject extends FlexProject
return list;
return config.getCompilerNamespacesManifestMappings();
}
+
+ @Override
+ public boolean isPlatformRule(ICSSRule rule) {
+ ImmutableList<ICSSMediaQueryCondition> mqlist = rule.getMediaQueryConditions();
+ int n = mqlist.size();
+ if (n > 0)
+ {
+ if (mqlist.get(0).toString().equals("-flex-flash"))
+ return false;
+ }
+ return true;
+ }
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/07aa3782/compiler/src/main/java/org/apache/flex/compiler/internal/projects/FlexProject.java
----------------------------------------------------------------------
diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/projects/FlexProject.java b/compiler/src/main/java/org/apache/flex/compiler/internal/projects/FlexProject.java
index 5ba8cdd..7a29c35 100644
--- a/compiler/src/main/java/org/apache/flex/compiler/internal/projects/FlexProject.java
+++ b/compiler/src/main/java/org/apache/flex/compiler/internal/projects/FlexProject.java
@@ -44,6 +44,7 @@ import org.apache.flex.compiler.config.RSLSettings;
import org.apache.flex.compiler.constants.IASLanguageConstants;
import org.apache.flex.compiler.constants.IMetaAttributeConstants;
import org.apache.flex.compiler.css.ICSSManager;
+import org.apache.flex.compiler.css.ICSSRule;
import org.apache.flex.compiler.definitions.IClassDefinition;
import org.apache.flex.compiler.definitions.IDefinition;
import org.apache.flex.compiler.definitions.IEffectDefinition;
@@ -2356,4 +2357,10 @@ public class FlexProject extends ASProject implements IFlexProject
{
return config.getCompilerNamespacesManifestMappings();
}
+
+ @Override
+ public boolean isPlatformRule(ICSSRule rule) {
+ return true;
+ }
+
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/07aa3782/compiler/src/main/java/org/apache/flex/compiler/projects/IFlexProject.java
----------------------------------------------------------------------
diff --git a/compiler/src/main/java/org/apache/flex/compiler/projects/IFlexProject.java b/compiler/src/main/java/org/apache/flex/compiler/projects/IFlexProject.java
index 937c259..adf8817 100644
--- a/compiler/src/main/java/org/apache/flex/compiler/projects/IFlexProject.java
+++ b/compiler/src/main/java/org/apache/flex/compiler/projects/IFlexProject.java
@@ -30,6 +30,7 @@ import org.apache.flex.compiler.common.XMLName;
import org.apache.flex.compiler.config.Configuration;
import org.apache.flex.compiler.config.RSLSettings;
import org.apache.flex.compiler.css.ICSSManager;
+import org.apache.flex.compiler.css.ICSSRule;
import org.apache.flex.compiler.exceptions.LibraryCircularDependencyException;
import org.apache.flex.compiler.internal.config.IWriteOnlyProjectSettings;
import org.apache.flex.compiler.internal.css.CSSManager;
@@ -223,5 +224,9 @@ public interface IFlexProject extends IASProject, IXMLNameResolver, IWriteOnlyPr
*/
List<MXMLNamespaceMapping> getCompilerNamespacesManifestMappings(Configuration config);
+ /**
+ * True if Rule will work on the destination platform
+ */
+ boolean isPlatformRule(ICSSRule rule);
}
[7/9] git commit: [flex-falcon] [refs/heads/dual] - handle calc here
too
Posted by ah...@apache.org.
handle calc here too
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/0f20898d
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/0f20898d
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/0f20898d
Branch: refs/heads/dual
Commit: 0f20898de0e7c4ddfd607bac52660986bff79900
Parents: cb0275a
Author: Alex Harui <ah...@apache.org>
Authored: Wed Mar 1 13:00:56 2017 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Mar 1 13:00:56 2017 -0800
----------------------------------------------------------------------
.../internal/driver/js/flexjs/JSCSSCompilationSession.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/0f20898d/compiler-jx/src/main/java/org/apache/flex/compiler/internal/driver/js/flexjs/JSCSSCompilationSession.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/driver/js/flexjs/JSCSSCompilationSession.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/driver/js/flexjs/JSCSSCompilationSession.java
index fe1c5e9..2a77161 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/driver/js/flexjs/JSCSSCompilationSession.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/driver/js/flexjs/JSCSSCompilationSession.java
@@ -370,6 +370,10 @@ public class JSCSSCompilationSession extends CSSCompilationSession
{
// TODO: implement me
}
+ else if ("calc".equals(functionCall.name))
+ {
+ // TODO: implement me
+ }
else if ("Embed".equals(functionCall.name))
{
// TODO: implement me
[4/9] git commit: [flex-falcon] [refs/heads/dual] - fix css calc
parsing
Posted by ah...@apache.org.
fix css calc parsing
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/962fd89f
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/962fd89f
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/962fd89f
Branch: refs/heads/dual
Commit: 962fd89fe9cca20e7da25886ab6db157f616386a
Parents: a08b7b1
Author: Alex Harui <ah...@apache.org>
Authored: Wed Mar 1 12:58:09 2017 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Mar 1 12:58:09 2017 -0800
----------------------------------------------------------------------
compiler-jx/src/test/resources/flexjs/files/CSSTestSource.css | 2 +-
.../src/test/resources/flexjs/files/CSSTestSource_result.css | 2 +-
.../src/main/antlr3/org/apache/flex/compiler/internal/css/CSS.g | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/962fd89f/compiler-jx/src/test/resources/flexjs/files/CSSTestSource.css
----------------------------------------------------------------------
diff --git a/compiler-jx/src/test/resources/flexjs/files/CSSTestSource.css b/compiler-jx/src/test/resources/flexjs/files/CSSTestSource.css
index f18dc6f..6bbb192 100755
--- a/compiler-jx/src/test/resources/flexjs/files/CSSTestSource.css
+++ b/compiler-jx/src/test/resources/flexjs/files/CSSTestSource.css
@@ -84,5 +84,5 @@
.usescalc {
color: #fff;
- width: calc((100% - 50px)/3;
+ width: calc((100% - 50px)/3);
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/962fd89f/compiler-jx/src/test/resources/flexjs/files/CSSTestSource_result.css
----------------------------------------------------------------------
diff --git a/compiler-jx/src/test/resources/flexjs/files/CSSTestSource_result.css b/compiler-jx/src/test/resources/flexjs/files/CSSTestSource_result.css
index 6a17c84..bc01e64 100755
--- a/compiler-jx/src/test/resources/flexjs/files/CSSTestSource_result.css
+++ b/compiler-jx/src/test/resources/flexjs/files/CSSTestSource_result.css
@@ -85,7 +85,7 @@
.usescalc {
color: #fff;
- width: calc((100% - 50px) / 3;
+ width: calc((100% - 50px)/3);
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/962fd89f/compiler/src/main/antlr3/org/apache/flex/compiler/internal/css/CSS.g
----------------------------------------------------------------------
diff --git a/compiler/src/main/antlr3/org/apache/flex/compiler/internal/css/CSS.g b/compiler/src/main/antlr3/org/apache/flex/compiler/internal/css/CSS.g
index af9348a..726b09f 100644
--- a/compiler/src/main/antlr3/org/apache/flex/compiler/internal/css/CSS.g
+++ b/compiler/src/main/antlr3/org/apache/flex/compiler/internal/css/CSS.g
@@ -580,9 +580,9 @@ RGB : 'rgb(' ( WS* NUMBER ( PERCENT | ) WS* ) ','
/** Arguments of a function call property value. */
ARGUMENTS
- : '(' ( options {greedy=false;}: . )* ')'
+ : '(' ( options {greedy=false;}: ARGUMENTS | . )* ')'
;
-
+
/**
* Match multiple semi-colons in Lexer level so that the parser can have a
* finite number of look ahead, instead of LL(*);