Changes in src/Parser/parser.yy [ca78437:9335ecc]

File:

• src/Parser/parser.yy (modified) (5 diffs)

src/Parser/parser.yy

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// cfa.y --
+// parser.yy --
 //
 // Author           : Peter A. Buhr
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jun 12 12:59:00 2017
-// Update Count     : 2402
+// Last Modified On : Wed Jun 28 22:11:22 2017
+// Update Count     : 2414
 //
 
@@ -48 +48 @@
 #include <cstdio>
 #include <stack>
-#include "lex.h"
-#include "parser.h"
 #include "ParseNode.h"
 #include "TypedefTable.h"
@@ -88 +86 @@
 bool forall = false;                                                                    // aggregate have one or more forall qualifiers ?
 %}
+
+// Types declaration
+%union
+{
+        Token tok;
+        ParseNode * pn;
+        ExpressionNode * en;
+        DeclarationNode * decl;
+        DeclarationNode::Aggregate aggKey;
+        DeclarationNode::TypeClass tclass;
+        StatementNode * sn;
+        ConstantExpr * constant;
+        ForCtl * fctl;
+        LabelNode * label;
+        InitializerNode * in;
+        OperKinds op;
+        std::string * str;
+        bool flag;
+}
 
 //************************* TERMINAL TOKENS ********************************
@@ -139 +156 @@
 
 %token ATassign                                                                                 // @=
-
-// Types declaration
-%union
-{
-        Token tok;
-        ParseNode * pn;
-        ExpressionNode * en;
-        DeclarationNode * decl;
-        DeclarationNode::Aggregate aggKey;
-        DeclarationNode::TypeClass tclass;
-        StatementNode * sn;
-        ConstantExpr * constant;
-        ForCtl * fctl;
-        LabelNode * label;
-        InitializerNode * in;
-        OperKinds op;
-        std::string * str;
-        bool flag;
-}
 
 %type<tok> identifier  no_attr_identifier  zero_one
@@ -959 +957 @@
 
 handler_clause:
-        CATCH '(' push push exception_declaration pop ')' compound_statement pop
+        // TEMPORARY, TEST EXCEPTIONS
+        CATCH '(' push push INTEGERconstant pop ')' compound_statement pop
+                { $$ = new StatementNode( build_catch( CatchStmt::Terminate, nullptr, new ExpressionNode( build_constantInteger( *$5 ) ), $8 ) ); }
+        | handler_clause CATCH '(' push push INTEGERconstant pop ')' compound_statement pop
+                { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( CatchStmt::Terminate, nullptr, new ExpressionNode( build_constantInteger( *$6 ) ), $9 ) ) ); }
+
+        | CATCH '(' push push exception_declaration pop ')' compound_statement pop
                 { $$ = new StatementNode( build_catch( CatchStmt::Terminate, $5, nullptr, $8 ) ); }
         | handler_clause CATCH '(' push push exception_declaration pop ')' compound_statement pop