Changeset 3d618a0 for src/Parser

Timestamp:

Sep 9, 2024, 6:16:09 PM (13 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

aa14aafe

Parents:

d93b813 (diff), f5dbc8d (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:

• StatementNode.cpp (modified) (2 diffs)
• TypeData.cpp (modified) (1 diff)
• parser.yy (modified) (1 diff)

src/Parser/StatementNode.cpp

@@ -11 +11 @@
 // Created On       : Sat May 16 14:59:41 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Aug 11 11:44:15 2023
-// Update Count     : 429
+// Last Modified On : Mon Sep  9 11:28:07 2024
+// Update Count     : 430
 //
 
@@ -208 +208 @@
 
 ast::Stmt * build_for( const CodeLocation & location, ForCtrl * forctl, StatementNode * stmt, StatementNode * else_ ) {
-        std::vector<ast::ptr<ast::Stmt>> astinit;                                               // maybe empty
+        std::vector<ast::ptr<ast::Stmt>> astinit;                       // maybe empty
         buildMoveList( forctl->init, astinit );
 
         if ( forctl->range_over ) {
                 ast::Expr * range_over = maybeMoveBuild( forctl->range_over );
+                auto kind = forctl->kind;                                               // save before delete, used in return
                 delete forctl;
                 return new ast::ForStmt( location,
                         std::move( astinit ),
-                        range_over, forctl->kind == OperKinds::LEThan,
+                        range_over, kind == OperKinds::LEThan,
                         buildMoveSingle( stmt ),
                         buildMoveOptional( else_ )

src/Parser/TypeData.cpp

@@ -1476 +1476 @@
                 } else if ( cur->has_enumeratorValue() ) {
                         ast::Expr * initValue;
-                        if (ret->isCfa && ret->base) {
-                                initValue = new ast::CastExpr( cur->enumeratorValue->location, maybeMoveBuild( cur->consume_enumeratorValue() ), ret->base  );
+                        if ( ret->isCfa && ret->base ) {
+                                CodeLocation location = cur->enumeratorValue->location;
+                                initValue = new ast::CastExpr( location, maybeMoveBuild( cur->consume_enumeratorValue() ), ret->base );
                         } else {
                                 initValue = maybeMoveBuild( cur->consume_enumeratorValue() );

src/Parser/parser.yy

@@ -927 +927 @@
                 { $$ = new ExpressionNode( build_unary_val( yylloc, OperKinds::Decr, $2 ) ); }
         | SIZEOF unary_expression
-                { $$ = new ExpressionNode( new ast::SizeofExpr( yylloc, maybeMoveBuild( $2 ) ) ); }
+                { $$ = new ExpressionNode( new ast::SizeofExpr( yylloc, new ast::TypeofType( maybeMoveBuild( $2 ) ) ) ); }
         | SIZEOF '(' type_no_function ')'
                 { $$ = new ExpressionNode( new ast::SizeofExpr( yylloc, maybeMoveBuildType( $3 ) ) ); }
         | ALIGNOF unary_expression                                                      // GCC, variable alignment
-                { $$ = new ExpressionNode( new ast::AlignofExpr( yylloc, maybeMoveBuild( $2 ) ) ); }
+                { $$ = new ExpressionNode( new ast::AlignofExpr( yylloc, new ast::TypeofType( maybeMoveBuild( $2 ) ) ) ); }
         | ALIGNOF '(' type_no_function ')'                                      // GCC, type alignment
                 { $$ = new ExpressionNode( new ast::AlignofExpr( yylloc, maybeMoveBuildType( $3 ) ) ); }