partially revert 0a863d9

pzinn · Jul 18, 2024 · adc939d · adc939d
1 parent 0a863d9
commit adc939d
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 23 deletions.
diff --git a/M2/Macaulay2/d/actors3.d b/M2/Macaulay2/d/actors3.d
@@ -1328,7 +1328,7 @@ map(a1:Sequence,a2:Sequence,f:Expr):Expr := (
 	       Expr(ret)
 	       )
 	  else (				  -- (x,y) -> ...
-	       if numparms != 2 then WrongNumArgs1(numparms,2)
+	       if numparms != 2 then WrongNumArgs(Code(model),numparms,2)
 	       else (
 		    saveLocalFrame := localFrame;
 		    values := new Sequence len framesize do provide nullE;
@@ -1455,7 +1455,7 @@ map(a:Sequence,f:Expr):Expr := (
 				   when arg is args:Sequence do (
 					if 1 == length(args) then values.0 = args.0
 					else (
-					     errret = WrongNumArgs1(numparms,length(args));
+					     errret = WrongNumArgs(dummyPosition,numparms,length(args));
 					     while true do provide nullE;
 					     )
 					)
@@ -1482,7 +1482,7 @@ map(a:Sequence,f:Expr):Expr := (
 				   when arg is args:Sequence do (
 					if 1 == length(args) then values.0 = args.0
 					else (
-					     errret = WrongNumArgs1(numparms,length(args));
+					     errret = WrongNumArgs(dummyPosition,numparms,length(args));
 					     while true do provide nullE;
 					     )
 					)
@@ -1521,12 +1521,12 @@ map(a:Sequence,f:Expr):Expr := (
 			      foreach arg in a do (
 				   when arg is args:Sequence do (
 					if 0 != length(args) then (
-					     errret = WrongNumArgs1(0,length(args));
+					     errret = WrongNumArgs(dummyPosition,0,length(args));
 					     while true do provide nullE;
 					     )
 					)
 				   else (
-					errret = WrongNumArgs1(numparms,1);
+					errret = WrongNumArgs(dummyPosition,numparms,1);
 					while true do provide nullE;
 					);
 				   tmp := eval(body);
@@ -1560,12 +1560,12 @@ map(a:Sequence,f:Expr):Expr := (
 					     foreach x at i in args do values.i = x;
 					     )
 					else (
-					     errret=WrongNumArgs1(numparms,length(args));
+					     errret=WrongNumArgs(dummyPosition,numparms,length(args));
 					     while true do provide nullE;
 					     )
 					)
 				   else (
-					errret = WrongNumArgs1(numparms,1);
+					errret = WrongNumArgs(dummyPosition,numparms,1);
 					while true do provide nullE;
 					);
 				   tmp := eval(body);
@@ -1644,7 +1644,7 @@ map(newlen:int,f:Expr):Expr := (
 	       numparms := desc.numparms;
 	       framesize := desc.framesize;
 	       if numparms != 1 then (
-		    errret = WrongNumArgs1(numparms,1);
+		    errret = WrongNumArgs(Code(model),numparms,1);
 		    while true do provide nullE;
 		    )
 	       else (
@@ -1831,7 +1831,7 @@ scan(n:int,f:Expr):Expr := (
 	  framesize := desc.framesize;
 	  if numparms != 1 then (
      	       recursionDepth = recursionDepth - 1;
-	       return WrongNumArgs1(numparms,1);
+	       return WrongNumArgs(Code(model),numparms,1);
 	       );
 	  if framesize == 1 then (
 	       values := new Sequence len framesize do provide nullE;
@@ -1963,7 +1963,7 @@ scan(a:Sequence,f:Expr):Expr := (
 				   else (
 					recursionDepth = recursionDepth - 1;
 					localFrame = saveLocalFrame;
-					return WrongNumArgs1(numparms,length(args));
+					return WrongNumArgs(dummyPosition,numparms,length(args));
 					)
 				   )
 			      else values.0 = arg;
@@ -1989,7 +1989,7 @@ scan(a:Sequence,f:Expr):Expr := (
 				   else (
 					recursionDepth = recursionDepth - 1;
 					localFrame = saveLocalFrame;
-					return WrongNumArgs1(numparms,length(args));
+					return WrongNumArgs(dummyPosition,numparms,length(args));
 					)
 				   )
 			      else values.0 = arg;
@@ -2018,13 +2018,13 @@ scan(a:Sequence,f:Expr):Expr := (
 				   if 0 != length(args) then (
 					recursionDepth = recursionDepth - 1;
 					localFrame = saveLocalFrame;
-					return WrongNumArgs1(0,length(args));
+					return WrongNumArgs(dummyPosition,0,length(args));
 					)
 				   )
 			      else (
 				   recursionDepth = recursionDepth - 1;
 				   localFrame = saveLocalFrame;
-				   return WrongNumArgs1(numparms,1);
+				   return WrongNumArgs(dummyPosition,numparms,1);
 				   );
 			      tmp := eval(body);
 			      when tmp is err:Error do (
@@ -2046,13 +2046,13 @@ scan(a:Sequence,f:Expr):Expr := (
 				   else (
 					recursionDepth = recursionDepth - 1;
 					localFrame = saveLocalFrame;
-					return WrongNumArgs1(numparms,length(args));
+					return WrongNumArgs(dummyPosition,numparms,length(args));
 					)
 				   )
 			      else (
 				   recursionDepth = recursionDepth - 1;
 				   localFrame = saveLocalFrame;
-				   return WrongNumArgs1(numparms,1);
+				   return WrongNumArgs(dummyPosition,numparms,1);
 				   );
 			      tmp := eval(body);
 			      when tmp is err:Error do (
@@ -2158,7 +2158,7 @@ scan(a1:Sequence,a2:Sequence,f:Expr):Expr := (
 	       recursionDepth = recursionDepth - 1;
 	       nullE)
 	  else (				  -- (x,y) -> ...
-	       if numparms != 2 then WrongNumArgs1(numparms,2)
+	       if numparms != 2 then WrongNumArgs(Code(model),numparms,2)
 	       else (
 		    saveLocalFrame := localFrame;
 		    values := new Sequence len framesize do provide nullE;

diff --git a/M2/Macaulay2/d/evaluate.d b/M2/Macaulay2/d/evaluate.d
@@ -42,7 +42,7 @@ export isEmptySequenceE(e:Expr):bool := (
     );
 printErrorMessageE(p:Position,message:Expr):Expr;
 printErrorMessage(p:Position,message:string):Expr; -- ???
-WrongNumArgs1(wanted:int,got:int):Expr;
+WrongNumArgs(p:Position,wanted:int,got:int):Expr;
 export printErrorMessageE(c:Code,message:string):Expr := printErrorMessageE(codePosition(c),toExpr(message));
 export printErrorMessageE(c:Code,message:Expr):Expr := printErrorMessageE(codePosition(c),message);
 export printErrorMessageE(c:Token,message:string):Expr := ( -- for use when we have no code
@@ -552,7 +552,7 @@ export applyFCS(c:FunctionClosure,v:Sequence):Expr := (
 	       )
 	  )
      else if desc.numparms != length(v)
-     then WrongNumArgs1(desc.numparms,length(v))
+     then WrongNumArgs(dummyPosition,desc.numparms,length(v))
      else (
 	  if framesize == 0 then (
 	       saveLocalFrame := localFrame;
@@ -849,7 +849,7 @@ export applyFCCS(c:FunctionClosure,cs:CodeSequence):Expr := (
 	  else applyFCS(c,v)
 	  )
      else if desc.numparms != length(cs)
-     then WrongNumArgs1(desc.numparms,length(cs))
+     then WrongNumArgs(dummyPosition,desc.numparms,length(cs))
      else (
      	  previousFrame := c.frame;
      	  framesize := desc.framesize;
@@ -980,7 +980,7 @@ export applyEEE(g:Expr,e0:Expr,e1:Expr):Expr := (
 	  if desc.restargs
 	  then applyFCS(c,Sequence(e0,e1))
 	  else if desc.numparms != 2
-	  then WrongNumArgs1(desc.numparms,2)
+	  then WrongNumArgs(dummyPosition,desc.numparms,2)
 	  else if recursionDepth > recursionLimit then RecursionLimit()
 	  else (
 	       previousFrame := c.frame;
@@ -1049,7 +1049,7 @@ export applyEEEE(g:Expr,e0:Expr,e1:Expr,e2:Expr):Expr := (
 	  if desc.restargs
 	  then applyFCS(c,Sequence(e0,e1,e2))
 	  else if desc.numparms != 3
-	  then WrongNumArgs1(desc.numparms,3)
+	  then WrongNumArgs(dummyPosition,desc.numparms,3)
 	  else if recursionDepth > recursionLimit then RecursionLimit()
 	  else (
 	       previousFrame := c.frame;
@@ -1369,9 +1369,10 @@ export printErrorMessage(p:Position,message:Expr):Expr := ( -- for use when we h
      e := Error(p,message,nullE,false,dummyFrame);
      printError(e);
      Expr(e));
-export WrongNumArgs1(wanted:int,got:int):Expr := Expr(Error(dummyPosition,toExpr("expected " + tostring(wanted) + " argument"
+export WrongNumArgs(p:Position,wanted:int,got:int):Expr := printErrorMessage0(p,"expected " + tostring(wanted) + " argument"
 	  + (if wanted == 1 then "" else "s") + ", but got "
-	  + tostring(got)),nullE,false,dummyFrame));
+	  + tostring(got));
+export WrongNumArgs(c:Code,wanted:int,got:int):Expr := WrongNumArgs(codePosition(c),wanted,got);
 
 export handleError(c:Code,e:Expr):Expr := (
      when e is err:Error do (