Changeset dbff8ec for src

Timestamp:

Jul 10, 2024, 3:39:37 AM (4 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

725f777f

Parents:

bb336a6 (diff), f3811df (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:software/cfa/cfa-cc

Location:

src/Parser

Files:

• ExpressionNode.cpp (modified) (1 diff)
• parser.yy (modified) (4 diffs)

src/Parser/ExpressionNode.cpp

@@ -483 +483 @@
         Default:                                                                                        // char default string type
         default:
-                strtype = new ast::BasicType( ast::BasicKind::Char, ast::CV::Const );
+                strtype = new ast::BasicType( ast::BasicKind::Char );
         } // switch
         ast::ArrayType * at = new ast::ArrayType(

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 Jun 27 14:45:57 2024
-// Update Count     : 6705
+// Last Modified On : Tue Jul  9 10:29:01 2024
+// Update Count     : 6713
 //
 
@@ -1998 +1998 @@
         c_declaration ';'
         | cfa_declaration ';'                                                           // CFA
-        | static_assert                                                                         // C11
+        | static_assert ';'                                                                     // C11
         ;
 
 static_assert:
-        STATICASSERT '(' constant_expression ',' string_literal ')' ';' // C11
+        STATICASSERT '(' constant_expression ',' string_literal ')' // C11
                 { $$ = DeclarationNode::newStaticAssert( $3, maybeMoveBuild( $5 ) ); }
-        | STATICASSERT '(' constant_expression ')' ';'          // CFA
+        | STATICASSERT '(' constant_expression ')'                      // CFA
                 { $$ = DeclarationNode::newStaticAssert( $3, build_constantStr( yylloc, *new string( "\"\"" ) ) ); }
 
@@ -2709 +2709 @@
                 { $$ = $2; }                                                                    // mark all fields in list
         | cfa_typedef_declaration ';'                                           // CFA
-        | static_assert                                                                         // C11
+        | static_assert ';'                                                                     // C11
         ;
 
@@ -3364 +3364 @@
                         $$ = $6;
                 }
+        | ';'                                                                                           // empty declaration
+                { $$ = nullptr; }
         ;