Skip to content

refactor!: cleanup rules that can be assimilated as commands #220

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
merged 6 commits into from
Aug 22, 2025
Merged

refactor!: cleanup rules that can be assimilated as commands #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6d1d8df
refactor!: cleanup rules that can be assimilated as commands
blindFS Jul 18, 2025
ba85ab4
fix: grammar.js format
blindFS Jul 18, 2025
6c98e0a
query files
blindFS Jul 19, 2025
97964bc
fix: attributes for extern
blindFS Jul 19, 2025
696b055
test: attribute for externs
blindFS Jul 19, 2025
0dd57d4
test: rm source.nu
blindFS Jul 19, 2025
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
175 changes: 16 additions & 159 deletions grammar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ module.exports = grammar({
extras: ($) => [/[ \t]/, $.comment],

inline: ($) => [
$._do_expression,
$._flag_value,
$._item_expression,
$._match_expression,
Expand All @@ -30,6 +29,7 @@ module.exports = grammar({
[$._block_body, $.record_body, $.val_closure],
[$._block_body, $.shebang],
[$._block_body, $.val_closure],
[$._block_body],
[$._expression_parenthesized, $._expr_binary_expression_parenthesized],
[$._match_pattern_list, $.val_list],
[$._match_pattern_record, $._value],
Expand All @@ -40,7 +40,6 @@ module.exports = grammar({
[$.block, $.val_closure],
[$.block, $.val_record, $.val_closure],
[$.command, $.record_entry],
[$.ctrl_do_parenthesized],
[$.ctrl_if_parenthesized],
[$.ctrl_try_parenthesized],
[$.expr_binary_parenthesized],
Expand Down Expand Up @@ -168,15 +167,13 @@ module.exports = grammar({
decl_export: ($) => seq(keyword().export_env, field('body', $.block)),

decl_extern: ($) =>
prec.right(
1,
seq(
optional(modifier().visibility),
keyword().extern,
field('name', $._command_name),
field('signature', choice($.parameter_parens, $.parameter_bracks)),
field('body', optional($.block)),
),
seq(
optional($.attribute_list),
optional(modifier().visibility),
keyword().extern,
field('name', $._command_name),
field('signature', choice($.parameter_parens, $.parameter_bracks)),
field('body', optional($.block)),
),

decl_module: ($) =>
Expand All @@ -188,14 +185,11 @@ module.exports = grammar({
),

decl_use: ($) =>
prec.right(
1,
seq(
optional(modifier().visibility),
keyword().use,
field('module', choice($.unquoted, $._stringish)),
optional(field('import_pattern', $.scope_pattern)),
),
seq(
optional(modifier().visibility),
keyword().use,
field('module', choice($.unquoted, $._stringish)),
optional(field('import_pattern', $.scope_pattern)),
),

/// Return types
Expand Down Expand Up @@ -371,33 +365,19 @@ module.exports = grammar({

// control statements cannot be used in pipeline because they
// do not return values
_ctrl_statement: ($) =>
choice($.ctrl_for, $.ctrl_loop, $.ctrl_while, $.ctrl_error),
_ctrl_statement: ($) => choice($.ctrl_for, $.ctrl_loop, $.ctrl_while),

// control expressions *return values and can be used in pipelines
//
// * `break` and `continue` do not return values (yet?) but can be
// used in pipelines
_ctrl_expression: ($) =>
choice(
field('ctrl_break', keyword().break),
field('ctrl_continue', keyword().continue),
$.ctrl_do,
$.ctrl_if,
$.ctrl_try,
$.ctrl_match,
$.ctrl_return,
),
_ctrl_expression: ($) => choice($.ctrl_if, $.ctrl_try, $.ctrl_match),

_ctrl_expression_parenthesized: ($) =>
choice(
field('ctrl_break', keyword().break),
field('ctrl_continue', keyword().continue),
alias($.ctrl_do_parenthesized, $.ctrl_do),
alias($.ctrl_if_parenthesized, $.ctrl_if),
alias($.ctrl_try_parenthesized, $.ctrl_try),
$.ctrl_match,
$.ctrl_return,
),

// Standalone Controls
Expand All @@ -413,47 +393,13 @@ module.exports = grammar({

ctrl_loop: ($) => seq(keyword().loop, field('body', $.block)),

ctrl_error: ($) =>
seq(
keyword().error,
modifier().error_make,
optional($._flag),
field('error_record', $.val_record),
),

ctrl_while: ($) =>
seq(
keyword().while,
field('condition', $._expression),
field('body', $.block),
),

// Nestable Controls
_do_expression: ($) =>
choice(
$._item_expression,
$._flag,
alias($.unquoted, $.val_string),
alias($._unquoted_with_expr, $.val_string),
),

ctrl_do: ($) =>
seq(
keyword().do,
repeat($._flag),
choice($._blosure, $.val_variable, $.expr_parenthesized),
repeat($._do_expression),
),

ctrl_do_parenthesized: ($) =>
seq(
keyword().do,
repeat($._flags_parenthesized),
repeat1($._separator),
choice($._blosure, $.val_variable, $.expr_parenthesized),
repeat(seq(optional($._repeat_newline), $._do_expression)),
),

ctrl_if: _ctrl_if_rule(false),
ctrl_if_parenthesized: _ctrl_if_rule(true),

Expand Down Expand Up @@ -574,24 +520,6 @@ module.exports = grammar({
ctrl_try: _ctrl_try_rule(false),
ctrl_try_parenthesized: _ctrl_try_rule(true),

ctrl_return: ($) =>
choice(
prec(
1,
seq(
keyword().return,
choice(
$._expression,
$.ctrl_do,
$.ctrl_if,
$.ctrl_try,
$.ctrl_match,
),
),
),
keyword().return,
),

/// Pipelines

pipe_element: ($) =>
Expand Down Expand Up @@ -624,53 +552,6 @@ module.exports = grammar({

/// Scope Statements

stmt_source: ($) =>
seq(
choice(keyword().source, keyword().source_env),
field('file', choice(alias($.unquoted, $.val_string), $._stringish)),
),

_stmt_hide: ($) => choice($.hide_mod, $.hide_env),

hide_mod: ($) =>
prec.right(
1,
seq(
keyword().hide,
field('module', $._command_name),
optional($.scope_pattern),
),
),

hide_env: ($) =>
seq(keyword().hide_env, repeat($._flag), repeat1($._variable_name)),

_stmt_overlay: ($) =>
choice($.overlay_hide, $.overlay_list, $.overlay_new, $.overlay_use),

overlay_list: (_$) => seq(keyword().overlay, 'list'),

overlay_hide: ($) =>
seq(
keyword().overlay,
'hide',
repeat(choice($._flag, $.val_list)),
field('overlay', choice($.unquoted, $._stringish)),
repeat(choice($._flag, $.val_list)),
),

overlay_new: ($) => seq(keyword().overlay, 'new', $._command_name),

overlay_use: ($) =>
seq(
keyword().overlay,
'use',
repeat($._flag),
field('overlay', choice($.unquoted, $._stringish)),
optional(seq(keyword().as, field('rename', $._command_name))),
repeat($._flag),
),

scope_pattern: ($) =>
choice(
field('wildcard', $.wild_card),
Expand Down Expand Up @@ -1578,10 +1459,7 @@ function _block_body_rules(suffix) {
['stmt_let' + suffix]: (/** @type {{ [x: string]: RuleOrLiteral; }} */ $) =>
prec.right(
prec_map().assignment,
seq(
choice(keyword().let, keyword().let_env),
$['_assignment_pattern' + suffix],
),
seq(keyword().let, $['_assignment_pattern' + suffix]),
),

['stmt_mut' + suffix]: (/** @type {{ [x: string]: RuleOrLiteral; }} */ $) =>
Expand Down Expand Up @@ -1641,9 +1519,6 @@ function _block_body_rules(suffix) {
['_statement' + suffix]: (/** @type {any} */ $) =>
choice(
$._ctrl_statement,
$._stmt_hide,
$._stmt_overlay,
$.stmt_source,
alias_for_suffix($, 'assignment', suffix),
alias_for_suffix($, 'stmt_let', suffix),
alias_for_suffix($, 'stmt_mut', suffix),
Expand Down Expand Up @@ -2067,36 +1942,19 @@ function keyword() {
module: 'module',

let: 'let',
let_env: 'let-env',
mut: 'mut',
const: 'const',

hide: 'hide',
hide_env: 'hide-env',

source: 'source',
source_env: 'source-env',

overlay: 'overlay',
register: 'register',

for: 'for',
loop: 'loop',
while: 'while',
error: 'error',

do: 'do',
if: 'if',
else: 'else',
try: 'try',
catch: 'catch',
match: 'match',

break: 'break',
continue: 'continue',
return: 'return',

as: 'as',
in: 'in',
};
}
Expand All @@ -2107,7 +1965,6 @@ function keyword() {
*/
function modifier() {
return {
error_make: 'make',
visibility: 'export',
};
}
Expand Down
Loading
Loading