@hew-lang/tree-sitter-hew 1.2.4 → 1.3.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/grammar.js CHANGED
@@ -52,7 +52,6 @@ export default grammar({
52
52
  [$._callable_expression, $._member_object],
53
53
  [$.qualified_expression, $.field_expression],
54
54
  [$.generic_apply_expression, $.bare_generic_call_expression],
55
- [$._callable_expression, $.private_capture_list],
56
55
  [$.actor_spawn],
57
56
  [$.trait_bound],
58
57
  // `-> fn() fails E` — the short `fails E` may belong to the inner callable
@@ -430,6 +429,7 @@ export default grammar({
430
429
  field('name', $.identifier),
431
430
  ':',
432
431
  field('type', $._type),
432
+ optional(seq('=', field('default', $.expression))),
433
433
  ),
434
434
  ),
435
435
 
@@ -584,7 +584,7 @@ export default grammar({
584
584
  ),
585
585
 
586
586
  // @sync:duration_suffixes
587
- duration_literal: $ => seq($.integer_literal, choice('ns', 'us', 'ms', 's', 'm', 'h')),
587
+ duration_literal: $ => token(seq(/[0-9][0-9_]*(\.[0-9][0-9_]*)?/, choice('ns', 'us', 'ms', 's', 'm', 'h'))),
588
588
 
589
589
  // ---- Machines ----
590
590
 
@@ -1059,7 +1059,6 @@ export default grammar({
1059
1059
  // A bare spawn ends after its actor and optional brace-delimited keys.
1060
1060
  _callable_expression: $ => choice(
1061
1061
  $.identifier,
1062
- alias('capture', $.identifier),
1063
1062
  $.self,
1064
1063
  $._literal,
1065
1064
  $.interpolated_string,
@@ -1144,7 +1143,7 @@ export default grammar({
1144
1143
  )),
1145
1144
 
1146
1145
  macro_invocation: $ => prec(PREC.POSTFIX, seq(
1147
- field('name', choice($.identifier, alias('capture', $.identifier), $.path_expression)), '!',
1146
+ field('name', choice($.identifier, $.path_expression)), '!',
1148
1147
  field('arguments', alias($.macro_pattern, $.token_tree)),
1149
1148
  )),
1150
1149
 
@@ -1414,7 +1413,6 @@ export default grammar({
1414
1413
  // braced body (hew-parser/src/parser.rs:7691 parse_pipe_lambda).
1415
1414
  lambda: $ => prec.right(2, seq(
1416
1415
  optional('move'),
1417
- optional($.private_capture_list),
1418
1416
  field('parameters', choice(
1419
1417
  '||',
1420
1418
  seq('|', optional($.type_parameters), optional(sep1($.lambda_parameter, ',')), '|'),
@@ -1426,22 +1424,15 @@ export default grammar({
1426
1424
  ),
1427
1425
  )),
1428
1426
 
1429
- private_capture_list: $ => seq(
1430
- 'capture', '(', sep1($.private_capture, ','), optional(','), ')',
1431
- ),
1432
-
1433
- private_capture: $ => seq('var', field('name', $.identifier)),
1434
-
1435
1427
  lambda_parameter: $ => seq(
1436
1428
  field('name', $.identifier),
1437
1429
  optional(seq(':', field('type', $._type))),
1438
1430
  ),
1439
1431
 
1440
- // Actor literals share the closure prefix for private mutable captures.
1432
+ // Actor literals infer captured state from their bodies, like closures.
1441
1433
  actor_expression: $ => prec(2, seq(
1442
1434
  'actor',
1443
1435
  optional('move'),
1444
- optional($.private_capture_list),
1445
1436
  '|',
1446
1437
  optional(sep1($.lambda_parameter, ',')),
1447
1438
  '|',
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@hew-lang/tree-sitter-hew",
3
- "version": "1.2.4",
3
+ "version": "1.3.1",
4
4
  "description": "Hew grammar for tree-sitter",
5
5
  "type": "module",
6
6
  "repository": {
@@ -40,7 +40,7 @@
40
40
  "devDependencies": {
41
41
  "prebuildify": "^6.0.1",
42
42
  "tree-sitter": "^0.25.0",
43
- "tree-sitter-cli": "0.25.10"
43
+ "tree-sitter-cli": "0.26.5"
44
44
  },
45
45
  "peerDependencies": {
46
46
  "tree-sitter": "^0.25.0"
@@ -21,8 +21,6 @@
21
21
  (clone_expression "clone" @keyword.operator)
22
22
  (callable_capabilities ["var" "once" "clone" "suspends"] @keyword)
23
23
  (trait_method_effect "suspends" @keyword)
24
- (private_capture_list "capture" @keyword)
25
- (private_capture (identifier) @variable)
26
24
  (failure_return "fails" @keyword)
27
25
  (return_error_expression "error" @keyword)
28
26
  (defer_statement "err" @keyword)
package/src/grammar.json CHANGED
@@ -2322,6 +2322,31 @@
2322
2322
  "type": "SYMBOL",
2323
2323
  "name": "_type"
2324
2324
  }
2325
+ },
2326
+ {
2327
+ "type": "CHOICE",
2328
+ "members": [
2329
+ {
2330
+ "type": "SEQ",
2331
+ "members": [
2332
+ {
2333
+ "type": "STRING",
2334
+ "value": "="
2335
+ },
2336
+ {
2337
+ "type": "FIELD",
2338
+ "name": "default",
2339
+ "content": {
2340
+ "type": "SYMBOL",
2341
+ "name": "expression"
2342
+ }
2343
+ }
2344
+ ]
2345
+ },
2346
+ {
2347
+ "type": "BLANK"
2348
+ }
2349
+ ]
2325
2350
  }
2326
2351
  ]
2327
2352
  }
@@ -3304,42 +3329,45 @@
3304
3329
  ]
3305
3330
  },
3306
3331
  "duration_literal": {
3307
- "type": "SEQ",
3308
- "members": [
3309
- {
3310
- "type": "SYMBOL",
3311
- "name": "integer_literal"
3312
- },
3313
- {
3314
- "type": "CHOICE",
3315
- "members": [
3316
- {
3317
- "type": "STRING",
3318
- "value": "ns"
3319
- },
3320
- {
3321
- "type": "STRING",
3322
- "value": "us"
3323
- },
3324
- {
3325
- "type": "STRING",
3326
- "value": "ms"
3327
- },
3328
- {
3329
- "type": "STRING",
3330
- "value": "s"
3331
- },
3332
- {
3333
- "type": "STRING",
3334
- "value": "m"
3335
- },
3336
- {
3337
- "type": "STRING",
3338
- "value": "h"
3339
- }
3340
- ]
3341
- }
3342
- ]
3332
+ "type": "TOKEN",
3333
+ "content": {
3334
+ "type": "SEQ",
3335
+ "members": [
3336
+ {
3337
+ "type": "PATTERN",
3338
+ "value": "[0-9][0-9_]*(\\.[0-9][0-9_]*)?"
3339
+ },
3340
+ {
3341
+ "type": "CHOICE",
3342
+ "members": [
3343
+ {
3344
+ "type": "STRING",
3345
+ "value": "ns"
3346
+ },
3347
+ {
3348
+ "type": "STRING",
3349
+ "value": "us"
3350
+ },
3351
+ {
3352
+ "type": "STRING",
3353
+ "value": "ms"
3354
+ },
3355
+ {
3356
+ "type": "STRING",
3357
+ "value": "s"
3358
+ },
3359
+ {
3360
+ "type": "STRING",
3361
+ "value": "m"
3362
+ },
3363
+ {
3364
+ "type": "STRING",
3365
+ "value": "h"
3366
+ }
3367
+ ]
3368
+ }
3369
+ ]
3370
+ }
3343
3371
  },
3344
3372
  "machine_declaration": {
3345
3373
  "type": "SEQ",
@@ -6418,15 +6446,6 @@
6418
6446
  "type": "SYMBOL",
6419
6447
  "name": "identifier"
6420
6448
  },
6421
- {
6422
- "type": "ALIAS",
6423
- "content": {
6424
- "type": "STRING",
6425
- "value": "capture"
6426
- },
6427
- "named": true,
6428
- "value": "identifier"
6429
- },
6430
6449
  {
6431
6450
  "type": "SYMBOL",
6432
6451
  "name": "self"
@@ -7072,15 +7091,6 @@
7072
7091
  "type": "SYMBOL",
7073
7092
  "name": "identifier"
7074
7093
  },
7075
- {
7076
- "type": "ALIAS",
7077
- "content": {
7078
- "type": "STRING",
7079
- "value": "capture"
7080
- },
7081
- "named": true,
7082
- "value": "identifier"
7083
- },
7084
7094
  {
7085
7095
  "type": "SYMBOL",
7086
7096
  "name": "path_expression"
@@ -8887,18 +8897,6 @@
8887
8897
  }
8888
8898
  ]
8889
8899
  },
8890
- {
8891
- "type": "CHOICE",
8892
- "members": [
8893
- {
8894
- "type": "SYMBOL",
8895
- "name": "private_capture_list"
8896
- },
8897
- {
8898
- "type": "BLANK"
8899
- }
8900
- ]
8901
- },
8902
8900
  {
8903
8901
  "type": "FIELD",
8904
8902
  "name": "parameters",
@@ -9011,77 +9009,6 @@
9011
9009
  ]
9012
9010
  }
9013
9011
  },
9014
- "private_capture_list": {
9015
- "type": "SEQ",
9016
- "members": [
9017
- {
9018
- "type": "STRING",
9019
- "value": "capture"
9020
- },
9021
- {
9022
- "type": "STRING",
9023
- "value": "("
9024
- },
9025
- {
9026
- "type": "SEQ",
9027
- "members": [
9028
- {
9029
- "type": "SYMBOL",
9030
- "name": "private_capture"
9031
- },
9032
- {
9033
- "type": "REPEAT",
9034
- "content": {
9035
- "type": "SEQ",
9036
- "members": [
9037
- {
9038
- "type": "STRING",
9039
- "value": ","
9040
- },
9041
- {
9042
- "type": "SYMBOL",
9043
- "name": "private_capture"
9044
- }
9045
- ]
9046
- }
9047
- }
9048
- ]
9049
- },
9050
- {
9051
- "type": "CHOICE",
9052
- "members": [
9053
- {
9054
- "type": "STRING",
9055
- "value": ","
9056
- },
9057
- {
9058
- "type": "BLANK"
9059
- }
9060
- ]
9061
- },
9062
- {
9063
- "type": "STRING",
9064
- "value": ")"
9065
- }
9066
- ]
9067
- },
9068
- "private_capture": {
9069
- "type": "SEQ",
9070
- "members": [
9071
- {
9072
- "type": "STRING",
9073
- "value": "var"
9074
- },
9075
- {
9076
- "type": "FIELD",
9077
- "name": "name",
9078
- "content": {
9079
- "type": "SYMBOL",
9080
- "name": "identifier"
9081
- }
9082
- }
9083
- ]
9084
- },
9085
9012
  "lambda_parameter": {
9086
9013
  "type": "SEQ",
9087
9014
  "members": [
@@ -9142,18 +9069,6 @@
9142
9069
  }
9143
9070
  ]
9144
9071
  },
9145
- {
9146
- "type": "CHOICE",
9147
- "members": [
9148
- {
9149
- "type": "SYMBOL",
9150
- "name": "private_capture_list"
9151
- },
9152
- {
9153
- "type": "BLANK"
9154
- }
9155
- ]
9156
- },
9157
9072
  {
9158
9073
  "type": "STRING",
9159
9074
  "value": "|"
@@ -10836,10 +10751,6 @@
10836
10751
  "generic_apply_expression",
10837
10752
  "bare_generic_call_expression"
10838
10753
  ],
10839
- [
10840
- "_callable_expression",
10841
- "private_capture_list"
10842
- ],
10843
10754
  [
10844
10755
  "actor_spawn"
10845
10756
  ],
@@ -10877,4 +10788,4 @@
10877
10788
  ],
10878
10789
  "supertypes": [],
10879
10790
  "reserved": {}
10880
- }
10791
+ }
@@ -88,10 +88,6 @@
88
88
  "type": "lambda_parameter",
89
89
  "named": true
90
90
  },
