Changeset b5b0907 for src/Parser/parser.yy

Timestamp:

Jun 15, 2015, 12:45:26 PM (11 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

94b4364

Parents:

ea9b9d3 (diff), a1d5d2a (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' into resolver

Conflicts:

src/CodeGen/CodeGenerator.cc

File:

• src/Parser/parser.yy (modified) (4 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 : Wed Jun 10 20:31:54 2015
-// Update Count     : 1040
+// Last Modified On : Sat Jun 13 07:21:45 2015
+// Update Count     : 1048
 // 
 
@@ -111 +111 @@
         ExpressionNode *en;
         DeclarationNode *decl;
-        DeclarationNode::TyCon aggKey;
+        DeclarationNode::Aggregate aggKey;
         DeclarationNode::TypeClass tclass;
         StatementNode *sn;
@@ -887 +887 @@
 
 asm_operand:                                                                                    // GCC
-        STRINGliteral '(' constant_expression ')'               {}
+        STRINGliteral '(' constant_expression ')'       {}
         ;
 
@@ -1247 +1247 @@
                 { $$ = DeclarationNode::newStorageClass( DeclarationNode::Register ); }
         | INLINE                                                                                        // C99
-                // INLINE is essentially a storage class specifier for functions, and hence, belongs here.
                 { $$ = DeclarationNode::newStorageClass( DeclarationNode::Inline ); }
         | FORTRAN                                                                                       // C99
                 { $$ = DeclarationNode::newStorageClass( DeclarationNode::Fortran ); }
+        | NORETURN                                                                                      // C11
+                { $$ = DeclarationNode::newStorageClass( DeclarationNode::Noreturn ); }
+        | THREADLOCAL                                                                           // C11
+                { $$ = DeclarationNode::newStorageClass( DeclarationNode::Threadlocal ); }
         ;