Skip to content

Commit ebce7f8

Browse files
Fix visitor after API changes (#311)
1 parent ebfdbeb commit ebce7f8

File tree

1 file changed

+33
-33
lines changed

1 file changed

+33
-33
lines changed

batteries/syntax/visitor.luau

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -165,55 +165,55 @@ end
165165

166166
local function visitIf(node: luau.AstStatIf, visitor: Visitor)
167167
if visitor.visitIf(node) then
168-
visitToken(node["if"], visitor)
168+
visitToken(node.ifKeyword, visitor)
169169
visitExpression(node.condition, visitor)
170-
visitToken(node["then"], visitor)
170+
visitToken(node.thenKeyword, visitor)
171171
visitBlock(node.consequent, visitor)
172172
for _, elseifNode in node.elseifs do
173-
visitToken(elseifNode["elseif"], visitor)
173+
visitToken(elseifNode.elseifKeyword, visitor)
174174
visitExpression(elseifNode.condition, visitor)
175-
visitToken(elseifNode["then"], visitor)
175+
visitToken(elseifNode.thenKeyword, visitor)
176176
visitBlock(elseifNode.consequent, visitor)
177177
end
178-
if node["else"] then
179-
visitToken(node["else"], visitor)
178+
if node.elseKeyword then
179+
visitToken(node.elseKeyword, visitor)
180180
end
181181
if node.antecedent then
182182
visitBlock(node.antecedent, visitor)
183183
end
184-
visitToken(node["end"], visitor)
184+
visitToken(node.endKeyword, visitor)
185185
end
186186
end
187187

188188
local function visitWhile(node: luau.AstStatWhile, visitor: Visitor)
189189
if visitor.visitWhile(node) then
190-
visitToken(node["while"], visitor)
190+
visitToken(node.whileKeyword, visitor)
191191
visitExpression(node.condition, visitor)
192-
visitToken(node["do"], visitor)
192+
visitToken(node.doKeyword, visitor)
193193
visitBlock(node.body, visitor)
194-
visitToken(node["end"], visitor)
194+
visitToken(node.endKeyword, visitor)
195195
end
196196
end
197197

198198
local function visitRepeat(node: luau.AstStatRepeat, visitor: Visitor)
199199
if visitor.visitRepeat(node) then
200-
visitToken(node["repeat"], visitor)
200+
visitToken(node.repeatKeyword, visitor)
201201
visitBlock(node.body, visitor)
202-
visitToken(node["until"], visitor)
202+
visitToken(node.untilKeyword, visitor)
203203
visitExpression(node.condition, visitor)
204204
end
205205
end
206206

207207
local function visitReturn(node: luau.AstStatReturn, visitor: Visitor)
208208
if visitor.visitReturn(node) then
209-
visitToken(node["return"], visitor)
209+
visitToken(node.returnKeyword, visitor)
210210
visitPunctuated(node.expressions, visitor, visitExpression)
211211
end
212212
end
213213

214214
local function visitLocalStatement(node: luau.AstStatLocal, visitor: Visitor)
215215
if visitor.visitLocalDeclaration(node) then
216-
visitToken(node["local"], visitor)
216+
visitToken(node.localKeyword, visitor)
217217
visitPunctuated(node.variables, visitor, visitLocal)
218218
if node.equals then
219219
visitToken(node.equals, visitor)
@@ -226,7 +226,7 @@ end
226226

227227
local function visitFor(node: luau.AstStatFor, visitor: Visitor)
228228
if visitor.visitFor(node) then
229-
visitToken(node["for"], visitor)
229+
visitToken(node.forKeyword, visitor)
230230
visitLocal(node.variable, visitor)
231231
visitToken(node.equals, visitor)
232232
visitExpression(node.from, visitor)
@@ -238,21 +238,21 @@ local function visitFor(node: luau.AstStatFor, visitor: Visitor)
238238
if node.step then
239239
visitExpression(node.step, visitor)
240240
end
241-
visitToken(node["do"], visitor)
241+
visitToken(node.doKeyword, visitor)
242242
visitBlock(node.body, visitor)
243-
visitToken(node["end"], visitor)
243+
visitToken(node.endKeyword, visitor)
244244
end
245245
end
246246

247247
local function visitForIn(node: luau.AstStatForIn, visitor: Visitor)
248248
if visitor.visitForIn(node) then
249-
visitToken(node["for"], visitor)
249+
visitToken(node.forKeyword, visitor)
250250
visitPunctuated(node.variables, visitor, visitLocal)
251-
visitToken(node["in"], visitor)
251+
visitToken(node.inKeyword, visitor)
252252
visitPunctuated(node.values, visitor, visitExpression)
253-
visitToken(node["do"], visitor)
253+
visitToken(node.doKeyword, visitor)
254254
visitBlock(node.body, visitor)
255-
visitToken(node["end"], visitor)
255+
visitToken(node.endKeyword, visitor)
256256
end
257257
end
258258

@@ -419,7 +419,7 @@ local function visitFunctionBody(node: luau.AstFunctionBody, visitor: Visitor)
419419
visitTypePack(node.returnAnnotation, visitor)
420420
end
421421
visitBlock(node.body, visitor)
422-
visitToken(node["end"], visitor)
422+
visitToken(node.endKeyword, visitor)
423423
end
424424

425425
local function visitAttribute(node: luau.AstAttribute, visitor)
@@ -431,7 +431,7 @@ local function visitAnonymousFunction(node: luau.AstExprAnonymousFunction, visit
431431
for _, attribute in node.attributes do
432432
visitAttribute(attribute, visitor)
433433
end
434-
visitToken(node["function"], visitor)
434+
visitToken(node.functionKeyword, visitor)
435435
visitFunctionBody(node.body, visitor)
436436
end
437437
end
@@ -441,7 +441,7 @@ local function visitFunction(node: luau.AstStatFunction, visitor: Visitor)
441441
for _, attribute in node.attributes do
442442
visitAttribute(attribute, visitor)
443443
end
444-
visitToken(node["function"], visitor)
444+
visitToken(node.functionKeyword, visitor)
445445
visitExpression(node.name, visitor)
446446
visitFunctionBody(node.body, visitor)
447447
end
@@ -452,8 +452,8 @@ local function visitLocalFunction(node: luau.AstStatLocalFunction, visitor: Visi
452452
for _, attribute in node.attributes do
453453
visitAttribute(attribute, visitor)
454454
end
455-
visitToken(node["local"], visitor)
456-
visitToken(node["function"], visitor)
455+
visitToken(node.localKeyword, visitor)
456+
visitToken(node.functionKeyword, visitor)
457457
visitLocal(node.name, visitor)
458458
visitFunctionBody(node.body, visitor)
459459
end
@@ -465,7 +465,7 @@ local function visitStatTypeFunction(node: luau.AstStatTypeFunction, visitor: Vi
465465
visitToken(node.export, visitor)
466466
end
467467
visitToken(node.type, visitor)
468-
visitToken(node["function"], visitor)
468+
visitToken(node.functionKeyword, visitor)
469469
visitToken(node.name, visitor)
470470
visitFunctionBody(node.body, visitor)
471471
end
@@ -551,17 +551,17 @@ end
551551

552552
local function visitIfExpression(node: luau.AstExprIfElse, visitor: Visitor)
553553
if visitor.visitIfExpression(node) then
554-
visitToken(node["if"], visitor)
554+
visitToken(node.ifKeyword, visitor)
555555
visitExpression(node.condition, visitor)
556-
visitToken(node["then"], visitor)
556+
visitToken(node.thenKeyword, visitor)
557557
visitExpression(node.consequent, visitor)
558-
for _, elseifs in node["elseifs"] do
559-
visitToken(elseifs["elseif"], visitor)
558+
for _, elseifs in node.elseifs do
559+
visitToken(elseifs.elseifKeyword, visitor)
560560
visitExpression(elseifs.condition, visitor)
561-
visitToken(elseifs["then"], visitor)
561+
visitToken(elseifs.thenKeyword, visitor)
562562
visitExpression(elseifs.consequent, visitor)
563563
end
564-
visitToken(node["else"], visitor)
564+
visitToken(node.elseKeyword, visitor)
565565
visitExpression(node.antecedent, visitor)
566566
end
567567
end

0 commit comments

Comments
 (0)