refract 1.0.0 → 1.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/README.md +15 -0
- data/lib/refract/basic_visitor.rb +3 -3
- data/lib/refract/converter.rb +101 -7
- data/lib/refract/formatter.rb +436 -170
- data/lib/refract/mutation_visitor.rb +17 -1
- data/lib/refract/nodes/alias_global_variable_node.rb +1 -1
- data/lib/refract/nodes/call_and_write_node.rb +3 -2
- data/lib/refract/nodes/call_node.rb +5 -2
- data/lib/refract/nodes/call_operator_write_node.rb +3 -2
- data/lib/refract/nodes/call_or_write_node.rb +3 -2
- data/lib/refract/nodes/false_node.rb +1 -0
- data/lib/refract/nodes/forwarding_arguments_node.rb +1 -0
- data/lib/refract/nodes/forwarding_parameter_node.rb +1 -0
- data/lib/refract/nodes/hash_pattern_node.rb +3 -2
- data/lib/refract/nodes/implicit_rest_node.rb +1 -0
- data/lib/refract/nodes/interpolated_match_last_line_node.rb +3 -2
- data/lib/refract/nodes/interpolated_regular_expression_node.rb +3 -2
- data/lib/refract/nodes/it_local_variable_read_node.rb +1 -0
- data/lib/refract/nodes/it_parameters_node.rb +1 -0
- data/lib/refract/nodes/match_last_line_node.rb +3 -2
- data/lib/refract/nodes/missing_node.rb +1 -0
- data/lib/refract/nodes/nil_node.rb +1 -0
- data/lib/refract/nodes/no_keywords_parameter_node.rb +1 -0
- data/lib/refract/nodes/numbered_parameters_node.rb +1 -0
- data/lib/refract/nodes/program_node.rb +4 -2
- data/lib/refract/nodes/redo_node.rb +1 -0
- data/lib/refract/nodes/regular_expression_node.rb +3 -2
- data/lib/refract/nodes/retry_node.rb +1 -0
- data/lib/refract/nodes/self_node.rb +1 -0
- data/lib/refract/nodes/shareable_constant_node.rb +3 -2
- data/lib/refract/nodes/source_encoding_node.rb +1 -0
- data/lib/refract/nodes/source_file_node.rb +1 -0
- data/lib/refract/nodes/source_line_node.rb +1 -0
- data/lib/refract/nodes/symbol_node.rb +3 -2
- data/lib/refract/nodes/true_node.rb +1 -0
- data/lib/refract/version.rb +1 -1
- data/lib/refract/visitor.rb +3 -1
- data/lib/refract.rb +27 -0
- metadata +2 -2
data/lib/refract/formatter.rb
CHANGED
|
@@ -2,25 +2,88 @@
|
|
|
2
2
|
|
|
3
3
|
module Refract
|
|
4
4
|
class Formatter < BasicVisitor
|
|
5
|
-
|
|
6
|
-
|
|
5
|
+
Result = Data.define(:source, :source_map)
|
|
6
|
+
|
|
7
|
+
IDENTIFIER = /(?:[A-Za-z_]|[^\x00-\x7F])(?:\w|[^\x00-\x7F])*/
|
|
8
|
+
BARE_IDENTIFIER = /\A#{IDENTIFIER}\z/
|
|
9
|
+
SETTER = /\A#{IDENTIFIER}=\z/
|
|
10
|
+
LABEL = /\A#{IDENTIFIER}[?!]?\z/
|
|
11
|
+
BARE_SYMBOL = %r{
|
|
12
|
+
\A(?:
|
|
13
|
+
#{IDENTIFIER}[?!=]?
|
|
14
|
+
| @@?#{IDENTIFIER}
|
|
15
|
+
| \$(?:#{IDENTIFIER}|-\w|\d+|[~*$?!@/\\;,.=:<>"&`'+])
|
|
16
|
+
| \[\]=? | [+-]@? | [~!] | \*\*? | [/%&|^`] | <=> | ===? | =~ | !~ | != | <[<=]? | >[>=]?
|
|
17
|
+
)\z
|
|
18
|
+
}x
|
|
19
|
+
|
|
20
|
+
STRING_ESCAPES = {
|
|
21
|
+
"\n" => "\\n",
|
|
22
|
+
"\t" => "\\t",
|
|
23
|
+
"\r" => "\\r",
|
|
24
|
+
"\f" => "\\f",
|
|
25
|
+
"\v" => "\\v",
|
|
26
|
+
"\a" => "\\a",
|
|
27
|
+
"\b" => "\\b",
|
|
28
|
+
"\e" => "\\e",
|
|
29
|
+
}.freeze
|
|
30
|
+
|
|
31
|
+
# In a regexp, `#` only needs escaping where it would start interpolation.
|
|
32
|
+
# The end of the source counts, since the closing `/` can form `$/`.
|
|
33
|
+
REGEXP_INTERPOLATION = %r{#(?=\{|@@?(?:[A-Za-z_]|[^\x00-\x7F])|\$(?:[A-Za-z_~*$?!@/\\;,.=:<>"&`'+\d]|-\w|[^\x00-\x7F]|\z))}
|
|
34
|
+
|
|
35
|
+
ESCAPE_PATTERNS = {
|
|
36
|
+
'"' => /[\\"]|#(?=[{@$])|[^[:print:]]/,
|
|
37
|
+
"`" => /[\\`]|#(?=[{@$])|[^[:print:]]/,
|
|
38
|
+
}.freeze
|
|
39
|
+
|
|
40
|
+
NON_ASCII = /[^\x00-\x7F]/
|
|
41
|
+
|
|
42
|
+
REGEXP_ENCODINGS = {
|
|
43
|
+
ascii_8bit: "n",
|
|
44
|
+
euc_jp: "e",
|
|
45
|
+
windows_31j: "s",
|
|
46
|
+
utf_8: "u",
|
|
47
|
+
}.freeze
|
|
48
|
+
|
|
49
|
+
def initialize(starting_line: 1)
|
|
50
|
+
super()
|
|
7
51
|
@buffer = []
|
|
8
52
|
@source_map = []
|
|
9
|
-
@
|
|
53
|
+
@inferred_lines = Set.new
|
|
54
|
+
@current_line = starting_line
|
|
10
55
|
@indent = 0
|
|
56
|
+
@shareable_constant_value = :none
|
|
11
57
|
end
|
|
12
58
|
|
|
13
|
-
def around_visit(node)
|
|
14
|
-
|
|
15
|
-
|
|
59
|
+
def around_visit(node, &)
|
|
60
|
+
value = shareable_constant_value_within(node) if statement?(node)
|
|
61
|
+
|
|
62
|
+
if value && (value != :none || @shareable_constant_value != :none)
|
|
63
|
+
shareable_constant_value(value) { map_source_and_visit(node, &) }
|
|
64
|
+
else
|
|
65
|
+
map_source_and_visit(node, &)
|
|
16
66
|
end
|
|
67
|
+
end
|
|
68
|
+
|
|
69
|
+
def visit_each(nodes)
|
|
70
|
+
nodes = nodes.compact
|
|
71
|
+
last = nodes.length - 1
|
|
17
72
|
|
|
18
|
-
|
|
73
|
+
nodes.each_with_index do |node, index|
|
|
74
|
+
length = @buffer.length
|
|
75
|
+
visit node
|
|
76
|
+
yield if block_given? && index < last && @buffer.length > length
|
|
77
|
+
end
|
|
19
78
|
end
|
|
20
79
|
|
|
21
80
|
def format_node(node)
|
|
22
81
|
visit(node)
|
|
23
|
-
|
|
82
|
+
|
|
83
|
+
Result.new(
|
|
84
|
+
source: @buffer.join,
|
|
85
|
+
source_map: @source_map,
|
|
86
|
+
)
|
|
24
87
|
end
|
|
25
88
|
|
|
26
89
|
visit AliasGlobalVariableNode do |node|
|
|
@@ -69,18 +132,23 @@ module Refract
|
|
|
69
132
|
visit ArrayPatternNode do |node|
|
|
70
133
|
visit node.constant
|
|
71
134
|
brackets do
|
|
72
|
-
visit_each(node.requireds) { push ", " }
|
|
73
|
-
visit(node.rest)
|
|
135
|
+
visit_each([*node.requireds, node.rest, *node.posts]) { push ", " }
|
|
74
136
|
end
|
|
75
137
|
end
|
|
76
138
|
|
|
77
139
|
visit AssocNode do |node|
|
|
78
140
|
case node.key
|
|
79
141
|
when SymbolNode
|
|
80
|
-
|
|
142
|
+
bare = !node.key.quoted && bare?(node.key.unescaped, LABEL)
|
|
143
|
+
push(bare ? node.key.unescaped : quote(node.key.unescaped))
|
|
81
144
|
push ":"
|
|
82
|
-
|
|
83
|
-
|
|
145
|
+
|
|
146
|
+
if ImplicitNode === node.value && bare && shorthand?(node.key, node.value.value)
|
|
147
|
+
visit node.value
|
|
148
|
+
else
|
|
149
|
+
space
|
|
150
|
+
visit((ImplicitNode === node.value) ? node.value.value : node.value)
|
|
151
|
+
end
|
|
84
152
|
else
|
|
85
153
|
visit node.key
|
|
86
154
|
push " => "
|
|
@@ -98,32 +166,30 @@ module Refract
|
|
|
98
166
|
end
|
|
99
167
|
|
|
100
168
|
visit BeginNode do |node|
|
|
101
|
-
|
|
102
|
-
push "begin"
|
|
103
|
-
|
|
104
|
-
indent do
|
|
105
|
-
visit node.statements
|
|
106
|
-
end
|
|
169
|
+
push "begin"
|
|
107
170
|
|
|
108
|
-
|
|
171
|
+
indent do
|
|
172
|
+
visit node.statements
|
|
173
|
+
end
|
|
109
174
|
|
|
110
|
-
|
|
111
|
-
visit node.rescue_clause
|
|
112
|
-
new_line
|
|
113
|
-
end
|
|
175
|
+
new_line
|
|
114
176
|
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
177
|
+
if node.rescue_clause
|
|
178
|
+
visit node.rescue_clause
|
|
179
|
+
new_line
|
|
180
|
+
end
|
|
119
181
|
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
182
|
+
if node.else_clause
|
|
183
|
+
visit node.else_clause
|
|
184
|
+
new_line
|
|
185
|
+
end
|
|
124
186
|
|
|
125
|
-
|
|
187
|
+
if node.ensure_clause
|
|
188
|
+
visit node.ensure_clause
|
|
189
|
+
new_line
|
|
126
190
|
end
|
|
191
|
+
|
|
192
|
+
push "end"
|
|
127
193
|
end
|
|
128
194
|
|
|
129
195
|
visit BlockArgumentNode do |node|
|
|
@@ -180,24 +246,33 @@ module Refract
|
|
|
180
246
|
end
|
|
181
247
|
|
|
182
248
|
visit CallAndWriteNode do |node|
|
|
183
|
-
|
|
184
|
-
visit node.receiver
|
|
185
|
-
push "."
|
|
186
|
-
end
|
|
187
|
-
|
|
249
|
+
call_receiver(node)
|
|
188
250
|
push node.read_name
|
|
189
|
-
|
|
190
|
-
push "&&="
|
|
191
|
-
space
|
|
251
|
+
push " &&= "
|
|
192
252
|
visit node.value
|
|
193
253
|
end
|
|
194
254
|
|
|
195
255
|
visit CallNode do |node|
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
256
|
+
arguments = node.arguments&.arguments
|
|
257
|
+
|
|
258
|
+
if node.attribute_write && node.block.nil? && arguments
|
|
259
|
+
if node.name == :[]= && !node.safe_navigation
|
|
260
|
+
*index, value = arguments
|
|
261
|
+
parenthesize(low_precedence?(node.receiver)) { visit node.receiver }
|
|
262
|
+
brackets { visit_each(index) { push ", " } }
|
|
263
|
+
push " = "
|
|
264
|
+
visit value
|
|
265
|
+
return
|
|
266
|
+
elsif node.name.match?(SETTER) && arguments.length == 1
|
|
267
|
+
call_receiver(node)
|
|
268
|
+
push node.name.name.delete_suffix("=")
|
|
269
|
+
push " = "
|
|
270
|
+
visit arguments.first
|
|
271
|
+
return
|
|
272
|
+
end
|
|
199
273
|
end
|
|
200
274
|
|
|
275
|
+
call_receiver(node)
|
|
201
276
|
push node.name
|
|
202
277
|
|
|
203
278
|
case node.block
|
|
@@ -220,30 +295,23 @@ module Refract
|
|
|
220
295
|
else
|
|
221
296
|
if node.arguments
|
|
222
297
|
parens { visit node.arguments }
|
|
298
|
+
elsif !node.receiver && !node.variable_call && node.name.match?(BARE_IDENTIFIER)
|
|
299
|
+
push "()"
|
|
223
300
|
end
|
|
224
301
|
end
|
|
225
302
|
end
|
|
226
303
|
|
|
227
304
|
visit CallOperatorWriteNode do |node|
|
|
228
|
-
|
|
229
|
-
visit node.receiver
|
|
230
|
-
push "."
|
|
231
|
-
end
|
|
232
|
-
|
|
305
|
+
call_receiver(node)
|
|
233
306
|
push node.read_name
|
|
234
307
|
space
|
|
235
308
|
push node.binary_operator
|
|
236
|
-
push "="
|
|
237
|
-
space
|
|
309
|
+
push "= "
|
|
238
310
|
visit node.value
|
|
239
311
|
end
|
|
240
312
|
|
|
241
313
|
visit CallOrWriteNode do |node|
|
|
242
|
-
|
|
243
|
-
visit node.receiver
|
|
244
|
-
push "."
|
|
245
|
-
end
|
|
246
|
-
|
|
314
|
+
call_receiver(node)
|
|
247
315
|
push node.read_name
|
|
248
316
|
push " ||= "
|
|
249
317
|
visit node.value
|
|
@@ -563,10 +631,17 @@ module Refract
|
|
|
563
631
|
end
|
|
564
632
|
|
|
565
633
|
visit HashPatternNode do |node|
|
|
566
|
-
|
|
567
|
-
|
|
568
|
-
|
|
569
|
-
|
|
634
|
+
if node.constant
|
|
635
|
+
visit node.constant
|
|
636
|
+
brackets do
|
|
637
|
+
visit_each([*node.elements, node.rest]) { push ", " }
|
|
638
|
+
end
|
|
639
|
+
else
|
|
640
|
+
braces do
|
|
641
|
+
space
|
|
642
|
+
visit_each([*node.elements, node.rest]) { push ", " }
|
|
643
|
+
space
|
|
644
|
+
end
|
|
570
645
|
end
|
|
571
646
|
end
|
|
572
647
|
|
|
@@ -575,13 +650,8 @@ module Refract
|
|
|
575
650
|
visit node.statements
|
|
576
651
|
push " if "
|
|
577
652
|
visit node.predicate
|
|
578
|
-
|
|
579
|
-
|
|
580
|
-
if IfNode === @stack[-2]
|
|
581
|
-
push "elsif "
|
|
582
|
-
else
|
|
583
|
-
push "if "
|
|
584
|
-
end
|
|
653
|
+
elsif (IfNode === @stack[-2]) && @stack[-2].subsequent.equal?(node)
|
|
654
|
+
push "elsif "
|
|
585
655
|
visit node.predicate
|
|
586
656
|
if node.statements
|
|
587
657
|
indent do
|
|
@@ -592,7 +662,19 @@ module Refract
|
|
|
592
662
|
new_line
|
|
593
663
|
visit node.subsequent
|
|
594
664
|
end
|
|
595
|
-
|
|
665
|
+
else
|
|
666
|
+
parenthesize(modifier_ambiguous?) do
|
|
667
|
+
push "if "
|
|
668
|
+
visit node.predicate
|
|
669
|
+
if node.statements
|
|
670
|
+
indent do
|
|
671
|
+
visit node.statements
|
|
672
|
+
end
|
|
673
|
+
end
|
|
674
|
+
if node.subsequent
|
|
675
|
+
new_line
|
|
676
|
+
visit node.subsequent
|
|
677
|
+
end
|
|
596
678
|
new_line
|
|
597
679
|
push "end"
|
|
598
680
|
end
|
|
@@ -695,70 +777,34 @@ module Refract
|
|
|
695
777
|
|
|
696
778
|
visit InterpolatedMatchLastLineNode do |node|
|
|
697
779
|
push "/"
|
|
698
|
-
node.parts
|
|
699
|
-
case part
|
|
700
|
-
when StringNode
|
|
701
|
-
push part.unescaped.gsub("/", "\\/")
|
|
702
|
-
else
|
|
703
|
-
visit part
|
|
704
|
-
end
|
|
705
|
-
end
|
|
780
|
+
visit_parts(node.parts) { |string| push escape_regexp(string) }
|
|
706
781
|
push "/"
|
|
782
|
+
regexp_flags(node)
|
|
707
783
|
end
|
|
708
784
|
|
|
709
785
|
visit InterpolatedRegularExpressionNode do |node|
|
|
710
786
|
push "/"
|
|
711
|
-
node.parts
|
|
712
|
-
case part
|
|
713
|
-
when StringNode
|
|
714
|
-
push part.unescaped.gsub("/", "\\/")
|
|
715
|
-
else
|
|
716
|
-
visit part
|
|
717
|
-
end
|
|
718
|
-
end
|
|
787
|
+
visit_parts(node.parts) { |string| push escape_regexp(string) }
|
|
719
788
|
push "/"
|
|
720
|
-
|
|
721
|
-
push "m" if node.multi_line
|
|
722
|
-
push "x" if node.extended
|
|
723
|
-
push "o" if node.once
|
|
789
|
+
regexp_flags(node)
|
|
724
790
|
end
|
|
725
791
|
|
|
726
792
|
visit InterpolatedStringNode do |node|
|
|
727
793
|
doubles do
|
|
728
|
-
node.parts
|
|
729
|
-
case part
|
|
730
|
-
when StringNode
|
|
731
|
-
push part.unescaped.gsub('"', '\"')
|
|
732
|
-
else
|
|
733
|
-
visit part
|
|
734
|
-
end
|
|
735
|
-
end
|
|
794
|
+
visit_parts(node.parts) { |string| push escape_string(string, '"') }
|
|
736
795
|
end
|
|
737
796
|
end
|
|
738
797
|
|
|
739
798
|
visit InterpolatedSymbolNode do |node|
|
|
740
|
-
push
|
|
741
|
-
|
|
742
|
-
|
|
743
|
-
when StringNode
|
|
744
|
-
push part.unescaped.gsub('"', '\"')
|
|
745
|
-
else
|
|
746
|
-
visit part
|
|
747
|
-
end
|
|
799
|
+
push ":"
|
|
800
|
+
doubles do
|
|
801
|
+
visit_parts(node.parts) { |string| push escape_string(string, '"') }
|
|
748
802
|
end
|
|
749
|
-
push '"'
|
|
750
803
|
end
|
|
751
804
|
|
|
752
805
|
visit InterpolatedXStringNode do |node|
|
|
753
806
|
push "`"
|
|
754
|
-
node.parts
|
|
755
|
-
case part
|
|
756
|
-
when StringNode
|
|
757
|
-
push part.unescaped.gsub("`", "\\`")
|
|
758
|
-
else
|
|
759
|
-
visit part
|
|
760
|
-
end
|
|
761
|
-
end
|
|
807
|
+
visit_parts(node.parts) { |string| push escape_string(string, "`") }
|
|
762
808
|
push "`"
|
|
763
809
|
end
|
|
764
810
|
|
|
@@ -842,12 +888,9 @@ module Refract
|
|
|
842
888
|
|
|
843
889
|
visit MatchLastLineNode do |node|
|
|
844
890
|
push "/"
|
|
845
|
-
push node.unescaped
|
|
891
|
+
push escape_regexp(node.unescaped)
|
|
846
892
|
push "/"
|
|
847
|
-
|
|
848
|
-
push "m" if node.multi_line
|
|
849
|
-
push "x" if node.extended
|
|
850
|
-
push "o" if node.once
|
|
893
|
+
regexp_flags(node)
|
|
851
894
|
end
|
|
852
895
|
|
|
853
896
|
visit MatchPredicateNode do |node|
|
|
@@ -863,8 +906,9 @@ module Refract
|
|
|
863
906
|
end
|
|
864
907
|
|
|
865
908
|
visit MatchWriteNode do |node|
|
|
866
|
-
visit node.call
|
|
867
|
-
|
|
909
|
+
visit node.call.receiver
|
|
910
|
+
push " =~ "
|
|
911
|
+
visit node.call.arguments
|
|
868
912
|
end
|
|
869
913
|
|
|
870
914
|
visit MissingNode do |node|
|
|
@@ -885,7 +929,9 @@ module Refract
|
|
|
885
929
|
end
|
|
886
930
|
|
|
887
931
|
visit MultiTargetNode do |node|
|
|
888
|
-
|
|
932
|
+
parenthesize(!(ForNode === @stack[-2])) do
|
|
933
|
+
visit_each([*node.lefts, node.rest, *node.rights]) { push ", " }
|
|
934
|
+
end
|
|
889
935
|
end
|
|
890
936
|
|
|
891
937
|
visit MultiWriteNode do |node|
|
|
@@ -987,6 +1033,18 @@ module Refract
|
|
|
987
1033
|
end
|
|
988
1034
|
|
|
989
1035
|
visit ProgramNode do |node|
|
|
1036
|
+
@escape_non_ascii = node.encoding && node.encoding != Encoding::UTF_8
|
|
1037
|
+
|
|
1038
|
+
if node.encoding && node.encoding != Encoding::UTF_8
|
|
1039
|
+
push "# encoding: #{node.encoding.name}"
|
|
1040
|
+
new_line
|
|
1041
|
+
end
|
|
1042
|
+
|
|
1043
|
+
unless node.frozen_string_literal.nil?
|
|
1044
|
+
push "# frozen_string_literal: #{node.frozen_string_literal}"
|
|
1045
|
+
new_line
|
|
1046
|
+
end
|
|
1047
|
+
|
|
990
1048
|
visit node.statements
|
|
991
1049
|
end
|
|
992
1050
|
|
|
@@ -997,12 +1055,7 @@ module Refract
|
|
|
997
1055
|
end
|
|
998
1056
|
|
|
999
1057
|
visit RationalNode do |node|
|
|
1000
|
-
|
|
1001
|
-
push node.numerator.to_s
|
|
1002
|
-
push "r"
|
|
1003
|
-
else
|
|
1004
|
-
push "#{(node.numerator.to_f / node.denominator)}r"
|
|
1005
|
-
end
|
|
1058
|
+
push rational(node.numerator, node.denominator)
|
|
1006
1059
|
end
|
|
1007
1060
|
|
|
1008
1061
|
visit RedoNode do |node|
|
|
@@ -1011,12 +1064,9 @@ module Refract
|
|
|
1011
1064
|
|
|
1012
1065
|
visit RegularExpressionNode do |node|
|
|
1013
1066
|
push "/"
|
|
1014
|
-
push node.unescaped
|
|
1067
|
+
push escape_regexp(node.unescaped)
|
|
1015
1068
|
push "/"
|
|
1016
|
-
|
|
1017
|
-
push "m" if node.multi_line
|
|
1018
|
-
push "x" if node.extended
|
|
1019
|
-
push "o" if node.once
|
|
1069
|
+
regexp_flags(node)
|
|
1020
1070
|
end
|
|
1021
1071
|
|
|
1022
1072
|
visit RequiredKeywordParameterNode do |node|
|
|
@@ -1080,7 +1130,11 @@ module Refract
|
|
|
1080
1130
|
end
|
|
1081
1131
|
|
|
1082
1132
|
visit ShareableConstantNode do |node|
|
|
1083
|
-
|
|
1133
|
+
if @stack.length == 1
|
|
1134
|
+
shareable_constant_value(node.value) { visit node.write }
|
|
1135
|
+
else
|
|
1136
|
+
visit node.write
|
|
1137
|
+
end
|
|
1084
1138
|
end
|
|
1085
1139
|
|
|
1086
1140
|
visit SingletonClassNode do |node|
|
|
@@ -1106,7 +1160,7 @@ module Refract
|
|
|
1106
1160
|
end
|
|
1107
1161
|
|
|
1108
1162
|
visit SourceLineNode do |node|
|
|
1109
|
-
push "__LINE__"
|
|
1163
|
+
push node.start_line&.to_s || "__LINE__"
|
|
1110
1164
|
end
|
|
1111
1165
|
|
|
1112
1166
|
visit SplatNode do |node|
|
|
@@ -1115,28 +1169,33 @@ module Refract
|
|
|
1115
1169
|
end
|
|
1116
1170
|
|
|
1117
1171
|
visit StatementsNode do |node|
|
|
1118
|
-
visit_each(node.body) { new_line }
|
|
1172
|
+
visit_each(flatten_statements(node.body)) { new_line }
|
|
1119
1173
|
end
|
|
1120
1174
|
|
|
1121
1175
|
visit StringNode do |node|
|
|
1122
|
-
|
|
1123
|
-
push node.unescaped.gsub('"', '\"')
|
|
1124
|
-
end
|
|
1176
|
+
push quote(node.unescaped)
|
|
1125
1177
|
end
|
|
1126
1178
|
|
|
1127
1179
|
visit SuperNode do |node|
|
|
1128
1180
|
push "super"
|
|
1129
|
-
|
|
1130
|
-
|
|
1131
|
-
|
|
1132
|
-
|
|
1181
|
+
|
|
1182
|
+
parens do
|
|
1183
|
+
visit_each([node.arguments, (node.block if BlockArgumentNode === node.block)]) { push ", " }
|
|
1184
|
+
end
|
|
1185
|
+
|
|
1186
|
+
if BlockNode === node.block
|
|
1187
|
+
space
|
|
1188
|
+
visit node.block
|
|
1133
1189
|
end
|
|
1134
|
-
visit node.block if node.block
|
|
1135
1190
|
end
|
|
1136
1191
|
|
|
1137
1192
|
visit SymbolNode do |node|
|
|
1138
1193
|
push ":"
|
|
1139
|
-
|
|
1194
|
+
if node.quoted || !bare?(node.unescaped, BARE_SYMBOL)
|
|
1195
|
+
push quote(node.unescaped)
|
|
1196
|
+
else
|
|
1197
|
+
push node.unescaped
|
|
1198
|
+
end
|
|
1140
1199
|
end
|
|
1141
1200
|
|
|
1142
1201
|
visit TrueNode do |node|
|
|
@@ -1155,22 +1214,24 @@ module Refract
|
|
|
1155
1214
|
push " unless "
|
|
1156
1215
|
visit node.predicate
|
|
1157
1216
|
else
|
|
1158
|
-
|
|
1159
|
-
|
|
1217
|
+
parenthesize(modifier_ambiguous?) do
|
|
1218
|
+
push "unless "
|
|
1219
|
+
visit node.predicate
|
|
1220
|
+
|
|
1221
|
+
if node.statements
|
|
1222
|
+
indent do
|
|
1223
|
+
visit node.statements
|
|
1224
|
+
end
|
|
1225
|
+
end
|
|
1160
1226
|
|
|
1161
|
-
|
|
1162
|
-
|
|
1163
|
-
visit node.
|
|
1227
|
+
if node.else_clause
|
|
1228
|
+
new_line
|
|
1229
|
+
visit node.else_clause
|
|
1164
1230
|
end
|
|
1165
|
-
end
|
|
1166
1231
|
|
|
1167
|
-
if node.else_clause
|
|
1168
1232
|
new_line
|
|
1169
|
-
|
|
1233
|
+
push "end"
|
|
1170
1234
|
end
|
|
1171
|
-
|
|
1172
|
-
new_line
|
|
1173
|
-
push "end"
|
|
1174
1235
|
end
|
|
1175
1236
|
end
|
|
1176
1237
|
|
|
@@ -1180,15 +1241,17 @@ module Refract
|
|
|
1180
1241
|
push " until "
|
|
1181
1242
|
visit node.predicate
|
|
1182
1243
|
else
|
|
1183
|
-
|
|
1184
|
-
|
|
1185
|
-
|
|
1186
|
-
|
|
1187
|
-
|
|
1244
|
+
parenthesize(modifier_ambiguous?) do
|
|
1245
|
+
push "until "
|
|
1246
|
+
visit node.predicate
|
|
1247
|
+
if node.statements
|
|
1248
|
+
indent do
|
|
1249
|
+
visit node.statements
|
|
1250
|
+
end
|
|
1188
1251
|
end
|
|
1252
|
+
new_line
|
|
1253
|
+
push "end"
|
|
1189
1254
|
end
|
|
1190
|
-
new_line
|
|
1191
|
-
push "end"
|
|
1192
1255
|
end
|
|
1193
1256
|
end
|
|
1194
1257
|
|
|
@@ -1207,21 +1270,23 @@ module Refract
|
|
|
1207
1270
|
push " while "
|
|
1208
1271
|
visit node.predicate
|
|
1209
1272
|
else
|
|
1210
|
-
|
|
1211
|
-
|
|
1212
|
-
|
|
1213
|
-
|
|
1214
|
-
|
|
1273
|
+
parenthesize(modifier_ambiguous?) do
|
|
1274
|
+
push "while "
|
|
1275
|
+
visit node.predicate
|
|
1276
|
+
if node.statements
|
|
1277
|
+
indent do
|
|
1278
|
+
visit node.statements
|
|
1279
|
+
end
|
|
1215
1280
|
end
|
|
1281
|
+
new_line
|
|
1282
|
+
push "end"
|
|
1216
1283
|
end
|
|
1217
|
-
new_line
|
|
1218
|
-
push "end"
|
|
1219
1284
|
end
|
|
1220
1285
|
end
|
|
1221
1286
|
|
|
1222
1287
|
visit XStringNode do |node|
|
|
1223
1288
|
push "`"
|
|
1224
|
-
push node.unescaped
|
|
1289
|
+
push escape_string(node.unescaped, "`")
|
|
1225
1290
|
push "`"
|
|
1226
1291
|
end
|
|
1227
1292
|
|
|
@@ -1242,6 +1307,7 @@ module Refract
|
|
|
1242
1307
|
value.name
|
|
1243
1308
|
end
|
|
1244
1309
|
|
|
1310
|
+
@current_line += string.count("\n") if string
|
|
1245
1311
|
@buffer << string
|
|
1246
1312
|
end
|
|
1247
1313
|
|
|
@@ -1300,5 +1366,205 @@ module Refract
|
|
|
1300
1366
|
yield
|
|
1301
1367
|
push '"'
|
|
1302
1368
|
end
|
|
1369
|
+
|
|
1370
|
+
private def rational(numerator, denominator)
|
|
1371
|
+
rest, twos, fives = denominator, 0, 0
|
|
1372
|
+
(rest /= 2) && (twos += 1) while rest.even?
|
|
1373
|
+
(rest /= 5) && (fives += 1) while (rest % 5).zero?
|
|
1374
|
+
return "(#{numerator}r/#{denominator})" unless rest == 1
|
|
1375
|
+
|
|
1376
|
+
places = [twos, fives].max
|
|
1377
|
+
digits = (numerator.abs * (10 ** places) / denominator).to_s.rjust(places + 1, "0")
|
|
1378
|
+
sign = numerator.negative? ? "-" : ""
|
|
1379
|
+
|
|
1380
|
+
if places.zero?
|
|
1381
|
+
"#{sign}#{digits}r"
|
|
1382
|
+
else
|
|
1383
|
+
"#{sign}#{digits[0...-places]}.#{digits[-places..]}r"
|
|
1384
|
+
end
|
|
1385
|
+
end
|
|
1386
|
+
|
|
1387
|
+
private def shorthand?(key, value)
|
|
1388
|
+
case value
|
|
1389
|
+
when LocalVariableReadNode, LocalVariableTargetNode, ConstantReadNode
|
|
1390
|
+
value.name.name == key.unescaped
|
|
1391
|
+
when CallNode
|
|
1392
|
+
value.name.name == key.unescaped && !value.receiver && !value.arguments && !value.block
|
|
1393
|
+
else
|
|
1394
|
+
false
|
|
1395
|
+
end
|
|
1396
|
+
end
|
|
1397
|
+
|
|
1398
|
+
# The outermost located node that starts on a line claims it. A node
|
|
1399
|
+
# without a location only fills an unclaimed line, with the line of its
|
|
1400
|
+
# nearest located ancestor, until a located node starts there.
|
|
1401
|
+
private def map_source_and_visit(node)
|
|
1402
|
+
if (start_line = node.start_line)
|
|
1403
|
+
if @source_map[@current_line].nil? || @inferred_lines.delete?(@current_line)
|
|
1404
|
+
@source_map[@current_line] = start_line
|
|
1405
|
+
end
|
|
1406
|
+
elsif @source_map[@current_line].nil? && (start_line = @stack.reverse_each.lazy.filter_map(&:start_line).first)
|
|
1407
|
+
@source_map[@current_line] = start_line
|
|
1408
|
+
@inferred_lines << @current_line
|
|
1409
|
+
end
|
|
1410
|
+
|
|
1411
|
+
yield(node)
|
|
1412
|
+
end
|
|
1413
|
+
|
|
1414
|
+
# A statement on lines of its own, so a magic comment can go before and after it.
|
|
1415
|
+
private def statement?(node)
|
|
1416
|
+
StatementsNode === @stack[-2] && !inline_statements?(@stack[-3])
|
|
1417
|
+
end
|
|
1418
|
+
|
|
1419
|
+
private def inline_statements?(parent)
|
|
1420
|
+
case parent
|
|
1421
|
+
when IfNode, UnlessNode, WhileNode, UntilNode
|
|
1422
|
+
parent.inline
|
|
1423
|
+
when ParenthesesNode, EmbeddedStatementsNode
|
|
1424
|
+
true
|
|
1425
|
+
else
|
|
1426
|
+
false
|
|
1427
|
+
end
|
|
1428
|
+
end
|
|
1429
|
+
|
|
1430
|
+
private def shareable_constant_value_within(node)
|
|
1431
|
+
case node
|
|
1432
|
+
when ShareableConstantNode
|
|
1433
|
+
return node.value
|
|
1434
|
+
when ConstantWriteNode, ConstantOrWriteNode, ConstantAndWriteNode, ConstantOperatorWriteNode,
|
|
1435
|
+
ConstantPathWriteNode, ConstantPathOrWriteNode, ConstantPathAndWriteNode, ConstantPathOperatorWriteNode
|
|
1436
|
+
|
|
1437
|
+
return :none
|
|
1438
|
+
end
|
|
1439
|
+
|
|
1440
|
+
node.class.attributes.each do |name|
|
|
1441
|
+
Array(node.public_send(name)).each do |child|
|
|
1442
|
+
next unless Node === child
|
|
1443
|
+
next if StatementsNode === child && !inline_statements?(node)
|
|
1444
|
+
|
|
1445
|
+
value = shareable_constant_value_within(child)
|
|
1446
|
+
return value if value
|
|
1447
|
+
end
|
|
1448
|
+
end
|
|
1449
|
+
|
|
1450
|
+
nil
|
|
1451
|
+
end
|
|
1452
|
+
|
|
1453
|
+
private def shareable_constant_value(value)
|
|
1454
|
+
previous = @shareable_constant_value
|
|
1455
|
+
@shareable_constant_value = value
|
|
1456
|
+
|
|
1457
|
+
push "# shareable_constant_value: #{value}"
|
|
1458
|
+
new_line
|
|
1459
|
+
yield
|
|
1460
|
+
new_line
|
|
1461
|
+
push "# shareable_constant_value: #{previous}"
|
|
1462
|
+
ensure
|
|
1463
|
+
@shareable_constant_value = previous
|
|
1464
|
+
end
|
|
1465
|
+
|
|
1466
|
+
private def bare?(name, pattern)
|
|
1467
|
+
name.valid_encoding? && (name.ascii_only? || !@escape_non_ascii) && name.match?(pattern)
|
|
1468
|
+
end
|
|
1469
|
+
|
|
1470
|
+
private def low_precedence?(node)
|
|
1471
|
+
case node
|
|
1472
|
+
when AndNode, OrNode, RescueModifierNode, RangeNode, FlipFlopNode, MatchPredicateNode, MatchRequiredNode, ShareableConstantNode
|
|
1473
|
+
true
|
|
1474
|
+
when IfNode, UnlessNode, WhileNode, UntilNode
|
|
1475
|
+
node.inline
|
|
1476
|
+
when CallNode
|
|
1477
|
+
node.attribute_write
|
|
1478
|
+
else
|
|
1479
|
+
node.type.end_with?("write_node")
|
|
1480
|
+
end
|
|
1481
|
+
end
|
|
1482
|
+
|
|
1483
|
+
private def call_receiver(node)
|
|
1484
|
+
return unless node.receiver
|
|
1485
|
+
|
|
1486
|
+
parenthesize(low_precedence?(node.receiver)) { visit node.receiver }
|
|
1487
|
+
push "&" if node.safe_navigation
|
|
1488
|
+
push "."
|
|
1489
|
+
end
|
|
1490
|
+
|
|
1491
|
+
private def parenthesize(condition, &)
|
|
1492
|
+
condition ? parens(&) : yield
|
|
1493
|
+
end
|
|
1494
|
+
|
|
1495
|
+
# `return`, `break`, `next` and `rescue` are complete on their own, so a
|
|
1496
|
+
# keyword expression after them would be read as a modifier.
|
|
1497
|
+
private def modifier_ambiguous?
|
|
1498
|
+
case @stack[-2]
|
|
1499
|
+
when RescueNode
|
|
1500
|
+
true
|
|
1501
|
+
when RescueModifierNode
|
|
1502
|
+
@stack[-2].rescue_expression.equal?(@stack[-1])
|
|
1503
|
+
when ArgumentsNode
|
|
1504
|
+
ReturnNode === @stack[-3] || BreakNode === @stack[-3] || NextNode === @stack[-3]
|
|
1505
|
+
else
|
|
1506
|
+
false
|
|
1507
|
+
end
|
|
1508
|
+
end
|
|
1509
|
+
|
|
1510
|
+
private def quote(string)
|
|
1511
|
+
if string.include?('"') && string.valid_encoding? && (string.ascii_only? || !@escape_non_ascii) && !string.match?(/['\\]|[^[:print:]]/)
|
|
1512
|
+
"'#{string}'"
|
|
1513
|
+
else
|
|
1514
|
+
%("#{escape_string(string, '"')}")
|
|
1515
|
+
end
|
|
1516
|
+
end
|
|
1517
|
+
|
|
1518
|
+
private def escape_string(string, delimiter)
|
|
1519
|
+
string = string.b unless string.encoding == Encoding::UTF_8 && string.valid_encoding?
|
|
1520
|
+
|
|
1521
|
+
pattern = ESCAPE_PATTERNS.fetch(delimiter)
|
|
1522
|
+
pattern = Regexp.union(pattern, NON_ASCII) if @escape_non_ascii
|
|
1523
|
+
|
|
1524
|
+
string.gsub(pattern) do |char|
|
|
1525
|
+
if (escape = STRING_ESCAPES[char])
|
|
1526
|
+
escape
|
|
1527
|
+
elsif char.bytesize == 1 && char.match?(/[[:print:]]/)
|
|
1528
|
+
"\\#{char}"
|
|
1529
|
+
elsif char.bytesize == 1
|
|
1530
|
+
format("\\x%02X", char.ord)
|
|
1531
|
+
else
|
|
1532
|
+
format("\\u{%X}", char.ord)
|
|
1533
|
+
end
|
|
1534
|
+
end
|
|
1535
|
+
end
|
|
1536
|
+
|
|
1537
|
+
private def escape_regexp(string)
|
|
1538
|
+
string = string.b unless string.valid_encoding?
|
|
1539
|
+
string.gsub(%r{\\.|/|#{REGEXP_INTERPOLATION}}m) { |match| (match.length == 2) ? match : "\\#{match}" }
|
|
1540
|
+
end
|
|
1541
|
+
|
|
1542
|
+
private def regexp_flags(node)
|
|
1543
|
+
push "i" if node.ignore_case
|
|
1544
|
+
push "m" if node.multi_line
|
|
1545
|
+
push "x" if node.extended
|
|
1546
|
+
push "o" if node.once
|
|
1547
|
+
push REGEXP_ENCODINGS.fetch(node.encoding) if node.encoding
|
|
1548
|
+
end
|
|
1549
|
+
|
|
1550
|
+
private def visit_parts(parts)
|
|
1551
|
+
flatten_parts(parts)
|
|
1552
|
+
.chunk_while { |a, b| StringNode === a && StringNode === b }
|
|
1553
|
+
.each do |chunk|
|
|
1554
|
+
if StringNode === chunk.first
|
|
1555
|
+
yield chunk.map(&:unescaped).join
|
|
1556
|
+
else
|
|
1557
|
+
visit chunk.first
|
|
1558
|
+
end
|
|
1559
|
+
end
|
|
1560
|
+
end
|
|
1561
|
+
|
|
1562
|
+
private def flatten_statements(body)
|
|
1563
|
+
body.flat_map { |statement| (StatementsNode === statement) ? flatten_statements(statement.body) : statement }
|
|
1564
|
+
end
|
|
1565
|
+
|
|
1566
|
+
private def flatten_parts(parts)
|
|
1567
|
+
parts.flat_map { |part| (InterpolatedStringNode === part) ? flatten_parts(part.parts) : part }
|
|
1568
|
+
end
|
|
1303
1569
|
end
|
|
1304
1570
|
end
|