Remove conflict due to invalid 'export EXPRESSION'.

Author: mjambon

grammar.js

@@ -80,9 +80,6 @@ module.exports = grammar({
     [$.assignment_expression, $.object_assignment_pattern],
     [$.labeled_statement, $._property_name],
     [$.computed_property_name, $.array],
-    [$.export_clause, $.object, $.object_pattern],
-    [$._import_export_specifier, $.object, $.object_pattern],
-    [$.export_statement, $._property_name],
   ],
 
   word: $ => $.identifier,
@@ -111,15 +108,20 @@ module.exports = grammar({
       seq(
         repeat(field('decorator', $.decorator)),
         'export',
-        optional('default'),
         choice(
           field('declaration', $.declaration),
           seq(
-            field('value', $.expression),
-            $._semicolon
+            'default',
+            choice(
+              field('declaration', $.declaration),
+              seq(
+                field('value', $.expression),
+                $._semicolon
+              )
+            )
           )
         )
-      ),
+      )
     ),
 
     export_clause: $ => seq(

test/corpus/statements.txt

@@ -65,6 +65,7 @@ export let name1, name2, nameN;
 export let name1 = value1, name2 = value2, name3, nameN;
 
 export default expression;
+export default { field1: 42, field2: [] }
 export default function () { }
 export default function name1() { }
 export { name1 as default };
@@ -100,6 +101,10 @@ export { import1 as name1, import2 as name2, nameN } from 'foo';
       (variable_declarator (identifier))))
   (export_statement
     (identifier))
+  (export_statement
+    (object
+      (pair (property_identifier) (number))
+      (pair (property_identifier) (array))))
   (export_statement
     (function (formal_parameters) (statement_block)))
   (export_statement