Changeset 168c007 for src/Parser

Timestamp:

Mar 21, 2017, 12:50:27 PM (8 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:

da6d4566, f5392c1

Parents:

94a8123 (diff), e04b636 (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

Location:

src/Parser

Files:

• DeclarationNode.cc (modified) (2 diffs)
• ParseNode.h (modified) (2 diffs)
• TypeData.cc (modified) (5 diffs)
• lex.ll (modified) (1 diff)
• parser.yy (modified) (2 diffs)

src/Parser/DeclarationNode.cc ¶

@@ -10 +10 @@
 // Created On       : Sat May 16 12:34:05 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar 17 08:46:05 2017
-// Update Count     : 1017
+// Last Modified On : Fri Mar 17 15:46:33 2017
+// Update Count     : 1018
 //
 
@@ -36 +36 @@
 const char * DeclarationNode::signednessNames[] = { "signed", "unsigned", "NoSignednessNames" };
 const char * DeclarationNode::lengthNames[] = { "short", "long", "long long", "NoLengthNames" };
-const char * DeclarationNode::aggregateNames[] = { "struct", "union", "context", "NoAggregateNames" };
+const char * DeclarationNode::aggregateNames[] = { "struct", "union", "trait", "coroutine", "monitor", "thread", "NoAggregateNames" };
 const char * DeclarationNode::typeClassNames[] = { "otype", "dtype", "ftype", "NoTypeClassNames" };
 const char * DeclarationNode::builtinTypeNames[] = { "__builtin_va_list", "NoBuiltinTypeNames" };

src/Parser/ParseNode.h ¶

@@ -10 +10 @@
 // Created On       : Sat May 16 13:28:16 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar 16 08:32:43 2017
-// Update Count     : 776
+// Last Modified On : Fri Mar 17 15:42:18 2017
+// Update Count     : 777
 //
 
@@ -206 +206 @@
         enum Signedness { Signed, Unsigned, NoSignedness };
         enum Length { Short, Long, LongLong, NoLength };
-        enum Aggregate { Struct, Union, Trait, NoAggregate };
+        enum Aggregate { Struct, Union, Trait, Coroutine, Monitor, Thread, NoAggregate };
         enum TypeClass { Otype, Dtype, Ftype, Ttype, NoTypeClass };
         enum BuiltinType { Valist, Zero, One, NoBuiltinType };

src/Parser/TypeData.cc ¶

@@ -10 +10 @@
 // Created On       : Sat May 16 15:12:51 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar 17 08:46:10 2017
-// Update Count     : 560
+// Last Modified On : Fri Mar 17 15:52:43 2017
+// Update Count     : 563
 //
 
@@ -619 +619 @@
         switch ( td->aggregate.kind ) {
           case DeclarationNode::Struct:
-                at = new StructDecl( *td->aggregate.name, attributes );
+          case DeclarationNode::Coroutine:
+          case DeclarationNode::Monitor:
+          case DeclarationNode::Thread:
+                at = new StructDecl( *td->aggregate.name, td->aggregate.kind, attributes );
                 buildForall( td->aggregate.params, at->get_parameters() );
                 break;
@@ -656 +659 @@
                           switch ( type->aggregate.kind ) {
                                 case DeclarationNode::Struct:
+                                case DeclarationNode::Coroutine:
+                                case DeclarationNode::Monitor:
+                                case DeclarationNode::Thread:
                                   ret = new StructInstType( buildQualifiers( type ), (StructDecl *)typedecl );
                                   break;
@@ -671 +677 @@
                           switch ( type->aggregate.kind ) {
                                 case DeclarationNode::Struct:
+                                case DeclarationNode::Coroutine:
+                                case DeclarationNode::Monitor:
+                                case DeclarationNode::Thread:
                                   ret = new StructInstType( buildQualifiers( type ), *type->aggregate.name );
                                   break;
@@ -703 +712 @@
                   switch ( type->aggregate.kind ) {
                         case DeclarationNode::Struct:
+                        case DeclarationNode::Coroutine:
+                        case DeclarationNode::Monitor:
+                        case DeclarationNode::Thread:
                           ret = new StructInstType( buildQualifiers( type ), *type->aggregate.name );
                           break;

src/Parser/lex.ll ¶

@@ -202 +202 @@
 __const__               { KEYWORD_RETURN(CONST); }                              // GCC
 continue                { KEYWORD_RETURN(CONTINUE); }
-_Coroutine              { KEYWORD_RETURN(COROUTINE); }                  // CFA
+coroutine               { KEYWORD_RETURN(COROUTINE); }                  // CFA
 default                 { KEYWORD_RETURN(DEFAULT); }
 disable                 { KEYWORD_RETURN(DISABLE); }                    // CFA

src/Parser/parser.yy ¶

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar 16 12:57:03 2017
-// Update Count     : 2316
+// Last Modified On : Fri Mar 17 15:42:22 2017
+// Update Count     : 2317
 //
 
@@ -1638 +1638 @@
                 { $$ = DeclarationNode::Union; }
         | COROUTINE
-                { $$ = DeclarationNode::Struct; }
+                { $$ = DeclarationNode::Coroutine; }
         | MONITOR
-                { $$ = DeclarationNode::Struct; }
+                { $$ = DeclarationNode::Monitor; }
         | THREAD
-                { $$ = DeclarationNode::Struct; }
+                { $$ = DeclarationNode::Thread; }
         ;