Merge remote-tracking branch 'stg609/master' into dev

codingseb · codingseb · commit ec15cba8c39e · 2021-06-28T20:52:05.000+02:00
diff --git a/CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs b/CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs
@@ -2933,8 +2933,16 @@ protected virtual bool EvaluateString(string expression, Stack<object> stack, re
 
                     if (expression.Substring(i)[0] == '"')
                     {
-                        endOfString = true;
-                        stack.Push(resultString.ToString());
+                        if (expression.Substring(i).Length > 1 && expression.Substring(i)[1] == '"')
+                        {
+                            i += 2;
+                            resultString.Append(@"""");
+                        }
+                        else
+                        {
+                            endOfString = true;
+                            stack.Push(resultString.ToString());
+                        }
                     }
                     else if (expression.Substring(i)[0] == '{')
                     {

Original file line number	Diff line number	Diff line change
`@@ -2933,8 +2933,16 @@ protected virtual bool EvaluateString(string expression, Stack<object> stack, re`
`2933`	`2933`
`2934`	`2934`	`if (expression.Substring(i)[0] == '"')`
`2935`	`2935`	`{`
`2936`		`- endOfString = true;`
`2937`		`- stack.Push(resultString.ToString());`
	`2936`	`+ if (expression.Substring(i).Length > 1 && expression.Substring(i)[1] == '"')`
	`2937`	`+ {`
	`2938`	`+ i += 2;`
	`2939`	`+ resultString.Append(@"""");`
	`2940`	`+ }`
	`2941`	`+ else`
	`2942`	`+ {`
	`2943`	`+ endOfString = true;`
	`2944`	`+ stack.Push(resultString.ToString());`
	`2945`	`+ }`
`2938`	`2946`	`}`
`2939`	`2947`	`else if (expression.Substring(i)[0] == '{')`
`2940`	`2948`	`{`