@@ -27,13 +27,13 @@ variables:
27
27
INTERG : ' [+-]?(?:0x{{HEXNUM}}|{{DECNUM}}){{IDTERM}}'
28
28
INTERO : ' i32\.(?:reinterpret_f32|trunc_f(?:32|64)_[su]|wrap_i64)|i64\.(?:extend_i32_[su]|trunc_f(?:32|64)_[su]|reinterpret[/_]f64)'
29
29
MEMOPS : ' (?:f(?:32|64)\.(?:load|store)|i(?:32|64)\.(?:load(?:(?:8_|16_)[su])?|store(?:8|16)?)|i64\.(?:load32_[su]|store32)){{IDTERM}}'
30
- MEMOP2 : ' ( memory\.(?:grow|size)|grow_memory|current_memory ){{IDTERM}}'
30
+ MEMOP2 : ' memory\.(?:grow|size){{IDTERM}}'
31
31
NCONST : ' [fi](?:32|64)\.const{{IDTERM}}'
32
32
NUMOPS : ' (?:{{FLOATC}}|{{FLOATO}}|{{INTERC}}|{{INTERO}}){{IDTERM}}'
33
33
STARTS : ' (\(){{WHITES}}*(start){{IDTERM}}'
34
34
UINTER : ' (?:0x{{HEXNUM}}|{{DECNUM}}){{IDTERM}}'
35
35
VALTYP : ' [fi](?:32|64){{IDTERM}}'
36
- VAROPS : ' (?:[gs]et_(?:glob|loc)al|tee_local)|(?: (?:global|local)\.(?:get|set))|(?:local\.tee){{IDTERM}}'
36
+ VAROPS : ' (?:(?:global|local)\.(?:get|set))|(?:local\.tee){{IDTERM}}'
37
37
WHITES : ' [ \n\r\t]'
38
38
39
39
contexts :
@@ -80,7 +80,7 @@ contexts:
80
80
push : comment_block
81
81
constant_expression :
82
82
# This is a narrow subset of "expression" permitting only one "constant" or
83
- # "get_global " instruction. There are a few places where the grammar
83
+ # "global.get " instruction. There are a few places where the grammar
84
84
# indicates "expression" but where this constraint is then enforced at a
85
85
# higher level. For simplicity I’ve added this artificial production; even
86
86
# though the constraint it describes is technically not syntactic, it
@@ -97,7 +97,7 @@ contexts:
97
97
- - include : constant_expression_instr
98
98
- include : constant_expression_instr
99
99
constant_expression_instr :
100
- - match : ' get_global {{IDTERM}}'
100
+ - match : ' global.get {{IDTERM}}'
101
101
scope : support.function.variable.wast
102
102
set : reference
103
103
- match : ' {{NCONST}}'
0 commit comments