Changeset d28524a for src/Parser

Timestamp:

Jun 23, 2022, 1:41:39 PM (4 years ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct

Children:

3322180, a6cfb4d, fd365da

Parents:

4e83bb7 (diff), 9dad5b3 (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:

• lex.ll (modified) (1 diff)
• parser.yy (modified) (6 diffs)

src/Parser/lex.ll

@@ -82 +82 @@
 // Stop warning due to incorrectly generated flex code.
 #pragma GCC diagnostic ignored "-Wsign-compare"
+
+// lex uses __null in a boolean context, it's fine.
+#pragma GCC diagnostic ignored "-Wnull-conversion"
 %}
 

src/Parser/parser.yy

@@ -56 +56 @@
 
 #include "SynTree/Attribute.h"     // for Attribute
+
+// lex uses __null in a boolean context, it's fine.
+#pragma GCC diagnostic ignored "-Wparentheses-equality"
 
 extern DeclarationNode * parseTree;
@@ -1240 +1243 @@
                 {
                         $$ = new StatementNode( build_while( new CondCtl( nullptr, new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) ), maybe_build_compound( $4 ) ) );
-                        SemanticWarning( yylloc, Warning::SuperfluousElse );
+                        SemanticWarning( yylloc, Warning::SuperfluousElse, "" );
                 }
         | WHILE '(' conditional_declaration ')' statement       %prec THEN
@@ -1251 +1254 @@
                 {
                         $$ = new StatementNode( build_do_while( new ExpressionNode( build_constantInteger( *new string( "1" ) ) ), maybe_build_compound( $2 ) ) );
-                        SemanticWarning( yylloc, Warning::SuperfluousElse );
+                        SemanticWarning( yylloc, Warning::SuperfluousElse, "" );
                 }
         | DO statement WHILE '(' comma_expression ')' ';'
@@ -1262 +1265 @@
                 {
                         $$ = new StatementNode( build_for( new ForCtrl( (ExpressionNode * )nullptr, (ExpressionNode * )nullptr, (ExpressionNode * )nullptr ), maybe_build_compound( $4 ) ) );
-                        SemanticWarning( yylloc, Warning::SuperfluousElse );
+                        SemanticWarning( yylloc, Warning::SuperfluousElse, "" );
                 }
         | FOR '(' for_control_expression_list ')' statement     %prec THEN
@@ -2394 +2397 @@
         | ENUM '(' cfa_abstract_parameter_declaration ')' attribute_list_opt '{' enumerator_list comma_opt '}'
                 {
-                        if ( $3->storageClasses.val != 0 || $3->type->qualifiers.val != 0 ) 
+                        if ( $3->storageClasses.val != 0 || $3->type->qualifiers.val != 0 )
                         { SemanticError( yylloc, "storage-class and CV qualifiers are not meaningful for enumeration constants, which are const." ); }
 
@@ -2841 +2844 @@
                         linkage = LinkageSpec::update( yylloc, linkage, $2 );
                 }
-          up external_definition down 
+          up external_definition down
                 {
                         linkage = linkageStack.top();