Skip to content

Commit

Permalink
updating generated files and test script
Browse files Browse the repository at this point in the history
  • Loading branch information
@denuno
denuno committed Oct 27, 2012
1 parent 34f5d81 commit 2761fbe
Show file tree
Hide file tree
Showing 28 changed files with 71,431 additions and 16,024 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
@@ -1 +1,3 @@
bin/
.DS_Store
/cfml.parsing.jar
4 changes: 3 additions & 1 deletion README
View file
@@ -1,3 +1,5 @@
== cfml.parsing ==

A CFML parser. Uses the cfml.dictionary project to provide engine-specific information.
A CFML parser. Uses the cfml.dictionary project to provide engine-specific information.

Build with ant : cd build; ant build;
1 change: 1 addition & 0 deletions build/.gitignore
View file
@@ -0,0 +1 @@
testresults/
17 changes: 11 additions & 6 deletions build/build.xml
View file
Expand Up @@ -4,6 +4,7 @@
<property name="build.dir" location="${basedir}"/>
<property name="output.dir" location="../bin"/>
<property name="src.tests" location="../test/src"/>
<property name="reports.tests" location="./testresults/"/>
<property name="grammar.jar" location="../cfml.parsing.jar"/>
<property name="grammar.dir" location="../antlr"/>
<property name="grammar.file" location="${grammar.dir}/CFScript.g"/>
Expand Down Expand Up @@ -31,7 +32,7 @@
<attribute name="outputdirectory" default="." />
<attribute name="libdirectory" default="../lib" />
<sequential>
<java classname="org.antlr.Tool" fork="true" failonerror="true" classpathref="build.lib.path" includeantruntime="false">
<java classname="org.antlr.Tool" fork="true" failonerror="true" classpathref="build.lib.path">
<jvmarg value="-Xms512M"/>
<jvmarg value="-Xmx1024M"/>
<arg value="-o" />
Expand All @@ -55,7 +56,7 @@

<target name="grammar.compile" depends="grammar.generate">
<mkdir dir="../bin" />
<javac srcdir="${src.dir}" destdir="../bin" listfiles="Yes" deprecation="Yes" classpathref="build.lib.path">
<javac srcdir="${src.dir}" destdir="../bin" listfiles="Yes" deprecation="Yes" classpathref="build.lib.path" includeantruntime="false">
<compilerarg value="-Xlint:unchecked" />
<classpath>
<pathelement path="${java.class.path}" />
Expand Down Expand Up @@ -91,18 +92,22 @@
<echo message="${last.revision.info}"/>
</target>

<target name="test">
<junit printsummary="true" haltonerror="false" haltonfailure="false" includeantruntime="false">
<target name="test" depends="build">
<mkdir dir="${reports.tests}" />
<junit printsummary="true" haltonerror="false" haltonfailure="false" includeantruntime="false" fork="true" dir="../">
<classpath>
<pathelement location="../lib/junit-4.10.jar"/>
<pathelement path="${grammar.jar}"/>
<pathelement path="${java.class.path}"/>
<pathelement path="${toString:build.path}"/>
<pathelement path="${toString:build.lib.path}"/>
</classpath>
<batchtest fork="yes" todir="${reports.tests}">
<fileset dir="${src.tests}">
<include name="**/*Test*.java"/>
<exclude name="**/AllTests.java"/>
</fileset>
<formatter type="failure"/>
<formatter type="xml"/>
<formatter type="plain" usefile="false"/>
</batchtest>
</junit>
</target>
Expand Down
Binary file added lib/jdom-1.1.2.jar
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion src/cfml/parsing/cfml/antlr/CFLexer.java
View file
@@ -1,4 +1,4 @@
// $ANTLR 3.4 /Users/valliant/Projects/java/CFML/cfml.parsing/antlr/concept/CF.g 2012-02-26 00:36:19
// $ANTLR 3.4 /Users/valliant/Projects/java/CFML/cfml.parsing/antlr/concept/CF.g 2012-10-27 03:10:04

