@@ -41,10 +41,6 @@ containerparent(
41
41
unique int child: @container ref
42
42
);
43
43
44
- is_in_psmodule_path(
45
- int file: @file ref
46
- );
47
-
48
44
/* Comments */
49
45
comment_entity(
50
46
unique int id: @comment_entity,
@@ -68,15 +64,15 @@ extractor_messages(
68
64
);
69
65
70
66
parent(
71
- int child : @ast ref,
72
- int parent : @ast ref
67
+ int parent : @ast ref,
68
+ int child : @ast ref
73
69
);
74
70
75
71
/* AST Nodes */
76
72
// This is all the kinds of nodes that can inherit from Ast
77
73
// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.ast?view=powershellsdk-7.3.0
78
74
@ast = @not_implemented | @attribute_base | @catch_clause | @command_element |
79
- @member | @named_block | @param_block | @parameter | @redirection | @script_block | @statement | @statement_block | @named_attribute_argument ;
75
+ @member | @named_block | @param_block | @parameter | @redirection | @script_block | @statement | @statement_block;
80
76
// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.attributebaseast?view=powershellsdk-7.2.0
81
77
@attribute_base = @attribute | @type_constraint;
82
78
@@ -86,7 +82,7 @@ parent(
86
82
// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.commandbaseast?view=powershellsdk-7.3.0
87
83
@command_base = @command | @command_expression;
88
84
// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.chainableast?view=powershellsdk-7.3.0
89
- @chainable = @command_base | @ pipeline | @pipeline_chain;
85
+ @chainable = @pipeline | @pipeline_chain;
90
86
//https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.pipelinebaseast?view=powershellsdk-7.3.0
91
87
@pipeline_base = @chainable | @error_statement | @assignment_statement;
92
88
// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.statementast?view=powershellsdk-7.3.0
@@ -413,13 +409,13 @@ if_statement(
413
409
if_statement_clause(
414
410
int id: @if_statement ref,
415
411
int index: int ref,
416
- int item1: @pipeline_base ref,
417
- int item2: @statement_block ref
412
+ int item1: @ast ref,
413
+ int item2: @ast ref
418
414
)
419
415
420
416
if_statement_else(
421
417
int id: @if_statement ref,
422
- int elseItem: @statement_block ref
418
+ int elseItem: @ast ref
423
419
)
424
420
425
421
if_statement_location(
@@ -471,7 +467,7 @@ statement_block_trap(
471
467
// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.subexpressionast?view=powershellsdk-7.3.0
472
468
sub_expression(
473
469
unique int id: @sub_expression,
474
- int subExpression: @statement_block ref
470
+ int subExpression: @ast ref
475
471
)
476
472
477
473
sub_expression_location(
@@ -631,7 +627,7 @@ exit_statement(
631
627
632
628
exit_statement_pipeline(
633
629
int id: @exit_statement ref,
634
- int expression: @pipeline_base ref
630
+ int expression: @ast ref
635
631
)
636
632
637
633
exit_statement_location(
@@ -818,7 +814,7 @@ continue_statement_location(
818
814
819
815
statement_label(
820
816
int id: @labelled_statement ref,
821
- int label: @expression ref
817
+ int label: @ast ref
822
818
)
823
819
824
820
// ReturnStatementAst
@@ -829,7 +825,7 @@ return_statement(
829
825
830
826
return_statement_pipeline(
831
827
int id: @return_statement ref,
832
- int pipeline: @pipeline_base ref
828
+ int pipeline: @ast ref
833
829
)
834
830
835
831
return_statement_location(
@@ -841,12 +837,12 @@ return_statement_location(
841
837
// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.dowhilestatementast?view=powershellsdk-7.3.0
842
838
do_while_statement(
843
839
unique int id: @do_while_statement,
844
- int body: @statement_block ref
840
+ int body: @ast ref
845
841
)
846
842
847
843
do_while_statement_condition(
848
844
int id: @do_while_statement ref,
849
- int condition: @pipeline_base ref
845
+ int condition: @ast ref
850
846
)
851
847
852
848
do_while_statement_location(
@@ -858,12 +854,12 @@ do_while_statement_location(
858
854
// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.dountilstatementast?view=powershellsdk-7.3.0
859
855
do_until_statement(
860
856
unique int id: @do_until_statement,
861
- int body: @statement_block ref
857
+ int body: @ast ref
862
858
)
863
859
864
860
do_until_statement_condition(
865
861
int id: @do_until_statement ref,
866
- int condition: @pipeline_base ref
862
+ int condition: @ast ref
867
863
)
868
864
869
865
do_until_statement_location(
@@ -875,12 +871,12 @@ do_until_statement_location(
875
871
// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.whilestatementast?view=powershellsdk-7.3.0
876
872
while_statement(
877
873
unique int id: @while_statement,
878
- int body: @statement_block ref
874
+ int body: @ast ref
879
875
)
880
876
881
877
while_statement_condition(
882
878
int id: @while_statement ref,
883
- int condition: @pipeline_base ref
879
+ int condition: @ast ref
884
880
)
885
881
886
882
while_statement_location(
@@ -892,9 +888,9 @@ while_statement_location(
892
888
// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.foreachstatementast?view=powershellsdk-7.3.0
893
889
foreach_statement(
894
890
unique int id: @foreach_statement,
895
- int variable: @variable_expression ref,
896
- int condition: @pipeline_base ref,
897
- int body: @statement_block ref,
891
+ int variable: @ast ref,
892
+ int condition: @ast ref,
893
+ int body: @ast ref,
898
894
int flags: int ref
899
895
)
900
896
@@ -907,7 +903,7 @@ foreach_statement_location(
907
903
// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.forstatementast?view=powershellsdk-7.3.0
908
904
for_statement(
909
905
unique int id: @for_statement,
910
- int body: @statement_block ref
906
+ int body: @ast ref
911
907
)
912
908
913
909
for_statement_location(
@@ -917,17 +913,17 @@ for_statement_location(
917
913
918
914
for_statement_condition(
919
915
int id: @for_statement ref,
920
- int condition: @pipeline_base ref
916
+ int condition: @ast ref
921
917
)
922
918
923
919
for_statement_initializer(
924
920
int id: @for_statement ref,
925
- int initializer: @pipeline_base ref
921
+ int initializer: @ast ref
926
922
)
927
923
928
924
for_statement_iterator(
929
925
int id: @for_statement ref,
930
- int iterator: @pipeline_base ref
926
+ int iterator: @ast ref
931
927
)
932
928
933
929
// ExpandableStringExpressionAst
@@ -992,14 +988,14 @@ unary_expression_location(
992
988
// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.catchclauseast?view=powershellsdk-7.3.0
993
989
catch_clause(
994
990
unique int id: @catch_clause,
995
- int body: @statement_block ref,
991
+ int body: @ast ref,
996
992
boolean isCatchAll: boolean ref
997
993
)
998
994
999
995
catch_clause_catch_type(
1000
996
int id: @catch_clause ref,
1001
997
int index: int ref,
1002
- int catch_type: @type_constraint ref
998
+ int catch_type: @ast ref
1003
999
)
1004
1000
1005
1001
catch_clause_location(
@@ -1028,7 +1024,7 @@ throw_statement_pipeline(
1028
1024
// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.trystatementast?view=powershellsdk-7.3.0
1029
1025
try_statement(
1030
1026
unique int id: @try_statement,
1031
- int body: @statement_block ref
1027
+ int body: @ast ref
1032
1028
)
1033
1029
1034
1030
try_statement_catch_clause(
@@ -1103,9 +1099,9 @@ token_location(
1103
1099
// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.configurationdefinitionast?view=powershellsdk-7.3.0
1104
1100
configuration_definition(
1105
1101
unique int id: @configuration_definition,
1106
- int body: @script_block_expression ref,
1102
+ int body: @ast ref,
1107
1103
int configurationType: int ref,
1108
- int name: @expression ref
1104
+ int name: @ast ref
1109
1105
)
1110
1106
1111
1107
configuration_definition_location(
@@ -1117,7 +1113,7 @@ configuration_definition_location(
1117
1113
// https://learn.microsoft.com/en-us/dotnet/api/system.management.automation.language.datastatementast?view=powershellsdk-7.3.0
1118
1114
data_statement(
1119
1115
unique int id: @data_statement,
1120
- int body: @statement_block ref
1116
+ int body: @ast ref
1121
1117
)
1122
1118
1123
1119
data_statement_variable(
0 commit comments