[#389] Change default import syntax

common/imports.js

@@ -1,47 +1,40 @@
-const Prec = require('./precedence')
 const { commaSep1 } = require('./util')
 
 module.exports = {
   import_: ($) => seq('import', $._import_body),
   exported_import: ($) => seq('export', $._import_body),
   _import_body_constructor: (dialect) => ($) =>
     dialect === 'tony'
-      ? prec.left(
-          Prec.Pattern,
-          seq(
-            choice(
-              field('default', alias($.identifier, $.identifier_pattern_name)),
-              seq(
-                optional(
-                  seq(
-                    field(
-                      'default',
-                      alias($.identifier, $.identifier_pattern_name),
-                    ),
-                    ',',
+      ? seq(
+          choice(
+            field('default', alias($.identifier, $.identifier_pattern_name)),
+            seq(
+              optional(
+                seq(
+                  field(
+                    'default',
+                    alias($.identifier, $.identifier_pattern_name),
                   ),
+                  '@',
                 ),
-                '{',
-                commaSep1(
-                  field('import', choice($.import_identifier, $.import_type)),
-                ),
-                '}',
               ),
+              '{',
+              commaSep1(
+                field('import', choice($.import_identifier, $.import_type)),
+              ),
+              '}',
             ),
-            'from',
-            field('source', $.raw_string),
           ),
+          'from',
+          field('source', $.raw_string),
         )
       : dialect === 'dtn'
-      ? prec.left(
-          Prec.Pattern,
-          seq(
-            '{',
-            commaSep1(field('import', $.import_type)),
-            '}',
-            'from',
-            field('source', $.raw_string),
-          ),
+      ? seq(
+          '{',
+          commaSep1(field('import', $.import_type)),
+          '}',
+          'from',
+          field('source', $.raw_string),
         )
       : undefined,
   import_identifier: ($) =>

common/patterns.js

@@ -14,20 +14,17 @@ module.exports = {
     ),
 
   destructuring_pattern: ($) =>
-    prec(
-      Prec.Pattern,
-      seq(
-        optional(
-          seq(
-            field('alias', alias($.identifier, $.identifier_pattern_name)),
-            '@',
-          ),
-        ),
-        field(
-          'pattern',
-          choice($.struct_pattern, $.tuple_pattern, $.list_pattern),
+    seq(
+      optional(
+        seq(
+          field('alias', alias($.identifier, $.identifier_pattern_name)),
+          '@',
         ),
       ),
+      field(
+        'pattern',
+        choice($.struct_pattern, $.tuple_pattern, $.list_pattern),
+      ),
     ),
 
   struct_pattern: ($) =>

common/precedence.js

@@ -2,7 +2,6 @@ module.exports = {
   TaggedType: -1,
   SubtractionType: -1,
   UnionType: 0,
-  Assignment: 1,
   TypeHint: 1,
   CurriedType: 1,
   NamedInfixApplication: 1,

common/terms.js

@@ -77,26 +77,20 @@ module.exports = {
     ),
 
   simple_assignment: ($) =>
-    prec.right(
-      Prec.Assignment,
-      seq(
+    seq(
         field('pattern', $._assignable_pattern),
         ':=',
         field('value', $._simple_term),
       ),
-    ),
   compound_assignment: ($) =>
-    prec.right(
-      Prec.Assignment,
-      seq(
+    seq(
         field('pattern', $._assignable_pattern),
         ':=',
         choice(
           field('value', $._compound_term),
           seq($._indent, field('value', $._compound_term), $._dedent),
         ),
       ),
-    ),
 
   enum_: ($) =>
     seq(

tony/corpus/imports.txt

@@ -0,0 +1,66 @@
+==================
+import
+==================
+
+import {
+  a as b,
+  c,
+  Type as Type,
+  Type
+} from 'source'
+import x@{ a, b } from 'source'
+import x from 'source'
+
+---
+
+(program
+  import: (import
+    import: (import_identifier
+      name: (identifier_pattern_name)
+      as: (identifier_pattern_name))
+    import: (import_identifier
+      as: (identifier_pattern_name))
+    import: (import_type
+      name: (type)
+      as: (type))
+    import: (import_type
+      as: (type))
+    source: (raw_string))
+  import: (import
+    default: (identifier_pattern_name)
+    import: (import_identifier
+      as: (identifier_pattern_name))
+    import: (import_identifier
+      as: (identifier_pattern_name))
+    source: (raw_string))
+  import: (import
+    default: (identifier_pattern_name)
+    source: (raw_string)))
+
+==================
+exported import
+==================
+
+export { a, b } from 'source'
+export x@{ a, b } from 'source'
+export x from 'source'
+
+---
+
+(program
+  import: (exported_import
+    import: (import_identifier
+      as: (identifier_pattern_name))
+    import: (import_identifier
+      as: (identifier_pattern_name))
+    source: (raw_string))
+  import: (exported_import
+    default: (identifier_pattern_name)
+    import: (import_identifier
+      as: (identifier_pattern_name))
+    import: (import_identifier
+      as: (identifier_pattern_name))
+    source: (raw_string))
+  import: (exported_import
+    default: (identifier_pattern_name)
+    source: (raw_string)))

tony/corpus/program.txt

@@ -17,58 +17,3 @@ hash bang line
 (program
   hashBangLine: (hash_bang_line))
 
-==================
-import
-==================
-
-import {
-  a as b,
-  c,
-  Type as Type,
-  Type
-} from 'source'
-import x, { a, b } from 'source'
-import x from 'source'
-
----
-
-(program
-  import: (import
-    import: (import_identifier
-      name: (identifier_pattern_name)
-      as: (identifier_pattern_name))
-    import: (import_identifier
-      as: (identifier_pattern_name))
-    import: (import_type
-      name: (type)
-      as: (type))
-    import: (import_type
-      as: (type))
-    source: (raw_string))
-  import: (import
-    default: (identifier_pattern_name)
-    import: (import_identifier
-      as: (identifier_pattern_name))
-    import: (import_identifier
-      as: (identifier_pattern_name))
-    source: (raw_string))
-  import: (import
-    default: (identifier_pattern_name)
-    source: (raw_string)))
-
-==================
-exported import
-==================
-
-export x, { a, b } from 'source'
-
----
-
-(program
-  import: (exported_import
-    default: (identifier_pattern_name)
-    import: (import_identifier
-      as: (identifier_pattern_name))
-    import: (import_identifier
-      as: (identifier_pattern_name))
-    source: (raw_string)))