Changeset c5283ba for src

Timestamp:

Jun 29, 2018, 3:02:51 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

1f133dc

Parents:

9f66811

Message:

Fixed #94, properly list the number of expected mutex parameter

File:

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

src/ResolvExpr/Resolver.cc

@@ -583 +583 @@
                                                         // Make sure we don't widen any existing bindings
                                                         resultEnv.forbidWidening();
-                                                        
+
                                                         // Find any unbound type variables
                                                         resultEnv.extractOpenVars( openVars );
@@ -590 +590 @@
                                                         auto param_end = function->parameters.end();
 
-                                                        int n_mutex_arg = 0;
+                                                        int n_mutex_param = 0;
 
                                                         // For every arguments of its set, check if it matches one of the parameter
@@ -600 +600 @@
                                                                         // 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, toString("candidate function not viable: too many mutex arguments, expected ", n_mutex_param, "\n" ));
                                                                 }
 
-                                                                n_mutex_arg++;
+                                                                n_mutex_param++;
 
                                                                 // Check if the argument matches the parameter type in the current scope
@@ -626 +626 @@
                                                         // Check if parameters are missing
                                                         if( advance_to_mutex( param, param_end ) ) {
+                                                                do {
+                                                                        n_mutex_param++;
+                                                                        param++;
+                                                                } while( advance_to_mutex( param, param_end ) );
+
                                                                 // 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, toString("candidate function not viable: too few mutex arguments, expected ", n_mutex_param, "\n" ));
                                                         }