Finally remove deepcopy from main evaluation loop.

corywalker · Jul 17, 2017 · cb2fee0 · cb2fee0
1 parent cc5acb4
commit cb2fee0
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/expreduce/builtin_flowcontrol.go b/expreduce/builtin_flowcontrol.go
@@ -65,15 +65,15 @@ func GetFlowControlDefinitions() (defs []Definition) {
 			if len(this.Parts) != 3 {
 				return this
 			}
-			isequal := this.Parts[1].Eval(es).IsEqual(&Symbol{"True"}, &es.CASLogger)
+			isequal := this.Parts[1].DeepCopy().Eval(es).IsEqual(&Symbol{"True"}, &es.CASLogger)
 			cont := isequal == "EQUAL_TRUE"
 			for cont {
-				tmpRes := this.Parts[2].Eval(es)
+				tmpRes := this.Parts[2].DeepCopy().Eval(es)
 				retVal, isReturn := tryReturnValue(tmpRes)
 				if isReturn {
 					return retVal
 				}
-				isequal = this.Parts[1].Eval(es).IsEqual(&Symbol{"True"}, &es.CASLogger)
+				isequal = this.Parts[1].DeepCopy().Eval(es).IsEqual(&Symbol{"True"}, &es.CASLogger)
 				cont = isequal == "EQUAL_TRUE"
 			}
 

diff --git a/expreduce/builtin_list.go b/expreduce/builtin_list.go
@@ -163,7 +163,9 @@ func GetListDefinitions() (defs []Definition) {
 					toReturn := NewExpression([]Ex{&Symbol{"List"}})
 					for mis.cont() {
 						mis.defineCurrent(es)
-						toReturn.Parts = append(toReturn.Parts, this.Parts[1].Eval(es))
+						// TODO: use ReplacePD for this. We're only replacing
+						// symbols. Don't need a full Eval.
+						toReturn.Parts = append(toReturn.Parts, this.Parts[1].DeepCopy().Eval(es))
 						es.Debugf("%v\n", toReturn)
 						mis.next()
 					}

diff --git a/expreduce/builtin_numbertheory.go b/expreduce/builtin_numbertheory.go
@@ -39,7 +39,9 @@ func GetNumberTheoryDefinitions() (defs []Definition) {
 				}
 				r := asInt.Val.Cmp(zero)
 				if r > 0 {
-					ints = append(ints, asInt.Val)
+					tmpI := big.NewInt(0)
+					tmpI.Set(asInt.Val)
+					ints = append(ints, tmpI)
 				}
 				if r < 0 {
 					tmpI := big.NewInt(0)

diff --git a/expreduce/ex_expression.go b/expreduce/ex_expression.go
@@ -106,7 +106,7 @@ func (this *Expression) Eval(es *EvalState) Ex {
 	if currExHash == this.cachedHash {
 		return this
 	}
-	var currEx Ex = this.DeepCopy()
+	var currEx Ex = this
 	insideDefinition := false
 	for currExHash != lastExHash {
 		lastExHash = currExHash