Skip to content

Better support for modules #137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nkrkv merged 7 commits into from
Nov 5, 2022
Merged

Better support for modules #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
30350ad
better support for module
aspeddro Sep 21, 2022
bde2a34
add tests
aspeddro Sep 21, 2022
254b8e1
update constrain_type
aspeddro Sep 21, 2022
881aae7
polish: modules
aspeddro Sep 21, 2022
630e76a
add more cases
aspeddro Sep 22, 2022
e174d23
remove todo
aspeddro Sep 22, 2022
c9aacd0
Merge branch 'main' into fix-fcm
nkrkv Nov 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 57 additions & 45 deletions grammar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,10 @@ module.exports = grammar({

include_statement: $ => seq(
'include',
choice($.module_expression, seq('(', $.module_expression, ')')),
choice(
$.module_expression,
seq('(', choice($.module_expression, $.functor_parameter), ')')
),
),

declaration: $ => choice(
Expand Down Expand Up @@ -202,14 +205,15 @@ module.exports = grammar({
),

functor_parameter: $ => seq(
$.module_identifier,
$.module_identifier_path,
$.module_type_annotation,
),

module_type_annotation: $ => seq(
':',
choice(
$.module_expression,
seq('(', $.module_expression, ')'),
$.block,
)
),
Expand Down Expand Up @@ -291,18 +295,8 @@ module.exports = grammar({
$.object_type,
$.generic_type,
$.unit_type,
$.module_pack,
$.unit,
$.module_pack_type,
),

module_pack_type: $ => seq(
'module',
'(',
choice($.module_identifier, $._type_identifier),
optional(
seq('with', sep1('and', seq('type', $._type_identifier, '=', $._type_identifier)))
),
')'
),

tuple_type: $ => prec.dynamic(-1, seq(
Expand Down Expand Up @@ -509,7 +503,7 @@ module.exports = grammar({
$.pipe_expression,
$.subscript_expression,
$.member_expression,
$.module_pack_expression,
$.module_pack,
$.extension_expression,
),

Expand All @@ -522,7 +516,8 @@ module.exports = grammar({
),

value_identifier_path: $ => seq(
repeat1(seq($.module_identifier, '.')),
$.module_identifier_path,
'.',
$.value_identifier,
),

Expand Down Expand Up @@ -736,11 +731,11 @@ module.exports = grammar({
),
)),

module_pack_expression: $ => seq(
module_pack: $ => seq(
'module',
'(',
choice($.module_expression, $.block),
optional(seq(':', $.module_expression)),
$._module_definition,
optional($.module_type_annotation),
')'
),

Expand Down Expand Up @@ -831,7 +826,8 @@ module.exports = grammar({
$._destructuring_pattern,
$.polyvar_type_pattern,
$.unit,
$._parenthesized_pattern
$.module_pack,
$._parenthesized_pattern,
)),
optional($.type_annotation),
optional($.as_aliasing),
Expand Down Expand Up @@ -1214,7 +1210,8 @@ module.exports = grammar({
)),

nested_variant_identifier: $ => seq(
repeat1(seq($.module_identifier, '.')),
$.module_identifier_path,
'.',
$.variant_identifier
),

Expand All @@ -1240,54 +1237,65 @@ module.exports = grammar({
),

type_identifier_path: $ => seq(
repeat1(seq($.module_identifier, '.')),
$.module_identifier_path,
'.',
$.type_identifier
),

module_expression: $ => choice(
$.module_identifier,
$.module_identifier_path,
$.type_identifier_path,
Copy link
Collaborator Author

@aspeddro aspeddro Sep 21, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

type_identifier_path to match module_pack in type_declaration

type t = Ok | Failed(module(Component.t))
//                                    ^ here

$.module_type_of,
$.functor_use,
$.module_type_constraint,
$.module_unpack,
),

module_identifier_path: $ => prec.left(seq(
$.module_expression,
'.',
module_identifier_path: $ => path(
$.module_identifier_path,
$.module_identifier,
)),
),

module_type_of: $ => prec.dynamic(-1, seq(
module_type_of: $ => prec.left(seq(
'module',
'type',
'of',
choice($.module_expression, $.block),
choice($.module_expression, $.block)
)),

module_type_constraint: $ => seq(
'(',
choice($.module_identifier, $.module_identifier_path),
':',
$.module_type_of,
_module_type_constraint: $ => seq(
'with',
sep1('and',
seq(
'module',
$.module_expression,
choice('=', ':='),
$.module_expression
)
sep1(choice('and', 'with'),
choice($.constrain_module, $.constrain_type)
),
')'
),

module_type_constraint: $ => prec.left(choice(
seq($.module_identifier_path, $._module_type_constraint),
seq(
'(',
$.module_identifier_path, $._module_type_constraint,
')',
$._module_type_constraint
)
)),

constrain_module: $ => seq(
'module',
$.module_identifier_path,
choice('=', ':='),
$.module_identifier_path,
),

constrain_type: $ => seq(
'type',
$._type,
choice('=', ':='),
$._type,
),

functor_use: $ => seq(
choice(
$.module_identifier,
$.module_identifier_path,
),
$.module_identifier_path,
alias($.functor_arguments, $.arguments),
),

Expand Down Expand Up @@ -1486,3 +1494,7 @@ function commaSept(rule) {
function sep1(delimiter, rule) {
return seq(rule, repeat(seq(delimiter, rule)))
}

function path(prefix, final) {
return choice(final, seq(prefix, '.', final))
}
16 changes: 13 additions & 3 deletions test/corpus/decorators.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@ let onResult = () => @doesNotRaise Belt.Array.getExn([], 0)
(parenthesized_expression
(decorator (decorator_identifier))
(value_identifier_path
(module_identifier) (value_identifier)))
(module_identifier_path
(module_identifier))
(value_identifier)))
(arguments
(number)
(character))))
Expand All @@ -51,7 +53,10 @@ let onResult = () => @doesNotRaise Belt.Array.getExn([], 0)
(value_identifier)
(decorator (decorator_identifier))
(call_expression
(value_identifier_path (module_identifier) (value_identifier))
(value_identifier_path
(module_identifier_path
(module_identifier))
(value_identifier))
(arguments
(number)
(character))))
Expand All @@ -62,7 +67,12 @@ let onResult = () => @doesNotRaise Belt.Array.getExn([], 0)
(formal_parameters)
(decorator (decorator_identifier))
(call_expression
(value_identifier_path (module_identifier) (module_identifier) (value_identifier))
(value_identifier_path
(module_identifier_path
(module_identifier_path
(module_identifier))
(module_identifier))
(value_identifier))
(arguments
(array)
(number))))))
Expand Down
Loading