Changeset fa463f1 for src/Parser/parser.yy

Timestamp:

Aug 30, 2016, 4:26:01 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, 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:

c8dfcd3

Parents:

3906301 (diff), 32a2a99 (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 ctor

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 : Mon Aug 22 14:30:56 2016
-// Update Count     : 1944
+// Last Modified On : Fri Aug 26 16:45:44 2016
+// Update Count     : 1964
 //
 
@@ -54 +54 @@
 #include "TypeData.h"
 #include "LinkageSpec.h"
-
-union DeclQualifiers {
-        unsigned int value;                                                                     // assume 32-bits
-        struct {
-                bool Extern : 1;
-                bool Static : 1;
-                bool Auto : 1;
-                bool Register : 1;
-                bool Inline : 1;
-                bool Fortran : 1;
-                bool Noreturn : 1;
-                bool Threadlocal : 1;
-                bool Extension : 1;
-                bool Lvalue : 1;
-                bool Const : 1;
-                bool Volatile : 1;
-                bool Restrict : 1;
-                bool Atomic : 1;
-        } qual;
-}; // DeclQualifiers
-DeclQualifiers declQualifiers = { 0 };
-
-union DeclType {
-        unsigned int value;                                                                     // assume 32-bits
-        struct {
-                bool Char : 1;
-                bool Bool : 1;
-                bool Short : 1;
-                bool Int : 1;
-                bool Float : 1;
-                bool Double : 1;
-                bool Long : 1;
-                bool Signed : 1;
-                bool Unsigned : 1;
-                bool Void : 1;
-                bool Complex : 1;
-                bool Imaginary : 1;
-                bool Valist : 1;
-        } type;
-}; // DeclType
-DeclType declTypes = { 0 };
 
 extern DeclarationNode * parseTree;
@@ -649 +608 @@
 assignment_operator:
         '='                                                                                     { $$ = OperKinds::Assign; }
+        | ATassign                                                                      { $$ = OperKinds::AtAssn; }
         | MULTassign                                                            { $$ = OperKinds::MulAssn; }
         | DIVassign                                                                     { $$ = OperKinds::DivAssn; }
@@ -1328 +1288 @@
         type_qualifier_name
         | attribute
-        //{ $$ = DeclarationNode::newQualifier( DeclarationNode::Attribute ); }
+                //{ $$ = DeclarationNode::newQualifier( DeclarationNode::Attribute ); }
         ;
 
@@ -1382 +1342 @@
                 { $$ = DeclarationNode::newStorageClass( DeclarationNode::Register ); }
         | INLINE                                                                                        // C99
-                { $$ = DeclarationNode::newStorageClass( DeclarationNode::Inline ); }
+                //{ $$ = DeclarationNode::newStorageClass( DeclarationNode::Inline ); }
+                { $$ = new DeclarationNode; $$->isInline = true; }
         | FORTRAN                                                                                       // C99
                 { $$ = DeclarationNode::newStorageClass( DeclarationNode::Fortran ); }
         | NORETURN                                                                                      // C11
-                { $$ = DeclarationNode::newStorageClass( DeclarationNode::Noreturn ); }
+                //{ $$ = DeclarationNode::newStorageClass( DeclarationNode::Noreturn ); }
+                { $$ = new DeclarationNode; $$->isNoreturn = true; }
         | THREADLOCAL                                                                           // C11
                 { $$ = DeclarationNode::newStorageClass( DeclarationNode::Threadlocal ); }
@@ -2153 +2115 @@
 asm_name_opt:                                                                                   // GCC
         // empty
-        | ASM '(' string_literal_list ')' attribute_list_opt
-                { delete $3; }
+        | ASM '(' string_literal_list ')' attribute_list_opt { delete $3; }     // FIX ME: unimplemented
         ;
 
@@ -2183 +2144 @@
         // empty
         | any_word
-        | any_word '(' comma_expression_opt ')'
-                { delete $3; }
+        | any_word '(' comma_expression_opt ')' { delete $3; } // FIX ME: unimplemented
         ;
 
 any_word:                                                                                               // GCC
-        identifier_or_type_name { delete $1; }
-        | storage_class { delete $1; }
-        | basic_type_name { delete $1; }
-        | type_qualifier { delete $1; }
+        identifier_or_type_name { delete $1; }                          // FIX ME: unimplemented
+        | storage_class { delete $1; }                                          // FIX ME: unimplemented
+        | basic_type_name { delete $1; }                                        // FIX ME: unimplemented
+        | type_qualifier { delete $1; }                                         // FIX ME: unimplemented
         ;