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/02/28 19:10:58 UTC
[1/3] git commit: [flex-falcon] [refs/heads/maven] - ignore maven
target folder
Repository: flex-falcon
Updated Branches:
refs/heads/maven 87e5047d2 -> a6e3f80fe
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/ad54c461
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/ad54c461
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/ad54c461
Branch: refs/heads/maven
Commit: ad54c461c0fecfd2169f759266a95cf116eeafd3
Parents: 87e5047
Author: Jose Barragan <jo...@apache.org>
Authored: Fri Feb 28 19:08:27 2014 +0100
Committer: Jose Barragan <jo...@apache.org>
Committed: Fri Feb 28 19:08:27 2014 +0100
----------------------------------------------------------------------
.gitignore | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ad54c461/.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
[2/3] 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/a848e819
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/a848e819
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/a848e819
Branch: refs/heads/maven
Commit: a848e819e5dce3091f68aec92cb048c1d778bba7
Parents: ad54c46
Author: Jose Barragan <jo...@apache.org>
Authored: Fri Feb 28 19:10:24 2014 +0100
Committer: Jose Barragan <jo...@apache.org>
Committed: Fri Feb 28 19:10:24 2014 +0100
----------------------------------------------------------------------
compiler/pom.xml | 26 +++++++++++---------------
1 file changed, 11 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a848e819/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>
[3/3] 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/a6e3f80f
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/a6e3f80f
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/a6e3f80f
Branch: refs/heads/maven
Commit: a6e3f80fe258adf29d4d9027ec0b59854c0497e3
Parents: a848e81
Author: Jose Barragan <jo...@apache.org>
Authored: Fri Feb 28 19:10:52 2014 +0100
Committer: Jose Barragan <jo...@apache.org>
Committed: Fri Feb 28 19:10:52 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/a6e3f80f/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/a6e3f80f/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());
}