From 857b26285efd2521302e1bcec4d1cf1134a2a318 Mon Sep 17 00:00:00 2001 From: Doug Torrance Date: Fri, 6 Sep 2024 20:44:32 -0400 Subject: [PATCH 1/4] Remove unused setup functions for 2 unop's (prefix/postfix) --- M2/Macaulay2/d/common.d | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/M2/Macaulay2/d/common.d b/M2/Macaulay2/d/common.d index 71ed211b17..04bda4aa03 100644 --- a/M2/Macaulay2/d/common.d +++ b/M2/Macaulay2/d/common.d @@ -69,13 +69,6 @@ export setup(word:Word,fun1:unop,fun2:binop):void := ( e.unary = fun1; e.binary = fun2; ); -export setup(word:Word,fun1:unop,fun2:unop):void := ( - e := makeSymbol(word,dummyPosition,globalDictionary); - unopNameList = unopNameListCell(fun2,e,unopNameList); - unopNameList = unopNameListCell(fun1,e,unopNameList); - e.unary = fun1; - e.postfix = fun2; - ); export setup(e:SymbolClosure,fn:unop):void := ( unopNameList = unopNameListCell(fn,e.symbol,unopNameList); e.symbol.unary = fn; @@ -94,12 +87,6 @@ export setup(e:SymbolClosure,fun1:unop,fun2:binop):void := ( e.symbol.unary = fun1; e.symbol.binary = fun2; ); -export setup(e:SymbolClosure,fun1:unop,fun2:unop):void := ( - unopNameList = unopNameListCell(fun1,e.symbol,unopNameList); - unopNameList = unopNameListCell(fun2,e.symbol,unopNameList); - 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; From 9a31b7117ce74cf7ec9947eee42a6a60824c7b7e Mon Sep 17 00:00:00 2001 From: Doug Torrance Date: Fri, 6 Sep 2024 20:45:34 -0400 Subject: [PATCH 2/4] Remove setup(SymbolClosure,unop); identical to setupop --- M2/Macaulay2/d/actors.d | 2 +- M2/Macaulay2/d/common.d | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/M2/Macaulay2/d/actors.d b/M2/Macaulay2/d/actors.d index b8c55143dd..21e65408af 100644 --- a/M2/Macaulay2/d/actors.d +++ b/M2/Macaulay2/d/actors.d @@ -810,7 +810,7 @@ export notFun(rhs:Code):Expr := ( else if a == True then False else if a == False then True else unarymethod(a,notS)); -setup(notS,notFun); +setupop(notS,notFun); EqualEqualEqualfun(lhs:Code,rhs:Code):Expr := ( -- # typical value: symbol ===, Thing, Thing, Boolean x := eval(lhs); diff --git a/M2/Macaulay2/d/common.d b/M2/Macaulay2/d/common.d index 04bda4aa03..a8b9325e6a 100644 --- a/M2/Macaulay2/d/common.d +++ b/M2/Macaulay2/d/common.d @@ -69,10 +69,6 @@ export setup(word:Word,fun1:unop,fun2:binop):void := ( e.unary = fun1; e.binary = fun2; ); -export setup(e:SymbolClosure,fn:unop):void := ( - unopNameList = unopNameListCell(fn,e.symbol,unopNameList); - e.symbol.unary = fn; - ); export setuppostfix(e:SymbolClosure,fn:unop):void := ( unopNameList = unopNameListCell(fn,e.symbol,unopNameList); e.symbol.postfix = fn; From 0a0ea7b0194543f8a59f426e15b3e77635b85e7c Mon Sep 17 00:00:00 2001 From: Doug Torrance Date: Fri, 6 Sep 2024 20:53:10 -0400 Subject: [PATCH 3/4] Remove unused setup(Word,...) We only actually call any setup function on SymbolClosure's --- M2/Macaulay2/d/common.d | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/M2/Macaulay2/d/common.d b/M2/Macaulay2/d/common.d index a8b9325e6a..b6b65d6868 100644 --- a/M2/Macaulay2/d/common.d +++ b/M2/Macaulay2/d/common.d @@ -49,26 +49,6 @@ export pos(c:Code):void := ( -- for use in the debugger stdIO << codePosition(c) << endl; ); -export setup(word:Word):void := ( - makeSymbol(word,dummyPosition,globalDictionary); - ); -export setup(word:Word,fn:unop):void := ( - e := makeSymbol(word,dummyPosition,globalDictionary); - unopNameList = unopNameListCell(fn,e,unopNameList); - e.unary = fn; - ); -export setup(word:Word,fn:binop):void := ( - e := makeSymbol(word,dummyPosition,globalDictionary); - binopNameList = binopNameListCell(fn,e,binopNameList); - e.binary = fn; - ); -export setup(word:Word,fun1:unop,fun2:binop):void := ( - e := makeSymbol(word,dummyPosition,globalDictionary); - unopNameList = unopNameListCell(fun1,e,unopNameList); - binopNameList = binopNameListCell(fun2,e,binopNameList); - e.unary = fun1; - e.binary = fun2; - ); export setuppostfix(e:SymbolClosure,fn:unop):void := ( unopNameList = unopNameListCell(fn,e.symbol,unopNameList); e.symbol.postfix = fn; From f302dd18186b8ea01135f8db3908fea386525733 Mon Sep 17 00:00:00 2001 From: Doug Torrance Date: Fri, 6 Sep 2024 20:55:56 -0400 Subject: [PATCH 4/4] Remove setupfun(string, unop) --- M2/Macaulay2/d/common.d | 8 -------- 1 file changed, 8 deletions(-) diff --git a/M2/Macaulay2/d/common.d b/M2/Macaulay2/d/common.d index b6b65d6868..9ae9702522 100644 --- a/M2/Macaulay2/d/common.d +++ b/M2/Macaulay2/d/common.d @@ -73,14 +73,6 @@ export setup(e:SymbolClosure,fn:ternop):void := ( export setup(e:SymbolClosure,fn:multop):void := ( multopNameList = multopNameListCell(fn,e.symbol,multopNameList); ); -export setupfun(name:string,fun:unop):Symbol := ( - word := makeUniqueWord(name, - parseinfo(precSpace,precSpace,precSpace,parsefuns(unaryop, defaultbinary))); - entry := makeSymbol(word,dummyPosition,globalDictionary); - unopNameList = unopNameListCell(fun,entry,unopNameList); - entry.unary = fun; - entry.Protected = true; - entry); export setupfun(name:string, value:function(Expr):Expr):Symbol := ( word := makeUniqueWord(name,parseWORD); entry := makeSymbol(word,dummyPosition,globalDictionary);