Skip to content

Commit 922608c

Browse files
committed
Swift: expression visitor
This transfers the current status of `ExprVisitor` from the proof-of-concept, together with some changes required for swift 5.6.
1 parent 3f45b73 commit 922608c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+1714
-114
lines changed

swift/codegen/schema.yml

Lines changed: 71 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ Decl:
150150

151151
Expr:
152152
_extends: AstNode
153-
# type: Type?
153+
type: Type?
154154

155155
Pattern:
156156
_extends: AstNode
@@ -279,37 +279,37 @@ AbstractClosureExpr:
279279

280280
AnyTryExpr:
281281
_extends: Expr
282-
# sub_expr: Expr
282+
sub_expr: Expr
283283

284284
AppliedPropertyWrapperExpr:
285285
_extends: Expr
286286

287287
Argument:
288-
# label: string
289-
# expr: Expr
288+
label: string
289+
expr: Expr
290290
_dir: expr
291291

292292
ApplyExpr:
293293
_extends: Expr
294-
# function: Expr
295-
# arguments: Argument*
294+
function: Expr
295+
arguments: Argument*
296296

297297
ArrowExpr:
298298
_extends: Expr
299299

300300
AssignExpr:
301301
_extends: Expr
302-
# dest: Expr
303-
# source: Expr
302+
dest: Expr
303+
source: Expr
304304

305305
BindOptionalExpr:
306306
_extends: Expr
307-
# sub_expr: Expr
307+
sub_expr: Expr
308308

309309
CaptureListExpr:
310310
_extends: Expr
311-
# binding_decls: PatternBindingDecl*
312-
# closure_body: ClosureExpr
311+
binding_decls: PatternBindingDecl*
312+
closure_body: ClosureExpr
313313

314314
CodeCompletionExpr:
315315
_extends: Expr
@@ -319,64 +319,64 @@ CollectionExpr:
319319

320320
DeclRefExpr:
321321
_extends: Expr
322-
# decl: Decl
323-
# replacement_types: Type*
322+
decl: Decl
323+
replacement_types: Type*
324324

325325
DefaultArgumentExpr:
326326
_extends: Expr
327-
# param_decl: ParamDecl
328-
# param_index: int
329-
# caller_side_default: Expr?
327+
param_decl: ParamDecl
328+
param_index: int
329+
caller_side_default: Expr?
330330

331331
DiscardAssignmentExpr:
332332
_extends: Expr
333333

334334
DotSyntaxBaseIgnoredExpr:
335335
_extends: Expr
336-
# qualifier: Expr
337-
# sub_expr: Expr
336+
qualifier: Expr
337+
sub_expr: Expr
338338

339339
DynamicTypeExpr:
340340
_extends: Expr
341-
# base_expr: Expr
341+
base_expr: Expr
342342

343343
EditorPlaceholderExpr:
344344
_extends: Expr
345345

346346
EnumIsCaseExpr:
347347
_extends: Expr
348-
# sub_expr: Expr
349-
# type_repr: TypeRepr
350-
# element: EnumElementDecl
348+
sub_expr: Expr
349+
type_repr: TypeRepr
350+
element: EnumElementDecl
351351

352352
ErrorExpr:
353353
_extends: Expr
354354

355355
ExplicitCastExpr:
356356
_extends: Expr
357-
# sub_expr: Expr
357+
sub_expr: Expr
358358

359359
ForceValueExpr:
360360
_extends: Expr
361-
# sub_expr: Expr
361+
sub_expr: Expr
362362

363363
IdentityExpr:
364364
_extends: Expr
365-
# sub_expr: Expr
365+
sub_expr: Expr
366366

367367
IfExpr:
368368
_extends: Expr
369-
# condition: Expr
370-
# then_expr: Expr
371-
# else_expr: Expr
369+
condition: Expr
370+
then_expr: Expr
371+
else_expr: Expr
372372

373373
ImplicitConversionExpr:
374374
_extends: Expr
375-
# sub_expr: Expr
375+
sub_expr: Expr
376376

377377
InOutExpr:
378378
_extends: Expr
379-
# sub_expr: Expr
379+
sub_expr: Expr
380380

381381
KeyPathApplicationExpr:
382382
_extends: Expr
@@ -386,12 +386,12 @@ KeyPathDotExpr:
386386

387387
KeyPathExpr:
388388
_extends: Expr
389-
# parsed_root: Expr?
390-
# parsed_path: Expr?
389+
parsed_root: Expr?
390+
parsed_path: Expr?
391391

392392
LazyInitializerExpr:
393393
_extends: Expr
394-
# sub_expr: Expr
394+
sub_expr: Expr
395395

396396
LiteralExpr:
397397
_extends: Expr
@@ -401,31 +401,31 @@ LookupExpr:
401401

402402
MakeTemporarilyEscapableExpr:
403403
_extends: Expr
404-
# escaping_closure: OpaqueValueExpr
405-
# nonescaping_closure: Expr
406-
# sub_expr: Expr
404+
escaping_closure: OpaqueValueExpr
405+
nonescaping_closure: Expr
406+
sub_expr: Expr
407407

408408
ObjCSelectorExpr:
409409
_extends: Expr
410-
# sub_expr: Expr
411-
# method: AbstractFunctionDecl
410+
sub_expr: Expr
411+
method: AbstractFunctionDecl
412412

413413
OneWayExpr:
414414
_extends: Expr
415-
# sub_expr: Expr
415+
sub_expr: Expr
416416

