From 0701b3552e78b0ad1112e2fe2460467ddaabcc5a Mon Sep 17 00:00:00 2001
From: Vadym Slizov <z7zmey@gmail.com>
Date: Mon, 28 Dec 2020 21:43:55 +0200
Subject: [PATCH] refactoring: fix scanning double dollar in template string

---
 internal/scanner/scanner.go      | Bin 410134 -> 410157 bytes
 internal/scanner/scanner.rl      |  11 ++++----
 internal/scanner/scanner_test.go |  42 +++++++++++++++++++++++++++++++
 3 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/internal/scanner/scanner.go b/internal/scanner/scanner.go
index 49e8150e909af3178d6c5ad83cbd6dcc40a33cd0..7fd94d176e2d989db815d6262845a74f30270ca9 100644
GIT binary patch
delta 4790
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
CNLXC}

delta 4939
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
QD4O(qpYBWTQ1h7o0mr_gS^xk5

diff --git a/internal/scanner/scanner.rl b/internal/scanner/scanner.rl
index 30d12af..812c742 100644
--- a/internal/scanner/scanner.rl
+++ b/internal/scanner/scanner.rl
@@ -115,11 +115,12 @@ func (lex *Lexer) Lex() *token.Token {
                 | '"'              -> final
             ),
             double_qoute_nonvarname: (
-                (any - [\\{"\r\n] - varname_first) -> double_qoute
-                | "\r" @new_line                   -> double_qoute
-                | "\n" @new_line                   -> double_qoute
-                | "\\"                             -> double_qoute_any
-                | '"'                              -> final
+                (any - [\\${"\r\n] - varname_first) -> double_qoute
+                | "\r" @new_line                    -> double_qoute
+                | "\n" @new_line                    -> double_qoute
+                | "\\"                              -> double_qoute_any
+                | '$'                               -> double_qoute_nonvarname
+                | '"'                               -> final
             );
 
         main := |*
diff --git a/internal/scanner/scanner_test.go b/internal/scanner/scanner_test.go
index 04888c4..a51e6ea 100644
--- a/internal/scanner/scanner_test.go
+++ b/internal/scanner/scanner_test.go
@@ -1628,3 +1628,45 @@ func TestIgnoreControllCharactersAtStringVarOffset(t *testing.T) {
 	actual = string(tkn.Value)
 	assert.DeepEqual(t, expected, actual)
 }
+
+func TestDoubleDollar(t *testing.T) {
+	src := `<?php "$$a";`
+
+	lexer := NewLexer([]byte(src), "7.4", nil)
+
+	expected := "\""
+	tkn := lexer.Lex()
+	actual := string(tkn.Value)
+	assert.DeepEqual(t, expected, actual)
+
+	expected = "$"
+	tkn = lexer.Lex()
+	actual = string(tkn.Value)
+	assert.DeepEqual(t, expected, actual)
+
+	expected = "$a"
+	tkn = lexer.Lex()
+	actual = string(tkn.Value)
+	assert.DeepEqual(t, expected, actual)
+}
+
+func TestTripleDollar(t *testing.T) {
+	src := `<?php "$$$a";`
+
+	lexer := NewLexer([]byte(src), "7.4", nil)
+
+	expected := "\""
+	tkn := lexer.Lex()
+	actual := string(tkn.Value)
+	assert.DeepEqual(t, expected, actual)
+
+	expected = "$$"
+	tkn = lexer.Lex()
+	actual = string(tkn.Value)
+	assert.DeepEqual(t, expected, actual)
+
+	expected = "$a"
+	tkn = lexer.Lex()
+	actual = string(tkn.Value)
+	assert.DeepEqual(t, expected, actual)
+}