maride/php-parser
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into refactoring

Browse Source
This commit is contained in:
Vadym Slizov
2020-07-29 22:23:44 +02:00
parent ce18c23597 cbf185c8f4
commit 88dfd32d9e
9 changed files with 5899 additions and 4548 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
internal/php5/parser_test.go
View File

@@ -1049,8 +1049,7 @@ func TestPhp5ParameterNode(t *testing.T) {
},
},
},
Stmts: []ast.Vertex{
},
Stmts: []ast.Vertex{},
},
&ast.StmtClass{
Node: ast.Node{
@@ -1278,8 +1277,7 @@ func TestPhp5ParameterNode(t *testing.T) {
EndPos: 114,
},
},
Stmts: []ast.Vertex{
},
Stmts: []ast.Vertex{},
},
},
},
@@ -1465,8 +1463,7 @@ func TestPhp5ParameterNode(t *testing.T) {
},
},
},
Stmts: []ast.Vertex{
},
Stmts: []ast.Vertex{},
},
},
&ast.StmtExpression{
@@ -1651,14 +1648,12 @@ func TestPhp5ParameterNode(t *testing.T) {
},
},
},
Stmts: []ast.Vertex{
},
Stmts: []ast.Vertex{},
},
},
},
}
lexer := scanner.NewLexer([]byte(src), "5.6", false, nil)
php5parser := php5.NewParser(lexer, nil)
php5parser.Parse()

13
internal/php7/parser_test.go
View File

@@ -1170,8 +1170,7 @@ func TestPhp7ParameterNode(t *testing.T) {
},
},
},
Stmts: []ast.Vertex{
},
Stmts: []ast.Vertex{},
},
&ast.StmtClass{
Node: ast.Node{
@@ -1409,8 +1408,7 @@ func TestPhp7ParameterNode(t *testing.T) {
EndPos: 116,
},
},
Stmts: []ast.Vertex{
},
Stmts: []ast.Vertex{},
},
},
},
@@ -1606,8 +1604,7 @@ func TestPhp7ParameterNode(t *testing.T) {
},
},
},
Stmts: []ast.Vertex{
},
Stmts: []ast.Vertex{},
},
},
&ast.StmtExpression{
@@ -1802,14 +1799,12 @@ func TestPhp7ParameterNode(t *testing.T) {
},
},
},
Stmts: []ast.Vertex{
},
Stmts: []ast.Vertex{},
},
},
},
}
lexer := scanner.NewLexer([]byte(src), "7.4", false, nil)
php7parser := php7.NewParser(lexer, nil)
php7parser.Parse()

10255
internal/scanner/scanner.go generated
View File

File diff suppressed because it is too large Load Diff

58
internal/scanner/scanner.rl
View File

@@ -35,13 +35,13 @@ func (lex *Lexer) Lex() *Token {
action heredoc_lbl_start {lblStart = lex.p}
action heredoc_lbl_end {lblEnd = lex.p}
action constant_string_new_line {
action new_line {
if lex.data[lex.p] == '\n' {
lex.newLines.Append(lex.p)
lex.newLines.Append(lex.p+1)
}
if lex.data[lex.p] == '\r' && lex.data[lex.p+1] != '\n' {
lex.newLines.Append(lex.p)
lex.newLines.Append(lex.p+1)
}
}
@@ -51,7 +51,7 @@ func (lex *Lexer) Lex() *Token {
action is_not_string_end_or_var { lex.isNotStringEnd('"') && lex.isNotStringVar() }
action is_not_backqoute_end_or_var { lex.isNotStringEnd('`') && lex.isNotStringVar() }
newline = ('\r\n' >(nl, 1) | '\r' >(nl, 0) | '\n' >(nl, 0)) %{lex.newLines.Append(lex.p);};
newline = ('\r\n' >(nl, 1) | '\r' >(nl, 0) | '\n' >(nl, 0)) $new_line %{};
any_line = any | newline;
whitespace = [\t\v\f ];
whitespace_line = [\t\v\f ] | newline;
@@ -79,45 +79,45 @@ func (lex *Lexer) Lex() *Token {
# single qoute string
qoute: (
(any - [\\'\r\n]) -> qoute
| "\r" @constant_string_new_line -> qoute
| "\n" @constant_string_new_line -> qoute
| "\\" -> qoute_any
| "'" -> final
(any - [\\'\r\n]) -> qoute
| "\r" @new_line -> qoute
| "\n" @new_line -> qoute
| "\\" -> qoute_any
| "'" -> final
),
qoute_any: (
(any - [\r\n]) -> qoute
| "\r" @constant_string_new_line -> qoute
| "\n" @constant_string_new_line -> qoute
(any - [\r\n]) -> qoute
| "\r" @new_line -> qoute
| "\n" @new_line -> qoute
),
# double qoute string
double_qoute: (
(any - [\\"${\r\n]) -> double_qoute
| "\r" @constant_string_new_line -> double_qoute
| "\n" @constant_string_new_line -> double_qoute
| "\\" -> double_qoute_any
| '"' -> final
| '$' -> double_qoute_nonvarname
| '{' -> double_qoute_nondollar
(any - [\\"${\r\n]) -> double_qoute
| "\r" @new_line -> double_qoute
| "\n" @new_line -> double_qoute
| "\\" -> double_qoute_any
| '"' -> final
| '$' -> double_qoute_nonvarname
| '{' -> double_qoute_nondollar
),
double_qoute_any: (
(any - [\r\n]) -> double_qoute
| "\r" @constant_string_new_line -> double_qoute
| "\n" @constant_string_new_line -> double_qoute
(any - [\r\n]) -> double_qoute
| "\r" @new_line -> double_qoute
| "\n" @new_line -> double_qoute
),
double_qoute_nondollar: (
(any - [\\$"\r\n]) -> double_qoute
| "\r" @constant_string_new_line -> double_qoute
| "\n" @constant_string_new_line -> double_qoute
| "\\" -> double_qoute_any
| '"' -> final
(any - [\\$"\r\n]) -> double_qoute
| "\r" @new_line -> double_qoute
| "\n" @new_line -> double_qoute
| "\\" -> double_qoute_any
| '"' -> final
),
double_qoute_nonvarname: (
(any - [\\{"\r\n] - varname_first) -> double_qoute
| "\r" @constant_string_new_line -> double_qoute
| "\n" @constant_string_new_line -> double_qoute
| "\r" @new_line -> double_qoute
| "\n" @new_line -> double_qoute
| "\\" -> double_qoute_any
| '"' -> final
);