417417
OpaqueValueExpr:
418418
_extends: Expr
419419

420420
OpenExistentialExpr:
421421
_extends: Expr
422-
# sub_expr: Expr
423-
# existential: Expr
424-
# opaque_expr: OpaqueValueExpr
422+
sub_expr: Expr
423+
existential: Expr
424+
opaque_expr: OpaqueValueExpr
425425

426426
OptionalEvaluationExpr:
427427
_extends: Expr
428-
# sub_expr: Expr
428+
sub_expr: Expr
429429

430430
OtherConstructorDeclRefExpr:
431431
_extends: Expr
@@ -438,34 +438,34 @@ PropertyWrapperValuePlaceholderExpr:
438438

439439
RebindSelfInConstructorExpr:
440440
_extends: Expr
441-
# sub_expr: Expr
442-
# self: VarDecl
441+
sub_expr: Expr
442+
self: VarDecl
443443

444444
SequenceExpr:
445445
_extends: Expr
446446

447447
SuperRefExpr:
448448
_extends: Expr
449-
# self: VarDecl
449+
self: VarDecl
450450

451451
TapExpr:
452452
_extends: Expr
453-
# sub_expr: Expr?
454-
# var: VarDecl
455-
# body: BraceStmt
453+
sub_expr: Expr?
454+
var: VarDecl
455+
body: BraceStmt
456456

457457
TupleElementExpr:
458458
_extends: Expr
459-
# sub_expr: Expr
460-
# index: int
459+
sub_expr: Expr
460+
index: int
461461

462462
TupleExpr:
463463
_extends: Expr
464-
# elements: Expr*
464+
elements: Expr*
465465

466466
TypeExpr:
467467
_extends: Expr
468-
# type_repr: TypeRepr?
468+
type_repr: TypeRepr?
469469

470470
UnresolvedDeclRefExpr:
471471
_extends: Expr
@@ -484,7 +484,7 @@ UnresolvedSpecializeExpr:
484484

485485
VarargExpansionExpr:
486486
_extends: Expr
487-
# sub_expr: Expr
487+
sub_expr: Expr
488488

489489
AnyPattern:
490490
_extends: Pattern
@@ -655,11 +655,11 @@ TypeDecl:
655655

656656
AutoClosureExpr:
657657
_extends: AbstractClosureExpr
658-
# body: BraceStmt
658+
body: BraceStmt
659659

660660
ClosureExpr:
661661
_extends: AbstractClosureExpr
662-
# body: BraceStmt
662+
body: BraceStmt
663663

664664
ForceTryExpr:
665665
_extends: AnyTryExpr
@@ -684,15 +684,15 @@ PrefixUnaryExpr:
684684

685685
SelfApplyExpr:
686686
_extends: ApplyExpr
687-
# base_expr: Expr
687+
base_expr: Expr
688688

689689
ArrayExpr:
690690
_extends: CollectionExpr
691-
# elements: Expr*
691+
elements: Expr*
692692

693693
DictionaryExpr:
694694
_extends: CollectionExpr
695-
# elements: Expr*
695+
elements: Expr*
696696

697697
CheckedCastExpr:
698698
_extends: ExplicitCastExpr
@@ -810,10 +810,10 @@ BuiltinLiteralExpr:
810810

811811
InterpolatedStringLiteralExpr:
812812
_extends: LiteralExpr
813-
# interpolation_expr: OpaqueValueExpr?
814-
# interpolation_count_expr: Expr?
815-
# literal_capacity_expr: Expr?
816-
# appending_expr: TapExpr?
813+
interpolation_expr: OpaqueValueExpr?
814+
interpolation_count_expr: Expr?
815+
literal_capacity_expr: Expr?
816+
appending_expr: TapExpr?
817817

818818
RegexLiteralExpr:
819819
_extends: LiteralExpr
@@ -829,14 +829,14 @@ DynamicLookupExpr:
829829

830830
MemberRefExpr:
831831
_extends: LookupExpr
832-
# base_expr: Expr
832+
base_expr: Expr
833833

834834
SubscriptExpr:
835835
_extends:
836836
- GenericContext
837837
- LookupExpr
838-
# base_expr: Expr
839-
# arguments: Argument*
838+
base_expr: Expr
839+
arguments: Argument*
840840

841841
OverloadedDeclRefExpr:
842842
_extends: OverloadSetRefExpr
@@ -959,18 +959,18 @@ IsExpr:
959959

960960
BooleanLiteralExpr:
961961
_extends: BuiltinLiteralExpr
962-
# value: boolean
962+
value: boolean
963963

964964
MagicIdentifierLiteralExpr:
965965
_extends: BuiltinLiteralExpr
966-
# kind: string
966+
kind: string
967967

968968
NumberLiteralExpr:
969969
_extends: BuiltinLiteralExpr
970970

971971
StringLiteralExpr:
972972
_extends: BuiltinLiteralExpr
973-
# value: string
973+
value: string
974974

975975
DynamicMemberRefExpr:
976976
_extends: DynamicLookupExpr
@@ -1018,11 +1018,11 @@ TypeAliasDecl:
10181018

10191019
FloatLiteralExpr:
10201020
_extends: NumberLiteralExpr
1021-
# string_value: string
1021+
string_value: string
10221022

10231023
IntegerLiteralExpr:
10241024
_extends: NumberLiteralExpr
1025-
# string_value: string
1025+
string_value: string
10261026

10271027
ErrorTypeRepr:
10281028
_extends: TypeRepr

0 commit comments

Comments
 (0)