Changes in src/ResolvExpr/Resolver.cc [ab780e6:bc61563]

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 ) {
@@ -364 +356 @@
                 return it != end;
         }
-} // anonymous namespace
+}
 
 class Resolver final
@@ -737 +729 @@
 const ast::IfStmt * Resolver::previsit( const ast::IfStmt * ifStmt ) {
         return ast::mutate_field(
-                ifStmt, &ast::IfStmt::cond, findCondExpression( ifStmt->cond, context ) );
+                ifStmt, &ast::IfStmt::cond, findIntegralExpression( ifStmt->cond, context ) );
 }
 
 const ast::WhileDoStmt * Resolver::previsit( const ast::WhileDoStmt * whileDoStmt ) {
         return ast::mutate_field(
-                whileDoStmt, &ast::WhileDoStmt::cond, findCondExpression( whileDoStmt->cond, context ) );
+                whileDoStmt, &ast::WhileDoStmt::cond, findIntegralExpression( whileDoStmt->cond, context ) );
 }
 
@@ -748 +740 @@
         if ( forStmt->cond ) {
                 forStmt = ast::mutate_field(
-                        forStmt, &ast::ForStmt::cond, findCondExpression( forStmt->cond, context ) );
+                        forStmt, &ast::ForStmt::cond, findIntegralExpression( forStmt->cond, context ) );
         }
 
@@ -1083 +1075 @@
 
                 // Resolve the conditions as if it were an IfStmt, statements normally
-                clause2->when_cond = findCondExpression( clause.when_cond, context );
+                clause2->when_cond = findSingleExpression( clause.when_cond, context );
                 clause2->stmt = clause.stmt->accept( *visitor );
 
@@ -1097 +1089 @@
                         new ast::BasicType{ ast::BasicType::LongLongUnsignedInt };
                 auto timeout_time = findSingleExpression( stmt->timeout_time, target, context );
-                auto timeout_cond = findCondExpression( stmt->timeout_cond, context );
+                auto timeout_cond = findSingleExpression( stmt->timeout_cond, context );
                 auto timeout_stmt = stmt->timeout_stmt->accept( *visitor );
 
@@ -1110 +1102 @@
         if ( stmt->else_stmt ) {
                 // resolve the condition like IfStmt, stmts normally
-                auto else_cond = findCondExpression( stmt->else_cond, context );
+                auto else_cond = findSingleExpression( stmt->else_cond, context );
                 auto else_stmt = stmt->else_stmt->accept( *visitor );