Changes in src/ResolvExpr/Resolver.cc [b9f383f:bd87b138]

File:

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

src/ResolvExpr/Resolver.cc

@@ -492 +492 @@
                         }
 
-                        if(clause.target.arguments.empty()) {
-                                SemanticError( stmt->location, "Waitfor clause must have at least one mutex parameter");
-                        }
-
                         // Find all alternatives for all arguments in canonical form
                         std::vector< AlternativeFinder > argAlternatives;
@@ -560 +556 @@
                                                         auto param_end = function->parameters.end();
 
-                                                        int n_mutex_arg = 0;
-
                                                         // For every arguments of its set, check if it matches one of the parameter
                                                         // The order is important
@@ -570 +564 @@
                                                                         // We ran out of parameters but still have arguments
                                                                         // this function doesn't match
-                                                                        SemanticError( function, toString("candidate function not viable: too many mutex arguments, expected ", n_mutex_arg, "\n" ));
+                                                                        SemanticError( function, "candidate function not viable: too many mutex arguments\n" );
                                                                 }
 
-                                                                n_mutex_arg++;
-
                                                                 // Check if the argument matches the parameter type in the current scope
-                                                                if( ! unify( arg.expr->get_result(), (*param)->get_type(), resultEnv, resultNeed, resultHave, openVars, this->indexer ) ) {
+                                                                if( ! unify( (*param)->get_type(), arg.expr->get_result(), resultEnv, resultNeed, resultHave, openVars, this->indexer ) ) {
                                                                         // Type doesn't match
                                                                         stringstream ss;
                                                                         ss << "candidate function not viable: no known convertion from '";
+                                                                        arg.expr->get_result()->print( ss );
+                                                                        ss << "' to '";
                                                                         (*param)->get_type()->print( ss );
-                                                                        ss << "' to '";
-                                                                        arg.expr->get_result()->print( ss );
                                                                         ss << "'\n";
                                                                         SemanticError( function, ss.str() );
@@ -596 +588 @@
                                                                 // We ran out of arguments but still have parameters left
                                                                 // this function doesn't match
-                                                                SemanticError( function, toString("candidate function not viable: too few mutex arguments, expected ", n_mutex_arg, "\n" ));
+                                                                SemanticError( function, "candidate function not viable: too few mutex arguments\n" );
                                                         }