Changeset 221c542e for src/Parser

Timestamp:

Jan 24, 2024, 8:19:18 AM (2 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

64c4b4d

Parents:

bad9c8f (diff), 71b5aad5 (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.cc (modified) (2 diffs)
• parserutility.cc (modified) (1 diff)
• parserutility.h (modified) (1 diff)

src/Parser/ExpressionNode.cc

@@ -673 +673 @@
                 ast::LogicalFlag flag ) {
         return new ast::LogicalExpr( location,
-                notZeroExpr( maybeMoveBuild( expr_node1 ) ),
-                notZeroExpr( maybeMoveBuild( expr_node2 ) ),
+                maybeMoveBuild( expr_node1 ),
+                maybeMoveBuild( expr_node2 ),
                 flag
         );
@@ -713 +713 @@
                 ExpressionNode * expr_node3 ) {
         return new ast::ConditionalExpr( location,
-                notZeroExpr( maybeMoveBuild( expr_node1 ) ),
+                maybeMoveBuild( expr_node1 ),
                 maybeMoveBuild( expr_node2 ),
                 maybeMoveBuild( expr_node3 )

src/Parser/parserutility.cc

@@ -27 +27 @@
 //    if ( (int)(x != 0) ) ...
 
-ast::Expr * notZeroExpr( ast::Expr * orig ) {
+ast::Expr * notZeroExpr( const ast::Expr * orig ) {
         return ( !orig ) ? nullptr : new ast::CastExpr( orig->location,
                 ast::UntypedExpr::createCall( orig->location,

src/Parser/parserutility.h

@@ -21 +21 @@
 }
 
-ast::Expr * notZeroExpr( ast::Expr *orig );
+ast::Expr * notZeroExpr( const ast::Expr *orig );
 
 template< typename T >