Changeset b78c54f for src/ResolvExpr/Resolver.cc

Timestamp:

Apr 12, 2024, 7:49:21 AM (2 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

3e1cd17, 90320ac

Parents:

feb999f (diff), ab780e6 (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/ResolvExpr/Resolver.cc (modified) (7 diffs)

src/ResolvExpr/Resolver.cc

@@ -340 +340 @@
         }
 
+        ast::ptr< ast::Expr > findCondExpression(
+                const ast::Expr * untyped, const ResolveContext & context
+        ) {
+                if ( nullptr == untyped ) return untyped;
+                ast::ptr<ast::Expr> condExpr = createCondExpr( untyped );
+                return findIntegralExpression( condExpr, context );
+        }
+
         /// check if a type is a character type
         bool isCharType( const ast::Type * t ) {
@@ -356 +364 @@
                 return it != end;
         }
-}
+} // anonymous namespace
 
 class Resolver final
@@ -729 +737 @@
 const ast::IfStmt * Resolver::previsit( const ast::IfStmt * ifStmt ) {
         return ast::mutate_field(
-                ifStmt, &ast::IfStmt::cond, findIntegralExpression( ifStmt->cond, context ) );
+                ifStmt, &ast::IfStmt::cond, findCondExpression( ifStmt->cond, context ) );
 }
 
 const ast::WhileDoStmt * Resolver::previsit( const ast::WhileDoStmt * whileDoStmt ) {
         return ast::mutate_field(
-                whileDoStmt, &ast::WhileDoStmt::cond, findIntegralExpression( whileDoStmt->cond, context ) );
+                whileDoStmt, &ast::WhileDoStmt::cond, findCondExpression( whileDoStmt->cond, context ) );
 }
 
@@ -740 +748 @@
         if ( forStmt->cond ) {
                 forStmt = ast::mutate_field(
-                        forStmt, &ast::ForStmt::cond, findIntegralExpression( forStmt->cond, context ) );
+                        forStmt, &ast::ForStmt::cond, findCondExpression( forStmt->cond, context ) );
         }
 
@@ -1075 +1083 @@
 
                 // Resolve the conditions as if it were an IfStmt, statements normally
-                clause2->when_cond = findSingleExpression( clause.when_cond, context );
+                clause2->when_cond = findCondExpression( clause.when_cond, context );
                 clause2->stmt = clause.stmt->accept( *visitor );
 
@@ -1089 +1097 @@
                         new ast::BasicType{ ast::BasicType::LongLongUnsignedInt };
                 auto timeout_time = findSingleExpression( stmt->timeout_time, target, context );
-                auto timeout_cond = findSingleExpression( stmt->timeout_cond, context );
+                auto timeout_cond = findCondExpression( stmt->timeout_cond, context );
                 auto timeout_stmt = stmt->timeout_stmt->accept( *visitor );
 
@@ -1102 +1110 @@
         if ( stmt->else_stmt ) {
                 // resolve the condition like IfStmt, stmts normally
-                auto else_cond = findSingleExpression( stmt->else_cond, context );
+                auto else_cond = findCondExpression( stmt->else_cond, context );
                 auto else_stmt = stmt->else_stmt->accept( *visitor );