Skip to content

Commit beafe77

Browse files
eregonandrykonchin
eregon
authored and
andrykonchin
committed
Adapt to Prism no longer including */**/&/... in locals
1 parent db0d327 commit beafe77

17 files changed

+88
-108
lines changed

‎spec/truffle/parsing/fixtures/def/argument_descriptors/with_block_without_name.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ ast: |
2525
arityForCheck = Arity{preRequired = 0, optional = 0, hasRest = false, isImplicitRest = false, postRequired = 0, keywordArguments = [], requiredKeywordArgumentsCount = 0, hasKeywordsRest = false}
2626
callTarget = Object#foo
2727
checkArityProfile = false
28-
frameDescriptor = FrameDescriptor@...{#0:(self), #1:%$~_, #2:%forward_block, #3:%method_block_arg}
28+
frameDescriptor = FrameDescriptor@...{#0:(self), #1:%$~_, #2:%method_block_arg, #3:%forward_block}
2929
instrumentationBits = 0
3030
keywordArguments = false
3131
localReturnProfile = false
@@ -69,13 +69,13 @@ ast: |
6969
SaveMethodBlockNode
7070
attributes:
7171
flags = 0
72-
slot = 3
72+
slot = 2
7373
sourceCharIndex = -1
7474
sourceLength = 0
7575
SaveMethodBlockNode
7676
attributes:
7777
flags = 0
78-
slot = 2
78+
slot = 3
7979
sourceCharIndex = -1
8080
sourceLength = 0
8181
NilLiteralNode

‎spec/truffle/parsing/fixtures/def/argument_descriptors/with_double_splat_operator_without_name.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ ast: |
2727
arityForCheck = Arity{preRequired = 0, optional = 0, hasRest = false, isImplicitRest = false, postRequired = 0, keywordArguments = [a, b], requiredKeywordArgumentsCount = 2, hasKeywordsRest = true}
2828
callTarget = Object#foo
2929
checkArityProfile = false
30-
frameDescriptor = FrameDescriptor@...{#0:(self), #1:%$~_, #2:a, #3:b, #4:%kwrest, #5:%method_block_arg}
30+
frameDescriptor = FrameDescriptor@...{#0:(self), #1:%$~_, #2:a, #3:b, #4:%method_block_arg, #5:%kwrest}
3131
instrumentationBits = 0
3232
keywordArguments = true
3333
localReturnProfile = false
@@ -71,7 +71,7 @@ ast: |
7171
SaveMethodBlockNode
7272
attributes:
7373
flags = 0
74-
slot = 5
74+
slot = 4
7575
sourceCharIndex = -1
7676
sourceLength = 0
7777
WriteLocalVariableNode
@@ -111,7 +111,7 @@ ast: |
111111
WriteLocalVariableNode
112112
attributes:
113113
flags = 0
114-
frameSlot = 4 # %kwrest
114+
frameSlot = 5 # %kwrest
115115
sourceCharIndex = -1
116116
sourceLength = 0
117117
children:

‎spec/truffle/parsing/fixtures/def/argument_descriptors/with_forwarding_operator.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ ast: |
2727
arityForCheck = Arity{preRequired = 0, optional = 0, hasRest = true, isImplicitRest = false, postRequired = 0, keywordArguments = [], requiredKeywordArgumentsCount = 0, hasKeywordsRest = true}
2828
callTarget = Object#foo
2929
checkArityProfile = false
30-
frameDescriptor = FrameDescriptor@...{#0:(self), #1:%$~_, #2:%forward_rest, #3:%forward_kwrest, #4:%forward_block, #5:%method_block_arg}
30+
frameDescriptor = FrameDescriptor@...{#0:(self), #1:%$~_, #2:%method_block_arg, #3:%forward_rest, #4:%forward_kwrest, #5:%forward_block}
3131
instrumentationBits = 0
3232
keywordArguments = true
3333
localReturnProfile = false
@@ -71,13 +71,13 @@ ast: |
7171
SaveMethodBlockNode
7272
attributes:
7373
flags = 0
74-
slot = 5
74+
slot = 2
7575
sourceCharIndex = -1
7676
sourceLength = 0
7777
WriteLocalVariableNode
7878
attributes:
7979
flags = 0
80-
frameSlot = 2 # %forward_rest
80+
frameSlot = 3 # %forward_rest
8181
sourceCharIndex = -1
8282
sourceLength = 0
8383
children:
@@ -94,7 +94,7 @@ ast: |
9494
WriteLocalVariableNode
9595
attributes:
9696
flags = 0
97-
frameSlot = 3 # %forward_kwrest
97+
frameSlot = 4 # %forward_kwrest
9898
sourceCharIndex = -1
9999
sourceLength = 0
100100
children:
@@ -115,7 +115,7 @@ ast: |
115115
SaveMethodBlockNode
116116
attributes:
117117
flags = 0
118-
slot = 4
118+
slot = 5
119119
sourceCharIndex = -1
120120
sourceLength = 0
121121
NilLiteralNode

‎spec/truffle/parsing/fixtures/def/argument_descriptors/with_splat_operator_without_name.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ ast: |
2929
arityForCheck = Arity{preRequired = 2, optional = 0, hasRest = true, isImplicitRest = false, postRequired = 2, keywordArguments = [], requiredKeywordArgumentsCount = 0, hasKeywordsRest = false}
3030
callTarget = Object#foo
3131
checkArityProfile = false
32-
frameDescriptor = FrameDescriptor@...{#0:(self), #1:%$~_, #2:a, #3:b, #4:%unnamed_rest, #5:d, #6:f, #7:%method_block_arg}
32+
frameDescriptor = FrameDescriptor@...{#0:(self), #1:%$~_, #2:a, #3:b, #4:d, #5:f, #6:%method_block_arg, #7:%unnamed_rest}
3333
instrumentationBits = 0
3434
keywordArguments = false
3535
localReturnProfile = false
@@ -119,13 +119,13 @@ ast: |
119119
SaveMethodBlockNode
120120
attributes:
121121
flags = 0
122-
slot = 7
122+
slot = 6
123123
sourceCharIndex = -1
124124
sourceLength = 0
125125
WriteLocalVariableNode
126126
attributes:
127127
flags = 0
128-
frameSlot = 4 # %unnamed_rest
128+
frameSlot = 7 # %unnamed_rest
129129
sourceCharIndex = -1
130130
sourceLength = 0
131131
children:
@@ -142,7 +142,7 @@ ast: |
142142
WriteLocalVariableNode
143143
attributes:
144144
flags = 0
145-
frameSlot = 6 # f
145+
frameSlot = 5 # f
146146
sourceCharIndex = -1
147147
sourceLength = 0
148148
children:
@@ -160,7 +160,7 @@ ast: |
160160
WriteLocalVariableNode
161161
attributes:
162162
flags = 0
163-
frameSlot = 5 # d
163+
frameSlot = 4 # d
164164
sourceCharIndex = -1
165165
sourceLength = 0
166166
children:

‎spec/truffle/parsing/fixtures/def/arity/with_forwarding_operator.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ ast: |
3131
arityForCheck = Arity{preRequired = 0, optional = 0, hasRest = true, isImplicitRest = false, postRequired = 0, keywordArguments = [], requiredKeywordArgumentsCount = 0, hasKeywordsRest = true}
3232
callTarget = Object#foo
3333
checkArityProfile = false
34-
frameDescriptor = FrameDescriptor@...{#0:(self), #1:%$~_, #2:%forward_rest, #3:%forward_kwrest, #4:%forward_block, #5:%method_block_arg}
34+
frameDescriptor = FrameDescriptor@...{#0:(self), #1:%$~_, #2:%method_block_arg, #3:%forward_rest, #4:%forward_kwrest, #5:%forward_block}
3535
instrumentationBits = 0
3636
keywordArguments = true
3737
localReturnProfile = false
@@ -75,13 +75,13 @@ ast: |
7575
SaveMethodBlockNode
7676
attributes:
7777
flags = 0
78-
slot = 5
78+
slot = 2
7979
sourceCharIndex = -1
8080
sourceLength = 0
8181
WriteLocalVariableNode
8282
attributes:
8383
flags = 0
84-
frameSlot = 2 # %forward_rest
84+
frameSlot = 3 # %forward_rest
8585
sourceCharIndex = -1
8686
sourceLength = 0
8787
children:
@@ -98,7 +98,7 @@ ast: |
9898
WriteLocalVariableNode
9999
attributes:
100100
flags = 0
101-
frameSlot = 3 # %forward_kwrest
101+
frameSlot = 4 # %forward_kwrest
102102
sourceCharIndex = -1
103103
sourceLength = 0
104104
children:
@@ -119,7 +119,7 @@ ast: |
119119
SaveMethodBlockNode
120120
attributes:
121121
flags = 0
122-
slot = 4
122+
slot = 5
123123
sourceCharIndex = -1
124124
sourceLength = 0
125125
NilLiteralNode

‎spec/truffle/parsing/fixtures/def/parameters_declaration_in_a_frame/with_block_without_name.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ ast: |
2929
arityForCheck = Arity{preRequired = 0, optional = 0, hasRest = false, isImplicitRest = false, postRequired = 0, keywordArguments = [], requiredKeywordArgumentsCount = 0, hasKeywordsRest = false}
3030
callTarget = Object#foo
3131
checkArityProfile = false
32-
frameDescriptor = FrameDescriptor@...{#0:(self), #1:%$~_, #2:%forward_block, #3:%method_block_arg}
32+
frameDescriptor = FrameDescriptor@...{#0:(self), #1:%$~_, #2:%method_block_arg, #3:%forward_block}
3333
instrumentationBits = 0
3434
keywordArguments = false
3535
localReturnProfile = false
@@ -73,13 +73,13 @@ ast: |
7373
SaveMethodBlockNode
7474
attributes:
7575
flags = 0
76-
slot = 3
76+
slot = 2
7777
sourceCharIndex = -1
7878
sourceLength = 0
7979
SaveMethodBlockNode
8080
attributes:
8181
flags = 0
82-
slot = 2
82+
slot = 3
8383
sourceCharIndex = -1
8484
sourceLength = 0
8585
NilLiteralNode

‎spec/truffle/parsing/fixtures/def/parameters_to_local_variables/with_block_without_name.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ ast: |
2525
arityForCheck = Arity{preRequired = 0, optional = 0, hasRest = false, isImplicitRest = false, postRequired = 0, keywordArguments = [], requiredKeywordArgumentsCount = 0, hasKeywordsRest = false}
2626
callTarget = Object#foo
2727
checkArityProfile = false
28-
frameDescriptor = FrameDescriptor@...{#0:(self), #1:%$~_, #2:%forward_block, #3:%method_block_arg}
28+
frameDescriptor = FrameDescriptor@...{#0:(self), #1:%$~_, #2:%method_block_arg, #3:%forward_block}
2929
instrumentationBits = 0
3030
keywordArguments = false
3131
localReturnProfile = false
@@ -69,13 +69,13 @@ ast: |
6969
SaveMethodBlockNode
7070
attributes:
7171
flags = 0
72-
slot = 3
72+
slot = 2
7373
sourceCharIndex = -1
7474
sourceLength = 0
7575
SaveMethodBlockNode
7676
attributes:
7777
flags = 0
78-
slot = 2
78+
slot = 3
7979
sourceCharIndex = -1
8080
sourceLength = 0
8181
NilLiteralNode

‎spec/truffle/parsing/fixtures/def/parameters_to_local_variables/with_forwarding_operator.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ ast: |
2828
arityForCheck = Arity{preRequired = 0, optional = 0, hasRest = true, isImplicitRest = false, postRequired = 0, keywordArguments = [], requiredKeywordArgumentsCount = 0, hasKeywordsRest = true}
2929
callTarget = Object#foo
3030
checkArityProfile = false
31-
frameDescriptor = FrameDescriptor@...{#0:(self), #1:%$~_, #2:%forward_rest, #3:%forward_kwrest, #4:%forward_block, #5:%method_block_arg}
31+
frameDescriptor = FrameDescriptor@...{#0:(self), #1:%$~_, #2:%method_block_arg, #3:%forward_rest, #4:%forward_kwrest, #5:%forward_block}
3232
instrumentationBits = 0
3333
keywordArguments = true
3434
localReturnProfile = false
@@ -72,13 +72,13 @@ ast: |
7272
SaveMethodBlockNode
7373
attributes:
7474
flags = 0
75-
slot = 5
75+
slot = 2
7676
sourceCharIndex = -1
7777
sourceLength = 0
7878
WriteLocalVariableNode
7979
attributes:
8080
flags = 0
81-
frameSlot = 2 # %forward_rest
81+
frameSlot = 3 # %forward_rest
8282
sourceCharIndex = -1
8383
sourceLength = 0
8484
children:
@@ -95,7 +95,7 @@ ast: |
9595
WriteLocalVariableNode
9696
attributes:
9797
flags = 0
98-
frameSlot = 3 # %forward_kwrest
98+
frameSlot = 4 # %forward_kwrest
9999
sourceCharIndex = -1
100100
sourceLength = 0
101101
children:
@@ -116,7 +116,7 @@ ast: |
116116
SaveMethodBlockNode
117117
attributes:
118118
flags = 0
119-
slot = 4
119+
slot = 5
120120
sourceCharIndex = -1
121121
sourceLength = 0
122122
NilLiteralNode

‎spec/truffle/parsing/fixtures/method_calls/parameter_forwarding/block_without_name.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ ast: |
2323
arityForCheck = Arity{preRequired = 0, optional = 0, hasRest = false, isImplicitRest = false, postRequired = 0, keywordArguments = [], requiredKeywordArgumentsCount = 0, hasKeywordsRest = false}
2424
callTarget = Object#foo
2525
checkArityProfile = false
26-
frameDescriptor = FrameDescriptor@...{#0:(self), #1:%$~_, #2:%forward_block, #3:%method_block_arg}
26+
frameDescriptor = FrameDescriptor@...{#0:(self), #1:%$~_, #2:%method_block_arg, #3:%forward_block}
2727
instrumentationBits = 0
2828
keywordArguments = false
2929
localReturnProfile = false
@@ -67,13 +67,13 @@ ast: |
6767
SaveMethodBlockNode
6868
attributes:
6969
flags = 0
70-
slot = 3
70+
slot = 2
7171
sourceCharIndex = -1
7272
sourceLength = 0
7373
SaveMethodBlockNode
7474
attributes:
7575
flags = 0
76-
slot = 2
76+
slot = 3
7777
sourceCharIndex = -1
7878
sourceLength = 0
7979
RubyCallNode
@@ -104,7 +104,7 @@ ast: |
104104
ReadLocalVariableNode
105105
attributes:
106106
flags = 0
107-
frameSlot = 2 # %forward_block
107+
frameSlot = 3 # %forward_block
108108
sourceCharIndex = -1
109109
sourceLength = 0
110110
type = FRAME_LOCAL

0 commit comments

Comments
 (0)