91
- {
92
- "type": "private_capture_list",
93
- "named": true
94
- },
95
91
  {
96
92
  "type": "return_type",
97
93
  "named": true
@@ -1800,21 +1796,6 @@
1800
1796
  ]
1801
1797
  }
1802
1798
  },
1803
- {
1804
- "type": "duration_literal",
1805
- "named": true,
1806
- "fields": {},
1807
- "children": {
1808
- "multiple": false,
1809
- "required": true,
1810
- "types": [
1811
- {
1812
- "type": "integer_literal",
1813
- "named": true
1814
- }
1815
- ]
1816
- }
1817
- },
1818
1799
  {
1819
1800
  "type": "else_clause",
1820
1801
  "named": true,
@@ -3466,13 +3447,9 @@
3466
3447
  }
3467
3448
  },
3468
3449
  "children": {
3469
- "multiple": true,
3450
+ "multiple": false,
3470
3451
  "required": false,
3471
3452
  "types": [
3472
- {
3473
- "type": "private_capture_list",
3474
- "named": true
3475
- },
3476
3453
  {
3477
3454
  "type": "return_type",
3478
3455
  "named": true
@@ -4797,6 +4774,16 @@
4797
4774
  "type": "parameter",
4798
4775
  "named": true,
4799
4776
  "fields": {
4777
+ "default": {
4778
+ "multiple": false,
4779
+ "required": false,
4780
+ "types": [
4781
+ {
4782
+ "type": "expression",
4783
+ "named": true
4784
+ }
4785
+ ]
4786
+ },
4800
4787
  "name": {
4801
4788
  "multiple": false,
4802
4789
  "required": false,
@@ -5107,37 +5094,6 @@
5107
5094
  "named": true,
5108
5095
  "fields": {}
5109
5096
  },
5110
- {
5111
- "type": "private_capture",
5112
- "named": true,
5113
- "fields": {
5114
- "name": {
5115
- "multiple": false,
5116
- "required": true,
5117
- "types": [
5118
- {
5119
- "type": "identifier",
5120
- "named": true
5121
- }
5122
- ]
5123
- }
5124
- }
5125
- },
5126
- {
5127
- "type": "private_capture_list",
5128
- "named": true,
5129
- "fields": {},
5130
- "children": {
5131
- "multiple": true,
5132
- "required": true,
5133
- "types": [
5134
- {
5135
- "type": "private_capture",
5136
- "named": true
5137
- }
5138
- ]
5139
- }
5140
- },
5141
5097
  {
5142
5098
  "type": "qualified_expression",
5143
5099
  "named": true,
@@ -7463,10 +7419,6 @@
7463
7419
  "type": "bytes",
7464
7420
  "named": false
7465
7421
  },
7466
- {
7467
- "type": "capture",
7468
- "named": false
7469
- },
7470
7422
  {
7471
7423
  "type": "char",
7472
7424
  "named": false
@@ -7531,6 +7483,10 @@
7531
7483
  "type": "duration",
7532
7484
  "named": false
7533
7485
  },
7486
+ {
7487
+ "type": "duration_literal",
7488
+ "named": true
7489
+ },
7534
7490
  {
7535
7491
  "type": "dyn",
7536
7492
  "named": false
@@ -7639,10 +7595,6 @@
7639
7595
  "type": "gen",
7640
7596
  "named": false
7641
7597
  },
7642
- {
7643
- "type": "h",
7644
- "named": false
7645
- },
7646
7598
  {
7647
7599
  "type": "handle",
7648
7600
  "named": false
@@ -7744,10 +7696,6 @@
7744
7696
  "type": "loop",
7745
7697
  "named": false
7746
7698
  },
7747
- {
7748
- "type": "m",
7749
- "named": false
7750
- },
7751
7699
  {
7752
7700
  "type": "machine",
7753
7701
  "named": false
@@ -7772,10 +7720,6 @@
7772
7720
  "type": "move",
7773
7721
  "named": false
7774
7722
  },
7775
- {
7776
- "type": "ms",
7777
- "named": false
7778
- },
7779
7723
  {
7780
7724
  "type": "mut",
7781
7725
  "named": false
@@ -7784,10 +7728,6 @@
7784
7728
  "type": "none_literal",
7785
7729
  "named": true
7786
7730
  },
7787
- {
7788
- "type": "ns",
7789
- "named": false
7790
- },
7791
7731
  {
7792
7732
  "type": "on",
7793
7733
  "named": false
@@ -7876,10 +7816,6 @@
7876
7816
  "type": "return",
7877
7817
  "named": false
7878
7818
  },
7879
- {
7880
- "type": "s",
7881
- "named": false
7882
- },
7883
7819
  {
7884
7820
  "type": "scope",
7885
7821
  "named": false
@@ -7976,10 +7912,6 @@
7976
7912
  "type": "unsafe",
7977
7913
  "named": false
7978
7914
  },
7979
- {
7980
- "type": "us",
7981
- "named": false
7982
- },
7983
7915
  {
7984
7916
  "type": "usize",
7985
7917
  "named": false
@@ -8044,4 +7976,4 @@
8044
7976
  "type": "~",
8045
7977
  "named": false
8046
7978
  }
8047
- ]
7979
+ ]