Skip to content

Commit 6e69a81

Browse files
committed
Move flag position consistently to front
1 parent 18e6df0 commit 6e69a81

File tree

660 files changed

+25533
-25544
lines changed

Some content is hidden

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

660 files changed

+25533
-25544
lines changed

config.yml

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -457,27 +457,27 @@ nodes:
457457
^^^^^^^^^^^^^^
458458
- name: ArgumentsNode
459459
fields:
460-
- name: arguments
461-
type: node[]
462460
- name: flags
463461
type: flags
464462
kind: ArgumentsNodeFlags
463+
- name: arguments
464+
type: node[]
465465
comment: |
466466
Represents a set of arguments to a method or a keyword.
467467
468468
return foo, bar, baz
469469
^^^^^^^^^^^^^
470470
- name: ArrayNode
471471
fields:
472+
- name: flags
473+
type: flags
474+
kind: ArrayNodeFlags
472475
- name: elements
473476
type: node[]
474477
- name: opening_loc
475478
type: location?
476479
- name: closing_loc
477480
type: location?
478-
- name: flags
479-
type: flags
480-
kind: ArrayNodeFlags
481481
comment: |
482482
Represents an array literal. This can be a regular array using brackets or
483483
a special array using % like %w or %i.
@@ -661,15 +661,15 @@ nodes:
661661
^^^^^^^^^
662662
- name: CallAndWriteNode
663663
fields:
664+
- name: flags
665+
type: flags
666+
kind: CallNodeFlags
664667
- name: receiver
665668
type: node?
666669
- name: call_operator_loc
667670
type: location?
668671
- name: message_loc
669672
type: location?
670-
- name: flags
671-
type: flags
672-
kind: CallNodeFlags
673673
- name: read_name
674674
type: constant
675675
- name: write_name
@@ -685,6 +685,9 @@ nodes:
685685
^^^^^^^^^^^^^^^^^
686686
- name: CallNode
687687
fields:
688+
- name: flags
689+
type: flags
690+
kind: CallNodeFlags
688691
- name: receiver
689692
type: node?
690693
- name: call_operator_loc
@@ -702,9 +705,6 @@ nodes:
702705
type: location?
703706
- name: block
704707
type: node?
705-
- name: flags
706-
type: flags
707-
kind: CallNodeFlags
708708
comment: |
709709
Represents a method call, in all of the various forms that can take.
710710
@@ -727,15 +727,15 @@ nodes:
727727
^^^^^^^^
728728
- name: CallOperatorWriteNode
729729
fields:
730+
- name: flags
731+
type: flags
732+
kind: CallNodeFlags
730733
- name: receiver
731734
type: node?
732735
- name: call_operator_loc
733736
type: location?
734737
- name: message_loc
735738
type: location?
736-
- name: flags
737-
type: flags
738-
kind: CallNodeFlags
739739
- name: read_name
740740
type: constant
741741
- name: write_name
@@ -753,15 +753,15 @@ nodes:
753753
^^^^^^^^^^^^^^
754754
- name: CallOrWriteNode
755755
fields:
756+
- name: flags
757+
type: flags
758+
kind: CallNodeFlags
756759
- name: receiver
757760
type: node?
758761
- name: call_operator_loc
759762
type: location?
760763
- name: message_loc
761764
type: location?
762-
- name: flags
763-
type: flags
764-
kind: CallNodeFlags
765765
- name: read_name
766766
type: constant
767767
- name: write_name
@@ -1241,15 +1241,15 @@ nodes:
12411241
^^^^^^^^^^^^^^^^^^^^
12421242
- name: FlipFlopNode
12431243
fields:
1244+
- name: flags
1245+
type: flags
1246+
kind: RangeFlags
12441247
- name: left
12451248
type: node?
12461249
- name: right
12471250
type: node?
12481251
- name: operator_loc
12491252
type: location
1250-
- name: flags
1251-
type: flags
1252-
kind: RangeFlags
12531253
comment: |
12541254
Represents the use of the `..` or `...` operators to create flip flops.
12551255
@@ -1500,6 +1500,9 @@ nodes:
15001500
^^^^^^^^^^^
15011501
- name: IndexAndWriteNode
15021502
fields:
1503+
- name: flags
1504+
type: flags
1505+
kind: CallNodeFlags
15031506
- name: receiver
15041507
type: node?
15051508
- name: call_operator_loc
@@ -1513,9 +1516,6 @@ nodes:
15131516
type: location
15141517
- name: block
15151518
type: node?
1516-
- name: flags
1517-
type: flags
1518-
kind: CallNodeFlags
15191519
- name: operator_loc
15201520
type: location
15211521
- name: value
@@ -1527,6 +1527,9 @@ nodes:
15271527
^^^^^^^^^^^^^^^^^^^^^^
15281528
- name: IndexOperatorWriteNode
15291529
fields:
1530+
- name: flags
1531+
type: flags
1532+
kind: CallNodeFlags
15301533
- name: receiver
15311534
type: node?
15321535
- name: call_operator_loc
@@ -1540,9 +1543,6 @@ nodes:
15401543
type: location
15411544
- name: block
15421545
type: node?
1543-
- name: flags
1544-
type: flags
1545-
kind: CallNodeFlags
15461546
- name: operator
15471547
type: constant
15481548
- name: operator_loc
@@ -1556,6 +1556,9 @@ nodes:
15561556
^^^^^^^^^^^^^^^^^^^^^
15571557
- name: IndexOrWriteNode
15581558
fields:
1559+
- name: flags
1560+
type: flags
1561+
kind: CallNodeFlags
15591562
- name: receiver
15601563
type: node?
15611564
- name: call_operator_loc
@@ -1569,9 +1572,6 @@ nodes:
15691572
type: location
15701573
- name: block
15711574
type: node?
1572-
- name: flags
1573-
type: flags
1574-
kind: CallNodeFlags
15751575
- name: operator_loc
15761576
type: location
15771577
- name: value
@@ -1673,15 +1673,15 @@ nodes:
16731673
^
16741674
- name: InterpolatedMatchLastLineNode
16751675
fields:
1676+
- name: flags
1677+
type: flags
1678+
kind: RegularExpressionFlags
16761679
- name: opening_loc
16771680
type: location
16781681
- name: parts
16791682
type: node[]
16801683
- name: closing_loc
16811684
type: location
1682-
- name: flags
1683-
type: flags
1684-
kind: RegularExpressionFlags
16851685
newline: parts
16861686
comment: |
16871687
Represents a regular expression literal that contains interpolation that
@@ -1692,15 +1692,15 @@ nodes:
16921692
^^^^^^^^^^^^^^^^
16931693
- name: InterpolatedRegularExpressionNode
16941694
fields:
1695+
- name: flags
1696+
type: flags
1697+
kind: RegularExpressionFlags
16951698
- name: opening_loc
16961699
type: location
16971700
- name: parts
16981701
type: node[]
16991702
- name: closing_loc
17001703
type: location
1701-
- name: flags
1702-
type: flags
1703-
kind: RegularExpressionFlags
17041704
newline: parts
17051705
comment: |
17061706
Represents a regular expression literal that contains interpolation.
@@ -1889,6 +1889,9 @@ nodes:
18891889
^^^^^^^
18901890
- name: MatchLastLineNode
18911891
fields:
1892+
- name: flags
1893+
type: flags
1894+
kind: RegularExpressionFlags
18921895
- name: opening_loc
18931896
type: location
18941897
- name: content_loc
@@ -1897,9 +1900,6 @@ nodes:
18971900
type: location
18981901
- name: unescaped
18991902
type: string
1900-
- name: flags
1901-
type: flags
1902-
kind: RegularExpressionFlags
19031903
comment: |
19041904
Represents a regular expression literal used in the predicate of a
19051905
conditional to implicitly match against the last line read by an IO
@@ -2206,15 +2206,15 @@ nodes:
22062206
comment: The top level node of any parse tree.
22072207
- name: RangeNode
22082208
fields:
2209+
- name: flags
2210+
type: flags
2211+
kind: RangeFlags
22092212
- name: left
22102213
type: node?
22112214
- name: right
22122215
type: node?
22132216
- name: operator_loc
22142217
type: location
2215-
- name: flags
2216-
type: flags
2217-
kind: RangeFlags
22182218
comment: |
22192219
Represents the use of the `..` or `...` operators.
22202220
@@ -2240,6 +2240,9 @@ nodes:
22402240
^^^^
22412241
- name: RegularExpressionNode
22422242
fields:
2243+
- name: flags
2244+
type: flags
2245+
kind: RegularExpressionFlags
22432246
- name: opening_loc
22442247
type: location
22452248
- name: content_loc
@@ -2248,9 +2251,6 @@ nodes:
22482251
type: location
22492252
- name: unescaped
22502253
type: string
2251-
- name: flags
2252-
type: flags
2253-
kind: RegularExpressionFlags
22542254
comment: |
22552255
Represents a regular expression literal with no interpolation.
22562256
@@ -2525,6 +2525,9 @@ nodes:
25252525
^^^^^^^^^^^^^^^^^^^^^^^
25262526
- name: UntilNode
25272527
fields:
2528+
- name: flags
2529+
type: flags
2530+
kind: LoopFlags
25282531
- name: keyword_loc
25292532
type: location
25302533
- name: closing_loc
@@ -2534,9 +2537,6 @@ nodes:
25342537
- name: statements
25352538
type: node?
25362539
kind: StatementsNode
2537-
- name: flags
2538-
type: flags
2539-
kind: LoopFlags
25402540
newline: predicate
25412541
comment: |
25422542
Represents the use of the `until` keyword, either in the block form or the modifier form.
@@ -2564,6 +2564,9 @@ nodes:
25642564
end
25652565
- name: WhileNode
25662566
fields:
2567+
- name: flags
2568+
type: flags
2569+
kind: LoopFlags
25672570
- name: keyword_loc
25682571
type: location
25692572
- name: closing_loc
@@ -2573,9 +2576,6 @@ nodes:
25732576
- name: statements
25742577
type: node?
25752578
kind: StatementsNode
2576-
- name: flags
2577-
type: flags
2578-
kind: LoopFlags
25792579
newline: predicate
25802580
comment: |
25812581
Represents the use of the `while` keyword, either in the block form or the modifier form.

lib/prism/desugar_compiler.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,15 +157,15 @@ def desugar_operator_write_node(node, read_class, write_class, *arguments)
157157
*arguments,
158158
node.name_loc,
159159
CallNode.new(
160+
0,
160161
read_class.new(*arguments, node.name_loc),
161162
nil,
162163
node.operator_loc.slice.chomp("="),
163164
node.operator_loc.copy(length: node.operator_loc.length - 1),
164165
nil,
165-
ArgumentsNode.new([node.value], 0, node.value.location),
166+
ArgumentsNode.new(0, [node.value], node.value.location),
166167
nil,
167168
nil,
168-
0,
169169
node.location
170170
),
171171
node.operator_loc.copy(start_offset: node.operator_loc.end_offset - 1, length: 1),

0 commit comments

Comments
 (0)