package cfml.parsing.cfml.antlr;

Expand Down
2 changes: 1 addition & 1 deletion src/cfml/parsing/cfml/antlr/CFMLLexer.java
View file
@@ -1,4 +1,4 @@
// $ANTLR 3.4 /Users/valliant/Projects/java/CFML/cfml.parsing/antlr/CFML.g 2012-02-26 12:15:39
// $ANTLR 3.4 /Users/valliant/Projects/java/CFML/cfml.parsing/antlr/CFML.g 2012-10-27 03:09:26

package cfml.parsing.cfml.antlr;
import cfml.parsing.cfscript.CFParseException;
Expand Down
32 changes: 16 additions & 16 deletions src/cfml/parsing/cfml/antlr/CFMLParser.java
View file
@@ -1,4 +1,4 @@
// $ANTLR 3.4 /Users/valliant/Projects/java/CFML/cfml.parsing/antlr/CFML.g 2012-02-26 12:15:36
// $ANTLR 3.4 /Users/valliant/Projects/java/CFML/cfml.parsing/antlr/CFML.g 2012-10-27 03:09:23

package cfml.parsing.cfml.antlr;
import cfml.parsing.cfscript.CFParseException;
Expand Down Expand Up @@ -483,7 +483,7 @@ public final CFMLParser.componentDeclaration_return componentDeclaration() throw
if ( state.backtracking==0 ) stream_componentGuts.add(componentGuts6.getTree());

