From d4d457340af9e3c90a98dde5e6f00bacddaae0cb Mon Sep 17 00:00:00 2001 From: Adam Pippin Date: Mon, 15 Feb 2021 00:44:31 -0800 Subject: [PATCH] Fix bug in expression string literal parser --- app/Engine/Cfnpp/Expression/TokenOperator.php | 2 +- app/Engine/Cfnpp/Expression/TokenStringLiteral.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Engine/Cfnpp/Expression/TokenOperator.php b/app/Engine/Cfnpp/Expression/TokenOperator.php index cffc8e4..9d90b28 100644 --- a/app/Engine/Cfnpp/Expression/TokenOperator.php +++ b/app/Engine/Cfnpp/Expression/TokenOperator.php @@ -17,11 +17,11 @@ class TokenOperator extends Token */ public const OPERATORS = [ 'eq', + 'neq', 'gt', 'gte', 'lt', 'lte', - 'neq', 'and', 'or' ]; diff --git a/app/Engine/Cfnpp/Expression/TokenStringLiteral.php b/app/Engine/Cfnpp/Expression/TokenStringLiteral.php index 685caaa..252b997 100644 --- a/app/Engine/Cfnpp/Expression/TokenStringLiteral.php +++ b/app/Engine/Cfnpp/Expression/TokenStringLiteral.php @@ -67,6 +67,7 @@ class TokenStringLiteral extends Token if ($escaped) { $buffer .= $stream[$i]; + $escaped = false; } elseif ($stream[$i] == '"') {