You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jo...@apache.org on 2014/03/23 14:09:35 UTC
[01/17] git commit: [flex-falcon] [refs/heads/maven] - modified:
compiler.tests/functional-tests/f/SDKSWCTests.java Removed obsolete comment
from test. modified:
compiler/src/org/apache/flex/compiler/config/Configurator.java
Repository: flex-falcon
Updated Branches:
refs/heads/maven 00703ca19 -> 8b718a776 (forced update)
modified: compiler.tests/functional-tests/f/SDKSWCTests.java
Removed obsolete comment from test.
modified: compiler/src/org/apache/flex/compiler/config/Configurator.java
Only remove the theme setting from DefaultsConfigurator if flexlib or application.home is not specified. This fixes compiling sparkskins on AIR.
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/697db6f8
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/697db6f8
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/697db6f8
Branch: refs/heads/maven
Commit: 697db6f875c15cf3d675142c7a8d64f33f933ed2
Parents: 9fdf5bf
Author: dloverin <da...@gmail.com>
Authored: Sat Mar 8 10:37:32 2014 -0500
Committer: dloverin <da...@gmail.com>
Committed: Sat Mar 8 10:57:19 2014 -0500
----------------------------------------------------------------------
compiler.tests/functional-tests/f/SDKSWCTests.java | 2 +-
compiler/src/org/apache/flex/compiler/config/Configurator.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/697db6f8/compiler.tests/functional-tests/f/SDKSWCTests.java
----------------------------------------------------------------------
diff --git a/compiler.tests/functional-tests/f/SDKSWCTests.java b/compiler.tests/functional-tests/f/SDKSWCTests.java
index 7cd2a8d..56b0bef 100644
--- a/compiler.tests/functional-tests/f/SDKSWCTests.java
+++ b/compiler.tests/functional-tests/f/SDKSWCTests.java
@@ -332,7 +332,7 @@ public class SDKSWCTests
}
@Test
- public void sparkSWC() // FAILS -> FLEX-33307
+ public void sparkSWC()
{
extraArgs = new String[]
{
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/697db6f8/compiler/src/org/apache/flex/compiler/config/Configurator.java
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/config/Configurator.java b/compiler/src/org/apache/flex/compiler/config/Configurator.java
index 3ce223f..30543e7 100644
--- a/compiler/src/org/apache/flex/compiler/config/Configurator.java
+++ b/compiler/src/org/apache/flex/compiler/config/Configurator.java
@@ -1026,9 +1026,9 @@ public class Configurator implements ICompilerSettings, IConfigurator, ICompiler
System.getProperty("application.home") == null)
{
cfgbuf.clearVar("load-config", null, -1);
+ cfgbuf.clearVar("compiler.theme", null, -1);
}
- cfgbuf.clearVar("compiler.theme", null, -1);
}
/**
[06/17] git commit: [flex-falcon] [refs/heads/maven] - continue to
try to use flex-falcon script to fix flex-sdk script
Posted by jo...@apache.org.
continue to try to use flex-falcon script to fix flex-sdk script
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/d2119c68
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/d2119c68
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/d2119c68
Branch: refs/heads/maven
Commit: d2119c68ec319ea39d4bb650c4d2c8a307d8403d
Parents: 7190216
Author: Alex Harui <ah...@apache.org>
Authored: Thu Mar 20 09:45:53 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Mar 20 09:45:53 2014 -0700
----------------------------------------------------------------------
jenkins.xml | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d2119c68/jenkins.xml
----------------------------------------------------------------------
diff --git a/jenkins.xml b/jenkins.xml
index 7154aa8..78aca83 100644
--- a/jenkins.xml
+++ b/jenkins.xml
@@ -37,14 +37,17 @@
<target name="clear.sdk.lock" >
<!-- attempt to delete file on builds.apache.org that is gumming up the sdk build -->
<delete file="f:/hudson/hudson-slave/workspace/flex-sdk/.git/index.lock" />
+ <echo>Running git status</echo>
<exec executable="git" dir="f:/hudson/hudson-slave/workspace/flex-sdk" failonerror="true">
<arg value="status"/>
</exec>
+ <echo>Running git checkout</echo>
<exec executable="git" dir="f:/hudson/hudson-slave/workspace/flex-sdk" failonerror="true">
<arg value="checkout"/>
<arg value="--"/>
<arg value="."/>
</exec>
+ <echo>Running git clean</echo>
<exec executable="git" dir="f:/hudson/hudson-slave/workspace/flex-sdk" failonerror="true">
<arg value="clean"/>
<arg value="-fd"/>
[08/17] git commit: [flex-falcon] [refs/heads/maven] - fix baseline
Posted by jo...@apache.org.
fix baseline
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/3c27b0f8
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/3c27b0f8
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/3c27b0f8
Branch: refs/heads/maven
Commit: 3c27b0f8132cffb1a1420cb62b490737f2b5a71d
Parents: 12f338c
Author: Alex Harui <ah...@apache.org>
Authored: Fri Mar 21 11:54:43 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Mar 21 11:54:43 2014 -0700
----------------------------------------------------------------------
compiler.jx.tests/test-files/flexjs/files/MyInitialView_result.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/3c27b0f8/compiler.jx.tests/test-files/flexjs/files/MyInitialView_result.js
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/test-files/flexjs/files/MyInitialView_result.js b/compiler.jx.tests/test-files/flexjs/files/MyInitialView_result.js
index 55cf7f3..6b68a21 100644
--- a/compiler.jx.tests/test-files/flexjs/files/MyInitialView_result.js
+++ b/compiler.jx.tests/test-files/flexjs/files/MyInitialView_result.js
@@ -197,7 +197,7 @@ MyInitialView.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'MyInitialView', q
/**
* @private
- * @type {org.apache.flex.utils.org.apache.flex.utils.Timer}
+ * @type {org.apache.flex.utils.Timer}
*/
MyInitialView.prototype.timer;
[02/17] git commit: [flex-falcon] [refs/heads/maven] - try to unlock
sdk build on builds.a.o
Posted by jo...@apache.org.
try to unlock sdk build on builds.a.o
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/c87817b2
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/c87817b2
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/c87817b2
Branch: refs/heads/maven
Commit: c87817b228b63238035d5645e4d536abbd931a8a
Parents: 697db6f
Author: Alex Harui <ah...@apache.org>
Authored: Thu Mar 20 07:23:32 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Mar 20 07:24:51 2014 -0700
----------------------------------------------------------------------
jenkins.xml | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c87817b2/jenkins.xml
----------------------------------------------------------------------
diff --git a/jenkins.xml b/jenkins.xml
index ef8afa3..053e137 100644
--- a/jenkins.xml
+++ b/jenkins.xml
@@ -34,6 +34,11 @@
<mkdir dir="${jflex.root}" />
</target>
+ <target name="clear.sdk.lock" >
+ <!-- attempt to delete file on builds.apache.org that is gumming up the sdk build -->
+ <delete file="f:/hudson/hudson-slave/workspace/flex-sdk/.git/index.lock" />
+ </target>
+
<target name="jflex-download" description="Copies JFlex from JFlex website">
<echo message="Be patient. This takes a few minutes..." />
<get src="http://jflex.de/${jflex.filename}.zip" dest="${jflex.temp.filename}" verbose="false" />
[13/17] git commit: [flex-falcon] [refs/heads/maven] - added jflex
and antler maven plugin generation
Posted by jo...@apache.org.
added jflex and antler maven plugin generation
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/4079813d
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/4079813d
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/4079813d
Branch: refs/heads/maven
Commit: 4079813d5aad96bc16e90cc879d6a72543d2b538
Parents: 402b78c
Author: Carlos Rovira <ca...@apache.org>
Authored: Wed Jul 17 21:59:29 2013 +0200
Committer: Jose Barragan <jo...@apache.org>
Committed: Sun Mar 23 14:09:19 2014 +0100
----------------------------------------------------------------------
compiler/pom.xml | 125 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 123 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/4079813d/compiler/pom.xml
----------------------------------------------------------------------
diff --git a/compiler/pom.xml b/compiler/pom.xml
index 3aa8061..2180fb4 100644
--- a/compiler/pom.xml
+++ b/compiler/pom.xml
@@ -15,23 +15,144 @@
<name>Falcon Compiler</name>
<description>Falcon Flex main compiler</description>
- <packaging>jar</packaging>
+ <properties>
+ <javac.debug>true</javac.debug>
+ <javac.deprecation>false</javac.deprecation>
+ </properties>
+
+ <packaging>pom</packaging>
- <!-- JFLEX 1.4.3 http://jflex.sourceforge.net/maven-jflex-plugin/usage.html-->
<build>
+ <sourceDirectory>src</sourceDirectory>
<plugins>
+ <!-- JFLEX 1.4.3 http://jflex.sourceforge.net/maven-jflex-plugin/usage.html-->
<plugin>
<groupId>de.jflex</groupId>
<artifactId>maven-jflex-plugin</artifactId>
<version>1.4.3</version>
+ <configuration>
+ <outputDirectory>target/generated/src</outputDirectory>
+ </configuration>
+ <executions>
+ <execution>
+ <id>raw.as.tokenizer</id>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <lexDefinitions>
+ <lexDefinition>src/org/apache/flex/compiler/internal/parsing/as/RawASTokenizer.lex</lexDefinition>
+ </lexDefinitions>
+ <skeleton>src/org/apache/flex/compiler/internal/parsing/as/skeleton.falcon</skeleton>
+ </configuration>
+ </execution>
+ <execution>
+ <id>raw.asdoc.tokenizer</id>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <lexDefinitions>
+ <lexDefinition>src/org/apache/flex/compiler/internal/parsing/as/RawASDocTokenizer.lex</lexDefinition>
+ </lexDefinitions>
+ </configuration>
+ </execution>
+ <execution>
+ <id>raw.mxml.tokenizer</id>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <lexDefinitions>
+ <lexDefinition>src/org/apache/flex/compiler/internal/parsing/mxml/RawMXMLTokenizer.lex</lexDefinition>
+ </lexDefinitions>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- ANTLR -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>antlr-maven-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <sourceDirectory>src/org/apache/flex/compiler/internal</sourceDirectory>
+ <outputDirectory>target/generated/src</outputDirectory>
+ </configuration>
<executions>
<execution>
+ <id>as.parser</id>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <grammars>parsing/as/ASParser.g</grammars>
+ </configuration>
+ </execution>
+ <execution>
+ <id>metadata.parser</id>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <grammars>parsing/as/MetadataParser.g</grammars>
+ </configuration>
+ </execution>
+ <execution>
+ <id>css.lexer.and.parser</id>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <grammars>css/CSS.g</grammars>
+ </configuration>
+ </execution>
+ <execution>
+ <id>css.tree</id>
<goals>
<goal>generate</goal>
</goals>
+ <configuration>
+ <grammars>css/CSSTree.g</grammars>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>apt-maven-plugin</artifactId>
+ <version>1.0-alpha-5</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <includea>
+ <include>generated/src/org/apache/flex/compiler/internal/parsing/as/ASParser.java</include>
+ </includes>
+ <factory>@SuppressWarnings("unused")</factory>
+
+ </configuration>
</execution>
</executions>
</plugin>
+ <!-- The AnnotateClass tool is used to add @SupressWarnings annotations to Java code produced by ANTLR and JBurg -->
+ <!--<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.1</version>
+ <configuration>
+ <debug>${javac.debug}</debug>
+ <showDeprecation>${javac.deprecation}</showDeprecation>
+ <compilerArgument>-Xlint:all,-path,-fallthrough</compilerArgument>
+ <source>tools/AnnotateClass</source>
+ <generatedSourcesDirectory>generated/classes</generatedSourcesDirectory>
+ </configuration>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </plugin>-->
</plugins>
</build>
[15/17] git commit: [flex-falcon] [refs/heads/maven] - antlr
execution pass
Posted by jo...@apache.org.
antlr execution pass
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/7e405195
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/7e405195
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/7e405195
Branch: refs/heads/maven
Commit: 7e40519563f6e2ba78dd6abbfbb8ac6e84b3b9e6
Parents: 019dc96
Author: Jose Barragan <jo...@apache.org>
Authored: Fri Feb 28 22:53:40 2014 +0100
Committer: Jose Barragan <jo...@apache.org>
Committed: Sun Mar 23 14:09:20 2014 +0100
----------------------------------------------------------------------
compiler/pom.xml | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/7e405195/compiler/pom.xml
----------------------------------------------------------------------
diff --git a/compiler/pom.xml b/compiler/pom.xml
index fb92b95..cf258ca 100644
--- a/compiler/pom.xml
+++ b/compiler/pom.xml
@@ -70,13 +70,14 @@
</execution>
</executions>
</plugin>
+
<!-- ANTLR -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>antlr-maven-plugin</artifactId>
<version>2.2</version>
<configuration>
- <sourceDirectory>src/org/apache/flex/compiler/internal</sourceDirectory>
+ <sourceDirectory>${project.build.sourceDirectory}/org/apache/flex/compiler/internal</sourceDirectory>
<outputDirectory>target/generated/src</outputDirectory>
</configuration>
<executions>
@@ -99,7 +100,7 @@
<goal>generate</goal>
</goals>
<configuration>
- <sourceDirectory>src/org/apache/flex/compiler/internal/parsing/as</sourceDirectory>
+ <sourceDirectory>${project.build.sourceDirectory}/org/apache/flex/compiler/internal/parsing/as</sourceDirectory>
<grammars>MetadataParser.g</grammars>
<!--<includes>ImportMetadataTokenTypes.txt</includes>-->
</configuration>
@@ -108,6 +109,7 @@
</execution>
</executions>
</plugin>
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
@@ -133,13 +135,13 @@
</execution>
</executions>
</plugin>
- <!--- See more at: http://www.vineetmanohar.com/2009/11/3-ways-to-run-java-main-from-maven/#sthash.iBz2SwMh.dpuf-->
+
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>antlr3-maven-plugin</artifactId>
- <version>1.0</version>
+ <groupId>org.antlr</groupId>
+ <artifactId>antlr4-maven-plugin</artifactId>
+ <version>4.2</version>
<configuration>
- <sourceDirectory>src/org/apache/flex/compiler/internal</sourceDirectory>
+ <sourceDirectory>${project.build.sourceDirectory}/org/apache/flex/compiler/internal</sourceDirectory>
<outputDirectory>target/generated/src</outputDirectory>
</configuration>
<executions>
@@ -147,7 +149,7 @@
<execution>
<id>css.lexer.and.parser</id>
<goals>
- <goal>antlr</goal>
+ <goal>antlr4</goal>
</goals>
<configuration>
<sourceDirectory>css/CSS.g</sourceDirectory>
@@ -159,7 +161,7 @@
<execution>
<id>css.tree</id>
<goals>
- <goal>antlr</goal>
+ <goal>antlr4</goal>
</goals>
<configuration>
<sourceDirectory>css/CSSTree.g</sourceDirectory>
@@ -207,11 +209,11 @@
</build>
<dependencies>
- <!-- antlr - http://www.antlr.org/download/antlr-3.3-complete.jar -->
+ <!-- antlr - http://www.antlr.org/download/antlr-4.2-complete.jar -->
<dependency>
<groupId>org.antlr</groupId>
- <artifactId>antlr-runtime</artifactId>
- <version>3.3</version>
+ <artifactId>antlr4-runtime</artifactId>
+ <version>4.2</version>
</dependency>
<!-- commons-cli - http://archive.apache.org/dist/commons/cli/binaries/commons-cli-1.2-bin.tar.gz -->
<dependency>
[17/17] git commit: [flex-falcon] [refs/heads/maven] - antlr
ajustments on pom
Posted by jo...@apache.org.
antlr ajustments on pom
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/55646525
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/55646525
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/55646525
Branch: refs/heads/maven
Commit: 55646525ab9ad5d341b3c6bd84af560faa3d8e52
Parents: 7e40519
Author: Jose Barragan <jo...@apache.org>
Authored: Tue Mar 4 17:21:22 2014 +0100
Committer: Jose Barragan <jo...@apache.org>
Committed: Sun Mar 23 14:09:20 2014 +0100
----------------------------------------------------------------------
compiler/pom.xml | 124 +++++++++++++++++++-------------------------------
1 file changed, 47 insertions(+), 77 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/55646525/compiler/pom.xml
----------------------------------------------------------------------
diff --git a/compiler/pom.xml b/compiler/pom.xml
index cf258ca..b30c601 100644
--- a/compiler/pom.xml
+++ b/compiler/pom.xml
@@ -22,6 +22,8 @@
<packaging>pom</packaging>
+
+
<build>
<sourceDirectory>src</sourceDirectory>
<plugins>
@@ -31,7 +33,9 @@
<version>1.5.0</version>
<configuration>
<outputDirectory>${project.build.directory}/generated/src</outputDirectory>
- <skeleton>${project.build.sourceDirectory}/org/apache/flex/compiler/internal/parsing/as/skeleton.default</skeleton>
+ <skeleton>
+ ${project.build.sourceDirectory}/org/apache/flex/compiler/internal/parsing/as/skeleton.default
+ </skeleton>
</configuration>
<executions>
<execution>
@@ -41,9 +45,13 @@
</goals>
<configuration>
<lexDefinitions>
- <lexDefinition>${project.build.sourceDirectory}/org/apache/flex/compiler/internal/parsing/as/RawASTokenizer.lex</lexDefinition>
+ <lexDefinition>
+ ${project.build.sourceDirectory}/org/apache/flex/compiler/internal/parsing/as/RawASTokenizer.lex
+ </lexDefinition>
</lexDefinitions>
- <skeleton>${project.build.sourceDirectory}/org/apache/flex/compiler/internal/parsing/as/skeleton.falcon</skeleton>
+ <skeleton>
+ ${project.build.sourceDirectory}/org/apache/flex/compiler/internal/parsing/as/skeleton.falcon
+ </skeleton>
</configuration>
</execution>
<execution>
@@ -53,7 +61,9 @@
</goals>
<configuration>
<lexDefinitions>
- <lexDefinition>${project.build.sourceDirectory}/org/apache/flex/compiler/internal/parsing/as/RawASDocTokenizer.lex</lexDefinition>
+ <lexDefinition>
+ ${project.build.sourceDirectory}/org/apache/flex/compiler/internal/parsing/as/RawASDocTokenizer.lex
+ </lexDefinition>
</lexDefinitions>
</configuration>
</execution>
@@ -64,7 +74,9 @@
</goals>
<configuration>
<lexDefinitions>
- <lexDefinition>${project.build.sourceDirectory}/org/apache/flex/compiler/internal/parsing/mxml/RawMXMLTokenizer.lex</lexDefinition>
+ <lexDefinition>
+ ${project.build.sourceDirectory}/org/apache/flex/compiler/internal/parsing/mxml/RawMXMLTokenizer.lex
+ </lexDefinition>
</lexDefinitions>
</configuration>
</execution>
@@ -77,99 +89,57 @@
<artifactId>antlr-maven-plugin</artifactId>
<version>2.2</version>
<configuration>
- <sourceDirectory>${project.build.sourceDirectory}/org/apache/flex/compiler/internal</sourceDirectory>
- <outputDirectory>target/generated/src</outputDirectory>
+ <sourceDirectory>${project.build.sourceDirectory}/org/apache/flex/compiler/internal/parsing/as</sourceDirectory>
+ <outputDirectory>${project.build.directory}/generated/src</outputDirectory>
</configuration>
<executions>
<!-- Generating ASParser and ASTokenTypes -->
<execution>
- <id>as.parser</id>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
- <grammars>parsing/as/ASParser.g</grammars>
- </configuration>
- <!-- TODO ASParser.java annotate tool @SuppressWarnings("unused") -->
- <!-- TODO ASTokenTypes.java annotate tool @SuppressWarnings("unused") -->
- </execution>
- <!-- Generating MetadataParser and MetadataTokenTypes -->
- <execution>
- <id>metadata.parser</id>
+ <id>parseAS</id>
<goals>
<goal>generate</goal>
</goals>
<configuration>
+ <grammarDefs>
+ <grammar>
+ <name>ASParser.g</name>
+ </grammar>
+ <grammar>
+ <name>MetadataParser.g</name>
+ </grammar>
+ </grammarDefs>
<sourceDirectory>${project.build.sourceDirectory}/org/apache/flex/compiler/internal/parsing/as</sourceDirectory>
- <grammars>MetadataParser.g</grammars>
- <!--<includes>ImportMetadataTokenTypes.txt</includes>-->
</configuration>
- <!-- TODO MetadataParser.java annotate tool @SuppressWarnings("all") -->
- <!-- TODO MetadataTokenTypes.java annotate tool @SuppressWarnings("unused") -->
</execution>
</executions>
</plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.2.1</version>
- <executions>
- <execution>
- <goals>
- <goal>java</goal>
- </goals>
- <configuration>
- <mainClass>org.apache.flex.compiler.tools.AnnotateClass</mainClass>
-
- <!--<argument>-classpath</argument>
- <classpath>
- <dependency>commons-io:commons-io</dependency>
- <dependency>commons-lang:commons-lang</dependency>
- </classpath>
- <executable>maven</executable>
- <workingDirectory>/tmp</workingDirectory>-->
-
-
- </configuration>
- </execution>
- </executions>
- </plugin>
-
<plugin>
<groupId>org.antlr</groupId>
- <artifactId>antlr4-maven-plugin</artifactId>
- <version>4.2</version>
+ <artifactId>antlr3-maven-plugin</artifactId>
+ <version>3.5.1</version>
<configuration>
- <sourceDirectory>${project.build.sourceDirectory}/org/apache/flex/compiler/internal</sourceDirectory>
- <outputDirectory>target/generated/src</outputDirectory>
+ <sourceDirectory>${project.build.sourceDirectory}/org/apache/flex/compiler/internal/css</sourceDirectory>
+ <outputDirectory>${project.build.directory}/generated/src/org/apache/flex/compiler/internal/css</outputDirectory>
</configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.antlr</groupId>
+ <artifactId>antlr-runtime</artifactId>
+ <version>3.5.1</version>
+ </dependency>
+ </dependencies>
<executions>
- <!-- Generating CSSLexer and CSSParser -->
- <execution>
- <id>css.lexer.and.parser</id>
- <goals>
- <goal>antlr4</goal>
- </goals>
- <configuration>
- <sourceDirectory>css/CSS.g</sourceDirectory>
- </configuration>
- <!-- TODO CSSLexer.java annotate tool @SuppressWarnings("unused") -->
- <!-- TODO CSSParser.java annotate tool @SuppressWarnings("unused") -->
- </execution>
- <!-- Generating CSSTree -->
+ <!-- Generating ASParser and ASTokenTypes -->
<execution>
- <id>css.tree</id>
+ <id>parseCSS</id>
<goals>
- <goal>antlr4</goal>
+ <goal>antlr</goal>
</goals>
- <configuration>
- <sourceDirectory>css/CSSTree.g</sourceDirectory>
- </configuration>
- <!-- TODO CSSTree.java annotate tool @SuppressWarnings({"rawtypes", "unchecked", "unused"} -->
</execution>
</executions>
</plugin>
+
+
<!--<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>apt-maven-plugin</artifactId>
@@ -211,9 +181,9 @@
<dependencies>
<!-- antlr - http://www.antlr.org/download/antlr-4.2-complete.jar -->
<dependency>
- <groupId>org.antlr</groupId>
- <artifactId>antlr4-runtime</artifactId>
- <version>4.2</version>
+ <groupId>antlr</groupId>
+ <artifactId>antlr</artifactId>
+ <version>2.7.7</version>
</dependency>
<!-- commons-cli - http://archive.apache.org/dist/commons/cli/binaries/commons-cli-1.2-bin.tar.gz -->
<dependency>
[03/17] git commit: [flex-falcon] [refs/heads/maven] - changes needed
to compile basictests in flex-asjs for SWF
Posted by jo...@apache.org.
changes needed to compile basictests in flex-asjs for SWF
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/13592ed2
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/13592ed2
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/13592ed2
Branch: refs/heads/maven
Commit: 13592ed21cb3ca24f1f33f50fdfa1c1605a3a898
Parents: c87817b
Author: Alex Harui <ah...@apache.org>
Authored: Thu Mar 20 07:24:00 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Mar 20 07:24:52 2014 -0700
----------------------------------------------------------------------
.../internal/targets/FlexAppSWFTarget.java | 470 +++++++++++--------
.../targets/FlexApplicationFrame1Info.java | 7 +
.../internal/targets/FlexLibrarySWFTarget.java | 3 +-
.../compiler/internal/targets/FlexTarget.java | 134 +++---
4 files changed, 354 insertions(+), 260 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/13592ed2/compiler/src/org/apache/flex/compiler/internal/targets/FlexAppSWFTarget.java
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/internal/targets/FlexAppSWFTarget.java b/compiler/src/org/apache/flex/compiler/internal/targets/FlexAppSWFTarget.java
index 8a2afeb..87976bd 100644
--- a/compiler/src/org/apache/flex/compiler/internal/targets/FlexAppSWFTarget.java
+++ b/compiler/src/org/apache/flex/compiler/internal/targets/FlexAppSWFTarget.java
@@ -748,10 +748,13 @@ public class FlexAppSWFTarget extends AppSWFTarget
protected void createFrames(SWFTarget swfTarget, ISWF swf, ImmutableSet<ICompilationUnit> builtCompilationUnits, Set<ICompilationUnit> emittedCompilationUnits, Collection<ICompilerProblem> problems) throws InterruptedException
{
final FlexDelegate delegate = getDelegate();
+ final ClassDefinition rootClassDefinition =
+ getRootClassDefinition();
frame1Info = new FlexApplicationFrame1Info(flexProject,
targetSettings,
- getRootClassDefinition(),
+ rootClassDefinition,
delegate.getGenerateSystemManagerAndFlexInit(),
+ delegate.isFlexInfo(rootClassDefinition),
builtCompilationUnits);
SWFFrame applicationSWFFrame = null;
for (final SWFFrameInfo frameInfo : frameInfos)
@@ -780,8 +783,6 @@ public class FlexAppSWFTarget extends AppSWFTarget
}
else
{
- final ClassDefinition rootClassDefinition =
- getRootClassDefinition();
swf.setTopLevelClass(rootClassDefinition.getQualifiedName());
// if we are not generating a system manager but have RSLs to load, generate
@@ -1172,7 +1173,8 @@ public class FlexAppSWFTarget extends AppSWFTarget
if (frame1Info != null)
return frame1Info;
frame1Info = new FlexApplicationFrame1Info(flexProject,
- targetSettings, mainApplicationClassDefinition, getGenerateSystemManagerAndFlexInit(), getBuiltCompilationUnitSet().compilationUnits);
+ targetSettings, mainApplicationClassDefinition, getGenerateSystemManagerAndFlexInit(),
+ isFlexInfo((ClassDefinition)mainApplicationClassDefinition), getBuiltCompilationUnitSet().compilationUnits);
return frame1Info;
}
@@ -1203,7 +1205,8 @@ public class FlexAppSWFTarget extends AppSWFTarget
Set<ICompilationUnit> emittedCompilationUnits,
Collection<ICompilerProblem> problems) throws InterruptedException
{
- if (getGenerateSystemManagerAndFlexInit() || isFlexInfo((ClassDefinition)mainApplicationClassDefinition))
+ boolean isAppFlexInfo = isFlexInfo((ClassDefinition)mainApplicationClassDefinition);
+ if (getGenerateSystemManagerAndFlexInit() || isAppFlexInfo)
{
try
{
@@ -1215,7 +1218,9 @@ public class FlexAppSWFTarget extends AppSWFTarget
final CSSCodeGenProblem problem = new CSSCodeGenProblem(e);
problems.add(problem);
}
- addGeneratedFlexInitToFrame(problems, mainApplicationFrame, emittedCompilationUnits);
+ FlexRSLInfo rslInfo = getDelegate().getRSLInfo();
+ addGeneratedFlexInitToFrame(problems, mainApplicationFrame, emittedCompilationUnits,
+ isAppFlexInfo, frame1Info, rslInfo);
}
else
{
@@ -1334,7 +1339,8 @@ public class FlexAppSWFTarget extends AppSWFTarget
* added to the speciifed {@link SWFFrame}.
* @throws InterruptedException
*/
- private boolean addGeneratedFlexInitToFrame(final Collection<ICompilerProblem> problems, SWFFrame frame, Set<ICompilationUnit> emittedCompilationUnits) throws InterruptedException
+ private boolean addGeneratedFlexInitToFrame(final Collection<ICompilerProblem> problems, SWFFrame frame, Set<ICompilationUnit> emittedCompilationUnits,
+ boolean isAppFlexInfo, FlexApplicationFrame1Info frame1Info, FlexRSLInfo rslInfo) throws InterruptedException
{
ABCEmitter emitter = new ABCEmitter();
emitter.visit(ABCConstants.VERSION_ABC_MAJOR_FP10, ABCConstants.VERSION_ABC_MINOR_FP10);
@@ -1393,230 +1399,281 @@ public class FlexAppSWFTarget extends AppSWFTarget
// local2.registerInheritingStyle(local0); // local2 is the style manager.
// }
// }
- MethodInfo initMethodInfo = new MethodInfo();
- initMethodInfo.setMethodName("FlexInit init method");
- initMethodInfo.setParamTypes(new Vector<Name>(Collections.singleton(iModuleFactoryReference.getMName())));
- initMethodInfo.setReturnType(new Name(IASLanguageConstants.void_));
- IMethodVisitor initMethodVisitor = emitter.visitMethod(initMethodInfo);
- initMethodVisitor.visit();
- MethodBodyInfo initMethodBodyInfo = new MethodBodyInfo();
- initMethodBodyInfo.setMethodInfo(initMethodInfo);
- IMethodBodyVisitor initMethodBodyVisitor = initMethodVisitor.visitBody(initMethodBodyInfo);
- initMethodBodyVisitor.visit();
-
- // local0 = temp
- // local1 = module factory argument
- // local2 = style manager
- // local3 = inherited styles array
- InstructionList initMethod = new InstructionList();
-
- // Since we don't need "this", we can kill local0, we'll use it later for something else.
- initMethod.addInstruction(ABCConstants.OP_kill, 0);
- initMethod.addInstruction(ABCConstants.OP_finddef, childManagerReference.getMName());
- initMethod.addInstruction(ABCConstants.OP_getlocal1);
- initMethod.addInstruction(ABCConstants.OP_constructprop, new Object[] { childManagerReference.getMName(), 1 });
- initMethod.addInstruction(ABCConstants.OP_pop);
- initMethod.addInstruction(ABCConstants.OP_finddef, styleManagerImplReference.getMName());
- initMethod.addInstruction(ABCConstants.OP_getlocal1);
- initMethod.addInstruction(ABCConstants.OP_constructprop, new Object[] { styleManagerImplReference.getMName(), 1 });
- initMethod.addInstruction(ABCConstants.OP_setlocal2);
-
- Map<String, String> effectNameToTriggerMap = new TreeMap<String, String>();
- Map<String, Boolean> inheritingStyleMap = new TreeMap<String, Boolean>();
- Map<ClassDefinition, String> remoteClassAliasMap =
- new TreeMap<ClassDefinition, String>(new Comparator<ClassDefinition>()
- {
- @Override
- public int compare(ClassDefinition o1, ClassDefinition o2)
+ if (isAppFlexInfo)
+ {
+ MethodInfo initMethodInfo = new MethodInfo();
+ initMethodInfo.setMethodName("FlexInit init method");
+ initMethodInfo.setParamTypes(new Vector<Name>(Collections.singleton(new Name("Object"))));
+ initMethodInfo.setReturnType(new Name(IASLanguageConstants.void_));
+ IMethodVisitor initMethodVisitor = emitter.visitMethod(initMethodInfo);
+ initMethodVisitor.visit();
+ MethodBodyInfo initMethodBodyInfo = new MethodBodyInfo();
+ initMethodBodyInfo.setMethodInfo(initMethodInfo);
+ IMethodBodyVisitor initMethodBodyVisitor = initMethodVisitor.visitBody(initMethodBodyInfo);
+ initMethodBodyVisitor.visit();
+
+ // local0 = temp
+ // local1 = module factory argument
+ // local2 = style manager
+ // local3 = inherited styles array
+ InstructionList initMethod = new InstructionList();
+ initMethod.addInstruction(ABCConstants.OP_returnvoid);
+
+ initMethodBodyVisitor.visitInstructionList(initMethod);
+ initMethodBodyVisitor.visitEnd();
+ initMethodVisitor.visitEnd();
+
+ ITraitVisitor initMethodTraitVisitor =
+ classGen.getCTraitsVisitor().visitMethodTrait(ABCConstants.TRAIT_Method, new Name("init"), 0, initMethodInfo);
+ initMethodTraitVisitor.visitStart();
+ initMethodTraitVisitor.visitEnd();
+
+ codegenInfoMethod(classGen,
+ flexProject.getCompatibilityVersion(),
+ getMainClassQName(),
+ getPreloaderClassReference(),
+ getRuntimeDPIProviderClassReference(),
+ splashScreenImage,
+ getRootNode(),
+ getTargetAttributes(),
+ flexProject.getLocales(),
+ frame1Info,
+ accessibleClassNames,
+ getFlexInitClassName(),
+ getStylesClassName(),
+ targetSettings.getRuntimeSharedLibraries(),
+ rslInfo,
+ problems,
+ isAppFlexInfo);
+
+ }
+ else
+ {
+ MethodInfo initMethodInfo = new MethodInfo();
+ initMethodInfo.setMethodName("FlexInit init method");
+ initMethodInfo.setParamTypes(new Vector<Name>(Collections.singleton(iModuleFactoryReference.getMName())));
+ initMethodInfo.setReturnType(new Name(IASLanguageConstants.void_));
+ IMethodVisitor initMethodVisitor = emitter.visitMethod(initMethodInfo);
+ initMethodVisitor.visit();
+ MethodBodyInfo initMethodBodyInfo = new MethodBodyInfo();
+ initMethodBodyInfo.setMethodInfo(initMethodInfo);
+ IMethodBodyVisitor initMethodBodyVisitor = initMethodVisitor.visitBody(initMethodBodyInfo);
+ initMethodBodyVisitor.visit();
+
+ // local0 = temp
+ // local1 = module factory argument
+ // local2 = style manager
+ // local3 = inherited styles array
+ InstructionList initMethod = new InstructionList();
+
+ // Since we don't need "this", we can kill local0, we'll use it later for something else.
+ initMethod.addInstruction(ABCConstants.OP_kill, 0);
+ initMethod.addInstruction(ABCConstants.OP_finddef, childManagerReference.getMName());
+ initMethod.addInstruction(ABCConstants.OP_getlocal1);
+ initMethod.addInstruction(ABCConstants.OP_constructprop, new Object[] { childManagerReference.getMName(), 1 });
+ initMethod.addInstruction(ABCConstants.OP_pop);
+ initMethod.addInstruction(ABCConstants.OP_finddef, styleManagerImplReference.getMName());
+ initMethod.addInstruction(ABCConstants.OP_getlocal1);
+ initMethod.addInstruction(ABCConstants.OP_constructprop, new Object[] { styleManagerImplReference.getMName(), 1 });
+ initMethod.addInstruction(ABCConstants.OP_setlocal2);
+
+ Map<String, String> effectNameToTriggerMap = new TreeMap<String, String>();
+ Map<String, Boolean> inheritingStyleMap = new TreeMap<String, Boolean>();
+ Map<ClassDefinition, String> remoteClassAliasMap =
+ new TreeMap<ClassDefinition, String>(new Comparator<ClassDefinition>()
{
- return o1.getQualifiedName().compareTo(o2.getQualifiedName());
- }
- })
- {
- private static final long serialVersionUID = 1L;
-
- /**
- * Override so warning messages can be logged.
- */
- @Override
- public String put(ClassDefinition key, String value)
+ @Override
+ public int compare(ClassDefinition o1, ClassDefinition o2)
+ {
+ return o1.getQualifiedName().compareTo(o2.getQualifiedName());
+ }
+ })
{
- // check for duplicate values and log a warning if any remote
- // classes try to use the same alias.
- if (containsValue(value))
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * Override so warning messages can be logged.
+ */
+ @Override
+ public String put(ClassDefinition key, String value)
{
- for (Map.Entry<ClassDefinition,String> entry : entrySet())
- {
- if (value != null && value.equals(entry.getValue()))
+ // check for duplicate values and log a warning if any remote
+ // classes try to use the same alias.
+ if (containsValue(value))
+ {
+ for (Map.Entry<ClassDefinition,String> entry : entrySet())
{
- problems.add(new ClassesMappedToSameRemoteAliasProblem(key.getQualifiedName(),
- entry.getKey().getQualifiedName(), value));
- break;
+ if (value != null && value.equals(entry.getValue()))
+ {
+ problems.add(new ClassesMappedToSameRemoteAliasProblem(key.getQualifiedName(),
+ entry.getKey().getQualifiedName(), value));
+ break;
+ }
}
- }
+ }
+ return super.put(key, value);
}
- return super.put(key, value);
- }
- };
-
- for (ICompilationUnit cu : emittedCompilationUnits)
- {
- Collection<IDefinition> visibleDefs = cu.getFileScopeRequest().get().getExternallyVisibleDefinitions();
- for (IDefinition visibleDef : visibleDefs)
+ };
+
+ for (ICompilationUnit cu : emittedCompilationUnits)
{
- if (visibleDef instanceof ClassDefinition)
+ Collection<IDefinition> visibleDefs = cu.getFileScopeRequest().get().getExternallyVisibleDefinitions();
+ for (IDefinition visibleDef : visibleDefs)
{
- ClassDefinition visibleClass = (ClassDefinition) visibleDef;
- IEffectDefinition[] effectDefinitions = visibleClass.getEffectDefinitions(flexProject.getWorkspace());
- for (IEffectDefinition effectDefinition : effectDefinitions)
- {
- // TODO create compiler problem if effect already has a trigger.
- effectNameToTriggerMap.put(effectDefinition.getBaseName(), effectDefinition.getEvent());
- }
-
- IStyleDefinition[] styleDefinitions = visibleClass.getStyleDefinitions(flexProject.getWorkspace());
- for (IStyleDefinition styleDefinition : styleDefinitions)
+ if (visibleDef instanceof ClassDefinition)
{
- boolean isInheriting = styleDefinition.isInheriting();
- // TODO create compiler problem if style definitions conflict
- inheritingStyleMap.put(styleDefinition.getBaseName(), isInheriting);
+ ClassDefinition visibleClass = (ClassDefinition) visibleDef;
+ IEffectDefinition[] effectDefinitions = visibleClass.getEffectDefinitions(flexProject.getWorkspace());
+ for (IEffectDefinition effectDefinition : effectDefinitions)
+ {
+ // TODO create compiler problem if effect already has a trigger.
+ effectNameToTriggerMap.put(effectDefinition.getBaseName(), effectDefinition.getEvent());
+ }
+
+ IStyleDefinition[] styleDefinitions = visibleClass.getStyleDefinitions(flexProject.getWorkspace());
+ for (IStyleDefinition styleDefinition : styleDefinitions)
+ {
+ boolean isInheriting = styleDefinition.isInheriting();
+ // TODO create compiler problem if style definitions conflict
+ inheritingStyleMap.put(styleDefinition.getBaseName(), isInheriting);
+ }
+
+ String remoteClassAlias = visibleClass.getRemoteClassAlias();
+ if (remoteClassAlias != null)
+ remoteClassAliasMap.put(visibleClass, remoteClassAlias);
}
-
- String remoteClassAlias = visibleClass.getRemoteClassAlias();
- if (remoteClassAlias != null)
- remoteClassAliasMap.put(visibleClass, remoteClassAlias);
}
}
- }
-
- // register effects
- if (!effectNameToTriggerMap.isEmpty())
- {
- IDefinition mxInternalDef = mxInternalReference.resolve(flexProject);
- if (!(mxInternalDef instanceof NamespaceDefinition))
- return false;
-
-
- IResolvedQualifiersReference registerEffectTriggerRef =
- ReferenceFactory.resolvedQualifierQualifiedReference(flexProject.getWorkspace(), (INamespaceDefinition)mxInternalDef,
- "registerEffectTrigger");
- Name registerEffectTriggerName = registerEffectTriggerRef.getMName();
- initMethod.addInstruction(ABCConstants.OP_getlex, effectManagerReference.getMName());
-
- for (Map.Entry<String, String> effectEntry : effectNameToTriggerMap.entrySet())
+ // register effects
+ if (!effectNameToTriggerMap.isEmpty())
{
- initMethod.addInstruction(ABCConstants.OP_dup); // copy the effectManager class closure
- initMethod.addInstruction(ABCConstants.OP_pushstring, effectEntry.getKey());
- initMethod.addInstruction(ABCConstants.OP_pushstring, effectEntry.getValue());
- initMethod.addInstruction(ABCConstants.OP_callpropvoid, new Object[] { registerEffectTriggerName, 2 });
+ IDefinition mxInternalDef = mxInternalReference.resolve(flexProject);
+ if (!(mxInternalDef instanceof NamespaceDefinition))
+ return false;
+
+
+ IResolvedQualifiersReference registerEffectTriggerRef =
+ ReferenceFactory.resolvedQualifierQualifiedReference(flexProject.getWorkspace(), (INamespaceDefinition)mxInternalDef,
+ "registerEffectTrigger");
+ Name registerEffectTriggerName = registerEffectTriggerRef.getMName();
+
+ initMethod.addInstruction(ABCConstants.OP_getlex, effectManagerReference.getMName());
+
+ for (Map.Entry<String, String> effectEntry : effectNameToTriggerMap.entrySet())
+ {
+ initMethod.addInstruction(ABCConstants.OP_dup); // copy the effectManager class closure
+ initMethod.addInstruction(ABCConstants.OP_pushstring, effectEntry.getKey());
+ initMethod.addInstruction(ABCConstants.OP_pushstring, effectEntry.getValue());
+ initMethod.addInstruction(ABCConstants.OP_callpropvoid, new Object[] { registerEffectTriggerName, 2 });
+ }
+ initMethod.addInstruction(ABCConstants.OP_pop);
+
}
- initMethod.addInstruction(ABCConstants.OP_pop);
- }
-
- // Initialize AccessibilityClasses. Below is example code. Each
- // accessibility class found by the compiler will have its
- // enableAccessibility() method called.
- //
- // if (Capabilities.hasAccessibility) {
- // spark.accessibility.TextBaseAccImpl.enableAccessibility();
- // mx.accessibility.UIComponentAccProps.enableAccessibility();
- // spark.accessibility.ButtonBaseAccImpl.enableAccessibility();
- // }
- if (targetSettings.isAccessible())
- {
- Name capabilitiesSlotName = capabilitiesReference.getMName();
- initMethod.addInstruction(ABCConstants.OP_findpropstrict, capabilitiesSlotName);
- initMethod.addInstruction(ABCConstants.OP_getproperty, capabilitiesSlotName);
- initMethod.addInstruction(ABCConstants.OP_getproperty, new Name("hasAccessibility"));
- Label accessibilityEnd = new Label();
- initMethod.addInstruction(ABCConstants.OP_iffalse, accessibilityEnd);
-
- IResolvedQualifiersReference enableAccessibilityReference = ReferenceFactory.packageQualifiedReference(flexProject.getWorkspace(),
- "enableAccessibility");
- Name enableAccessibilityName = enableAccessibilityReference.getMName();
- Object[] enableAccessibilityCallPropOperands = new Object[] { enableAccessibilityName, 0 };
- for (String accessibilityClassName : accessibleClassNames)
+ // Initialize AccessibilityClasses. Below is example code. Each
+ // accessibility class found by the compiler will have its
+ // enableAccessibility() method called.
+ //
+ // if (Capabilities.hasAccessibility) {
+ // spark.accessibility.TextBaseAccImpl.enableAccessibility();
+ // mx.accessibility.UIComponentAccProps.enableAccessibility();
+ // spark.accessibility.ButtonBaseAccImpl.enableAccessibility();
+ // }
+ if (targetSettings.isAccessible())
{
- IResolvedQualifiersReference ref = ReferenceFactory.packageQualifiedReference(flexProject.getWorkspace(),
- accessibilityClassName);
- Name accName = ref.getMName();
- initMethod.addInstruction(ABCConstants.OP_getlex, accName);
- initMethod.addInstruction(ABCConstants.OP_callproperty, enableAccessibilityCallPropOperands);
- initMethod.addInstruction(ABCConstants.OP_pop);
+ Name capabilitiesSlotName = capabilitiesReference.getMName();
+ initMethod.addInstruction(ABCConstants.OP_findpropstrict, capabilitiesSlotName);
+ initMethod.addInstruction(ABCConstants.OP_getproperty, capabilitiesSlotName);
+ initMethod.addInstruction(ABCConstants.OP_getproperty, new Name("hasAccessibility"));
+ Label accessibilityEnd = new Label();
+ initMethod.addInstruction(ABCConstants.OP_iffalse, accessibilityEnd);
+
+ IResolvedQualifiersReference enableAccessibilityReference = ReferenceFactory.packageQualifiedReference(flexProject.getWorkspace(),
+ "enableAccessibility");
+ Name enableAccessibilityName = enableAccessibilityReference.getMName();
+ Object[] enableAccessibilityCallPropOperands = new Object[] { enableAccessibilityName, 0 };
+ for (String accessibilityClassName : accessibleClassNames)
+ {
+ IResolvedQualifiersReference ref = ReferenceFactory.packageQualifiedReference(flexProject.getWorkspace(),
+ accessibilityClassName);
+ Name accName = ref.getMName();
+ initMethod.addInstruction(ABCConstants.OP_getlex, accName);
+ initMethod.addInstruction(ABCConstants.OP_callproperty, enableAccessibilityCallPropOperands);
+ initMethod.addInstruction(ABCConstants.OP_pop);
+ }
+
+ initMethod.labelNext(accessibilityEnd);
}
-
- initMethod.labelNext(accessibilityEnd);
- }
-
- // register class aliases
- if (!remoteClassAliasMap.isEmpty())
- {
- Name getClassByAliasName = getClassByAliasReference.getMName();
- Name registerClassAliasName = registerClassAliasReference.getMName();
- Object[] getClassByAliasCallPropOperands = new Object[] { getClassByAliasName, 1 };
- Object [] registerClassAliasCallPropOperands = new Object[] { registerClassAliasName, 2 };
- for (Map.Entry<ClassDefinition, String> classAliasEntry : remoteClassAliasMap.entrySet())
+
+ // register class aliases
+ if (!remoteClassAliasMap.isEmpty())
{
- Label tryLabel = new Label();
- initMethod.labelNext(tryLabel);
- initMethod.addInstruction(ABCConstants.OP_finddef, getClassByAliasName);
- initMethod.addInstruction(ABCConstants.OP_pushstring, classAliasEntry.getValue());
- initMethod.addInstruction(ABCConstants.OP_callproperty, getClassByAliasCallPropOperands);
- Name classMName = classAliasEntry.getKey().getMName(flexProject);
- initMethod.addInstruction(ABCConstants.OP_getlex, classMName);
- Label endTryLabel = new Label();
- initMethod.addInstruction(ABCConstants.OP_ifeq, endTryLabel);
- initMethod.addInstruction(ABCConstants.OP_finddef, registerClassAliasName);
- initMethod.addInstruction(ABCConstants.OP_pushstring, classAliasEntry.getValue());
- initMethod.addInstruction(ABCConstants.OP_getlex, classMName);
- initMethod.addInstruction(ABCConstants.OP_callpropvoid, registerClassAliasCallPropOperands);
- initMethod.labelNext(endTryLabel);
- Label afterCatch = new Label();
- initMethod.addInstruction(ABCConstants.OP_jump, afterCatch);
- Label catchLabel = new Label();
- initMethod.labelNext(catchLabel);
- initMethod.addInstruction(ABCConstants.OP_pop);
- initMethod.addInstruction(ABCConstants.OP_finddef, registerClassAliasName);
- initMethod.addInstruction(ABCConstants.OP_pushstring, classAliasEntry.getValue());
- initMethod.addInstruction(ABCConstants.OP_getlex, classMName);
- initMethod.addInstruction(ABCConstants.OP_callpropvoid, registerClassAliasCallPropOperands);
- initMethod.labelNext(afterCatch);
- initMethodBodyVisitor.visitException(tryLabel, endTryLabel, catchLabel,
- new Name(IASLanguageConstants.Error), null);
+ Name getClassByAliasName = getClassByAliasReference.getMName();
+ Name registerClassAliasName = registerClassAliasReference.getMName();
+ Object[] getClassByAliasCallPropOperands = new Object[] { getClassByAliasName, 1 };
+ Object [] registerClassAliasCallPropOperands = new Object[] { registerClassAliasName, 2 };
+ for (Map.Entry<ClassDefinition, String> classAliasEntry : remoteClassAliasMap.entrySet())
+ {
+ Label tryLabel = new Label();
+ initMethod.labelNext(tryLabel);
+ initMethod.addInstruction(ABCConstants.OP_finddef, getClassByAliasName);
+ initMethod.addInstruction(ABCConstants.OP_pushstring, classAliasEntry.getValue());
+ initMethod.addInstruction(ABCConstants.OP_callproperty, getClassByAliasCallPropOperands);
+ Name classMName = classAliasEntry.getKey().getMName(flexProject);
+ initMethod.addInstruction(ABCConstants.OP_getlex, classMName);
+ Label endTryLabel = new Label();
+ initMethod.addInstruction(ABCConstants.OP_ifeq, endTryLabel);
+ initMethod.addInstruction(ABCConstants.OP_finddef, registerClassAliasName);
+ initMethod.addInstruction(ABCConstants.OP_pushstring, classAliasEntry.getValue());
+ initMethod.addInstruction(ABCConstants.OP_getlex, classMName);
+ initMethod.addInstruction(ABCConstants.OP_callpropvoid, registerClassAliasCallPropOperands);
+ initMethod.labelNext(endTryLabel);
+ Label afterCatch = new Label();
+ initMethod.addInstruction(ABCConstants.OP_jump, afterCatch);
+ Label catchLabel = new Label();
+ initMethod.labelNext(catchLabel);
+ initMethod.addInstruction(ABCConstants.OP_pop);
+ initMethod.addInstruction(ABCConstants.OP_finddef, registerClassAliasName);
+ initMethod.addInstruction(ABCConstants.OP_pushstring, classAliasEntry.getValue());
+ initMethod.addInstruction(ABCConstants.OP_getlex, classMName);
+ initMethod.addInstruction(ABCConstants.OP_callpropvoid, registerClassAliasCallPropOperands);
+ initMethod.labelNext(afterCatch);
+ initMethodBodyVisitor.visitException(tryLabel, endTryLabel, catchLabel,
+ new Name(IASLanguageConstants.Error), null);
+ }
}
- }
-
- // register inheriting styles
- if (!inheritingStyleMap.isEmpty())
- {
- initMethod.addInstruction(ABCConstants.OP_getlex, stylesClassName);
- int count = 0;
- for (Map.Entry<String, Boolean> styleEntry : inheritingStyleMap.entrySet())
+
+ // register inheriting styles
+ if (!inheritingStyleMap.isEmpty())
{
- if (styleEntry.getValue().booleanValue())
+ initMethod.addInstruction(ABCConstants.OP_getlex, stylesClassName);
+ int count = 0;
+ for (Map.Entry<String, Boolean> styleEntry : inheritingStyleMap.entrySet())
{
- ++count;
- initMethod.addInstruction(ABCConstants.OP_pushstring, styleEntry.getKey());
+ if (styleEntry.getValue().booleanValue())
+ {
+ ++count;
+ initMethod.addInstruction(ABCConstants.OP_pushstring, styleEntry.getKey());
+ }
}
+
+ initMethod.addInstruction(ABCConstants.OP_newarray, count);
+ initMethod.addInstruction(ABCConstants.OP_setproperty, new Name("inheritingStyles"));
+
}
+
+ initMethod.addInstruction(ABCConstants.OP_returnvoid);
- initMethod.addInstruction(ABCConstants.OP_newarray, count);
- initMethod.addInstruction(ABCConstants.OP_setproperty, new Name("inheritingStyles"));
-
+ initMethodBodyVisitor.visitInstructionList(initMethod);
+ initMethodBodyVisitor.visitEnd();
+ initMethodVisitor.visitEnd();
+
+ ITraitVisitor initMethodTraitVisitor =
+ classGen.getCTraitsVisitor().visitMethodTrait(ABCConstants.TRAIT_Method, new Name("init"), 0, initMethodInfo);
+ initMethodTraitVisitor.visitStart();
+ initMethodTraitVisitor.visitEnd();
}
-
- initMethod.addInstruction(ABCConstants.OP_returnvoid);
-
- initMethodBodyVisitor.visitInstructionList(initMethod);
- initMethodBodyVisitor.visitEnd();
- initMethodVisitor.visitEnd();
-
- ITraitVisitor initMethodTraitVisitor =
- classGen.getCTraitsVisitor().visitMethodTrait(ABCConstants.TRAIT_Method, new Name("init"), 0, initMethodInfo);
- initMethodTraitVisitor.visitStart();
- initMethodTraitVisitor.visitEnd();
classGen.finishScript();
DoABCTag doABC = new DoABCTag();
@@ -1753,7 +1810,8 @@ public class FlexAppSWFTarget extends AppSWFTarget
getStylesClassName(),
targetSettings.getRuntimeSharedLibraries(),
rslInfo,
- problemCollection);
+ problemCollection,
+ false);
classGen.finishScript();
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/13592ed2/compiler/src/org/apache/flex/compiler/internal/targets/FlexApplicationFrame1Info.java
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/internal/targets/FlexApplicationFrame1Info.java b/compiler/src/org/apache/flex/compiler/internal/targets/FlexApplicationFrame1Info.java
index 382298e..792e3fd 100644
--- a/compiler/src/org/apache/flex/compiler/internal/targets/FlexApplicationFrame1Info.java
+++ b/compiler/src/org/apache/flex/compiler/internal/targets/FlexApplicationFrame1Info.java
@@ -57,12 +57,14 @@ final class FlexApplicationFrame1Info extends FlexFrame1Info
ITargetSettings targetSettings,
IClassDefinition mainApplicationClassDefinition,
boolean generateSystemManagerAndFlexInit,
+ boolean isFlexInfo,
ImmutableSet<ICompilationUnit> builtCompilationUnits) throws InterruptedException
{
super(flexProject);
this.targetSettings = targetSettings;
this.mainApplicationClassDefinition = mainApplicationClassDefinition;
this.generateSystemManagerAndFlexInit = generateSystemManagerAndFlexInit;
+ this.isFlexInfo = isFlexInfo;
// sorted set of mixin classes
mixinClassNames = new TreeSet<String>();
@@ -77,6 +79,7 @@ final class FlexApplicationFrame1Info extends FlexFrame1Info
private final ITargetSettings targetSettings;
private final IClassDefinition mainApplicationClassDefinition;
private final boolean generateSystemManagerAndFlexInit;
+ private final boolean isFlexInfo;
private final ApplicationAndModuleDefinitions appAndModuleDefs;
/**
@@ -107,6 +110,10 @@ final class FlexApplicationFrame1Info extends FlexFrame1Info
collectContributingSWCs(contributingSWCs, cu);
checkForCompiledAsAComponentProblem(appAndModuleDefs, problems, cu);
}
+ else if (isFlexInfo)
+ {
+ collectMixinMetaData(mixinClassNames, cu);
+ }
}
/**
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/13592ed2/compiler/src/org/apache/flex/compiler/internal/targets/FlexLibrarySWFTarget.java
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/internal/targets/FlexLibrarySWFTarget.java b/compiler/src/org/apache/flex/compiler/internal/targets/FlexLibrarySWFTarget.java
index 2dfb8a1..2f9a996 100644
--- a/compiler/src/org/apache/flex/compiler/internal/targets/FlexLibrarySWFTarget.java
+++ b/compiler/src/org/apache/flex/compiler/internal/targets/FlexLibrarySWFTarget.java
@@ -460,7 +460,8 @@ public final class FlexLibrarySWFTarget extends LibrarySWFTarget
null, // styles class name
null, // rsls
null, // rslinof
- problemCollection);
+ problemCollection,
+ false);
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/13592ed2/compiler/src/org/apache/flex/compiler/internal/targets/FlexTarget.java
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/internal/targets/FlexTarget.java b/compiler/src/org/apache/flex/compiler/internal/targets/FlexTarget.java
index f9a9e60..52348fb 100644
--- a/compiler/src/org/apache/flex/compiler/internal/targets/FlexTarget.java
+++ b/compiler/src/org/apache/flex/compiler/internal/targets/FlexTarget.java
@@ -270,14 +270,25 @@ public abstract class FlexTarget
String stylesClassName,
List<String> rsls,
FlexRSLInfo rslInfo,
- Collection<ICompilerProblem> problemCollection)
+ Collection<ICompilerProblem> problemCollection,
+ boolean isAppFlexInfo)
throws InterruptedException
{
IResolvedQualifiersReference applicationDomainRef = ReferenceFactory.packageQualifiedReference(flexProject.getWorkspace(),
IASLanguageConstants.ApplicationDomain);
- NamespaceDefinition.IPrivateNamespaceDefinition privateNSDef = NamespaceDefinition.createPrivateNamespaceDefinition("");
- IResolvedQualifiersReference infoSlotReference = ReferenceFactory.resolvedQualifierQualifiedReference(flexProject.getWorkspace(),
- privateNSDef, "info");
+ IResolvedQualifiersReference infoSlotReference;
+ if (isAppFlexInfo)
+ {
+ NamespaceDefinition.IStaticProtectedNamespaceDefinition staticNSDef = NamespaceDefinition.createStaticProtectedNamespaceDefinition("");
+ infoSlotReference = ReferenceFactory.resolvedQualifierQualifiedReference(flexProject.getWorkspace(),
+ staticNSDef, "_info");
+ }
+ else
+ {
+ NamespaceDefinition.IPrivateNamespaceDefinition privateNSDef = NamespaceDefinition.createPrivateNamespaceDefinition("");
+ infoSlotReference = ReferenceFactory.resolvedQualifierQualifiedReference(flexProject.getWorkspace(),
+ privateNSDef, "info");
+ }
Name infoSlotName = infoSlotReference.getMName();
InstructionList info = new InstructionList();
@@ -332,53 +343,56 @@ public abstract class FlexTarget
infoEntries++;
}
- // preloader:
- if (preloaderReference != null)
+ if (!isAppFlexInfo)
{
- info.addInstruction(ABCConstants.OP_pushstring, ATTRIBUTE_PRELOADER);
- info.addInstruction(ABCConstants.OP_getlex, preloaderReference.getMName());
- infoEntries++;
- }
-
- // runtimeDPIProvider:
- if (runtimeDPIProviderReference != null)
- {
- info.addInstruction(ABCConstants.OP_pushstring, ATTRIBUTE_RUNTIME_DPI_PROVIDER);
- info.addInstruction(ABCConstants.OP_getlex, runtimeDPIProviderReference.getMName());
- infoEntries++;
- }
-
- // splashScreenImage:
- if (splashScreen.generatedEmbedClassReference != null)
- {
- info.addInstruction(ABCConstants.OP_pushstring, ATTRIBUTE_SPLASH_SCREEN_IMAGE);
- info.addInstruction(ABCConstants.OP_getlex, splashScreen.generatedEmbedClassReference.getMName());
- infoEntries++;
+ // preloader:
+ if (preloaderReference != null)
+ {
+ info.addInstruction(ABCConstants.OP_pushstring, ATTRIBUTE_PRELOADER);
+ info.addInstruction(ABCConstants.OP_getlex, preloaderReference.getMName());
+ infoEntries++;
+ }
+
+ // runtimeDPIProvider:
+ if (runtimeDPIProviderReference != null)
+ {
+ info.addInstruction(ABCConstants.OP_pushstring, ATTRIBUTE_RUNTIME_DPI_PROVIDER);
+ info.addInstruction(ABCConstants.OP_getlex, runtimeDPIProviderReference.getMName());
+ infoEntries++;
+ }
+
+ // splashScreenImage:
+ if (splashScreen.generatedEmbedClassReference != null)
+ {
+ info.addInstruction(ABCConstants.OP_pushstring, ATTRIBUTE_SPLASH_SCREEN_IMAGE);
+ info.addInstruction(ABCConstants.OP_getlex, splashScreen.generatedEmbedClassReference.getMName());
+ infoEntries++;
+ }
+
+ // Add various root node attributes:
+ infoEntries += codegenRootNodeAttributes(targetAttributes, info, rootNode, problemCollection);
+
+ // compiledLocales:
+ if (compiledLocales != null)
+ {
+ info.addInstruction(ABCConstants.OP_pushstring, "compiledLocales");
+ for(String locale : compiledLocales)
+ info.addInstruction(ABCConstants.OP_pushstring, locale);
+ info.addInstruction(ABCConstants.OP_newarray, compiledLocales.size());
+ infoEntries++;
+ }
+
+ // compiledResourceBundleNames:
+ if (!frame1Info.compiledResourceBundleNames.isEmpty())
+ {
+ info.addInstruction(ABCConstants.OP_pushstring, "compiledResourceBundleNames");
+ for(String bundleName : frame1Info.compiledResourceBundleNames)
+ info.addInstruction(ABCConstants.OP_pushstring, bundleName);
+ info.addInstruction(ABCConstants.OP_newarray, frame1Info.compiledResourceBundleNames.size());
+ infoEntries++;
+ }
}
- // Add various root node attributes:
- infoEntries += codegenRootNodeAttributes(targetAttributes, info, rootNode, problemCollection);
-
- // compiledLocales:
- if (compiledLocales != null)
- {
- info.addInstruction(ABCConstants.OP_pushstring, "compiledLocales");
- for(String locale : compiledLocales)
- info.addInstruction(ABCConstants.OP_pushstring, locale);
- info.addInstruction(ABCConstants.OP_newarray, compiledLocales.size());
- infoEntries++;
- }
-
- // compiledResourceBundleNames:
- if (!frame1Info.compiledResourceBundleNames.isEmpty())
- {
- info.addInstruction(ABCConstants.OP_pushstring, "compiledResourceBundleNames");
- for(String bundleName : frame1Info.compiledResourceBundleNames)
- info.addInstruction(ABCConstants.OP_pushstring, bundleName);
- info.addInstruction(ABCConstants.OP_newarray, frame1Info.compiledResourceBundleNames.size());
- infoEntries++;
- }
-
// styleDataClassName
if (stylesClassName != null)
{
@@ -461,12 +475,26 @@ public abstract class FlexTarget
info.addInstruction(ABCConstants.OP_setproperty, infoSlotName);
info.labelNext(infoL1);
info.addInstruction(ABCConstants.OP_returnvalue);
- classGen.addITraitsMethod(new Name("info"), Collections.<Name> emptyList(),
- new Name("Object"), Collections.emptyList(), false, true, true, info);
- ITraitsVisitor itraitsVisitor = classGen.getITraitsVisitor();
- ITraitVisitor infoSlotVisitor = itraitsVisitor.visitSlotTrait(ABCConstants.TRAIT_Var, infoSlotName,
- ITraitsVisitor.RUNTIME_SLOT, new Name(IASLanguageConstants.Object), LexicalScope.noInitializer);
+ ITraitsVisitor itraitsVisitor;
+ ITraitVisitor infoSlotVisitor;
+ if (isAppFlexInfo)
+ {
+ classGen.addCTraitsMethod(new Name("info"), Collections.<Name> emptyList(),
+ new Name("Object"), Collections.emptyList(), false, info);
+ itraitsVisitor = classGen.getCTraitsVisitor();
+ infoSlotVisitor = itraitsVisitor.visitSlotTrait(ABCConstants.TRAIT_Var, infoSlotName,
+ ITraitsVisitor.RUNTIME_SLOT, new Name(IASLanguageConstants.Object), LexicalScope.noInitializer);
+ }
+ else
+ {
+ classGen.addITraitsMethod(new Name("info"), Collections.<Name> emptyList(),
+ new Name("Object"), Collections.emptyList(), false, true, true, info);
+ itraitsVisitor = classGen.getITraitsVisitor();
+ infoSlotVisitor = itraitsVisitor.visitSlotTrait(ABCConstants.TRAIT_Var, infoSlotName,
+ ITraitsVisitor.RUNTIME_SLOT, new Name(IASLanguageConstants.Object), LexicalScope.noInitializer);
+ }
+
infoSlotVisitor.visitStart();
infoSlotVisitor.visitEnd();
[16/17] git commit: [flex-falcon] [refs/heads/maven] - Testing fixed
old antlr maven plugin
Posted by jo...@apache.org.
Testing fixed old antlr maven plugin
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/8b718a77
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/8b718a77
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/8b718a77
Branch: refs/heads/maven
Commit: 8b718a7764900bb4df2f2820fe6d67d874025c18
Parents: 5564652
Author: Jose Barragan <jo...@apache.org>
Authored: Sun Mar 23 14:08:56 2014 +0100
Committer: Jose Barragan <jo...@apache.org>
Committed: Sun Mar 23 14:09:20 2014 +0100
----------------------------------------------------------------------
compiler/pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/8b718a77/compiler/pom.xml
----------------------------------------------------------------------
diff --git a/compiler/pom.xml b/compiler/pom.xml
index b30c601..8f44cc7 100644
--- a/compiler/pom.xml
+++ b/compiler/pom.xml
@@ -87,7 +87,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>antlr-maven-plugin</artifactId>
- <version>2.2</version>
+ <version>2.2.1</version>
<configuration>
<sourceDirectory>${project.build.sourceDirectory}/org/apache/flex/compiler/internal/parsing/as</sourceDirectory>
<outputDirectory>${project.build.directory}/generated/src</outputDirectory>
@@ -113,7 +113,7 @@
</execution>
</executions>
</plugin>
- <plugin>
+<!-- <plugin>
<groupId>org.antlr</groupId>
<artifactId>antlr3-maven-plugin</artifactId>
<version>3.5.1</version>
@@ -129,7 +129,7 @@
</dependency>
</dependencies>
<executions>
- <!-- Generating ASParser and ASTokenTypes -->
+ Generating ASParser and ASTokenTypes
<execution>
<id>parseCSS</id>
<goals>
@@ -137,7 +137,7 @@
</goals>
</execution>
</executions>
- </plugin>
+ </plugin>-->
<!--<plugin>
[07/17] git commit: [flex-falcon] [refs/heads/maven] - don't emit
relativeTo unless non-null
Posted by jo...@apache.org.
don't emit relativeTo unless non-null
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/12f338c0
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/12f338c0
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/12f338c0
Branch: refs/heads/maven
Commit: 12f338c0499b8d8fca2374e28d6e27ddcc7fbea3
Parents: d2119c6
Author: Alex Harui <ah...@apache.org>
Authored: Fri Mar 21 08:18:05 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Mar 21 08:18:05 2014 -0700
----------------------------------------------------------------------
.../codegen/mxml/flexjs/MXMLFlexJSEmitter.java | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/12f338c0/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
index f868b33..cd66409 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
@@ -1226,12 +1226,15 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
pos.value = ASEmitterTokens.SINGLE_QUOTE.getToken() + positionPropertyValue + ASEmitterTokens.SINGLE_QUOTE.getToken();
addItems.propertySpecifiers.add(pos);
- MXMLDescriptorSpecifier rel = new MXMLDescriptorSpecifier();
- rel.isProperty = true;
- rel.name = "relativeTo";
- rel.parent = addItems;
- rel.value = ASEmitterTokens.SINGLE_QUOTE.getToken() + relativeToPropertyValue + ASEmitterTokens.SINGLE_QUOTE.getToken();
- addItems.propertySpecifiers.add(rel);
+ if (relativeToPropertyValue != null)
+ {
+ MXMLDescriptorSpecifier rel = new MXMLDescriptorSpecifier();
+ rel.isProperty = true;
+ rel.name = "relativeTo";
+ rel.parent = addItems;
+ rel.value = ASEmitterTokens.SINGLE_QUOTE.getToken() + relativeToPropertyValue + ASEmitterTokens.SINGLE_QUOTE.getToken();
+ addItems.propertySpecifiers.add(rel);
+ }
inStatesOverride = false;
}
[04/17] git commit: [flex-falcon] [refs/heads/maven] - continue to
try to use flex-falcon script to fix flex-sdk script
Posted by jo...@apache.org.
continue to try to use flex-falcon script to fix flex-sdk script
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/ac9d795b
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/ac9d795b
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/ac9d795b
Branch: refs/heads/maven
Commit: ac9d795bbe250e58e9ca145a890189454e531aaf
Parents: 13592ed
Author: Alex Harui <ah...@apache.org>
Authored: Thu Mar 20 09:15:18 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Mar 20 09:15:18 2014 -0700
----------------------------------------------------------------------
jenkins.xml | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ac9d795b/jenkins.xml
----------------------------------------------------------------------
diff --git a/jenkins.xml b/jenkins.xml
index 053e137..409d300 100644
--- a/jenkins.xml
+++ b/jenkins.xml
@@ -37,6 +37,14 @@
<target name="clear.sdk.lock" >
<!-- attempt to delete file on builds.apache.org that is gumming up the sdk build -->
<delete file="f:/hudson/hudson-slave/workspace/flex-sdk/.git/index.lock" />
+ <exec executable="git" dir="f:/hudson/hudson-slave/workspace/flex-sdk" failonerror="true">
+ <arg value="status"/>
+ </exec>
+ <exec executable="git" dir="f:/hudson/hudson-slave/workspace/flex-sdk" failonerror="true">
+ <arg value="checkout"/>
+ <arg value="--"/>
+ <arg value="."/>
+ </exec>
</target>
<target name="jflex-download" description="Copies JFlex from JFlex website">
[10/17] git commit: [flex-falcon] [refs/heads/maven] - ignore maven
target folder
Posted by jo...@apache.org.
ignore maven target folder
Signed-off-by: Jose Barragan <jo...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/b9c3b208
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/b9c3b208
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/b9c3b208
Branch: refs/heads/maven
Commit: b9c3b208de11c28358bce169b0c1597644e53d57
Parents: 7027cfa
Author: Jose Barragan <jo...@apache.org>
Authored: Fri Feb 28 19:08:27 2014 +0100
Committer: Jose Barragan <jo...@apache.org>
Committed: Sun Mar 23 14:09:19 2014 +0100
----------------------------------------------------------------------
.gitignore | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/b9c3b208/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 0eecb39..4b80a65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,6 @@ local.properties
out/
temp/
rat.report
+
+# maven
+target
[05/17] git commit: [flex-falcon] [refs/heads/maven] - continue to
try to use flex-falcon script to fix flex-sdk script
Posted by jo...@apache.org.
continue to try to use flex-falcon script to fix flex-sdk script
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/71902162
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/71902162
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/71902162
Branch: refs/heads/maven
Commit: 71902162c684a99528a2a26cf51ec6eb92a8878f
Parents: ac9d795
Author: Alex Harui <ah...@apache.org>
Authored: Thu Mar 20 09:33:38 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Mar 20 09:33:38 2014 -0700
----------------------------------------------------------------------
jenkins.xml | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/71902162/jenkins.xml
----------------------------------------------------------------------
diff --git a/jenkins.xml b/jenkins.xml
index 409d300..7154aa8 100644
--- a/jenkins.xml
+++ b/jenkins.xml
@@ -45,6 +45,10 @@
<arg value="--"/>
<arg value="."/>
</exec>
+ <exec executable="git" dir="f:/hudson/hudson-slave/workspace/flex-sdk" failonerror="true">
+ <arg value="clean"/>
+ <arg value="-fd"/>
+ </exec>
</target>
<target name="jflex-download" description="Copies JFlex from JFlex website">
[14/17] git commit: [flex-falcon] [refs/heads/maven] - first two poms
for mavenizing flex falcon project and main compiler. Both build successful.
Note that JBurg dependency is not available in public repository yet
Posted by jo...@apache.org.
first two poms for mavenizing flex falcon project and main compiler. Both build successful. Note that JBurg dependency is not available in public repository yet
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/402b78c6
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/402b78c6
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/402b78c6
Branch: refs/heads/maven
Commit: 402b78c67190ac628605642b425098d85aa21f7c
Parents: 3c27b0f
Author: Jose Barragan <jo...@apache.org>
Authored: Fri Feb 28 10:45:22 2014 +0100
Committer: Jose Barragan <jo...@apache.org>
Committed: Sun Mar 23 14:09:19 2014 +0100
----------------------------------------------------------------------
compiler/pom.xml | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++
pom.xml | 21 ++++++++++++++
2 files changed, 98 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/402b78c6/compiler/pom.xml
----------------------------------------------------------------------
diff --git a/compiler/pom.xml b/compiler/pom.xml
new file mode 100644
index 0000000..3aa8061
--- /dev/null
+++ b/compiler/pom.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>falcon</artifactId>
+ <groupId>org.apache.flex</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>compiler</artifactId>
+ <name>Falcon Compiler</name>
+ <description>Falcon Flex main compiler</description>
+
+ <packaging>jar</packaging>
+
+ <!-- JFLEX 1.4.3 http://jflex.sourceforge.net/maven-jflex-plugin/usage.html-->
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>de.jflex</groupId>
+ <artifactId>maven-jflex-plugin</artifactId>
+ <version>1.4.3</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <!-- antlr - http://www.antlr.org/download/antlr-3.3-complete.jar -->
+ <dependency>
+ <groupId>org.antlr</groupId>
+ <artifactId>antlr-runtime</artifactId>
+ <version>3.3</version>
+ </dependency>
+ <!-- commons-cli - http://archive.apache.org/dist/commons/cli/binaries/commons-cli-1.2-bin.tar.gz -->
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <!-- commons-io - http://archive.apache.org/dist/commons/io/binaries/commons-io-2.0.1-bin.tar.gz -->
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+ <!-- guava - http://guava-libraries.googlecode.com/files/guava-r08.zip -->
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>r08</version>
+ </dependency>
+ <!-- JBurg - http://downloads.sourceforge.net/project/jburg/jburg-1.10.1.tar.gz (warning! this is not avaialbe publicly, I'm using a private maven repo for this one-->
+ <dependency>
+ <groupId>net.sourceforge</groupId>
+ <artifactId>jburg</artifactId>
+ <version>1.10.1</version>
+ </dependency>
+ <!-- lzma-sdk - http://downloads.sourceforge.net/project/sevenzip/LZMA%20SDK/lzma920.tar.bz2 -->
+ <dependency>
+ <groupId>com.github.jponge</groupId>
+ <artifactId>lzma-java</artifactId>
+ <version>1.2</version>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/402b78c6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..eb992e6
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.flex</groupId>
+ <artifactId>falcon</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <name>Falcon</name>
+ <description>Flex Java Compiler Modules</description>
+
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>compiler</module>
+ </modules>
+
+</project>
\ No newline at end of file
[09/17] git commit: [flex-falcon] [refs/heads/maven] - unstable
changes (need deep revision)
Posted by jo...@apache.org.
unstable changes (need deep revision)
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/7027cfad
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/7027cfad
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/7027cfad
Branch: refs/heads/maven
Commit: 7027cfade6efe5290389ee8d29d4f129c6f6b411
Parents: 4079813
Author: Carlos Rovira <ca...@apache.org>
Authored: Fri Dec 27 22:57:54 2013 +0100
Committer: Jose Barragan <jo...@apache.org>
Committed: Sun Mar 23 14:09:19 2014 +0100
----------------------------------------------------------------------
compiler/pom.xml | 78 +++++++++++++++++++++++++++++++++++++++++++--------
1 file changed, 66 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/7027cfad/compiler/pom.xml
----------------------------------------------------------------------
diff --git a/compiler/pom.xml b/compiler/pom.xml
index 2180fb4..3ecc4f0 100644
--- a/compiler/pom.xml
+++ b/compiler/pom.xml
@@ -25,13 +25,14 @@
<build>
<sourceDirectory>src</sourceDirectory>
<plugins>
- <!-- JFLEX 1.4.3 http://jflex.sourceforge.net/maven-jflex-plugin/usage.html-->
+ <!-- JFLEX 1.4.3 http://jflex.sourceforge.net/maven-jflex-plugin/usage.html -->
<plugin>
<groupId>de.jflex</groupId>
<artifactId>maven-jflex-plugin</artifactId>
<version>1.4.3</version>
<configuration>
<outputDirectory>target/generated/src</outputDirectory>
+ <skeleton>src/org/apache/flex/compiler/internal/parsing/as/skeleton.default</skeleton>
</configuration>
<executions>
<execution>
@@ -41,7 +42,8 @@
</goals>
<configuration>
<lexDefinitions>
- <lexDefinition>src/org/apache/flex/compiler/internal/parsing/as/RawASTokenizer.lex</lexDefinition>
+ <lexDefinition>src/org/apache/flex/compiler/internal/parsing/as/RawASTokenizer.lex
+ </lexDefinition>
</lexDefinitions>
<skeleton>src/org/apache/flex/compiler/internal/parsing/as/skeleton.falcon</skeleton>
</configuration>
@@ -53,7 +55,8 @@
</goals>
<configuration>
<lexDefinitions>
- <lexDefinition>src/org/apache/flex/compiler/internal/parsing/as/RawASDocTokenizer.lex</lexDefinition>
+ <lexDefinition>src/org/apache/flex/compiler/internal/parsing/as/RawASDocTokenizer.lex
+ </lexDefinition>
</lexDefinitions>
</configuration>
</execution>
@@ -64,7 +67,8 @@
</goals>
<configuration>
<lexDefinitions>
- <lexDefinition>src/org/apache/flex/compiler/internal/parsing/mxml/RawMXMLTokenizer.lex</lexDefinition>
+ <lexDefinition>src/org/apache/flex/compiler/internal/parsing/mxml/RawMXMLTokenizer.lex
+ </lexDefinition>
</lexDefinitions>
</configuration>
</execution>
@@ -80,6 +84,7 @@
<outputDirectory>target/generated/src</outputDirectory>
</configuration>
<executions>
+ <!-- Generating ASParser and ASTokenTypes -->
<execution>
<id>as.parser</id>
<goals>
@@ -88,37 +93,86 @@
<configuration>
<grammars>parsing/as/ASParser.g</grammars>
</configuration>
+ <!-- TODO ASParser.java annotate tool @SuppressWarnings("unused") -->
+ <!-- TODO ASTokenTypes.java annotate tool @SuppressWarnings("unused") -->
</execution>
+ <!-- Generating MetadataParser and MetadataTokenTypes -->
<execution>
<id>metadata.parser</id>
<goals>
<goal>generate</goal>
</goals>
<configuration>
- <grammars>parsing/as/MetadataParser.g</grammars>
+ <sourceDirectory>src/org/apache/flex/compiler/internal/parsing/as</sourceDirectory>
+ <grammars>MetadataParser.g</grammars>
+ <!--<includes>ImportMetadataTokenTypes.txt</includes>-->
</configuration>
+ <!-- TODO MetadataParser.java annotate tool @SuppressWarnings("all") -->
+ <!-- TODO MetadataTokenTypes.java annotate tool @SuppressWarnings("unused") -->
</execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.2.1</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ <configuration>
+ <mainClass>org.apache.flex.compiler.tools.AnnotateClass</mainClass>
+
+ <!--<argument>-classpath</argument>
+ <classpath>
+ <dependency>commons-io:commons-io</dependency>
+ <dependency>commons-lang:commons-lang</dependency>
+ </classpath>
+ <executable>maven</executable>
+ <workingDirectory>/tmp</workingDirectory>-->
+
+
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!--- See more at: http://www.vineetmanohar.com/2009/11/3-ways-to-run-java-main-from-maven/#sthash.iBz2SwMh.dpuf-->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>antlr3-maven-plugin</artifactId>
+ <version>3.1.0</version>
+ <configuration>
+ <sourceDirectory>src/org/apache/flex/compiler/internal</sourceDirectory>
+ <outputDirectory>target/generated/src</outputDirectory>
+ </configuration>
+ <executions>
+ <!-- Generating CSSLexer and CSSParser -->
<execution>
<id>css.lexer.and.parser</id>
<goals>
- <goal>generate</goal>
+ <goal>antlr</goal>
</goals>
<configuration>
- <grammars>css/CSS.g</grammars>
+ <sourceDirectory>css/CSS.g</sourceDirectory>
</configuration>
+ <!-- TODO CSSLexer.java annotate tool @SuppressWarnings("unused") -->
+ <!-- TODO CSSParser.java annotate tool @SuppressWarnings("unused") -->
</execution>
+ <!-- Generating CSSTree -->
<execution>
<id>css.tree</id>
<goals>
- <goal>generate</goal>
+ <goal>antlr</goal>
</goals>
<configuration>
- <grammars>css/CSSTree.g</grammars>
+ <sourceDirectory>css/CSSTree.g</sourceDirectory>
</configuration>
+ <!-- TODO CSSTree.java annotate tool @SuppressWarnings({"rawtypes", "unchecked", "unused"} -->
</execution>
</executions>
</plugin>
- <plugin>
+ <!--<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>apt-maven-plugin</artifactId>
<version>1.0-alpha-5</version>
@@ -128,7 +182,7 @@
<goal>process</goal>
</goals>
<configuration>
- <includea>
+ <includes>
<include>generated/src/org/apache/flex/compiler/internal/parsing/as/ASParser.java</include>
</includes>
<factory>@SuppressWarnings("unused")</factory>
@@ -136,7 +190,7 @@
</configuration>
</execution>
</executions>
- </plugin>
+ </plugin>-->
<!-- The AnnotateClass tool is used to add @SupressWarnings annotations to Java code produced by ANTLR and JBurg -->
<!--<plugin>
<groupId>org.apache.maven.plugins</groupId>
[11/17] git commit: [flex-falcon] [refs/heads/maven] - remove JFlex
parse warnings
Posted by jo...@apache.org.
remove JFlex parse warnings
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/019dc966
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/019dc966
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/019dc966
Branch: refs/heads/maven
Commit: 019dc966feb190b284478285a582ea297ea73496
Parents: 3802432
Author: Jose Barragan <jo...@apache.org>
Authored: Fri Feb 28 19:10:52 2014 +0100
Committer: Jose Barragan <jo...@apache.org>
Committed: Sun Mar 23 14:09:19 2014 +0100
----------------------------------------------------------------------
.../flex/compiler/internal/parsing/as/RawASDocTokenizer.lex | 4 ++--
.../flex/compiler/internal/parsing/as/RawASTokenizer.lex | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/019dc966/compiler/src/org/apache/flex/compiler/internal/parsing/as/RawASDocTokenizer.lex
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/internal/parsing/as/RawASDocTokenizer.lex b/compiler/src/org/apache/flex/compiler/internal/parsing/as/RawASDocTokenizer.lex
index 03b7a8f..5312ac9 100644
--- a/compiler/src/org/apache/flex/compiler/internal/parsing/as/RawASDocTokenizer.lex
+++ b/compiler/src/org/apache/flex/compiler/internal/parsing/as/RawASDocTokenizer.lex
@@ -194,7 +194,7 @@ NS_WHITE_SPACE_CHAR=[\r\n\t\b\012]
startOrContinueAggregate();
}
-<STRING1> ([\\](.|"\n"))+
+<STRING1> ([\\]([^]|"\n"))+
{
startOrContinueAggregate();
}
@@ -231,7 +231,7 @@ NS_WHITE_SPACE_CHAR=[\r\n\t\b\012]
return buildToken(TOKEN_ASDOC_TAG);
}
-<YYINITIAL, TAG, STRING1> .|"\n"
+<YYINITIAL, TAG, STRING1> [^]|"\n"
{
// just ignore anything that we don't recognize
// System.out.println(getContext(yyline));
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/019dc966/compiler/src/org/apache/flex/compiler/internal/parsing/as/RawASTokenizer.lex
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/internal/parsing/as/RawASTokenizer.lex b/compiler/src/org/apache/flex/compiler/internal/parsing/as/RawASTokenizer.lex
index f0fd6b6..d814d45 100644
--- a/compiler/src/org/apache/flex/compiler/internal/parsing/as/RawASTokenizer.lex
+++ b/compiler/src/org/apache/flex/compiler/internal/parsing/as/RawASTokenizer.lex
@@ -845,7 +845,7 @@ REGEX_CLASS="[" ({REGEX_ESCAPE}|[^\n\r\]\\])* "]"
{
}
-<TYPED_COLLECTION, TYPED_COLLECTION_LITERAL> .|"\n"
+<TYPED_COLLECTION, TYPED_COLLECTION_LITERAL> [^]|"\n"
{
yypushback(1);
typedDepth = 0;
@@ -932,7 +932,7 @@ REGEX_CLASS="[" ({REGEX_ESCAPE}|[^\n\r\]\\])* "]"
return buildToken(TOKEN_E4X_EQUALS);
}
-<E4X> .|"\n"
+<E4X> [^]|"\n"
{
yypushback(1);
yybegin(e4xTagDepth > 0 ? E4XTEXTVALUE : YYINITIAL);
@@ -1319,7 +1319,7 @@ REGEX_CLASS="[" ({REGEX_ESCAPE}|[^\n\r\]\\])* "]"
yybegin(YYINITIAL);
}
-<YYINITIAL, STRINGLITERAL, ESCAPE_SEQUENCE, TYPED_COLLECTION, TYPED_COLLECTION_LITERAL> .|"\n"
+<YYINITIAL, STRINGLITERAL, ESCAPE_SEQUENCE, TYPED_COLLECTION, TYPED_COLLECTION_LITERAL> [^]|"\n"
{
addBadCharacterProblem(yytext());
}
[12/17] git commit: [flex-falcon] [refs/heads/maven] - bump JFlex
dependency plugin version to 1.5.0
Posted by jo...@apache.org.
bump JFlex dependency plugin version to 1.5.0
Signed-off-by: Jose Barragan <jo...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/38024323
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/38024323
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/38024323
Branch: refs/heads/maven
Commit: 380243231da6407cd8f63bd45cfb6028191862b2
Parents: b9c3b20
Author: Jose Barragan <jo...@apache.org>
Authored: Fri Feb 28 19:10:24 2014 +0100
Committer: Jose Barragan <jo...@apache.org>
Committed: Sun Mar 23 14:09:19 2014 +0100
----------------------------------------------------------------------
compiler/pom.xml | 26 +++++++++++---------------
1 file changed, 11 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/38024323/compiler/pom.xml
----------------------------------------------------------------------
diff --git a/compiler/pom.xml b/compiler/pom.xml
index 3ecc4f0..fb92b95 100644
--- a/compiler/pom.xml
+++ b/compiler/pom.xml
@@ -13,7 +13,7 @@
<artifactId>compiler</artifactId>
<name>Falcon Compiler</name>
- <description>Falcon Flex main compiler</description>
+ <description>The Falcon compiler</description>
<properties>
<javac.debug>true</javac.debug>
@@ -25,14 +25,13 @@
<build>
<sourceDirectory>src</sourceDirectory>
<plugins>
- <!-- JFLEX 1.4.3 http://jflex.sourceforge.net/maven-jflex-plugin/usage.html -->
<plugin>
<groupId>de.jflex</groupId>
- <artifactId>maven-jflex-plugin</artifactId>
- <version>1.4.3</version>
+ <artifactId>jflex-maven-plugin</artifactId>
+ <version>1.5.0</version>
<configuration>
- <outputDirectory>target/generated/src</outputDirectory>
- <skeleton>src/org/apache/flex/compiler/internal/parsing/as/skeleton.default</skeleton>
+ <outputDirectory>${project.build.directory}/generated/src</outputDirectory>
+ <skeleton>${project.build.sourceDirectory}/org/apache/flex/compiler/internal/parsing/as/skeleton.default</skeleton>
</configuration>
<executions>
<execution>
@@ -42,10 +41,9 @@
</goals>
<configuration>
<lexDefinitions>
- <lexDefinition>src/org/apache/flex/compiler/internal/parsing/as/RawASTokenizer.lex
- </lexDefinition>
+ <lexDefinition>${project.build.sourceDirectory}/org/apache/flex/compiler/internal/parsing/as/RawASTokenizer.lex</lexDefinition>
</lexDefinitions>
- <skeleton>src/org/apache/flex/compiler/internal/parsing/as/skeleton.falcon</skeleton>
+ <skeleton>${project.build.sourceDirectory}/org/apache/flex/compiler/internal/parsing/as/skeleton.falcon</skeleton>
</configuration>
</execution>
<execution>
@@ -55,8 +53,7 @@
</goals>
<configuration>
<lexDefinitions>
- <lexDefinition>src/org/apache/flex/compiler/internal/parsing/as/RawASDocTokenizer.lex
- </lexDefinition>
+ <lexDefinition>${project.build.sourceDirectory}/org/apache/flex/compiler/internal/parsing/as/RawASDocTokenizer.lex</lexDefinition>
</lexDefinitions>
</configuration>
</execution>
@@ -67,8 +64,7 @@
</goals>
<configuration>
<lexDefinitions>
- <lexDefinition>src/org/apache/flex/compiler/internal/parsing/mxml/RawMXMLTokenizer.lex
- </lexDefinition>
+ <lexDefinition>${project.build.sourceDirectory}/org/apache/flex/compiler/internal/parsing/mxml/RawMXMLTokenizer.lex</lexDefinition>
</lexDefinitions>
</configuration>
</execution>
@@ -141,7 +137,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>antlr3-maven-plugin</artifactId>
- <version>3.1.0</version>
+ <version>1.0</version>
<configuration>
<sourceDirectory>src/org/apache/flex/compiler/internal</sourceDirectory>
<outputDirectory>target/generated/src</outputDirectory>
@@ -249,4 +245,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>