* Fixed subtraction problem.

Pulover · Oct 8, 2020 · 0b82a7c · 0b82a7c
1 parent e1785f8
commit 0b82a7c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/Eval.ahk b/Eval.ahk
@@ -488,6 +488,8 @@ ExprCompile(e)
 ExprEval(e,lp,eo,el)
 {
 	c1:=Chr(1)
+	While (RegExMatch(e,c1 "l-[\d\.]++(?!" c1 "o)"))
+	e:=RegExReplace(e,c1 "l-([\d\.]+)",c1 "l$1" c1 "o-")
 	Loop,Parse,e,%c1%
 	{
 		lf:=A_LoopField,tt:=SubStr(lf,1,1),t:=SubStr(lf,2)

diff --git a/Examples/EvalExamples.ahk b/Examples/EvalExamples.ahk
@@ -17,7 +17,7 @@ MsgBox, 1, Operators, % "Expression: `n`n" Expression "`n`n`nResults:`n`n" r
 IfMsgBox, Cancel, ExitApp
 
 ; Variable Assignment
-Expression := "VarA := 123,VarB := VarA - 23,VarX := ""First,Second,Third,Fourth"""
+Expression := "A := 100, B := A - 5 - 10 - 15, B, VarA := 123,VarB := VarA - 23,VarX := ""First,Second,Third,Fourth"""
 Result := Eval(Expression)
 r := StrJoin(Result, "`n")
 MsgBox, 1, Variable Assignment, % "Expression: `n`n" Expression "`n`n`nResults:`n`n" r