Changeset 640b3df for src/Parser/parser.yy

Timestamp:

Feb 21, 2023, 4:24:34 PM (3 years ago)

Author:

caparson <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

257a8f5, ce44c5f

Parents:

1180175 (diff), 9a533ba (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

File:

• src/Parser/parser.yy (modified) (5 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 : Thu Feb  2 21:36:16 2023
-// Update Count     : 5865
+// Last Modified On : Mon Feb 20 11:31:26 2023
+// Update Count     : 5896
 //
 
@@ -55 +55 @@
 #include "Common/utility.h"                                                             // for maybeMoveBuild, maybeBuild, CodeLo...
 
-#include "SynTree/Attribute.h"     // for Attribute
+#include "SynTree/Attribute.h"                                                  // for Attribute
 
 // lex uses __null in a boolean context, it's fine.
@@ -1951 +1951 @@
                 {
                         typedefTable.addToEnclosingScope( *$4->name, TYPEDEFname, "6" );
-                        $$ = $4->addType( $3 )->addQualifiers( $1 )->addTypedef();
+                        $$ = $4->addQualifiers( $1 )->addType( $3 )->addTypedef();
                 }
         | type_specifier TYPEDEF declarator
@@ -1961 +1961 @@
                 {
                         typedefTable.addToEnclosingScope( *$4->name, TYPEDEFname, "8" );
-                        $$ = $4->addQualifiers( $1 )->addTypedef()->addType( $1 );
+                        $$ = $4->addQualifiers( $1 )->addType( $1 )->addTypedef();
                 }
         ;
@@ -1983 +1983 @@
         | typedef_expression                                                            // deprecated GCC, naming expression type
         | sue_declaration_specifier
+                {
+                        assert( $1->type );
+                        if ( $1->type->qualifiers.val != 0 ) {
+                                SemanticError( yylloc, "Useless type qualifier in empty declaration." ); $$ = nullptr;
+                        }
+                }
         ;