prism 0.17.1 → 0.19.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +60 -1
- data/Makefile +5 -5
- data/README.md +4 -3
- data/config.yml +214 -68
- data/docs/build_system.md +6 -6
- data/docs/building.md +10 -3
- data/docs/configuration.md +11 -9
- data/docs/encoding.md +92 -88
- data/docs/heredocs.md +1 -1
- data/docs/javascript.md +29 -1
- data/docs/local_variable_depth.md +229 -0
- data/docs/ruby_api.md +16 -0
- data/docs/serialization.md +18 -13
- data/ext/prism/api_node.c +411 -240
- data/ext/prism/extconf.rb +97 -127
- data/ext/prism/extension.c +97 -33
- data/ext/prism/extension.h +1 -1
- data/include/prism/ast.h +377 -159
- data/include/prism/defines.h +17 -0
- data/include/prism/diagnostic.h +38 -6
- data/include/prism/{enc/pm_encoding.h → encoding.h} +126 -64
- data/include/prism/options.h +2 -2
- data/include/prism/parser.h +62 -36
- data/include/prism/regexp.h +2 -2
- data/include/prism/util/pm_buffer.h +9 -1
- data/include/prism/util/pm_memchr.h +2 -2
- data/include/prism/util/pm_strpbrk.h +3 -3
- data/include/prism/version.h +3 -3
- data/include/prism.h +13 -15
- data/lib/prism/compiler.rb +15 -3
- data/lib/prism/debug.rb +13 -4
- data/lib/prism/desugar_compiler.rb +4 -3
- data/lib/prism/dispatcher.rb +70 -14
- data/lib/prism/dot_visitor.rb +4612 -0
- data/lib/prism/dsl.rb +77 -57
- data/lib/prism/ffi.rb +19 -6
- data/lib/prism/lex_compat.rb +19 -9
- data/lib/prism/mutation_compiler.rb +26 -6
- data/lib/prism/node.rb +1314 -522
- data/lib/prism/node_ext.rb +102 -19
- data/lib/prism/parse_result.rb +58 -27
- data/lib/prism/ripper_compat.rb +49 -34
- data/lib/prism/serialize.rb +251 -227
- data/lib/prism/visitor.rb +15 -3
- data/lib/prism.rb +21 -4
- data/prism.gemspec +7 -9
- data/rbi/prism.rbi +688 -284
- data/rbi/prism_static.rbi +3 -0
- data/sig/prism.rbs +426 -156
- data/sig/prism_static.rbs +1 -0
- data/src/diagnostic.c +280 -216
- data/src/encoding.c +5137 -0
- data/src/node.c +99 -21
- data/src/options.c +21 -2
- data/src/prettyprint.c +1743 -1241
- data/src/prism.c +1774 -831
- data/src/regexp.c +15 -15
- data/src/serialize.c +261 -164
- data/src/util/pm_buffer.c +10 -1
- data/src/util/pm_memchr.c +1 -1
- data/src/util/pm_strpbrk.c +4 -4
- metadata +8 -10
- data/src/enc/pm_big5.c +0 -53
- data/src/enc/pm_euc_jp.c +0 -59
- data/src/enc/pm_gbk.c +0 -62
- data/src/enc/pm_shift_jis.c +0 -57
- data/src/enc/pm_tables.c +0 -743
- data/src/enc/pm_unicode.c +0 -2369
- data/src/enc/pm_windows_31j.c +0 -57
data/src/diagnostic.c
CHANGED
@@ -5,32 +5,33 @@
|
|
5
5
|
*
|
6
6
|
* When composing an error message, use sentence fragments.
|
7
7
|
*
|
8
|
-
* Try describing the property of the code that caused the error, rather than
|
9
|
-
* violated. It may help to use a fragment that completes
|
10
|
-
* encountered (a) ...". If appropriate, add a
|
11
|
-
* context) after a
|
8
|
+
* Try describing the property of the code that caused the error, rather than
|
9
|
+
* the rule that is being violated. It may help to use a fragment that completes
|
10
|
+
* a sentence beginning, "the parser encountered (a) ...". If appropriate, add a
|
11
|
+
* description of the rule violation (or other helpful context) after a
|
12
|
+
* semicolon.
|
12
13
|
*
|
13
|
-
* For example:, instead of "
|
14
|
+
* For example:, instead of "control escape sequence cannot be doubled", prefer:
|
14
15
|
*
|
15
|
-
* > "
|
16
|
+
* > "invalid control escape sequence; control cannot be repeated"
|
16
17
|
*
|
17
|
-
* In some cases, where the failure is more general or syntax expectations are
|
18
|
-
* more sense to use a fragment that completes a sentence
|
18
|
+
* In some cases, where the failure is more general or syntax expectations are
|
19
|
+
* violated, it may make more sense to use a fragment that completes a sentence
|
20
|
+
* beginning, "the parser ...".
|
19
21
|
*
|
20
22
|
* For example:
|
21
23
|
*
|
22
|
-
* > "
|
23
|
-
* > "
|
24
|
-
*
|
24
|
+
* > "expected an expression after `(`"
|
25
|
+
* > "cannot parse the expression"
|
25
26
|
*
|
26
27
|
* ## Message style guide
|
27
28
|
*
|
28
29
|
* - Use articles like "a", "an", and "the" when appropriate.
|
29
|
-
* - e.g., prefer "
|
30
|
+
* - e.g., prefer "cannot parse the expression" to "cannot parse expression".
|
30
31
|
* - Use the common name for tokens and nodes.
|
31
32
|
* - e.g., prefer "keyword splat" to "assoc splat"
|
32
33
|
* - e.g., prefer "embedded document" to "embdoc"
|
33
|
-
* -
|
34
|
+
* - Do not capitalize the initial word of the message.
|
34
35
|
* - Use back ticks around token literals
|
35
36
|
* - e.g., "Expected a `=>` between the hash key and value"
|
36
37
|
* - Do not use `.` or other punctuation at the end of the message.
|
@@ -38,7 +39,6 @@
|
|
38
39
|
* - For tokens that can have multiple meanings, reference the token and its meaning.
|
39
40
|
* - e.g., "`*` splat argument" is clearer and more complete than "splat argument" or "`*` argument"
|
40
41
|
*
|
41
|
-
*
|
42
42
|
* ## Error names (PM_ERR_*)
|
43
43
|
*
|
44
44
|
* - When appropriate, prefer node name to token name.
|
@@ -51,214 +51,229 @@
|
|
51
51
|
* sorted. See PM_ERR_ARGUMENT_NO_FORWARDING_* for an example.
|
52
52
|
*/
|
53
53
|
static const char* const diagnostic_messages[PM_DIAGNOSTIC_ID_LEN] = {
|
54
|
-
[PM_ERR_ALIAS_ARGUMENT] = "
|
55
|
-
[PM_ERR_AMPAMPEQ_MULTI_ASSIGN] = "
|
56
|
-
[PM_ERR_ARGUMENT_AFTER_BLOCK] = "
|
57
|
-
[
|
58
|
-
[
|
59
|
-
[
|
60
|
-
[
|
61
|
-
[
|
62
|
-
[
|
63
|
-
[
|
64
|
-
[
|
65
|
-
[
|
66
|
-
[
|
67
|
-
[
|
68
|
-
[
|
69
|
-
[
|
70
|
-
[
|
71
|
-
[
|
72
|
-
[
|
73
|
-
[
|
74
|
-
[
|
75
|
-
[
|
76
|
-
[
|
77
|
-
[
|
78
|
-
[
|
54
|
+
[PM_ERR_ALIAS_ARGUMENT] = "invalid argument being passed to `alias`; expected a bare word, symbol, constant, or global variable",
|
55
|
+
[PM_ERR_AMPAMPEQ_MULTI_ASSIGN] = "unexpected `&&=` in a multiple assignment",
|
56
|
+
[PM_ERR_ARGUMENT_AFTER_BLOCK] = "unexpected argument after a block argument",
|
57
|
+
[PM_ERR_ARGUMENT_AFTER_FORWARDING_ELLIPSES] = "unexpected argument after `...`",
|
58
|
+
[PM_ERR_ARGUMENT_BARE_HASH] = "unexpected bare hash argument",
|
59
|
+
[PM_ERR_ARGUMENT_BLOCK_MULTI] = "multiple block arguments; only one block is allowed",
|
60
|
+
[PM_ERR_ARGUMENT_FORMAL_CLASS] = "invalid formal argument; formal argument cannot be a class variable",
|
61
|
+
[PM_ERR_ARGUMENT_FORMAL_CONSTANT] = "invalid formal argument; formal argument cannot be a constant",
|
62
|
+
[PM_ERR_ARGUMENT_FORMAL_GLOBAL] = "invalid formal argument; formal argument cannot be a global variable",
|
63
|
+
[PM_ERR_ARGUMENT_FORMAL_IVAR] = "invalid formal argument; formal argument cannot be an instance variable",
|
64
|
+
[PM_ERR_ARGUMENT_FORWARDING_UNBOUND] = "unexpected `...` in an non-parenthesized call",
|
65
|
+
[PM_ERR_ARGUMENT_NO_FORWARDING_AMP] = "unexpected `&` when the parent method is not forwarding",
|
66
|
+
[PM_ERR_ARGUMENT_NO_FORWARDING_ELLIPSES] = "unexpected `...` when the parent method is not forwarding",
|
67
|
+
[PM_ERR_ARGUMENT_NO_FORWARDING_STAR] = "unexpected `*` when the parent method is not forwarding",
|
68
|
+
[PM_ERR_ARGUMENT_SPLAT_AFTER_ASSOC_SPLAT] = "unexpected `*` splat argument after a `**` keyword splat argument",
|
69
|
+
[PM_ERR_ARGUMENT_SPLAT_AFTER_SPLAT] = "unexpected `*` splat argument after a `*` splat argument",
|
70
|
+
[PM_ERR_ARGUMENT_TERM_PAREN] = "expected a `)` to close the arguments",
|
71
|
+
[PM_ERR_ARGUMENT_UNEXPECTED_BLOCK] = "unexpected `{` after a method call without parenthesis",
|
72
|
+
[PM_ERR_ARRAY_ELEMENT] = "expected an element for the array",
|
73
|
+
[PM_ERR_ARRAY_EXPRESSION] = "expected an expression for the array element",
|
74
|
+
[PM_ERR_ARRAY_EXPRESSION_AFTER_STAR] = "expected an expression after `*` in the array",
|
75
|
+
[PM_ERR_ARRAY_SEPARATOR] = "expected a `,` separator for the array elements",
|
76
|
+
[PM_ERR_ARRAY_TERM] = "expected a `]` to close the array",
|
77
|
+
[PM_ERR_BEGIN_LONELY_ELSE] = "unexpected `else` in `begin` block; a `rescue` clause must precede `else`",
|
78
|
+
[PM_ERR_BEGIN_TERM] = "expected an `end` to close the `begin` statement",
|
79
|
+
[PM_ERR_BEGIN_UPCASE_BRACE] = "expected a `{` after `BEGIN`",
|
80
|
+
[PM_ERR_BEGIN_UPCASE_TERM] = "expected a `}` to close the `BEGIN` statement",
|
79
81
|
[PM_ERR_BEGIN_UPCASE_TOPLEVEL] = "BEGIN is permitted only at toplevel",
|
80
|
-
[PM_ERR_BLOCK_PARAM_LOCAL_VARIABLE] = "
|
81
|
-
[PM_ERR_BLOCK_PARAM_PIPE_TERM] = "
|
82
|
-
[PM_ERR_BLOCK_TERM_BRACE] = "
|
83
|
-
[PM_ERR_BLOCK_TERM_END] = "
|
84
|
-
[PM_ERR_CANNOT_PARSE_EXPRESSION] = "
|
85
|
-
[PM_ERR_CANNOT_PARSE_STRING_PART] = "
|
86
|
-
[PM_ERR_CASE_EXPRESSION_AFTER_CASE] = "
|
87
|
-
[PM_ERR_CASE_EXPRESSION_AFTER_WHEN] = "
|
88
|
-
[
|
89
|
-
[
|
90
|
-
[
|
91
|
-
[
|
92
|
-
[
|
93
|
-
[
|
94
|
-
[
|
95
|
-
[
|
96
|
-
[
|
97
|
-
[
|
98
|
-
[
|
99
|
-
[
|
100
|
-
[
|
101
|
-
[
|
102
|
-
[
|
103
|
-
[
|
104
|
-
[
|
105
|
-
[
|
106
|
-
[
|
107
|
-
[
|
108
|
-
[
|
109
|
-
[
|
110
|
-
[
|
111
|
-
[
|
112
|
-
[
|
113
|
-
[
|
114
|
-
[
|
115
|
-
[
|
116
|
-
[
|
117
|
-
[
|
118
|
-
[
|
119
|
-
[
|
120
|
-
[
|
121
|
-
[
|
122
|
-
[
|
123
|
-
[
|
124
|
-
[
|
125
|
-
[
|
126
|
-
[
|
127
|
-
[
|
128
|
-
[
|
129
|
-
[
|
130
|
-
[
|
131
|
-
[
|
132
|
-
[
|
133
|
-
[
|
134
|
-
[
|
135
|
-
[
|
136
|
-
[
|
137
|
-
[
|
138
|
-
[
|
139
|
-
[
|
140
|
-
[
|
141
|
-
[
|
142
|
-
[
|
143
|
-
[
|
144
|
-
[
|
145
|
-
[
|
146
|
-
[
|
147
|
-
[
|
148
|
-
[
|
149
|
-
[
|
150
|
-
[
|
151
|
-
[
|
152
|
-
[
|
153
|
-
[
|
154
|
-
[
|
155
|
-
[
|
156
|
-
[
|
157
|
-
[
|
158
|
-
[
|
159
|
-
[
|
160
|
-
[
|
161
|
-
[
|
162
|
-
[
|
163
|
-
[
|
164
|
-
[
|
165
|
-
[
|
166
|
-
[
|
167
|
-
[
|
168
|
-
[
|
169
|
-
[
|
170
|
-
[
|
171
|
-
[
|
172
|
-
[
|
173
|
-
[
|
174
|
-
[
|
175
|
-
[
|
176
|
-
[
|
177
|
-
[
|
178
|
-
[
|
179
|
-
[
|
180
|
-
[
|
181
|
-
[
|
182
|
-
[
|
183
|
-
[
|
184
|
-
[
|
185
|
-
[
|
186
|
-
[
|
187
|
-
[
|
188
|
-
[
|
189
|
-
[
|
190
|
-
[
|
191
|
-
[
|
192
|
-
[
|
193
|
-
[
|
194
|
-
[
|
195
|
-
[
|
196
|
-
[
|
197
|
-
[
|
198
|
-
[
|
199
|
-
[
|
200
|
-
[
|
201
|
-
[
|
202
|
-
[
|
203
|
-
[
|
204
|
-
[
|
205
|
-
[
|
206
|
-
[
|
207
|
-
[
|
208
|
-
[
|
209
|
-
[
|
210
|
-
[
|
211
|
-
[
|
212
|
-
[
|
213
|
-
[
|
214
|
-
[
|
215
|
-
[
|
216
|
-
[
|
217
|
-
[
|
218
|
-
[
|
219
|
-
[
|
220
|
-
[
|
221
|
-
[
|
222
|
-
[
|
223
|
-
[
|
224
|
-
[
|
225
|
-
[
|
226
|
-
[
|
227
|
-
[
|
228
|
-
[
|
229
|
-
[
|
230
|
-
[
|
231
|
-
[
|
232
|
-
[
|
233
|
-
[
|
234
|
-
[
|
235
|
-
[
|
236
|
-
[
|
237
|
-
[
|
238
|
-
[
|
239
|
-
[
|
240
|
-
[
|
241
|
-
[
|
242
|
-
[
|
243
|
-
[
|
244
|
-
[
|
245
|
-
[
|
246
|
-
[
|
247
|
-
[
|
248
|
-
[
|
249
|
-
[
|
250
|
-
[
|
251
|
-
[
|
252
|
-
[
|
253
|
-
[
|
254
|
-
[
|
82
|
+
[PM_ERR_BLOCK_PARAM_LOCAL_VARIABLE] = "expected a local variable name in the block parameters",
|
83
|
+
[PM_ERR_BLOCK_PARAM_PIPE_TERM] = "expected the block parameters to end with `|`",
|
84
|
+
[PM_ERR_BLOCK_TERM_BRACE] = "expected a block beginning with `{` to end with `}`",
|
85
|
+
[PM_ERR_BLOCK_TERM_END] = "expected a block beginning with `do` to end with `end`",
|
86
|
+
[PM_ERR_CANNOT_PARSE_EXPRESSION] = "cannot parse the expression",
|
87
|
+
[PM_ERR_CANNOT_PARSE_STRING_PART] = "cannot parse the string part",
|
88
|
+
[PM_ERR_CASE_EXPRESSION_AFTER_CASE] = "expected an expression after `case`",
|
89
|
+
[PM_ERR_CASE_EXPRESSION_AFTER_WHEN] = "expected an expression after `when`",
|
90
|
+
[PM_ERR_CASE_MATCH_MISSING_PREDICATE] = "expected a predicate for a case matching statement",
|
91
|
+
[PM_ERR_CASE_MISSING_CONDITIONS] = "expected a `when` or `in` clause after `case`",
|
92
|
+
[PM_ERR_CASE_TERM] = "expected an `end` to close the `case` statement",
|
93
|
+
[PM_ERR_CLASS_IN_METHOD] = "unexpected class definition in a method definition",
|
94
|
+
[PM_ERR_CLASS_NAME] = "expected a constant name after `class`",
|
95
|
+
[PM_ERR_CLASS_SUPERCLASS] = "expected a superclass after `<`",
|
96
|
+
[PM_ERR_CLASS_TERM] = "expected an `end` to close the `class` statement",
|
97
|
+
[PM_ERR_CLASS_UNEXPECTED_END] = "unexpected `end`, expecting ';' or '\\n'",
|
98
|
+
[PM_ERR_CONDITIONAL_ELSIF_PREDICATE] = "expected a predicate expression for the `elsif` statement",
|
99
|
+
[PM_ERR_CONDITIONAL_IF_PREDICATE] = "expected a predicate expression for the `if` statement",
|
100
|
+
[PM_ERR_CONDITIONAL_PREDICATE_TERM] = "expected `then` or `;` or '\\n'",
|
101
|
+
[PM_ERR_CONDITIONAL_TERM] = "expected an `end` to close the conditional clause",
|
102
|
+
[PM_ERR_CONDITIONAL_TERM_ELSE] = "expected an `end` to close the `else` clause",
|
103
|
+
[PM_ERR_CONDITIONAL_UNLESS_PREDICATE] = "expected a predicate expression for the `unless` statement",
|
104
|
+
[PM_ERR_CONDITIONAL_UNTIL_PREDICATE] = "expected a predicate expression for the `until` statement",
|
105
|
+
[PM_ERR_CONDITIONAL_WHILE_PREDICATE] = "expected a predicate expression for the `while` statement",
|
106
|
+
[PM_ERR_CONSTANT_PATH_COLON_COLON_CONSTANT] = "expected a constant after the `::` operator",
|
107
|
+
[PM_ERR_DEF_ENDLESS] = "could not parse the endless method body",
|
108
|
+
[PM_ERR_DEF_ENDLESS_SETTER] = "invalid method name; a setter method cannot be defined in an endless method definition",
|
109
|
+
[PM_ERR_DEF_NAME] = "expected a method name",
|
110
|
+
[PM_ERR_DEF_NAME_AFTER_RECEIVER] = "expected a method name after the receiver",
|
111
|
+
[PM_ERR_DEF_PARAMS_TERM] = "expected a delimiter to close the parameters",
|
112
|
+
[PM_ERR_DEF_PARAMS_TERM_PAREN] = "expected a `)` to close the parameters",
|
113
|
+
[PM_ERR_DEF_RECEIVER] = "expected a receiver for the method definition",
|
114
|
+
[PM_ERR_DEF_RECEIVER_TERM] = "expected a `.` or `::` after the receiver in a method definition",
|
115
|
+
[PM_ERR_DEF_TERM] = "expected an `end` to close the `def` statement",
|
116
|
+
[PM_ERR_DEFINED_EXPRESSION] = "expected an expression after `defined?`",
|
117
|
+
[PM_ERR_EMBDOC_TERM] = "could not find a terminator for the embedded document",
|
118
|
+
[PM_ERR_EMBEXPR_END] = "expected a `}` to close the embedded expression",
|
119
|
+
[PM_ERR_EMBVAR_INVALID] = "invalid embedded variable",
|
120
|
+
[PM_ERR_END_UPCASE_BRACE] = "expected a `{` after `END`",
|
121
|
+
[PM_ERR_END_UPCASE_TERM] = "expected a `}` to close the `END` statement",
|
122
|
+
[PM_ERR_ESCAPE_INVALID_CONTROL] = "invalid control escape sequence",
|
123
|
+
[PM_ERR_ESCAPE_INVALID_CONTROL_REPEAT] = "invalid control escape sequence; control cannot be repeated",
|
124
|
+
[PM_ERR_ESCAPE_INVALID_HEXADECIMAL] = "invalid hexadecimal escape sequence",
|
125
|
+
[PM_ERR_ESCAPE_INVALID_META] = "invalid meta escape sequence",
|
126
|
+
[PM_ERR_ESCAPE_INVALID_META_REPEAT] = "invalid meta escape sequence; meta cannot be repeated",
|
127
|
+
[PM_ERR_ESCAPE_INVALID_UNICODE] = "invalid Unicode escape sequence",
|
128
|
+
[PM_ERR_ESCAPE_INVALID_UNICODE_CM_FLAGS] = "invalid Unicode escape sequence; Unicode cannot be combined with control or meta flags",
|
129
|
+
[PM_ERR_ESCAPE_INVALID_UNICODE_LITERAL] = "invalid Unicode escape sequence; multiple codepoints are not allowed in a character literal",
|
130
|
+
[PM_ERR_ESCAPE_INVALID_UNICODE_LONG] = "invalid Unicode escape sequence; maximum length is 6 digits",
|
131
|
+
[PM_ERR_ESCAPE_INVALID_UNICODE_TERM] = "invalid Unicode escape sequence; needs closing `}`",
|
132
|
+
[PM_ERR_EXPECT_ARGUMENT] = "expected an argument",
|
133
|
+
[PM_ERR_EXPECT_EOL_AFTER_STATEMENT] = "expected a newline or semicolon after the statement",
|
134
|
+
[PM_ERR_EXPECT_EXPRESSION_AFTER_AMPAMPEQ] = "expected an expression after `&&=`",
|
135
|
+
[PM_ERR_EXPECT_EXPRESSION_AFTER_PIPEPIPEEQ] = "expected an expression after `||=`",
|
136
|
+
[PM_ERR_EXPECT_EXPRESSION_AFTER_COMMA] = "expected an expression after `,`",
|
137
|
+
[PM_ERR_EXPECT_EXPRESSION_AFTER_EQUAL] = "expected an expression after `=`",
|
138
|
+
[PM_ERR_EXPECT_EXPRESSION_AFTER_LESS_LESS] = "expected an expression after `<<`",
|
139
|
+
[PM_ERR_EXPECT_EXPRESSION_AFTER_LPAREN] = "expected an expression after `(`",
|
140
|
+
[PM_ERR_EXPECT_EXPRESSION_AFTER_OPERATOR] = "expected an expression after the operator",
|
141
|
+
[PM_ERR_EXPECT_EXPRESSION_AFTER_SPLAT] = "expected an expression after `*` splat in an argument",
|
142
|
+
[PM_ERR_EXPECT_EXPRESSION_AFTER_SPLAT_HASH] = "expected an expression after `**` in a hash",
|
143
|
+
[PM_ERR_EXPECT_EXPRESSION_AFTER_STAR] = "expected an expression after `*`",
|
144
|
+
[PM_ERR_EXPECT_IDENT_REQ_PARAMETER] = "expected an identifier for the required parameter",
|
145
|
+
[PM_ERR_EXPECT_LPAREN_REQ_PARAMETER] = "expected a `(` to start a required parameter",
|
146
|
+
[PM_ERR_EXPECT_RBRACKET] = "expected a matching `]`",
|
147
|
+
[PM_ERR_EXPECT_RPAREN] = "expected a matching `)`",
|
148
|
+
[PM_ERR_EXPECT_RPAREN_AFTER_MULTI] = "expected a `)` after multiple assignment",
|
149
|
+
[PM_ERR_EXPECT_RPAREN_REQ_PARAMETER] = "expected a `)` to end a required parameter",
|
150
|
+
[PM_ERR_EXPECT_STRING_CONTENT] = "expected string content after opening string delimiter",
|
151
|
+
[PM_ERR_EXPECT_WHEN_DELIMITER] = "expected a delimiter after the predicates of a `when` clause",
|
152
|
+
[PM_ERR_EXPRESSION_BARE_HASH] = "unexpected bare hash in expression",
|
153
|
+
[PM_ERR_FOR_COLLECTION] = "expected a collection after the `in` in a `for` statement",
|
154
|
+
[PM_ERR_FOR_INDEX] = "expected an index after `for`",
|
155
|
+
[PM_ERR_FOR_IN] = "expected an `in` after the index in a `for` statement",
|
156
|
+
[PM_ERR_FOR_TERM] = "expected an `end` to close the `for` loop",
|
157
|
+
[PM_ERR_HASH_EXPRESSION_AFTER_LABEL] = "expected an expression after the label in a hash",
|
158
|
+
[PM_ERR_HASH_KEY] = "expected a key in the hash literal",
|
159
|
+
[PM_ERR_HASH_ROCKET] = "expected a `=>` between the hash key and value",
|
160
|
+
[PM_ERR_HASH_TERM] = "expected a `}` to close the hash literal",
|
161
|
+
[PM_ERR_HASH_VALUE] = "expected a value in the hash literal",
|
162
|
+
[PM_ERR_HEREDOC_TERM] = "could not find a terminator for the heredoc",
|
163
|
+
[PM_ERR_INCOMPLETE_QUESTION_MARK] = "incomplete expression at `?`",
|
164
|
+
[PM_ERR_INCOMPLETE_VARIABLE_CLASS] = "incomplete class variable",
|
165
|
+
[PM_ERR_INCOMPLETE_VARIABLE_INSTANCE] = "incomplete instance variable",
|
166
|
+
[PM_ERR_INVALID_ENCODING_MAGIC_COMMENT] = "unknown or invalid encoding in the magic comment",
|
167
|
+
[PM_ERR_INVALID_FLOAT_EXPONENT] = "invalid exponent",
|
168
|
+
[PM_ERR_INVALID_NUMBER_BINARY] = "invalid binary number",
|
169
|
+
[PM_ERR_INVALID_NUMBER_DECIMAL] = "invalid decimal number",
|
170
|
+
[PM_ERR_INVALID_NUMBER_HEXADECIMAL] = "invalid hexadecimal number",
|
171
|
+
[PM_ERR_INVALID_NUMBER_OCTAL] = "invalid octal number",
|
172
|
+
[PM_ERR_INVALID_NUMBER_UNDERSCORE] = "invalid underscore placement in number",
|
173
|
+
[PM_ERR_INVALID_PERCENT] = "invalid `%` token", // TODO WHAT?
|
174
|
+
[PM_ERR_INVALID_TOKEN] = "invalid token", // TODO WHAT?
|
175
|
+
[PM_ERR_INVALID_VARIABLE_GLOBAL] = "invalid global variable",
|
176
|
+
[PM_ERR_LAMBDA_OPEN] = "expected a `do` keyword or a `{` to open the lambda block",
|
177
|
+
[PM_ERR_LAMBDA_TERM_BRACE] = "expected a lambda block beginning with `{` to end with `}`",
|
178
|
+
[PM_ERR_LAMBDA_TERM_END] = "expected a lambda block beginning with `do` to end with `end`",
|
179
|
+
[PM_ERR_LIST_I_LOWER_ELEMENT] = "expected a symbol in a `%i` list",
|
180
|
+
[PM_ERR_LIST_I_LOWER_TERM] = "expected a closing delimiter for the `%i` list",
|
181
|
+
[PM_ERR_LIST_I_UPPER_ELEMENT] = "expected a symbol in a `%I` list",
|
182
|
+
[PM_ERR_LIST_I_UPPER_TERM] = "expected a closing delimiter for the `%I` list",
|
183
|
+
[PM_ERR_LIST_W_LOWER_ELEMENT] = "expected a string in a `%w` list",
|
184
|
+
[PM_ERR_LIST_W_LOWER_TERM] = "expected a closing delimiter for the `%w` list",
|
185
|
+
[PM_ERR_LIST_W_UPPER_ELEMENT] = "expected a string in a `%W` list",
|
186
|
+
[PM_ERR_LIST_W_UPPER_TERM] = "expected a closing delimiter for the `%W` list",
|
187
|
+
[PM_ERR_MALLOC_FAILED] = "failed to allocate memory",
|
188
|
+
[PM_ERR_MIXED_ENCODING] = "UTF-8 mixed within %s source",
|
189
|
+
[PM_ERR_MODULE_IN_METHOD] = "unexpected module definition in a method definition",
|
190
|
+
[PM_ERR_MODULE_NAME] = "expected a constant name after `module`",
|
191
|
+
[PM_ERR_MODULE_TERM] = "expected an `end` to close the `module` statement",
|
192
|
+
[PM_ERR_MULTI_ASSIGN_MULTI_SPLATS] = "multiple splats in multiple assignment",
|
193
|
+
[PM_ERR_NOT_EXPRESSION] = "expected an expression after `not`",
|
194
|
+
[PM_ERR_NUMBER_LITERAL_UNDERSCORE] = "number literal ending with a `_`",
|
195
|
+
[PM_ERR_NUMBERED_PARAMETER_NOT_ALLOWED] = "numbered parameters are not allowed when an ordinary parameter is defined",
|
196
|
+
[PM_ERR_NUMBERED_PARAMETER_OUTER_SCOPE] = "numbered parameter is already used in outer scope",
|
197
|
+
[PM_ERR_OPERATOR_MULTI_ASSIGN] = "unexpected operator for a multiple assignment",
|
198
|
+
[PM_ERR_OPERATOR_WRITE_ARGUMENTS] = "unexpected operator after a call with arguments",
|
199
|
+
[PM_ERR_OPERATOR_WRITE_BLOCK] = "unexpected operator after a call with a block",
|
200
|
+
[PM_ERR_PARAMETER_ASSOC_SPLAT_MULTI] = "unexpected multiple `**` splat parameters",
|
201
|
+
[PM_ERR_PARAMETER_BLOCK_MULTI] = "multiple block parameters; only one block is allowed",
|
202
|
+
[PM_ERR_PARAMETER_CIRCULAR] = "parameter default value references itself",
|
203
|
+
[PM_ERR_PARAMETER_METHOD_NAME] = "unexpected name for a parameter",
|
204
|
+
[PM_ERR_PARAMETER_NAME_REPEAT] = "repeated parameter name",
|
205
|
+
[PM_ERR_PARAMETER_NO_DEFAULT] = "expected a default value for the parameter",
|
206
|
+
[PM_ERR_PARAMETER_NO_DEFAULT_KW] = "expected a default value for the keyword parameter",
|
207
|
+
[PM_ERR_PARAMETER_NUMBERED_RESERVED] = "%.2s is reserved for numbered parameters",
|
208
|
+
[PM_ERR_PARAMETER_ORDER] = "unexpected parameter order",
|
209
|
+
[PM_ERR_PARAMETER_SPLAT_MULTI] = "unexpected multiple `*` splat parameters",
|
210
|
+
[PM_ERR_PARAMETER_STAR] = "unexpected parameter `*`",
|
211
|
+
[PM_ERR_PARAMETER_UNEXPECTED_FWD] = "unexpected `...` in parameters",
|
212
|
+
[PM_ERR_PARAMETER_WILD_LOOSE_COMMA] = "unexpected `,` in parameters",
|
213
|
+
[PM_ERR_PATTERN_EXPRESSION_AFTER_BRACKET] = "expected a pattern expression after the `[` operator",
|
214
|
+
[PM_ERR_PATTERN_EXPRESSION_AFTER_COMMA] = "expected a pattern expression after `,`",
|
215
|
+
[PM_ERR_PATTERN_EXPRESSION_AFTER_HROCKET] = "expected a pattern expression after `=>`",
|
216
|
+
[PM_ERR_PATTERN_EXPRESSION_AFTER_IN] = "expected a pattern expression after the `in` keyword",
|
217
|
+
[PM_ERR_PATTERN_EXPRESSION_AFTER_KEY] = "expected a pattern expression after the key",
|
218
|
+
[PM_ERR_PATTERN_EXPRESSION_AFTER_PAREN] = "expected a pattern expression after the `(` operator",
|
219
|
+
[PM_ERR_PATTERN_EXPRESSION_AFTER_PIN] = "expected a pattern expression after the `^` pin operator",
|
220
|
+
[PM_ERR_PATTERN_EXPRESSION_AFTER_PIPE] = "expected a pattern expression after the `|` operator",
|
221
|
+
[PM_ERR_PATTERN_EXPRESSION_AFTER_RANGE] = "expected a pattern expression after the range operator",
|
222
|
+
[PM_ERR_PATTERN_EXPRESSION_AFTER_REST] = "unexpected pattern expression after the `**` expression",
|
223
|
+
[PM_ERR_PATTERN_HASH_KEY] = "expected a key in the hash pattern",
|
224
|
+
[PM_ERR_PATTERN_HASH_KEY_LABEL] = "expected a label as the key in the hash pattern", // TODO // THIS // AND // ABOVE // IS WEIRD
|
225
|
+
[PM_ERR_PATTERN_IDENT_AFTER_HROCKET] = "expected an identifier after the `=>` operator",
|
226
|
+
[PM_ERR_PATTERN_LABEL_AFTER_COMMA] = "expected a label after the `,` in the hash pattern",
|
227
|
+
[PM_ERR_PATTERN_REST] = "unexpected rest pattern",
|
228
|
+
[PM_ERR_PATTERN_TERM_BRACE] = "expected a `}` to close the pattern expression",
|
229
|
+
[PM_ERR_PATTERN_TERM_BRACKET] = "expected a `]` to close the pattern expression",
|
230
|
+
[PM_ERR_PATTERN_TERM_PAREN] = "expected a `)` to close the pattern expression",
|
231
|
+
[PM_ERR_PIPEPIPEEQ_MULTI_ASSIGN] = "unexpected `||=` in a multiple assignment",
|
232
|
+
[PM_ERR_REGEXP_TERM] = "expected a closing delimiter for the regular expression",
|
233
|
+
[PM_ERR_RESCUE_EXPRESSION] = "expected a rescued expression",
|
234
|
+
[PM_ERR_RESCUE_MODIFIER_VALUE] = "expected a value after the `rescue` modifier",
|
235
|
+
[PM_ERR_RESCUE_TERM] = "expected a closing delimiter for the `rescue` clause",
|
236
|
+
[PM_ERR_RESCUE_VARIABLE] = "expected an exception variable after `=>` in a rescue statement",
|
237
|
+
[PM_ERR_RETURN_INVALID] = "invalid `return` in a class or module body",
|
238
|
+
[PM_ERR_STATEMENT_ALIAS] = "unexpected an `alias` at a non-statement position",
|
239
|
+
[PM_ERR_STATEMENT_POSTEXE_END] = "unexpected an `END` at a non-statement position",
|
240
|
+
[PM_ERR_STATEMENT_PREEXE_BEGIN] = "unexpected a `BEGIN` at a non-statement position",
|
241
|
+
[PM_ERR_STATEMENT_UNDEF] = "unexpected an `undef` at a non-statement position",
|
242
|
+
[PM_ERR_STRING_CONCATENATION] = "expected a string for concatenation",
|
243
|
+
[PM_ERR_STRING_INTERPOLATED_TERM] = "expected a closing delimiter for the interpolated string",
|
244
|
+
[PM_ERR_STRING_LITERAL_TERM] = "expected a closing delimiter for the string literal",
|
245
|
+
[PM_ERR_SYMBOL_INVALID] = "invalid symbol", // TODO expected symbol? prism.c ~9719
|
246
|
+
[PM_ERR_SYMBOL_TERM_DYNAMIC] = "expected a closing delimiter for the dynamic symbol",
|
247
|
+
[PM_ERR_SYMBOL_TERM_INTERPOLATED] = "expected a closing delimiter for the interpolated symbol",
|
248
|
+
[PM_ERR_TERNARY_COLON] = "expected a `:` after the true expression of a ternary operator",
|
249
|
+
[PM_ERR_TERNARY_EXPRESSION_FALSE] = "expected an expression after `:` in the ternary operator",
|
250
|
+
[PM_ERR_TERNARY_EXPRESSION_TRUE] = "expected an expression after `?` in the ternary operator",
|
251
|
+
[PM_ERR_UNDEF_ARGUMENT] = "invalid argument being passed to `undef`; expected a bare word, constant, or symbol argument",
|
252
|
+
[PM_ERR_UNARY_RECEIVER_BANG] = "expected a receiver for unary `!`",
|
253
|
+
[PM_ERR_UNARY_RECEIVER_MINUS] = "expected a receiver for unary `-`",
|
254
|
+
[PM_ERR_UNARY_RECEIVER_PLUS] = "expected a receiver for unary `+`",
|
255
|
+
[PM_ERR_UNARY_RECEIVER_TILDE] = "expected a receiver for unary `~`",
|
256
|
+
[PM_ERR_UNTIL_TERM] = "expected an `end` to close the `until` statement",
|
257
|
+
[PM_ERR_VOID_EXPRESSION] = "unexpected void value expression",
|
258
|
+
[PM_ERR_WHILE_TERM] = "expected an `end` to close the `while` statement",
|
259
|
+
[PM_ERR_WRITE_TARGET_IN_METHOD] = "dynamic constant assignment",
|
260
|
+
[PM_ERR_WRITE_TARGET_READONLY] = "immutable variable as a write target",
|
261
|
+
[PM_ERR_WRITE_TARGET_UNEXPECTED] = "unexpected write target",
|
262
|
+
[PM_ERR_XSTRING_TERM] = "expected a closing delimiter for the `%x` or backtick string",
|
263
|
+
[PM_WARN_AMBIGUOUS_FIRST_ARGUMENT_MINUS] = "ambiguous first argument; put parentheses or a space even after `-` operator",
|
264
|
+
[PM_WARN_AMBIGUOUS_FIRST_ARGUMENT_PLUS] = "ambiguous first argument; put parentheses or a space even after `+` operator",
|
265
|
+
[PM_WARN_AMBIGUOUS_PREFIX_STAR] = "ambiguous `*` has been interpreted as an argument prefix",
|
266
|
+
[PM_WARN_AMBIGUOUS_SLASH] = "ambiguous `/`; wrap regexp in parentheses or add a space after `/` operator",
|
267
|
+
[PM_WARN_END_IN_METHOD] = "END in method; use at_exit",
|
255
268
|
};
|
256
269
|
|
257
270
|
static const char*
|
258
271
|
pm_diagnostic_message(pm_diagnostic_id_t diag_id) {
|
259
272
|
assert(diag_id < PM_DIAGNOSTIC_ID_LEN);
|
273
|
+
|
260
274
|
const char *message = diagnostic_messages[diag_id];
|
261
275
|
assert(message);
|
276
|
+
|
262
277
|
return message;
|
263
278
|
}
|
264
279
|
|
@@ -270,7 +285,55 @@ pm_diagnostic_list_append(pm_list_t *list, const uint8_t *start, const uint8_t *
|
|
270
285
|
pm_diagnostic_t *diagnostic = (pm_diagnostic_t *) calloc(sizeof(pm_diagnostic_t), 1);
|
271
286
|
if (diagnostic == NULL) return false;
|
272
287
|
|
273
|
-
*diagnostic = (pm_diagnostic_t) {
|
288
|
+
*diagnostic = (pm_diagnostic_t) {
|
289
|
+
.location = { start, end },
|
290
|
+
.message = pm_diagnostic_message(diag_id),
|
291
|
+
.owned = false
|
292
|
+
};
|
293
|
+
|
294
|
+
pm_list_append(list, (pm_list_node_t *) diagnostic);
|
295
|
+
return true;
|
296
|
+
}
|
297
|
+
|
298
|
+
/**
|
299
|
+
* Append a diagnostic to the given list of diagnostics that is using a format
|
300
|
+
* string for its message.
|
301
|
+
*/
|
302
|
+
bool
|
303
|
+
pm_diagnostic_list_append_format(pm_list_t *list, const uint8_t *start, const uint8_t *end, pm_diagnostic_id_t diag_id, ...) {
|
304
|
+
va_list arguments;
|
305
|
+
va_start(arguments, diag_id);
|
306
|
+
|
307
|
+
const char *format = pm_diagnostic_message(diag_id);
|
308
|
+
int result = vsnprintf(NULL, 0, format, arguments);
|
309
|
+
va_end(arguments);
|
310
|
+
|
311
|
+
if (result < 0) {
|
312
|
+
return false;
|
313
|
+
}
|
314
|
+
|
315
|
+
pm_diagnostic_t *diagnostic = (pm_diagnostic_t *) calloc(sizeof(pm_diagnostic_t), 1);
|
316
|
+
if (diagnostic == NULL) {
|
317
|
+
return false;
|
318
|
+
}
|
319
|
+
|
320
|
+
size_t length = (size_t) (result + 1);
|
321
|
+
char *message = (char *) malloc(length);
|
322
|
+
if (message == NULL) {
|
323
|
+
free(diagnostic);
|
324
|
+
return false;
|
325
|
+
}
|
326
|
+
|
327
|
+
va_start(arguments, diag_id);
|
328
|
+
vsnprintf(message, length, format, arguments);
|
329
|
+
va_end(arguments);
|
330
|
+
|
331
|
+
*diagnostic = (pm_diagnostic_t) {
|
332
|
+
.location = { start, end },
|
333
|
+
.message = message,
|
334
|
+
.owned = true
|
335
|
+
};
|
336
|
+
|
274
337
|
pm_list_append(list, (pm_list_node_t *) diagnostic);
|
275
338
|
return true;
|
276
339
|
}
|
@@ -284,8 +347,9 @@ pm_diagnostic_list_free(pm_list_t *list) {
|
|
284
347
|
|
285
348
|
for (node = list->head; node != NULL; node = next) {
|
286
349
|
next = node->next;
|
287
|
-
|
288
350
|
pm_diagnostic_t *diagnostic = (pm_diagnostic_t *) node;
|
351
|
+
|
352
|
+
if (diagnostic->owned) free((void *) diagnostic->message);
|
289
353
|
free(diagnostic);
|
290
354
|
}
|
291
355
|
}
|