Merge pull request #161 from aspeddro/support-and-rec-module

Support `and` rec module

Author: nkrkv

grammar.js

@@ -177,10 +177,7 @@ module.exports = grammar({
       $.exception_declaration,
     ),
 
-    module_declaration: $ => seq(
-      'module',
-      optional('rec'),
-      optional('type'),
+    _module_binding: $ => prec.left(seq(
       field('name', choice($.module_identifier, $.type_identifier)),
       optional(seq(
         ':',
@@ -189,7 +186,20 @@ module.exports = grammar({
       optional(seq(
         '=',
         field('definition', $._module_definition),
+        repeat($._module_binding_and)
       )),
+    )),
+
+    _module_binding_and: $ => seq(
+      'and',
+      $._module_binding
+    ),
+
+    module_declaration: $ => seq(
+      'module',
+      optional('rec'),
+      optional('type'),
+      $._module_binding,
     ),
 
     _module_definition: $ => choice(

test/corpus/modules.txt

@@ -288,14 +288,33 @@ module rec BYOBReader: {
   include Reader
 } = BYOBReader
 
+module rec A: T = {
+  let x = B.x
+}
+and B: T = {
+  let x = 1
+}
+
 ---
 
 (source_file
   (module_declaration
     (module_identifier)
     (block
       (include_statement (module_identifier)))
-    (module_identifier)))
+    (module_identifier))
+
+  (module_declaration
+    (module_identifier) (module_identifier)
+    (block
+      (let_binding
+        (value_identifier)
+        (value_identifier_path
+          (module_identifier) (value_identifier))))
+    (module_identifier) (module_identifier)
+    (block
+      (let_binding
+        (value_identifier) (number)))))
 
 ===========================================
 Definition through extension