// AST REWRITE
// elements: componentGuts, componentAttribute
// elements: componentAttribute, componentGuts
// token labels:
// rule labels: retval
// token list labels:
Expand Down Expand Up @@ -1642,7 +1642,7 @@ else if ( (LA7_0==RIGHTPAREN) ) {
if ( state.backtracking==0 ) stream_compoundStatement.add(compoundStatement17.getTree());

// AST REWRITE
// elements: compoundStatement, functionReturnType, functionAccessType, parameterList, functionAttribute, identifier
// elements: parameterList, functionAccessType, functionAttribute, compoundStatement, identifier, functionReturnType
// token labels:
// rule labels: retval
// token list labels:
Expand Down Expand Up @@ -2734,7 +2734,7 @@ else if ( (LA15_0==STRING_LITERAL) ) {


// AST REWRITE
// elements: identifier, REQUIRED, impliesExpression, EQUALSOP, parameterType
// elements: impliesExpression, REQUIRED, identifier, EQUALSOP, parameterType
// token labels:
// rule labels: retval
// token list labels:
Expand Down Expand Up @@ -3000,7 +3000,7 @@ public final CFMLParser.componentAttribute_return componentAttribute() throws Re
if ( state.backtracking==0 ) stream_impliesExpression.add(impliesExpression38.getTree());

// AST REWRITE
// elements: impliesExpression, COLON, identifier, identifier
// elements: identifier, identifier, impliesExpression, COLON
// token labels:
// rule labels: retval
// token list labels:
Expand All @@ -3024,16 +3024,16 @@ public final CFMLParser.componentAttribute_return componentAttribute() throws Re
adaptor.addChild(root_1, stream_identifier.nextTree());

// /Users/valliant/Projects/java/CFML/cfml.parsing/antlr/CFML.g:477:102: ( COLON identifier )?
if ( stream_COLON.hasNext()||stream_identifier.hasNext() ) {
if ( stream_identifier.hasNext()||stream_COLON.hasNext() ) {
adaptor.addChild(root_1,
stream_COLON.nextNode()
);

adaptor.addChild(root_1, stream_identifier.nextTree());

}
stream_COLON.reset();
stream_identifier.reset();
stream_COLON.reset();

adaptor.addChild(root_1, stream_impliesExpression.nextTree());

Expand Down Expand Up @@ -7107,7 +7107,7 @@ public final CFMLParser.lockStatement_return lockStatement() throws RecognitionE
if ( state.backtracking==0 ) stream_compoundStatement.add(cs.getTree());

// AST REWRITE
// elements: compoundStatement, paramStatementAttributes
// elements: paramStatementAttributes, compoundStatement
// token labels:
// rule labels: retval
// token list labels:
Expand Down Expand Up @@ -7233,7 +7233,7 @@ public final CFMLParser.threadStatement_return threadStatement() throws Recognit


// AST REWRITE
// elements: paramStatementAttributes, compoundStatement
// elements: compoundStatement, paramStatementAttributes
// token labels:
// rule labels: retval
// token list labels:
Expand Down Expand Up @@ -10431,7 +10431,7 @@ public final CFMLParser.ternary_return ternary() throws RecognitionException {
if ( state.backtracking==0 ) stream_localAssignmentExpression.add(localAssignmentExpression200.getTree());

// AST REWRITE
// elements: localAssignmentExpression, equivalentExpression, localAssignmentExpression
// elements: equivalentExpression, localAssignmentExpression, localAssignmentExpression
// token labels:
// rule labels: retval
// token list labels:
Expand Down Expand Up @@ -14423,7 +14423,7 @@ else if ( ((!scriptMode)) ) {
if ( state.backtracking==0 ) stream_memberExpression.add(memberExpression281.getTree());

// AST REWRITE
// elements: memberExpression, MINUS
// elements: MINUS, memberExpression
// token labels:
// rule labels: retval
// token list labels:
Expand Down Expand Up @@ -14521,7 +14521,7 @@ else if ( ((!scriptMode)) ) {
if ( state.backtracking==0 ) stream_memberExpression.add(memberExpression285.getTree());

// AST REWRITE
// elements: MINUSMINUS, memberExpression
// elements: memberExpression, MINUSMINUS
// token labels:
// rule labels: retval
// token list labels:
Expand Down Expand Up @@ -14570,7 +14570,7 @@ else if ( ((!scriptMode)) ) {
if ( state.backtracking==0 ) stream_memberExpression.add(memberExpression287.getTree());

// AST REWRITE
// elements: memberExpression, PLUSPLUS
// elements: PLUSPLUS, memberExpression
// token labels:
// rule labels: retval
// token list labels:
Expand Down Expand Up @@ -15142,7 +15142,7 @@ public final CFMLParser.memberExpressionB_return memberExpressionB() throws Reco


// AST REWRITE
// elements: argumentList, memberExpressionB
// elements: memberExpressionB, argumentList
// token labels:
// rule labels: retval
// token list labels:
Expand Down Expand Up @@ -15197,7 +15197,7 @@ public final CFMLParser.memberExpressionB_return memberExpressionB() throws Reco


// AST REWRITE
// elements: LEFTBRACKET, impliesExpression, memberExpressionB
// elements: memberExpressionB, LEFTBRACKET, impliesExpression
// token labels:
// rule labels: retval
// token list labels:
Expand Down Expand Up @@ -15248,7 +15248,7 @@ public final CFMLParser.memberExpressionB_return memberExpressionB() throws Reco
if ( state.backtracking==0 ) stream_primaryExpressionIRW.add(primaryExpressionIRW316.getTree());

// AST REWRITE
// elements: memberExpressionB, DOT, primaryExpressionIRW
// elements: DOT, primaryExpressionIRW, memberExpressionB
// token labels:
// rule labels: retval
// token list labels:
Expand Down
2 changes: 1 addition & 1 deletion src/cfml/parsing/cfml/antlr/CFParser.java
View file
@@ -1,4 +1,4 @@
// $ANTLR 3.4 /Users/valliant/Projects/java/CFML/cfml.parsing/antlr/concept/CF.g 2012-02-26 00:36:19
// $ANTLR 3.4 /Users/valliant/Projects/java/CFML/cfml.parsing/antlr/concept/CF.g 2012-10-27 03:10:04

package cfml.parsing.cfml.antlr;
import java.util.LinkedList;
Expand Down

0 comments on commit 2761fbe

Please sign in to comment.