Merge pull request #61 from a0x77n/issue56

Fix try/catch handling
octopus-platform · Jul 2, 2015 · 2daf336 · 2daf336
2 parents 761567b + f55cd2d
commit 2daf336
Show file tree

Hide file tree

Showing 29 changed files with 2,434 additions and 1,927 deletions.
diff --git a/src/antlr/C/Function.g4 b/src/antlr/C/Function.g4
@@ -29,7 +29,7 @@ closing_curly: '}';
 block_starter: selection_or_iteration;
 
 selection_or_iteration: TRY                      #Try_statement
-                      | CATCH '(' param_type ')' #Catch_statement
+                      | CATCH '(' (param_type | ELLIPSIS) ')' #Catch_statement
                       | IF '(' condition ')'     #If_statement
                       | ELSE                     #Else_statement
                       | SWITCH '(' condition ')' #Switch_statement
@@ -51,6 +51,7 @@ jump_statement: BREAK ';'		#breakStatement
               | CONTINUE ';' 		#continueStatement
               | GOTO identifier ';'	#gotoStatement
               | RETURN expr? ';'	#returnStatement
+              | THROW expr?  ';'	#throwStatement
               ;
 
 label: CASE? (identifier | number | CHAR ) ':' ;

diff --git a/src/antlr/C/Function.tokens b/src/antlr/C/Function.tokens
@@ -42,6 +42,7 @@ REGISTER=80
 VIRTUAL=73
 SWITCH=63
 ELSE=57
+ELLIPSIS=100
 WHITESPACE=98
 ALPHA_NUMERIC=85
 PRE_IF=88
@@ -69,7 +70,7 @@ T__40=15
 T__41=14
 T__46=9
 T__47=8
-OTHER=100
+OTHER=101
 T__44=11
 T__45=10
 T__48=7
@@ -127,6 +128,7 @@ STRING=96
 '^='=36
 '+='=35
 'break'=60
+'...'=100
 '{'=86
 '>>='=34
 'void'=68

diff --git a/src/antlr/C/FunctionBaseListener.java b/src/antlr/C/FunctionBaseListener.java
@@ -3,7 +3,11 @@
 	package antlr.C;
 
 
-  import org.antlr.v4.runtime.ParserRuleContext;
+  import java.util.Stack;
+
+
+import org.antlr.v4.runtime.ParserRuleContext;
+import org.antlr.v4.runtime.Token;
 import org.antlr.v4.runtime.misc.NotNull;
 import org.antlr.v4.runtime.tree.ErrorNode;
 import org.antlr.v4.runtime.tree.TerminalNode;
@@ -578,6 +582,18 @@ public class FunctionBaseListener implements FunctionListener {
 	 * <p>The default implementation does nothing.</p>
 	 */
 	@Override public void exitGotoStatement(@NotNull FunctionParser.GotoStatementContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterThrowStatement(@NotNull FunctionParser.ThrowStatementContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitThrowStatement(@NotNull FunctionParser.ThrowStatementContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *

diff --git a/src/antlr/C/FunctionLexer.java b/src/antlr/C/FunctionLexer.java
diff --git a/src/antlr/C/FunctionLexer.tokens b/src/antlr/C/FunctionLexer.tokens
@@ -42,6 +42,7 @@ REGISTER=80
 VIRTUAL=73
 SWITCH=63
 ELSE=57
+ELLIPSIS=100
 WHITESPACE=98
 ALPHA_NUMERIC=85
 PRE_IF=88
@@ -69,7 +70,7 @@ T__40=15
 T__41=14
 T__46=9
 T__47=8
-OTHER=100
+OTHER=101
 T__44=11
 T__45=10
 T__48=7
@@ -127,6 +128,7 @@ STRING=96
 '^='=36
 '+='=35
 'break'=60
+'...'=100
 '{'=86
 '>>='=34
 'void'=68

diff --git a/src/antlr/C/FunctionListener.java b/src/antlr/C/FunctionListener.java
@@ -3,7 +3,10 @@
 	package antlr.C;
 
 
-  import org.antlr.v4.runtime.misc.NotNull;
+  import java.util.Stack;
+
+import org.antlr.v4.runtime.Token;
+import org.antlr.v4.runtime.misc.NotNull;
 import org.antlr.v4.runtime.tree.ParseTreeListener;
 
 /**
@@ -481,6 +484,16 @@ public interface FunctionListener extends ParseTreeListener {
 	 * @param ctx the parse tree
 	 */
 	void exitGotoStatement(@NotNull FunctionParser.GotoStatementContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link FunctionParser#throwStatement}.
+	 * @param ctx the parse tree
+	 */
+	void enterThrowStatement(@NotNull FunctionParser.ThrowStatementContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link FunctionParser#throwStatement}.
+	 * @param ctx the parse tree
+	 */
+	void exitThrowStatement(@NotNull FunctionParser.ThrowStatementContext ctx);
 	/**
 	 * Enter a parse tree produced by {@link FunctionParser#no_brackets}.
 	 * @param ctx the parse tree