Changeset a9b657a for src/Parser/parser.yy

Timestamp:

Mar 10, 2017, 11:01:31 AM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

dc0557d

Parents:

c857ad3 (diff), 149d297 (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:/u/cforall/software/cfa/cfa-cc

File:

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

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Mar  5 15:48:24 2017
-// Update Count     : 2227
+// Last Modified On : Thu Mar  9 21:40:20 2017
+// Update Count     : 2292
 //
 
@@ -104 +104 @@
 %token TYPEOF LABEL                                                                             // GCC
 %token ENUM STRUCT UNION
+%token COROUTINE MONITOR THREAD                                                 // CFA
 %token OTYPE FTYPE DTYPE TTYPE TRAIT                                    // CFA
 %token SIZEOF OFFSETOF
@@ -223 +224 @@
 %type<decl> external_function_definition function_definition function_array function_declarator function_no_ptr function_ptr
 
-%type<decl> identifier_parameter_array identifier_parameter_declarator identifier_parameter_function
-%type<decl> identifier_parameter_ptr identifier_list
+%type<decl> identifier_parameter_declarator identifier_parameter_ptr identifier_parameter_array identifier_parameter_function
+%type<decl> identifier_list
 
 %type<decl> cfa_abstract_array cfa_abstract_declarator_no_tuple cfa_abstract_declarator_tuple
@@ -270 +271 @@
 %type<en> type_name_list
 
-%type<decl> type_qualifier type_qualifier_name type_qualifier_list type_qualifier_list_opt type_specifier type_specifier_nobody
+%type<decl> type_qualifier type_qualifier_name type_qualifier_list_opt type_qualifier_list
+%type<decl> type_specifier type_specifier_nobody
 
 %type<decl> variable_declarator variable_ptr variable_array variable_function
@@ -1633 +1635 @@
         | UNION
                 { $$ = DeclarationNode::Union; }
+        | COROUTINE
+                { $$ = DeclarationNode::Struct; }
+        | MONITOR
+                { $$ = DeclarationNode::Struct; }
+        | THREAD
+                { $$ = DeclarationNode::Struct; }
         ;