Speedup by using Replace instead of ReplaceAll.

corywalker · Jul 16, 2017 · 823857f · 823857f
1 parent 2933d38
commit 823857f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 19 deletions.
diff --git a/expreduce/builtin_replacement.go b/expreduce/builtin_replacement.go
@@ -224,7 +224,7 @@ func getReplacementDefinitions() (defs []Definition) {
 				return this
 			}
 			for _, rule := range rules {
-				toReturn, replaced := Replace(this.Parts[1], rule, es, EmptyPD(), "")
+				toReturn, replaced := Replace(this.Parts[1], rule, es)
 				if replaced {
 					return toReturn
 				}

diff --git a/expreduce/evalstate.go b/expreduce/evalstate.go
@@ -145,9 +145,8 @@ func (this *EvalState) GetDef(name string, lhs Ex) (Ex, bool, *Expression) {
 			started = time.Now().UnixNano()
 		}
 
-		ismatchq, _ := IsMatchQ(lhs, def.Parts[1], EmptyPD(), this)
-		if ismatchq {
-			res := ReplaceAll(lhs, &def, this, EmptyPD(), "")
+		res, replaced := Replace(lhs, &def, this)
+		if replaced {
 			return res, true, &def
 		}
 

diff --git a/expreduce/replace.go b/expreduce/replace.go
@@ -101,19 +101,9 @@ func ReplacePD(this Ex, es *EvalState, pm *PDManager) Ex {
 // Final named pattern substitution will occur at the last possible time.
 func ReplaceAll(this Ex, r *Expression, es *EvalState, pm *PDManager,
                 stopAtHead string) Ex {
-	_, isFlt := this.(*Flt)
-	_, isInteger := this.(*Integer)
-	_, isString := this.(*String)
 	asExpression, isExpression := this.(*Expression)
-	_, isSymbol := this.(*Symbol)
-	_, isRational := this.(*Rational)
 
-	if isFlt || isInteger || isString || isSymbol || isRational {
-		if res, matches := IsMatchQ(this, r.Parts[1], pm, es); res {
-			return ReplacePD(r.Parts[2], es, matches)
-		}
-		return this
-	} else if isExpression {
+	if isExpression {
 		_, isRestrictedHead := HeadAssertion(this, stopAtHead)
 		if isRestrictedHead {
 			return this
@@ -123,12 +113,14 @@ func ReplaceAll(this Ex, r *Expression, es *EvalState, pm *PDManager,
 			return asExpression.ReplaceAll(r, stopAtHead, es)
 		}
 	}
-	return &Symbol{"$ReplaceAllFailed"}
+	if res, matches := IsMatchQ(this, r.Parts[1], pm, es); res {
+		return ReplacePD(r.Parts[2], es, matches)
+	}
+	return this
 }
 
-func Replace(this Ex, r *Expression, es *EvalState, pm *PDManager,
-                stopAtHead string) (Ex, bool) {
-	if res, matches := IsMatchQ(this, r.Parts[1], pm, es); res {
+func Replace(this Ex, r *Expression, es *EvalState) (Ex, bool) {
+	if res, matches := IsMatchQ(this, r.Parts[1], EmptyPD(), es); res {
 		return ReplacePD(r.Parts[2], es, matches), true
 	}
 	return this, false