Changes in src/ResolvExpr/Resolver.cc [251ce80:46da46b]

File:

• src/ResolvExpr/Resolver.cc (modified) (8 diffs)

src/ResolvExpr/Resolver.cc

@@ -38 +38 @@
 #include "AST/SymbolTable.hpp"
 #include "AST/Type.hpp"
-#include "Common/Eval.h"                 // for eval
-#include "Common/Iterate.hpp"            // for group_iterate
 #include "Common/PassVisitor.h"          // for PassVisitor
 #include "Common/SemanticError.h"        // for SemanticError
 #include "Common/Stats/ResolveTime.h"    // for ResolveTime::start(), ResolveTime::stop()
-#include "Common/ToString.hpp"           // for toCString
+#include "Common/utility.h"              // for ValueGuard, group_iterate
 #include "InitTweak/GenInit.h"
 #include "InitTweak/InitTweak.h"         // for isIntrinsicSingleArgCallStmt
@@ -1011 +1009 @@
                         ast::TypeEnvironment env;
                         CandidateFinder finder( context, env );
+                        finder.allowVoid = true;
                         finder.find( untyped, recursion_level == 1 ? mode.atTopLevel() : mode );
                         --recursion_level;
@@ -1054 +1053 @@
 
                         // promote candidate.cvtCost to .cost
-                        promoteCvtCost( winners );
+                        // promoteCvtCost( winners );
 
                         // produce ambiguous errors, if applicable
@@ -1108 +1107 @@
                 void removeExtraneousCast( ast::ptr<ast::Expr> & expr, const ast::SymbolTable & symtab ) {
                         if ( const ast::CastExpr * castExpr = expr.as< ast::CastExpr >() ) {
-                                if ( typesCompatible( castExpr->arg->result, castExpr->result ) ) {
+                                if ( typesCompatible( castExpr->arg->result, castExpr->result, symtab ) ) {
                                         // cast is to the same type as its argument, remove it
                                         swap_and_save_env( expr, castExpr->arg );
@@ -1730 +1729 @@
 
                         // Find all candidates for a function in canonical form
-                        funcFinder.find( clause.target, ResolvMode::withAdjustment() );
+                        funcFinder.find( clause.target_func, ResolvMode::withAdjustment() );
 
                         if ( funcFinder.candidates.empty() ) {
                                 stringstream ss;
                                 ss << "Use of undeclared indentifier '";
-                                ss << clause.target.strict_as< ast::NameExpr >()->name;
+                                ss << clause.target_func.strict_as< ast::NameExpr >()->name;
                                 ss << "' in call to waitfor";
                                 SemanticError( stmt->location, ss.str() );
@@ -1834 +1833 @@
                                                                 if (
                                                                         ! unify(
-                                                                                arg->expr->result, *param, resultEnv, need, have, open )
+                                                                                arg->expr->result, *param, resultEnv, need, have, open,
+                                                                                symtab )
                                                                 ) {
                                                                         // Type doesn't match
@@ -1921 +1921 @@
                         auto clause2 = new ast::WaitForClause( clause.location );
 
-                        clause2->target = funcCandidates.front()->expr;
+                        clause2->target_func = funcCandidates.front()->expr;
 
                         clause2->target_args.reserve( clause.target_args.size() );
@@ -1944 +1944 @@
 
                         // Resolve the conditions as if it were an IfStmt, statements normally
-                        clause2->when_cond = findSingleExpression( clause.when_cond, context );
+                        clause2->cond = findSingleExpression( clause.cond, context );
                         clause2->stmt = clause.stmt->accept( *visitor );