Skip to content

Commit b605060

Browse files
lukasstadlerlukasstadler
committed
avoid extraneous commas for cell vars in tast files
1 parent 8592cb8 commit b605060

40 files changed

+442
-442
lines changed

‎graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/parser/ParserTreePrinter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ private void add(FrameSlot[] slots) {
562562
} else {
563563
first = false;
564564
}
565-
sb.append(slot.getIdentifier()).append(", ");
565+
sb.append(slot.getIdentifier());
566566
}
567567
}
568568
}

‎graalpython/com.oracle.graal.python.test/testData/goldenFiles/ClassDefTests/classDef11.tast

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ModuleRootNode Name: <module 'classDef11'> SourceSection: [0,282]`def make_named
1818
FreeVarSlots: None
1919
ExecutionSlots:
2020
FreeVarsSlots: None
21-
CellVarsSlots: fields, , name,
21+
CellVarsSlots: fields, name
2222
FunctionRootNode SourceSection: [0,282]`def make_named_tuple...`
2323
Name: make_named_tuple_class
2424
Signature: varArgs=False, varKeywordArgs=False, noArguments=False, positionalOnly=True, requiresKeywordArgs=False
@@ -29,7 +29,7 @@ ModuleRootNode Name: <module 'classDef11'> SourceSection: [0,282]`def make_named
2929
FrameDescriptor: 4 slots [<return_val>, fields, name, named_tuple]
3030
ExecutionSlots:
3131
FreeVarsSlots: None
32-
CellVarsSlots: fields, , name,
32+
CellVarsSlots: fields, name
3333
InnerRootNode SourceSection: [0,282]`def make_named_tuple...`
3434
ReturnTargetNode SourceSection: [0,282]`def make_named_tuple...`
3535
Body: BlockNode SourceSection: None
@@ -60,9 +60,9 @@ ModuleRootNode Name: <module 'classDef11'> SourceSection: [0,282]`def make_named
6060
Arguments: None
6161
KwArguments: None
6262
Documentation: None
63-
FreeVarSlots: fields, , name,
63+
FreeVarSlots: fields, name
6464
ExecutionSlots:
65-
FreeVarsSlots: fields, , name,
65+
FreeVarsSlots: fields, name
6666
CellVarsSlots: None
6767
ClassBodyRootNode SourceSection: [46,264]`class named_tuple(tu...`
6868
Name: named_tuple
@@ -72,7 +72,7 @@ ModuleRootNode Name: <module 'classDef11'> SourceSection: [0,282]`def make_named
7272
NeedsCellFrame: False
7373
FrameDescriptor: 5 slots [__name__, __repr__, fields, n_sequence_fields, name]
7474
ExecutionSlots:
75-
FreeVarsSlots: fields, , name,
75+
FreeVarsSlots: fields, name
7676
CellVarsSlots: None
7777
InnerRootNode SourceSection: [46,264]`class named_tuple(tu...`
7878
ReturnTargetNode SourceSection: [46,264]`class named_tuple(tu...`
@@ -108,9 +108,9 @@ ModuleRootNode Name: <module 'classDef11'> SourceSection: [0,282]`def make_named
108108
Arguments: None
109109
KwArguments: None
110110
Documentation: None
111-
FreeVarSlots: fields, , name,
111+
FreeVarSlots: fields, name
112112
ExecutionSlots:
113-
FreeVarsSlots: fields, , name,
113+
FreeVarsSlots: fields, name
114114
CellVarsSlots: None
115115
FunctionRootNode SourceSection: [168,264]`def __repr__(self):↵...`
116116
Name: __repr__
@@ -121,7 +121,7 @@ ModuleRootNode Name: <module 'classDef11'> SourceSection: [0,282]`def make_named
121121
NeedsCellFrame: False
122122
FrameDescriptor: 6 slots [<return_val>, f, fields, name, sb, self]
123123
ExecutionSlots:
124-
FreeVarsSlots: fields, , name,
124+
FreeVarsSlots: fields, name
125125
CellVarsSlots: None
126126
InnerRootNode SourceSection: [168,264]`def __repr__(self):↵...`
127127
ReturnTargetNode SourceSection: [168,264]`def __repr__(self):↵...`

‎graalpython/com.oracle.graal.python.test/testData/goldenFiles/ClassDefTests/classDef12.tast

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ ModuleRootNode Name: <module 'classDef12'> SourceSection: [0,416]`def fn():↵
4444
FreeVarSlots: None
4545
ExecutionSlots:
4646
FreeVarsSlots: None
47-
CellVarsSlots: method_and_var,
47+
CellVarsSlots: method_and_var
4848
FunctionRootNode SourceSection: [14,393]`def get_nested_class...`
4949
Name: get_nested_class
5050
Signature: varArgs=False, varKeywordArgs=False, noArguments=True, positionalOnly=True, requiresKeywordArgs=False
@@ -54,7 +54,7 @@ ModuleRootNode Name: <module 'classDef12'> SourceSection: [0,416]`def fn():↵
5454
FrameDescriptor: 3 slots [<return_val>, Test, method_and_var]
5555
ExecutionSlots:
5656
FreeVarsSlots: None
57-
CellVarsSlots: method_and_var,
57+
CellVarsSlots: method_and_var
5858
InnerRootNode SourceSection: [14,393]`def get_nested_class...`
5959
ReturnTargetNode SourceSection: [14,393]`def get_nested_class...`
6060
Body: BlockNode SourceSection: None
@@ -76,9 +76,9 @@ ModuleRootNode Name: <module 'classDef12'> SourceSection: [0,416]`def fn():↵
7676
Arguments: None
7777
KwArguments: None
7878
Documentation: None
79-
FreeVarSlots: method_and_var,
79+
FreeVarSlots: method_and_var
8080
ExecutionSlots:
81-
FreeVarsSlots: method_and_var,
81+
FreeVarsSlots: method_and_var
8282
CellVarsSlots: None
8383
ClassBodyRootNode SourceSection: [77,375]`class Test(object):↵...`
8484
Name: Test
@@ -88,7 +88,7 @@ ModuleRootNode Name: <module 'classDef12'> SourceSection: [0,416]`def fn():↵
8888
NeedsCellFrame: False
8989
FrameDescriptor: 4 slots [actual_global, method_and_var, str, test]
9090
ExecutionSlots:
91-
FreeVarsSlots: method_and_var,
91+
FreeVarsSlots: method_and_var
9292
CellVarsSlots: None
9393
InnerRootNode SourceSection: [77,375]`class Test(object):↵...`
9494
ReturnTargetNode SourceSection: [77,375]`class Test(object):↵...`
@@ -143,9 +143,9 @@ ModuleRootNode Name: <module 'classDef12'> SourceSection: [0,416]`def fn():↵
143143
Arguments: None
144144
KwArguments: None
145145
Documentation: None
146-
FreeVarSlots: method_and_var,
146+
FreeVarSlots: method_and_var
147147
ExecutionSlots:
148-
FreeVarsSlots: method_and_var,
148+
FreeVarsSlots: method_and_var
149149
CellVarsSlots: None
150150
FunctionRootNode SourceSection: [179,245]`def test(self):↵ ...`
151151
Name: test
@@ -156,7 +156,7 @@ ModuleRootNode Name: <module 'classDef12'> SourceSection: [0,416]`def fn():↵
156156
NeedsCellFrame: False
157157
FrameDescriptor: 3 slots [<return_val>, method_and_var, self]
158158
ExecutionSlots:
159-
FreeVarsSlots: method_and_var,
159+
FreeVarsSlots: method_and_var
160160
CellVarsSlots: None
161161
InnerRootNode SourceSection: [179,245]`def test(self):↵ ...`
162162
ReturnTargetNode SourceSection: [179,245]`def test(self):↵ ...`

‎graalpython/com.oracle.graal.python.test/testData/goldenFiles/ClassDefTests/localMember02.tast

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ModuleRootNode Name: <module 'localMember02'> SourceSection: [0,156]`def fn():
1818
FreeVarSlots: None
1919
ExecutionSlots:
2020
FreeVarsSlots: None
21-
CellVarsSlots: a_local_var_out,
21+
CellVarsSlots: a_local_var_out
2222
FunctionRootNode SourceSection: [0,156]`def fn():↵ a_loca...`
2323
Name: fn
2424
Signature: varArgs=False, varKeywordArgs=False, noArguments=True, positionalOnly=True, requiresKeywordArgs=False
@@ -28,7 +28,7 @@ ModuleRootNode Name: <module 'localMember02'> SourceSection: [0,156]`def fn():
2828
FrameDescriptor: 3 slots [<return_val>, a_local_var_out, f]
2929
ExecutionSlots:
3030
FreeVarsSlots: None
31-
CellVarsSlots: a_local_var_out,
31+
CellVarsSlots: a_local_var_out
3232
InnerRootNode SourceSection: [0,156]`def fn():↵ a_loca...`
3333
ReturnTargetNode SourceSection: [0,156]`def fn():↵ a_loca...`
3434
Body: BlockNode SourceSection: None
@@ -46,9 +46,9 @@ ModuleRootNode Name: <module 'localMember02'> SourceSection: [0,156]`def fn():
4646
Arguments: None
4747
KwArguments: None
4848
Documentation: None
49-
FreeVarSlots: a_local_var_out,
49+
FreeVarSlots: a_local_var_out
5050
ExecutionSlots:
51-
FreeVarsSlots: a_local_var_out,
51+
FreeVarsSlots: a_local_var_out
5252
CellVarsSlots: None
5353
FunctionRootNode SourceSection: [51,156]`def f():↵ cla...`
5454
Name: f
@@ -58,7 +58,7 @@ ModuleRootNode Name: <module 'localMember02'> SourceSection: [0,156]`def fn():
5858
NeedsCellFrame: False
5959
FrameDescriptor: 3 slots [<return_val>, C, a_local_var_out]
6060
ExecutionSlots:
61-
FreeVarsSlots: a_local_var_out,
61+
FreeVarsSlots: a_local_var_out
6262
CellVarsSlots: None
6363
InnerRootNode SourceSection: [51,156]`def f():↵ cla...`
6464
ReturnTargetNode SourceSection: [51,156]`def f():↵ cla...`
@@ -76,9 +76,9 @@ ModuleRootNode Name: <module 'localMember02'> SourceSection: [0,156]`def fn():
7676
Arguments: None
7777
KwArguments: None
7878
Documentation: None
79-
FreeVarSlots: a_local_var_out,
79+
FreeVarSlots: a_local_var_out
8080
ExecutionSlots:
81-
FreeVarsSlots: a_local_var_out,
81+
FreeVarsSlots: a_local_var_out
8282
CellVarsSlots: None
8383
ClassBodyRootNode SourceSection: [68,136]`class C(object):↵ ...`
8484
Name: C
@@ -88,7 +88,7 @@ ModuleRootNode Name: <module 'localMember02'> SourceSection: [0,156]`def fn():
8888
NeedsCellFrame: False
8989
FrameDescriptor: 2 slots [a_local_var, a_local_var_out]
9090
ExecutionSlots:
91-
FreeVarsSlots: a_local_var_out,
91+
FreeVarsSlots: a_local_var_out
9292
CellVarsSlots: None
9393
InnerRootNode SourceSection: [68,136]`class C(object):↵ ...`
9494
ReturnTargetNode SourceSection: [68,136]`class C(object):↵ ...`

‎graalpython/com.oracle.graal.python.test/testData/goldenFiles/ClassDefTests/localMember03.tast

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ModuleRootNode Name: <module 'localMember03'> SourceSection: [0,210]`def fn():
1818
FreeVarSlots: None
1919
ExecutionSlots:
2020
FreeVarsSlots: None
21-
CellVarsSlots: a_local_var,
21+
CellVarsSlots: a_local_var
2222
FunctionRootNode SourceSection: [0,210]`def fn():↵ a_loca...`
2323
Name: fn
2424
Signature: varArgs=False, varKeywordArgs=False, noArguments=True, positionalOnly=True, requiresKeywordArgs=False
@@ -28,7 +28,7 @@ ModuleRootNode Name: <module 'localMember03'> SourceSection: [0,210]`def fn():
2828
FrameDescriptor: 3 slots [<return_val>, a_local_var, f]
2929
ExecutionSlots:
3030
FreeVarsSlots: None
31-
CellVarsSlots: a_local_var,
31+
CellVarsSlots: a_local_var
3232
InnerRootNode SourceSection: [0,210]`def fn():↵ a_loca...`
3333
ReturnTargetNode SourceSection: [0,210]`def fn():↵ a_loca...`
3434
Body: BlockNode SourceSection: None
@@ -46,9 +46,9 @@ ModuleRootNode Name: <module 'localMember03'> SourceSection: [0,210]`def fn():
4646
Arguments: None
4747
KwArguments: None
4848
Documentation: None
49-
FreeVarSlots: a_local_var,
49+
FreeVarSlots: a_local_var
5050
ExecutionSlots:
51-
FreeVarsSlots: a_local_var,
51+
FreeVarsSlots: a_local_var
5252
CellVarsSlots: None
5353
FunctionRootNode SourceSection: [47,210]`def f():↵ cla...`
5454
Name: f
@@ -58,7 +58,7 @@ ModuleRootNode Name: <module 'localMember03'> SourceSection: [0,210]`def fn():
5858
NeedsCellFrame: False
5959
FrameDescriptor: 3 slots [<return_val>, C, a_local_var]
6060
ExecutionSlots:
61-
FreeVarsSlots: a_local_var,
61+
FreeVarsSlots: a_local_var
6262
CellVarsSlots: None
6363
InnerRootNode SourceSection: [47,210]`def f():↵ cla...`
6464
ReturnTargetNode SourceSection: [47,210]`def f():↵ cla...`
@@ -76,9 +76,9 @@ ModuleRootNode Name: <module 'localMember03'> SourceSection: [0,210]`def fn():
7676
Arguments: None
7777
KwArguments: None
7878
Documentation: None
79-
FreeVarSlots: a_local_var,
79+
FreeVarSlots: a_local_var
8080
ExecutionSlots:
81-
FreeVarsSlots: a_local_var,
81+
FreeVarsSlots: a_local_var
8282
CellVarsSlots: None
8383
ClassBodyRootNode SourceSection: [64,190]`class C(object):↵ ...`
8484
Name: C
@@ -88,7 +88,7 @@ ModuleRootNode Name: <module 'localMember03'> SourceSection: [0,210]`def fn():
8888
NeedsCellFrame: False
8989
FrameDescriptor: 2 slots [a_local_var, method01]
9090
ExecutionSlots:
91-
FreeVarsSlots: a_local_var,
91+
FreeVarsSlots: a_local_var
9292
CellVarsSlots: None
9393
InnerRootNode SourceSection: [64,190]`class C(object):↵ ...`
9494
ReturnTargetNode SourceSection: [64,190]`class C(object):↵ ...`
@@ -112,9 +112,9 @@ ModuleRootNode Name: <module 'localMember03'> SourceSection: [0,210]`def fn():
112112
Arguments: None
113113
KwArguments: None
114114
Documentation: None
115-
FreeVarSlots: a_local_var,
115+
FreeVarSlots: a_local_var
116116
ExecutionSlots:
117-
FreeVarsSlots: a_local_var,
117+
FreeVarsSlots: a_local_var
118118
CellVarsSlots: None
119119
FunctionRootNode SourceSection: [131,190]`def method01():↵ ...`
120120
Name: method01
@@ -124,7 +124,7 @@ ModuleRootNode Name: <module 'localMember03'> SourceSection: [0,210]`def fn():
124124
NeedsCellFrame: False
125125
FrameDescriptor: 2 slots [<return_val>, a_local_var]
126126
ExecutionSlots:
127-
FreeVarsSlots: a_local_var,
127+
FreeVarsSlots: a_local_var
128128
CellVarsSlots: None
129129
InnerRootNode SourceSection: [131,190]`def method01():↵ ...`
130130
ReturnTargetNode SourceSection: [131,190]`def method01():↵ ...`

0 commit comments

Comments
 (0)