Changes in src/Parser/parser.yy [a7c90d4:d0ffed1]

File:

• src/Parser/parser.yy (modified) (7 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 : Tue Feb 28 09:58:10 2017
+// Update Count     : 2208
 //
 
@@ -91 +91 @@
 // keywords
 %token TYPEDEF
-%token EXTERN STATIC AUTO REGISTER
-%token THREADLOCAL                                                                              // C11
-%token INLINE FORTRAN                                                                   // C99, extension ISO/IEC 9899:1999 Section J.5.9(1)
-%token NORETURN                                                                                 // C11
+%token AUTO EXTERN REGISTER STATIC
+%token INLINE                                                                                   // C99
+%token FORTRAN                                                                                  // C99, extension ISO/IEC 9899:1999 Section J.5.9(1)
 %token CONST VOLATILE
 %token RESTRICT                                                                                 // C99
-%token ATOMIC                                                                                   // C11
-%token FORALL LVALUE MUTEX                                                              // CFA
+%token FORALL LVALUE                                                                    // CFA
 %token VOID CHAR SHORT INT LONG FLOAT DOUBLE SIGNED UNSIGNED ZERO_T ONE_T
 %token VALIST                                                                                   // GCC
@@ -104 +102 @@
 %token TYPEOF LABEL                                                                             // GCC
 %token ENUM STRUCT UNION
-%token OTYPE FTYPE DTYPE TTYPE TRAIT                                    // CFA
+%token OTYPE FTYPE DTYPE TTYPE TRAIT                                                    // CFA
 %token SIZEOF OFFSETOF
 %token ATTRIBUTE EXTENSION                                                              // GCC
@@ -110 +108 @@
 %token CHOOSE DISABLE ENABLE FALLTHRU TRY CATCH CATCHRESUME FINALLY THROW THROWRESUME AT        // CFA
 %token ASM                                                                                              // C99, extension ISO/IEC 9899:1999 Section J.5.10(1)
-%token ALIGNAS ALIGNOF GENERIC STATICASSERT                             // C11
+%token ALIGNAS ALIGNOF ATOMIC GENERIC NORETURN STATICASSERT THREADLOCAL // C11
 
 // names and constants: lexer differentiates between identifier and typedef names
@@ -1402 +1400 @@
 type_qualifier_name:
         CONST
-                { $$ = DeclarationNode::newTypeQualifier( DeclarationNode::Const ); }
+                { $$ = DeclarationNode::newQualifier( DeclarationNode::Const ); }
         | RESTRICT
-                { $$ = DeclarationNode::newTypeQualifier( DeclarationNode::Restrict ); }
+                { $$ = DeclarationNode::newQualifier( DeclarationNode::Restrict ); }
         | VOLATILE
-                { $$ = DeclarationNode::newTypeQualifier( DeclarationNode::Volatile ); }
+                { $$ = DeclarationNode::newQualifier( DeclarationNode::Volatile ); }
         | LVALUE                                                                                        // CFA
-                { $$ = DeclarationNode::newTypeQualifier( DeclarationNode::Lvalue ); }
-        | MUTEX
-                { $$ = DeclarationNode::newTypeQualifier( DeclarationNode::Mutex ); }
+                { $$ = DeclarationNode::newQualifier( DeclarationNode::Lvalue ); }
         | ATOMIC
-                { $$ = DeclarationNode::newTypeQualifier( DeclarationNode::Atomic ); }
+                { $$ = DeclarationNode::newQualifier( DeclarationNode::Atomic ); }
         | FORALL '('
                 {
@@ -1452 +1448 @@
         | REGISTER
                 { $$ = DeclarationNode::newStorageClass( DeclarationNode::Register ); }
+        | INLINE                                                                                        // C99
+                //{ $$ = DeclarationNode::newStorageClass( DeclarationNode::Inline ); }
+                { $$ = new DeclarationNode; $$->isInline = true; }
+        | FORTRAN                                                                                       // C99
+                { $$ = DeclarationNode::newStorageClass( DeclarationNode::Fortran ); }
+        | NORETURN                                                                                      // C11
+                //{ $$ = DeclarationNode::newStorageClass( DeclarationNode::Noreturn ); }
+                { $$ = new DeclarationNode; $$->isNoreturn = true; }
         | THREADLOCAL                                                                           // C11
                 { $$ = DeclarationNode::newStorageClass( DeclarationNode::Threadlocal ); }
-                // Put function specifiers here to simplify parsing rules, but separate them semantically.
-        | INLINE                                                                                        // C99
-                { $$ = DeclarationNode::newFuncSpecifier( DeclarationNode::Inline ); }
-        | FORTRAN                                                                                       // C99
-                { $$ = DeclarationNode::newFuncSpecifier( DeclarationNode::Fortran ); }
-        | NORETURN                                                                                      // C11
-                { $$ = DeclarationNode::newFuncSpecifier( DeclarationNode::Noreturn ); }
         ;
 
@@ -2036 +2033 @@
                 { $$ = $3->addQualifiers( $1 ); }
         | type_declaring_list ',' type_declarator
-                { $$ = $1->appendList( $3->copySpecifiers( $1 ) ); }
+                { $$ = $1->appendList( $3->copyStorageClasses( $1 ) ); }
         ;