Skip to content

Use term type *args* rather than *params* #52

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
kubouch merged 2 commits into from
Mar 5, 2025
Merged

Use term type *args* rather than *params* #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
596795f
Use term type args rather than params
ysthakur Feb 23, 2025
0014d90
Format
ysthakur Feb 23, 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
26 changes: 10 additions & 16 deletions src/parser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,10 @@ pub enum AstNode {
Name,
Type {
name: NodeId,
params: Option<NodeId>,
args: Option<NodeId>,
optional: bool,
},
TypeArgs(Vec<NodeId>),
Variable,

// Booleans
Expand Down Expand Up @@ -611,19 +612,12 @@ impl Parser {

// Explicit closure case
if self.is_pipe() {
let args = Some(self.signature_params(ParamsContext::Pipes));
let params = Some(self.signature_params(ParamsContext::Pipes));
let block = self.block(BlockContext::Closure);
self.rcurly();
span_end = self.position();

return self.create_node(
AstNode::Closure {
params: args,
block,
},
span_start,
span_end,
);
return self.create_node(AstNode::Closure { params, block }, span_start, span_end);
}

let rollback_point = self.get_rollback_point();
Expand Down Expand Up @@ -927,11 +921,11 @@ impl Parser {
self.create_node(AstNode::Params(param_list), span_start, span_end)
}

pub fn type_params(&mut self) -> NodeId {
pub fn type_args(&mut self) -> NodeId {
let _span = span!();
let span_start = self.position();
let span_end;
let param_list = {
let arg_list = {
self.less_than();

let mut output = vec![];
Expand All @@ -955,17 +949,17 @@ impl Parser {
output
};

self.create_node(AstNode::Params(param_list), span_start, span_end)
self.create_node(AstNode::TypeArgs(arg_list), span_start, span_end)
}

pub fn typename(&mut self) -> NodeId {
let _span = span!();
if let (Token::Bareword, span) = self.tokens.peek() {
let name = self.name();
let mut params = None;
let mut args = None;
if self.is_less_than() {
// We have generics
params = Some(self.type_params());
args = Some(self.type_args());
}

let optional = if self.is_question_mark() {
Expand All @@ -979,7 +973,7 @@ impl Parser {
self.create_node(
AstNode::Type {
name,
params,
args,
optional,
},
span.start,
Expand Down
7 changes: 3 additions & 4 deletions src/snapshots/[email protected]
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
source: src/test.rs
expression: evaluate_example(path)
input_file: tests/calls.nu
snapshot_kind: text
---
==== COMPILER ====
0: Name (0 to 4) "spam"
Expand All @@ -16,15 +15,15 @@ snapshot_kind: text
8: Name (28 to 36) "existing"
9: Name (38 to 39) "a"
10: Name (41 to 47) "string"
11: Type { name: NodeId(10), params: None, optional: false } (41 to 47)
11: Type { name: NodeId(10), args: None, optional: false } (41 to 47)
12: Param { name: NodeId(9), ty: Some(NodeId(11)) } (38 to 47)
13: Name (49 to 50) "b"
14: Name (52 to 58) "string"
15: Type { name: NodeId(14), params: None, optional: false } (52 to 58)
15: Type { name: NodeId(14), args: None, optional: false } (52 to 58)
16: Param { name: NodeId(13), ty: Some(NodeId(15)) } (49 to 58)
17: Name (60 to 61) "c"
18: Name (63 to 66) "int"
19: Type { name: NodeId(18), params: None, optional: false } (63 to 66)
19: Type { name: NodeId(18), args: None, optional: false } (63 to 66)
20: Param { name: NodeId(17), ty: Some(NodeId(19)) } (60 to 66)
21: Params([NodeId(12), NodeId(16), NodeId(20)]) (37 to 67)
22: Variable (72 to 74) "$a"
Expand Down
5 changes: 2 additions & 3 deletions src/snapshots/[email protected]
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,16 @@
source: src/test.rs
expression: evaluate_example(path)
input_file: tests/closure3.nu
snapshot_kind: text
---
==== COMPILER ====
0: Variable (4 to 11) "closure"
1: Name (16 to 17) "a"
2: Name (19 to 22) "int"
3: Type { name: NodeId(2), params: None, optional: false } (19 to 22)
3: Type { name: NodeId(2), args: None, optional: false } (19 to 22)
4: Param { name: NodeId(1), ty: Some(NodeId(3)) } (16 to 22)
5: Name (24 to 25) "b"
6: Name (27 to 30) "int"
7: Type { name: NodeId(6), params: None, optional: false } (27 to 30)
7: Type { name: NodeId(6), args: None, optional: false } (27 to 30)
8: Param { name: NodeId(5), ty: Some(NodeId(7)) } (24 to 30)
9: Params([NodeId(4), NodeId(8)]) (15 to 31)
10: Variable (32 to 34) "$a"
Expand Down
13 changes: 6 additions & 7 deletions src/snapshots/[email protected]
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,24 @@
source: src/test.rs
expression: evaluate_example(path)
input_file: tests/def.nu
snapshot_kind: text
---
==== COMPILER ====
0: Name (4 to 7) "foo"
1: Name (9 to 10) "x"
2: Param { name: NodeId(1), ty: None } (9 to 10)
3: Name (11 to 12) "y"
4: Name (14 to 17) "int"
5: Type { name: NodeId(4), params: None, optional: false } (14 to 17)
5: Type { name: NodeId(4), args: None, optional: false } (14 to 17)
6: Param { name: NodeId(3), ty: Some(NodeId(5)) } (11 to 17)
7: Name (19 to 20) "z"
8: Name (22 to 26) "list"
9: Name (27 to 31) "list"
10: Name (32 to 35) "int"
11: Type { name: NodeId(10), params: None, optional: false } (32 to 35)
12: Params([NodeId(11)]) (31 to 36)
13: Type { name: NodeId(9), params: Some(NodeId(12)), optional: false } (27 to 31)
14: Params([NodeId(13)]) (26 to 37)
15: Type { name: NodeId(8), params: Some(NodeId(14)), optional: false } (22 to 26)
11: Type { name: NodeId(10), args: None, optional: false } (32 to 35)
12: TypeArgs([NodeId(11)]) (31 to 36)
13: Type { name: NodeId(9), args: Some(NodeId(12)), optional: false } (27 to 31)
14: TypeArgs([NodeId(13)]) (26 to 37)
15: Type { name: NodeId(8), args: Some(NodeId(14)), optional: false } (22 to 26)
16: Param { name: NodeId(7), ty: Some(NodeId(15)) } (19 to 26)
17: Params([NodeId(2), NodeId(6), NodeId(16)]) (8 to 39)
18: Variable (44 to 46) "$x"
Expand Down
25 changes: 12 additions & 13 deletions src/snapshots/new_nu_parser__test__node_output@def_return_type.nu.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,17 @@
source: src/test.rs
expression: evaluate_example(path)
input_file: tests/def_return_type.nu
snapshot_kind: text
---
==== COMPILER ====
0: Name (4 to 7) "foo"
1: Params([]) (8 to 11)
2: Name (14 to 21) "nothing"
3: Type { name: NodeId(2), params: None, optional: false } (14 to 21)
3: Type { name: NodeId(2), args: None, optional: false } (14 to 21)
4: Name (25 to 29) "list"
5: Name (30 to 33) "any"
6: Type { name: NodeId(5), params: None, optional: false } (30 to 33)
7: Params([NodeId(6)]) (29 to 34)
8: Type { name: NodeId(4), params: Some(NodeId(7)), optional: false } (25 to 29)
6: Type { name: NodeId(5), args: None, optional: false } (30 to 33)
7: TypeArgs([NodeId(6)]) (29 to 34)
8: Type { name: NodeId(4), args: Some(NodeId(7)), optional: false } (25 to 29)
9: InOutType(NodeId(3), NodeId(8)) (14 to 35)
10: InOutTypes([NodeId(9)]) (14 to 35)
11: List([]) (37 to 38)
Expand All @@ -22,20 +21,20 @@ snapshot_kind: text
14: Name (46 to 49) "bar"
15: Params([]) (50 to 53)
16: Name (58 to 64) "string"
17: Type { name: NodeId(16), params: None, optional: false } (58 to 64)
17: Type { name: NodeId(16), args: None, optional: false } (58 to 64)
18: Name (68 to 72) "list"
19: Name (73 to 79) "string"
20: Type { name: NodeId(19), params: None, optional: false } (73 to 79)
21: Params([NodeId(20)]) (72 to 80)
22: Type { name: NodeId(18), params: Some(NodeId(21)), optional: false } (68 to 72)
20: Type { name: NodeId(19), args: None, optional: false } (73 to 79)
21: TypeArgs([NodeId(20)]) (72 to 80)
22: Type { name: NodeId(18), args: Some(NodeId(21)), optional: false } (68 to 72)
23: InOutType(NodeId(17), NodeId(22)) (58 to 80)
24: Name (82 to 85) "int"
25: Type { name: NodeId(24), params: None, optional: false } (82 to 85)
25: Type { name: NodeId(24), args: None, optional: false } (82 to 85)
26: Name (89 to 93) "list"
27: Name (94 to 97) "int"
28: Type { name: NodeId(27), params: None, optional: false } (94 to 97)
29: Params([NodeId(28)]) (93 to 98)
30: Type { name: NodeId(26), params: Some(NodeId(29)), optional: false } (89 to 93)
28: Type { name: NodeId(27), args: None, optional: false } (94 to 97)
29: TypeArgs([NodeId(28)]) (93 to 98)
30: Type { name: NodeId(26), args: Some(NodeId(29)), optional: false } (89 to 93)
31: InOutType(NodeId(25), NodeId(30)) (82 to 99)
32: InOutTypes([NodeId(23), NodeId(31)]) (56 to 101)
33: List([]) (103 to 104)
Expand Down
17 changes: 8 additions & 9 deletions src/snapshots/new_nu_parser__test__node_output@invalid_types.nu.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,17 @@
source: src/test.rs
expression: evaluate_example(path)
input_file: tests/invalid_types.nu
snapshot_kind: text
---
==== COMPILER ====
0: Name (4 to 7) "foo"
1: Name (9 to 10) "x"
2: Name (12 to 16) "list"
3: Name (17 to 20) "int"
4: Type { name: NodeId(3), params: None, optional: false } (17 to 20)
4: Type { name: NodeId(3), args: None, optional: false } (17 to 20)
5: Name (22 to 28) "string"
6: Type { name: NodeId(5), params: None, optional: false } (22 to 28)
7: Params([NodeId(4), NodeId(6)]) (16 to 29)
8: Type { name: NodeId(2), params: Some(NodeId(7)), optional: false } (12 to 16)
6: Type { name: NodeId(5), args: None, optional: false } (22 to 28)
7: TypeArgs([NodeId(4), NodeId(6)]) (16 to 29)
8: Type { name: NodeId(2), args: Some(NodeId(7)), optional: false } (12 to 16)
9: Param { name: NodeId(1), ty: Some(NodeId(8)) } (9 to 16)
10: Params([NodeId(9)]) (8 to 30)
11: Variable (33 to 35) "$x"
Expand All @@ -22,8 +21,8 @@ snapshot_kind: text
14: Name (42 to 45) "bar"
15: Name (47 to 48) "y"
16: Name (50 to 54) "list"
17: Params([]) (54 to 56)
18: Type { name: NodeId(16), params: Some(NodeId(17)), optional: false } (50 to 54)
17: TypeArgs([]) (54 to 56)
18: Type { name: NodeId(16), args: Some(NodeId(17)), optional: false } (50 to 54)
19: Param { name: NodeId(15), ty: Some(NodeId(18)) } (47 to 54)
20: Params([NodeId(19)]) (46 to 57)
21: Variable (60 to 62) "$y"
Expand Down Expand Up @@ -64,8 +63,8 @@ snapshot_kind: text
23: ()
24: ()
==== TYPE ERRORS ====
Error (NodeId 7): list must have only one type parameter (to allow selection of types, use oneof<int, string> -- WIP)
Error (NodeId 17): list must have one type parameter
Error (NodeId 7): list must have only one type argument (to allow selection of types, use oneof<int, string> -- WIP)
Error (NodeId 17): list must have one type argument
==== IR ====
register_count: 0
file_count: 0
Expand Down
17 changes: 8 additions & 9 deletions src/snapshots/new_nu_parser__test__node_output@let_mismatch.nu.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,32 @@
source: src/test.rs
expression: evaluate_example(path)
input_file: tests/let_mismatch.nu
snapshot_kind: text
---
==== COMPILER ====
0: Variable (4 to 5) "x"
1: Name (7 to 13) "number"
2: Type { name: NodeId(1), params: None, optional: false } (7 to 13)
2: Type { name: NodeId(1), args: None, optional: false } (7 to 13)
3: Int (16 to 18) "10"
4: Let { variable_name: NodeId(0), ty: Some(NodeId(2)), initializer: NodeId(3), is_mutable: false } (0 to 18)
5: Variable (32 to 33) "y"
6: Name (35 to 38) "any"
7: Type { name: NodeId(6), params: None, optional: false } (35 to 38)
7: Type { name: NodeId(6), args: None, optional: false } (35 to 38)
8: String (41 to 47) ""spam""
9: Let { variable_name: NodeId(5), ty: Some(NodeId(7)), initializer: NodeId(8), is_mutable: false } (28 to 47)
10: Variable (60 to 61) "z"
11: Name (63 to 69) "string"
12: Type { name: NodeId(11), params: None, optional: false } (63 to 69)
12: Type { name: NodeId(11), args: None, optional: false } (63 to 69)
13: Int (72 to 75) "123"
14: Let { variable_name: NodeId(10), ty: Some(NodeId(12)), initializer: NodeId(13), is_mutable: false } (56 to 75)
15: Variable (91 to 92) "w"
16: Name (94 to 98) "list"
17: Name (99 to 103) "list"
18: Name (104 to 107) "int"
19: Type { name: NodeId(18), params: None, optional: false } (104 to 107)
20: Params([NodeId(19)]) (103 to 108)
21: Type { name: NodeId(17), params: Some(NodeId(20)), optional: false } (99 to 103)
22: Params([NodeId(21)]) (98 to 109)
23: Type { name: NodeId(16), params: Some(NodeId(22)), optional: false } (94 to 98)
19: Type { name: NodeId(18), args: None, optional: false } (104 to 107)
20: TypeArgs([NodeId(19)]) (103 to 108)
21: Type { name: NodeId(17), args: Some(NodeId(20)), optional: false } (99 to 103)
22: TypeArgs([NodeId(21)]) (98 to 109)
23: Type { name: NodeId(16), args: Some(NodeId(22)), optional: false } (94 to 98)
24: String (116 to 119) "'a'"
25: List([NodeId(24)]) (114 to 120)
26: List([NodeId(25)]) (112 to 122)
Expand Down
3 changes: 1 addition & 2 deletions src/snapshots/new_nu_parser__test__node_output@mut_.nu.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@
source: src/test.rs
expression: evaluate_example(path)
input_file: tests/mut_.nu
snapshot_kind: text
---
==== COMPILER ====
0: Variable (4 to 5) "x"
1: Name (7 to 10) "int"
2: Type { name: NodeId(1), params: None, optional: false } (7 to 10)
2: Type { name: NodeId(1), args: None, optional: false } (7 to 10)
3: Int (13 to 16) "123"
4: Let { variable_name: NodeId(0), ty: Some(NodeId(2)), initializer: NodeId(3), is_mutable: true } (0 to 16)
5: Variable (18 to 20) "$x"
Expand Down
Loading
Loading