Merge branch 'master' into dev

2018-07-24 22:24:32 +03:00
parent f89d7d3a17 623a90a418
commit 0138749c6d
10 changed files with 15348 additions and 15226 deletions
--- a/php5/php5.go
+++ b/php5/php5.go
--- a/php5/php5.y
+++ b/php5/php5.y
@@ -377,6 +377,8 @@ top_statement:
                addMeta($$, $4.Meta, meta.SemiColonToken)

                yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
+
+                yylex.(*Parser).Begin(scanner.HALT_COMPILER)
            }
    |   T_NAMESPACE namespace_name ';'
            {
--- a/php5/php5_test.go
+++ b/php5/php5_test.go