Changeset 5541ea3d for src/Parser

Timestamp:

Aug 4, 2021, 2:40:11 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct

Children:

199894e

Parents:

0640189e (diff), df5b2c8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/Parser

Files:

• TypeData.cc (modified) (2 diffs)
• parser.yy (modified) (2 diffs)

src/Parser/TypeData.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 15:12:51 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jul 14 18:57:31 2021
-// Update Count     : 672
+// Last Modified By : Henry Xue
+// Last Modified On : Tue Jul 20 04:10:50 2021
+// Update Count     : 673
 //
 
@@ -778 +778 @@
           case AggregateDecl::Struct:
           case AggregateDecl::Coroutine:
+          case AggregateDecl::Exception:
           case AggregateDecl::Generator:
           case AggregateDecl::Monitor:

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jul 14 17:27:54 2021
-// Update Count     : 5030
+// Last Modified On : Tue Jul 20 22:03:04 2021
+// Update Count     : 5031
 //
 
@@ -1923 +1923 @@
 
 vtable:
-        VTABLE '(' typedef_name ')' default_opt
+        VTABLE '(' type_name ')' default_opt
                 { $$ = DeclarationNode::newVtableType( $3 ); }
                 // { SemanticError( yylloc, "vtable is currently unimplemented." ); $$ = nullptr; }