Revert hash and array literal syntax to align parse errors with Handlebars.js 4.7.8

Reverted changes from handlebars-lang/handlebars-parser#15

Author: theodorejb

grammar/handlebars.y

@@ -173,17 +173,7 @@ mustache:
     // Parsing out the '&' escape token at AST level saves ~500 bytes after min due to the removal of one parser node.
     // This also allows for handler unification as all mustache node instances can utilize the same handler
     // See https://github.com/handlebars-lang/handlebars-parser/blob/master/lib/parse.js
-    OPEN hash CLOSE {
-        $$ = $this->prepareMustache(
-            path: new HashLiteral($2->pairs, $2->loc),
-            params: [],
-            hash: null,
-            open: $1,
-            strip: $this->stripFlags($1, $3),
-            loc: locInfo(),
-        );
-    }
-  | OPEN expr expr_list optional_hash CLOSE {
+    OPEN expr expr_list optional_hash CLOSE {
         $$ = $this->prepareMustache(
             path: $2,
             params: $3,
@@ -244,17 +234,11 @@ expr_list:
 
 expr:
     helperName { $$ = $1; }
-  | exprHead { $$ = $1; }
-;
-
-exprHead:
-    arrayLiteral { $$ = $1; }
   | sexpr { $$ = $1; }
 ;
 
 sexpr:
-    OPEN_SEXPR hash CLOSE_SEXPR { $$ = new HashLiteral($2->pairs, $2->loc); }
-  | OPEN_SEXPR expr expr_list optional_hash CLOSE_SEXPR {
+    OPEN_SEXPR expr expr_list optional_hash CLOSE_SEXPR {
         $$ = new SubExpression(
             path: $2,
             params: $3,
@@ -288,11 +272,6 @@ hashSegment:
         );
     };
 
-arrayLiteral:
-    OPEN_ARRAY expr_list CLOSE_ARRAY {
-        $$ = new ArrayLiteral($2, locInfo());
-    };
-
 optional_blockParams:
     blockParams
   | /* empty */ { init(); }
@@ -334,7 +313,7 @@ sep:
 ;
 
 path:
-    exprHead sep pathSegments {
+    sexpr sep pathSegments {
         $$ = $this->preparePath(
             data: false,
             sexpr: $1,

src/Ast/HashLiteral.php

@@ -49,8 +49,8 @@ final class Lexer extends Phlexer
     public function __construct()
     {
         $LEFT_STRIP = $RIGHT_STRIP = '~';
-        $LOOKAHEAD = '[=~}\\s\\/.)\\]|]';
-        $LITERAL_LOOKAHEAD = '[~}\\s)\\]]';
+        $LOOKAHEAD = '[=~}\\s\\/.)|]';
+        $LITERAL_LOOKAHEAD = '[~}\\s)]';
 
         /*
          * ID is the inverse of control characters.
@@ -113,15 +113,6 @@ public function __construct()
             new Rule(['mu'], '\\(', fn() => self::T_OPEN_SEXPR),
             new Rule(['mu'], '\\)', fn() => self::T_CLOSE_SEXPR),
 
-            new Rule(['mu'], '\\[', function () {
-                // Assuming yy.syntax.square === 'string'. OPEN_ARRAY option not handled
-                $this->rewind(strlen($this->yytext));
-                // escaped literal
-                $this->pushState('escl');
-                return null;
-            }),
-            new Rule(['mu'], ']', fn() => self::T_CLOSE_ARRAY),
-
             new Rule(['mu'], '{{{{', fn() => self::T_OPEN_RAW_BLOCK),
             new Rule(['mu'], '}}}}', function () {
                 $this->popState();
@@ -193,9 +184,8 @@ public function __construct()
 
             new Rule(['mu'], $ID, fn() => self::T_ID),
 
-            new Rule(['escl'], '\\[(\\\\\\]|[^\\]])*\\]', function () {
+            new Rule(['mu'], '\\[(\\\\\\]|[^\\]])*\\]', function () {
                 $this->replace('/\\\\([\\\\\\]])/', '$1');
-                $this->popState();
                 return self::T_ID;
             }),