diff --git a/M2/Macaulay2/d/chrono.dd b/M2/Macaulay2/d/chrono.dd index 038f3aae0e..ddd27073df 100644 --- a/M2/Macaulay2/d/chrono.dd +++ b/M2/Macaulay2/d/chrono.dd @@ -57,22 +57,22 @@ showtimefun(a:Code):Expr := ( << threadEnd - threadStart << "s (thread); " << gcEnd - gcStart << "s (gc)" << endl; ret); -setupop(timeS,showtimefun); +setup(timeS,showtimefun); -- TODO: should "timing" return thread and gc times like "time"? timingfun(c:Code):Expr := ( s := cpuTimer(c); when s.1 is Error do s.1 else list(timeClass, s)); -setupop(timingS, timingfun); +setup(timingS, timingfun); elapsedTimefun(c:Code):Expr := ( s := wallTimer(c); when s.0 is dT:RRcell do ( stdError << " -- " << tostringRR(dT.v) << "s elapsed" << endl;) else nothing; s.1); -setupop(elapsedTimeS,elapsedTimefun); +setup(elapsedTimeS,elapsedTimefun); elapsedTimingfun(c:Code):Expr := ( s := wallTimer(c); when s.1 is Error do s.1 else list(timeClass, s)); -setupop(elapsedTimingS,elapsedTimingfun); +setup(elapsedTimingS,elapsedTimingfun); diff --git a/M2/Macaulay2/d/common.d b/M2/Macaulay2/d/common.d index 7dc9099872..8bc6fc3395 100644 --- a/M2/Macaulay2/d/common.d +++ b/M2/Macaulay2/d/common.d @@ -100,10 +100,6 @@ export setup(e:SymbolClosure,fun1:unop,fun2:unop):void := ( e.symbol.unary = fun1; e.symbol.postfix = fun2; ); -export setupop(s:SymbolClosure,fun:unop):void := ( - unopNameList = unopNameListCell(fun,s.symbol,unopNameList); - s.symbol.unary = fun; - ); export setup(e:SymbolClosure,fn:ternop):void := ( ternopNameList = ternopNameListCell(fn,e.symbol,ternopNameList); ); diff --git a/M2/Macaulay2/d/evaluate.d b/M2/Macaulay2/d/evaluate.d index 7495ef2266..21e4ab13e4 100644 --- a/M2/Macaulay2/d/evaluate.d +++ b/M2/Macaulay2/d/evaluate.d @@ -1631,24 +1631,24 @@ shieldfun(a:Code):Expr := ( exit(1); ); ret)); -setupop(shieldS,shieldfun); +setup(shieldS,shieldfun); returnFun(a:Code):Expr := ( e := if a == dummyCode then nullE else eval(a); when e is Error do e else Expr(Error(dummyPosition,returnMessage,e,false,dummyFrame))); -setupop(returnS,returnFun); +setup(returnS,returnFun); throwFun(a:Code):Expr := ( e := eval(a); when e is Error do e else Expr(Error(dummyPosition,throwMessage,e,false,dummyFrame))); -setupop(throwS,throwFun); +setup(throwS,throwFun); continueFun(a:Code):Expr := ( e := if a == dummyCode then nullE else eval(a); when e is Error do e else Expr(Error(dummyPosition, if a == dummyCode then continueMessage else continueMessageWithArg, e,false,dummyFrame))); -setupop(continueS,continueFun); +setup(continueS,continueFun); stepFun(a:Code):Expr := ( e := if a == dummyCode then nullE else eval(a); @@ -1656,12 +1656,12 @@ stepFun(a:Code):Expr := ( Expr(Error(dummyPosition, if a == dummyCode then stepMessage else stepMessageWithArg, e,false,dummyFrame)))); -setupop(stepS,stepFun); +setup(stepS,stepFun); breakFun(a:Code):Expr := ( e := if a == dummyCode then dummyExpr else eval(a); when e is Error do e else Expr(Error(dummyPosition,breakMessage,e,false,dummyFrame))); -setupop(breakS,breakFun); +setup(breakS,breakFun); addTestS := setupvar("addTest", nullE); -- will be overwritten in testing.m2 testfun(c:Code):Expr := ( @@ -1669,7 +1669,7 @@ testfun(c:Code):Expr := ( getGlobalVariable(addTestS), seq(eval(c), locate(codePosition(c)))); when r is Error do r else nullE); -setupop(TestS, testfun); +setup(TestS, testfun); assigntofun(lhs:Code,rhs:Code):Expr := ( left := eval(lhs);