Commit 62d14239 authored by Matthew Dawson's avatar Matthew Dawson
Browse files

Update antlr to version 4.1 

Update antlr to the latest release.  Also adjust the Matlab Grammar to continue
working.  No functional change necessary.

git-svn-id: https://groke.mcmaster.ca/svn/grad/colin/branches/TableTool_javization@10721 57e6efec-57d4-0310-aeb1-a6c144bb1a8b
parent 94a61df6

Matlab2SMT/pom.xml

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
        <dependency>

            <groupId>org.antlr</groupId>

            <artifactId>antlr4-runtime</artifactId>

            <version>4.0</version>

            <version>4.1</version>

        </dependency>

        <dependency>

            <groupId>org.apache.commons</groupId>
@@ -38,7 +38,7 @@ 
            <plugin>

                <groupId>org.antlr</groupId>

                <artifactId>antlr4-maven-plugin</artifactId>

                <version>4.0</version>

                <version>4.1</version>

                <configuration>

                    <sourceDirectory>src/main/java</sourceDirectory>

                </configuration>

Matlab2SMT/src/main/java/ca/mcmaster/cas/matlab2smt/MatlabParser.g4

+15 −15
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ statement 
	| SEMI # NULL_STMT // a null statement

	;



nlosoc	: ( hidden_nl | SEMI | COMMA )^;

nlosoc	: ( hidden_nl | SEMI | COMMA );



lhs: id_plus_indexers;

rhs: expression;
@@ -286,15 +286,15 @@ catch_statement 
	;

	

return_statement

	: RETURNS^ nlosoc

	: RETURNS nlosoc

	;



break_statement

	: BREAK^ nlosoc

	: BREAK nlosoc

	;

	

continue_statement

	: CONTINUE^ nlosoc

	: CONTINUE nlosoc

	;



global_statement
@@ -367,17 +367,17 @@ expression : e0; 


e0	: e1;



e1	: e2 (LOG_OR^ e2)*;

e2	: e3 (LOG_AND^ e3)*;

e3	: e4 (BIN_OR^ e4)*;

e4	: e5 (BIN_AND^ e5)*;

e5	: e6 (g1^ e6)*;

e6	: e7 (COLON^ e7)*;

e7	: e8 (g2^ e8)*;

e8	: e9 (g3^ e9)*;

e9	: prefix_operator^ e9 | e10;

e10	: e11 (g4^ e11)*; // note: in matlab, exponentiation is left-associative

e11	: unary_expression postfix_operator^?;

e1	: e2 (LOG_OR e2)*;

e2	: e3 (LOG_AND e3)*;

e3	: e4 (BIN_OR e4)*;

e4	: e5 (BIN_AND e5)*;

e5	: e6 (g1 e6)*;

e6	: e7 (COLON e7)*;

e7	: e8 (g2 e8)*;

e8	: e9 (g3 e9)*;

e9	: prefix_operator e9 | e10;

e10	: e11 (g4 e11)*; // note: in matlab, exponentiation is left-associative

e11	: unary_expression postfix_operator?;



unary_expression

	: base_expression #BASE_EXPRESIION