Skip to content

Commit 0fc0894

Browse files
ulyssessouzaulyssessouza
committed
Add strict var default values for empty and unset
Signed-off-by: Ulysses Souza <[email protected]>
1 parent 8a11f74 commit 0fc0894

12 files changed

+505
-284
lines changed

‎EnvLangValue.g4

Lines changed: 39 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,32 @@ dqstring
44
: content* (SPACE* | CRLF* | EOF)
55
;
66

7-
variable
8-
: var=(STRICT_VAR | SIMPLE_VAR)
9-
;
10-
117
content
128
: variable
139
| STR
1410
| SPACE
1511
| CRLF
1612
;
1713

18-
STRICT_VAR
14+
variable
15+
: var=
16+
(
17+
STRICT_VAR_WITH_DEFAULT_IF_UNSET_OR_EMPTY
18+
| STRICT_VAR_WITH_DEFAULT_IF_UNSET
19+
| SIMPLE_STRICT_VAR
20+
| SIMPLE_VAR
21+
)
22+
;
23+
24+
STRICT_VAR_WITH_DEFAULT_IF_UNSET_OR_EMPTY
25+
: '${' SPACE* VAR_ID ':-' STR SPACE* '}'
26+
;
27+
28+
STRICT_VAR_WITH_DEFAULT_IF_UNSET
29+
: '${' SPACE* VAR_ID '-' STR SPACE* '}'
30+
;
31+
32+
SIMPLE_STRICT_VAR
1933
: '${' SPACE* VAR_ID SPACE* '}'
2034
;
2135

@@ -27,29 +41,37 @@ STR
2741
: FIRST_CHAR REST_OF_STRING*
2842
;
2943

30-
SPACE
31-
: ' '
32-
| '\t'
33-
;
34-
35-
CRLF
36-
: '\r'? '\n'
37-
| '\r'
44+
PESO_SIGN
45+
: '$'
3846
;
3947

40-
fragment FIRST_CHAR
48+
FIRST_CHAR
4149
: ~[,\\."'\r\n ]
4250
;
4351
44-
fragment REST_OF_STRING
52+
REST_OF_STRING
4553
: ~[\\'"$\r\n ]
4654
;
4755

48-
fragment VAR_ID
49-
: [0-9]+ // Only numbers
56+
NUMBER
57+
: [0-9]+
58+
;
59+
60+
VAR_ID
61+
: NUMBER // Only numbers
5062
| [a-zA-Z_][a-zA-Z_0-9]* // Start with letters, then letters, numbers and underscores
5163
;
5264

65+
SPACE
66+
: ' '
67+
| '\t'
68+
;
69+
70+
CRLF
71+
: '\r'? '\n'
72+
| '\r'
73+
;
74+
5375
// Catch all rule.
5476
// This is used to avoid the error message "no viable alternative at input '<EOF>'". Just for debugging.
5577
ANY

‎facade_test.go

Lines changed: 72 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,44 @@ A = "aaa ${B} ccc "
183183
"A": strPtr("aaa"),
184184
},
185185
},
186+
{
187+
"SpecialWithPesoSign",
188+
`SPECIAL3 = "{{{ $ }}}"`,
189+
map[string]*string{
190+
"SPECIAL3": strPtr("{{{ $ }}}"),
191+
},
192+
nil,
193+
},
194+
{
195+
"VariableWithDefaultForEmpty",
196+
`VAR_DEFAULT_UNSET_OR_EMPTY = "${EMPTY_VAR:-eee}"`,
197+
map[string]*string{
198+
"VAR_DEFAULT_UNSET_OR_EMPTY": strPtr("eee"),
199+
},
200+
map[string]*string{
201+
"EMPTY_VAR": strPtr(""),
202+
},
203+
},
204+
{
205+
"VariableWithDefaultForUnset",
206+
`VAR_DEFAULT_UNSET_OR_EMPTY = "${UNSET_VAR-uuu}"`,
207+
map[string]*string{
208+
"VAR_DEFAULT_UNSET_OR_EMPTY": strPtr("uuu"),
209+
},
210+
nil,
211+
},
212+
{
213+
"VariableWithDefaultForUnset",
214+
`VAR_DEFAULT_UNSET_OR_EMPTY = "${EMPTY_VAR-uuu}"`,
215+
map[string]*string{
216+
"VAR_DEFAULT_UNSET_OR_EMPTY": strPtr(""),
217+
},
218+
map[string]*string{
219+
"EMPTY_VAR": strPtr(""),
220+
},
221+
},
186222
}
223+
187224
for _, tt := range tests {
188225
t.Run(tt.name, func(t *testing.T) {
189226
d := dao.NewDefaultDaoFromMap(tt.envState)
@@ -231,6 +268,8 @@ N3=43AS3sA43
231268
232269
N4=44AS4sA44
233270
271+
SIMPLE_SPACING = aaa ${B} ccc
272+
234273
235274
SPECIAL1 = "{{{ ${A} }}}"
236275
SPECIAL2 = "{{{ $A }}}"
@@ -239,31 +278,41 @@ SPECIAL4 = "{{{ $ $ $}}}"
239278
SPECIAL5 = "{{{ $$ }}}"
240279
SPECIAL6 = "{{{ $$$ }}}"
241280
281+
EMPTY_VAR=""
282+
283+
VAR_DEFAULT_UNSET = "${UNSET_VAR-uuu}"
284+
VAR_DEFAULT_UNSET_OR_EMPTY = "${EMPTY_VAR-eee}"
285+
VAR_DEFAULT_EMPTY = "${EMPTY_VAR:-eee}"
242286
`
243287
expected := map[string]*string{
244-
"A": strPtr("aaa"),
245-
"B": strPtr("bbb"),
246-
"C": strPtr("ccc"),
247-
"D": strPtr("ddd"),
248-
"E": strPtr("eee"),
249-
"F": strPtr(""),
250-
"G": nil,
251-
"H": strPtr("my_value"),
252-
"I": strPtr("bar baz"),
253-
"J": strPtr("foo bar"),
254-
"L": strPtr("my\nmulti\nline\nentry"),
255-
"M": strPtr("foo aaa bar"),
256-
"MYVAR": strPtr("before bar baz after foo bar opa "),
257-
"N1": strPtr("41"),
258-
"N2": strPtr("42"),
259-
"N3": strPtr("43AS3sA43"),
260-
"N4": strPtr("44AS4sA44"),
261-
"SPECIAL1": strPtr("{{{ aaa }}}"),
262-
"SPECIAL2": strPtr("{{{ aaa }}}"),
263-
"SPECIAL3": strPtr("{{{ $ }}}"),
264-
"SPECIAL4": strPtr("{{{ $ $ $}}}"),
265-
"SPECIAL5": strPtr("{{{ $$ }}}"),
266-
"SPECIAL6": strPtr("{{{ $$$ }}}"),
288+
"A": strPtr("aaa"),
289+
"B": strPtr("bbb"),
290+
"C": strPtr("ccc"),
291+
"D": strPtr("ddd"),
292+
"E": strPtr("eee"),
293+
"F": strPtr(""),
294+
"G": nil,
295+
"H": strPtr("my_value"),
296+
"I": strPtr("bar baz"),
297+
"J": strPtr("foo bar"),
298+
"L": strPtr("my\nmulti\nline\nentry"),
299+
"M": strPtr("foo aaa bar"),
300+
"MYVAR": strPtr("before bar baz after foo bar opa "),
301+
"N1": strPtr("41"),
302+
"N2": strPtr("42"),
303+
"N3": strPtr("43AS3sA43"),
304+
"N4": strPtr("44AS4sA44"),
305+
"SIMPLE_SPACING": strPtr("aaa bbb ccc"),
306+
"SPECIAL1": strPtr("{{{ aaa }}}"),
307+
"SPECIAL2": strPtr("{{{ aaa }}}"),
308+
"SPECIAL3": strPtr("{{{ $ }}}"),
309+
"SPECIAL4": strPtr("{{{ $ $ $}}}"),
310+
"SPECIAL5": strPtr("{{{ $$ }}}"),
311+
"SPECIAL6": strPtr("{{{ $$$ }}}"),
312+
"EMPTY_VAR": strPtr(""),
313+
"VAR_DEFAULT_UNSET": strPtr("uuu"),
314+
"VAR_DEFAULT_UNSET_OR_EMPTY": strPtr(""),
315+
"VAR_DEFAULT_EMPTY": strPtr("eee"),
267316
}
268317

269318
d := dao.NewDefaultDao()

‎gen/valueparser/EnvLangValue.interp

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,36 @@ null
55
null
66
null
77
null
8+
'$'
9+
null
10+
null
11+
null
12+
null
13+
null
14+
null
815
null
916

1017
token symbolic names:
1118
null
12-
STRICT_VAR
19+
STRICT_VAR_WITH_DEFAULT_IF_UNSET_OR_EMPTY
20+
STRICT_VAR_WITH_DEFAULT_IF_UNSET
21+
SIMPLE_STRICT_VAR
1322
SIMPLE_VAR
1423
STR
24+
PESO_SIGN
25+
FIRST_CHAR
26+
REST_OF_STRING
27+
NUMBER
28+
VAR_ID
1529
SPACE
1630
CRLF
1731
ANY
1832

1933
rule names:
2034
dqstring
21-
variable
2235
content
36+
variable
2337

2438

2539
atn:
26-
[4, 1, 6, 36, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 1, 0, 5, 0, 8, 8, 0, 10, 0, 12, 0, 11, 9, 0, 1, 0, 5, 0, 14, 8, 0, 10, 0, 12, 0, 17, 9, 0, 1, 0, 5, 0, 20, 8, 0, 10, 0, 12, 0, 23, 9, 0, 1, 0, 3, 0, 26, 8, 0, 1, 1, 1, 1, 1, 2, 1, 2, 1, 2, 1, 2, 3, 2, 34, 8, 2, 1, 2, 0, 0, 3, 0, 2, 4, 0, 1, 1, 0, 1, 2, 40, 0, 9, 1, 0, 0, 0, 2, 27, 1, 0, 0, 0, 4, 33, 1, 0, 0, 0, 6, 8, 3, 4, 2, 0, 7, 6, 1, 0, 0, 0, 8, 11, 1, 0, 0, 0, 9, 7, 1, 0, 0, 0, 9, 10, 1, 0, 0, 0, 10, 25, 1, 0, 0, 0, 11, 9, 1, 0, 0, 0, 12, 14, 5, 4, 0, 0, 13, 12, 1, 0, 0, 0, 14, 17, 1, 0, 0, 0, 15, 13, 1, 0, 0, 0, 15, 16, 1, 0, 0, 0, 16, 26, 1, 0, 0, 0, 17, 15, 1, 0, 0, 0, 18, 20, 5, 5, 0, 0, 19, 18, 1, 0, 0, 0, 20, 23, 1, 0, 0, 0, 21, 19, 1, 0, 0, 0, 21, 22, 1, 0, 0, 0, 22, 26, 1, 0, 0, 0, 23, 21, 1, 0, 0, 0, 24, 26, 5, 0, 0, 1, 25, 15, 1, 0, 0, 0, 25, 21, 1, 0, 0, 0, 25, 24, 1, 0, 0, 0, 26, 1, 1, 0, 0, 0, 27, 28, 7, 0, 0, 0, 28, 3, 1, 0, 0, 0, 29, 34, 3, 2, 1, 0, 30, 34, 5, 3, 0, 0, 31, 34, 5, 4, 0, 0, 32, 34, 5, 5, 0, 0, 33, 29, 1, 0, 0, 0, 33, 30, 1, 0, 0, 0, 33, 31, 1, 0, 0, 0, 33, 32, 1, 0, 0, 0, 34, 5, 1, 0, 0, 0, 5, 9, 15, 21, 25, 33]
40+
[4, 1, 13, 36, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 1, 0, 5, 0, 8, 8, 0, 10, 0, 12, 0, 11, 9, 0, 1, 0, 5, 0, 14, 8, 0, 10, 0, 12, 0, 17, 9, 0, 1, 0, 5, 0, 20, 8, 0, 10, 0, 12, 0, 23, 9, 0, 1, 0, 3, 0, 26, 8, 0, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 32, 8, 1, 1, 2, 1, 2, 1, 2, 0, 0, 3, 0, 2, 4, 0, 1, 1, 0, 1, 4, 40, 0, 9, 1, 0, 0, 0, 2, 31, 1, 0, 0, 0, 4, 33, 1, 0, 0, 0, 6, 8, 3, 2, 1, 0, 7, 6, 1, 0, 0, 0, 8, 11, 1, 0, 0, 0, 9, 7, 1, 0, 0, 0, 9, 10, 1, 0, 0, 0, 10, 25, 1, 0, 0, 0, 11, 9, 1, 0, 0, 0, 12, 14, 5, 11, 0, 0, 13, 12, 1, 0, 0, 0, 14, 17, 1, 0, 0, 0, 15, 13, 1, 0, 0, 0, 15, 16, 1, 0, 0, 0, 16, 26, 1, 0, 0, 0, 17, 15, 1, 0, 0, 0, 18, 20, 5, 12, 0, 0, 19, 18, 1, 0, 0, 0, 20, 23, 1, 0, 0, 0, 21, 19, 1, 0, 0, 0, 21, 22, 1, 0, 0, 0, 22, 26, 1, 0, 0, 0, 23, 21, 1, 0, 0, 0, 24, 26, 5, 0, 0, 1, 25, 15, 1, 0, 0, 0, 25, 21, 1, 0, 0, 0, 25, 24, 1, 0, 0, 0, 26, 1, 1, 0, 0, 0, 27, 32, 3, 4, 2, 0, 28, 32, 5, 5, 0, 0, 29, 32, 5, 11, 0, 0, 30, 32, 5, 12, 0, 0, 31, 27, 1, 0, 0, 0, 31, 28, 1, 0, 0, 0, 31, 29, 1, 0, 0, 0, 31, 30, 1, 0, 0, 0, 32, 3, 1, 0, 0, 0, 33, 34, 7, 0, 0, 0, 34, 5, 1, 0, 0, 0, 5, 9, 15, 21, 25, 31]

‎gen/valueparser/EnvLangValue.tokens

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
1-
STRICT_VAR=1
2-
SIMPLE_VAR=2
3-
STR=3
4-
SPACE=4
5-
CRLF=5
6-
ANY=6
1+
STRICT_VAR_WITH_DEFAULT_IF_UNSET_OR_EMPTY=1
2+
STRICT_VAR_WITH_DEFAULT_IF_UNSET=2
3+
SIMPLE_STRICT_VAR=3
4+
SIMPLE_VAR=4
5+
STR=5
6+
PESO_SIGN=6
7+
FIRST_CHAR=7
8+
REST_OF_STRING=8
9+
NUMBER=9
10+
VAR_ID=10
11+
SPACE=11
12+
CRLF=12
13+
ANY=13
14+
'$'=6

‎gen/valueparser/EnvLangValueLexer.interp

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,44 @@ null
55
null
66
null
77
null
8+
'$'
9+
null
10+
null
11+
null
12+
null
13+
null
14+
null
815
null
916

1017
token symbolic names:
1118
null
12-
STRICT_VAR
19+
STRICT_VAR_WITH_DEFAULT_IF_UNSET_OR_EMPTY
20+
STRICT_VAR_WITH_DEFAULT_IF_UNSET
21+
SIMPLE_STRICT_VAR
1322
SIMPLE_VAR
1423
STR
24+
PESO_SIGN
25+
FIRST_CHAR
26+
REST_OF_STRING
27+
NUMBER
28+
VAR_ID
1529
SPACE
1630
CRLF
1731
ANY
1832

1933
rule names:
20-
STRICT_VAR
34+
STRICT_VAR_WITH_DEFAULT_IF_UNSET_OR_EMPTY
35+
STRICT_VAR_WITH_DEFAULT_IF_UNSET
36+
SIMPLE_STRICT_VAR
2137
SIMPLE_VAR
2238
STR
23-
SPACE
24-
CRLF
39+
PESO_SIGN
2540
FIRST_CHAR
2641
REST_OF_STRING
42+
NUMBER
2743
VAR_ID
44+
SPACE
45+
CRLF
2846
ANY
2947

3048
channel names:
@@ -35,4 +53,4 @@ mode names:
3553
DEFAULT_MODE
3654

3755
atn:
38-
[4, 0, 6, 76, 6, -1, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 1, 0, 1, 0, 1, 0, 1, 0, 5, 0, 24, 8, 0, 10, 0, 12, 0, 27, 9, 0, 1, 0, 1, 0, 5, 0, 31, 8, 0, 10, 0, 12, 0, 34, 9, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 2, 1, 2, 5, 2, 43, 8, 2, 10, 2, 12, 2, 46, 9, 2, 1, 3, 1, 3, 1, 4, 3, 4, 51, 8, 4, 1, 4, 1, 4, 3, 4, 55, 8, 4, 1, 5, 1, 5, 1, 6, 1, 6, 1, 7, 4, 7, 62, 8, 7, 11, 7, 12, 7, 63, 1, 7, 1, 7, 5, 7, 68, 8, 7, 10, 7, 12, 7, 71, 9, 7, 3, 7, 73, 8, 7, 1, 8, 1, 8, 0, 0, 9, 1, 1, 3, 2, 5, 3, 7, 4, 9, 5, 11, 0, 13, 0, 15, 0, 17, 6, 1, 0, 6, 2, 0, 9, 9, 32, 32, 8, 0, 10, 10, 13, 13, 32, 32, 34, 34, 39, 39, 44, 44, 46, 46, 92, 92, 7, 0, 10, 10, 13, 13, 32, 32, 34, 34, 36, 36, 39, 39, 92, 92, 1, 0, 48, 57, 3, 0, 65, 90, 95, 95, 97, 122, 4, 0, 48, 57, 65, 90, 95, 95, 97, 122, 80, 0, 1, 1, 0, 0, 0, 0, 3, 1, 0, 0, 0, 0, 5, 1, 0, 0, 0, 0, 7, 1, 0, 0, 0, 0, 9, 1, 0, 0, 0, 0, 17, 1, 0, 0, 0, 1, 19, 1, 0, 0, 0, 3, 37, 1, 0, 0, 0, 5, 40, 1, 0, 0, 0, 7, 47, 1, 0, 0, 0, 9, 54, 1, 0, 0, 0, 11, 56, 1, 0, 0, 0, 13, 58, 1, 0, 0, 0, 15, 72, 1, 0, 0, 0, 17, 74, 1, 0, 0, 0, 19, 20, 5, 36, 0, 0, 20, 21, 5, 123, 0, 0, 21, 25, 1, 0, 0, 0, 22, 24, 3, 7, 3, 0, 23, 22, 1, 0, 0, 0, 24, 27, 1, 0, 0, 0, 25, 23, 1, 0, 0, 0, 25, 26, 1, 0, 0, 0, 26, 28, 1, 0, 0, 0, 27, 25, 1, 0, 0, 0, 28, 32, 3, 15, 7, 0, 29, 31, 3, 7, 3, 0, 30, 29, 1, 0, 0, 0, 31, 34, 1, 0, 0, 0, 32, 30, 1, 0, 0, 0, 32, 33, 1, 0, 0, 0, 33, 35, 1, 0, 0, 0, 34, 32, 1, 0, 0, 0, 35, 36, 5, 125, 0, 0, 36, 2, 1, 0, 0, 0, 37, 38, 5, 36, 0, 0, 38, 39, 3, 15, 7, 0, 39, 4, 1, 0, 0, 0, 40, 44, 3, 11, 5, 0, 41, 43, 3, 13, 6, 0, 42, 41, 1, 0, 0, 0, 43, 46, 1, 0, 0, 0, 44, 42, 1, 0, 0, 0, 44, 45, 1, 0, 0, 0, 45, 6, 1, 0, 0, 0, 46, 44, 1, 0, 0, 0, 47, 48, 7, 0, 0, 0, 48, 8, 1, 0, 0, 0, 49, 51, 5, 13, 0, 0, 50, 49, 1, 0, 0, 0, 50, 51, 1, 0, 0, 0, 51, 52, 1, 0, 0, 0, 52, 55, 5, 10, 0, 0, 53, 55, 5, 13, 0, 0, 54, 50, 1, 0, 0, 0, 54, 53, 1, 0, 0, 0, 55, 10, 1, 0, 0, 0, 56, 57, 8, 1, 0, 0, 57, 12, 1, 0, 0, 0, 58, 59, 8, 2, 0, 0, 59, 14, 1, 0, 0, 0, 60, 62, 7, 3, 0, 0, 61, 60, 1, 0, 0, 0, 62, 63, 1, 0, 0, 0, 63, 61, 1, 0, 0, 0, 63, 64, 1, 0, 0, 0, 64, 73, 1, 0, 0, 0, 65, 69, 7, 4, 0, 0, 66, 68, 7, 5, 0, 0, 67, 66, 1, 0, 0, 0, 68, 71, 1, 0, 0, 0, 69, 67, 1, 0, 0, 0, 69, 70, 1, 0, 0, 0, 70, 73, 1, 0, 0, 0, 71, 69, 1, 0, 0, 0, 72, 61, 1, 0, 0, 0, 72, 65, 1, 0, 0, 0, 73, 16, 1, 0, 0, 0, 74, 75, 9, 0, 0, 0, 75, 18, 1, 0, 0, 0, 9, 0, 25, 32, 44, 50, 54, 63, 69, 72, 0]
56+
[4, 0, 13, 129, 6, -1, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 1, 0, 1, 0, 1, 0, 1, 0, 5, 0, 32, 8, 0, 10, 0, 12, 0, 35, 9, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 5, 0, 43, 8, 0, 10, 0, 12, 0, 46, 9, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 5, 1, 54, 8, 1, 10, 1, 12, 1, 57, 9, 1, 1, 1, 1, 1, 1, 1, 1, 1, 5, 1, 63, 8, 1, 10, 1, 12, 1, 66, 9, 1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 2, 1, 2, 5, 2, 74, 8, 2, 10, 2, 12, 2, 77, 9, 2, 1, 2, 1, 2, 5, 2, 81, 8, 2, 10, 2, 12, 2, 84, 9, 2, 1, 2, 1, 2, 1, 3, 1, 3, 1, 3, 1, 4, 1, 4, 5, 4, 93, 8, 4, 10, 4, 12, 4, 96, 9, 4, 1, 5, 1, 5, 1, 6, 1, 6, 1, 7, 1, 7, 1, 8, 4, 8, 105, 8, 8, 11, 8, 12, 8, 106, 1, 9, 1, 9, 1, 9, 5, 9, 112, 8, 9, 10, 9, 12, 9, 115, 9, 9, 3, 9, 117, 8, 9, 1, 10, 1, 10, 1, 11, 3, 11, 122, 8, 11, 1, 11, 1, 11, 3, 11, 126, 8, 11, 1, 12, 1, 12, 0, 0, 13, 1, 1, 3, 2, 5, 3, 7, 4, 9, 5, 11, 6, 13, 7, 15, 8, 17, 9, 19, 10, 21, 11, 23, 12, 25, 13, 1, 0, 6, 8, 0, 10, 10, 13, 13, 32, 32, 34, 34, 39, 39, 44, 44, 46, 46, 92, 92, 7, 0, 10, 10, 13, 13, 32, 32, 34, 34, 36, 36, 39, 39, 92, 92, 1, 0, 48, 57, 3, 0, 65, 90, 95, 95, 97, 122, 4, 0, 48, 57, 65, 90, 95, 95, 97, 122, 2, 0, 9, 9, 32, 32, 140, 0, 1, 1, 0, 0, 0, 0, 3, 1, 0, 0, 0, 0, 5, 1, 0, 0, 0, 0, 7, 1, 0, 0, 0, 0, 9, 1, 0, 0, 0, 0, 11, 1, 0, 0, 0, 0, 13, 1, 0, 0, 0, 0, 15, 1, 0, 0, 0, 0, 17, 1, 0, 0, 0, 0, 19, 1, 0, 0, 0, 0, 21, 1, 0, 0, 0, 0, 23, 1, 0, 0, 0, 0, 25, 1, 0, 0, 0, 1, 27, 1, 0, 0, 0, 3, 49, 1, 0, 0, 0, 5, 69, 1, 0, 0, 0, 7, 87, 1, 0, 0, 0, 9, 90, 1, 0, 0, 0, 11, 97, 1, 0, 0, 0, 13, 99, 1, 0, 0, 0, 15, 101, 1, 0, 0, 0, 17, 104, 1, 0, 0, 0, 19, 116, 1, 0, 0, 0, 21, 118, 1, 0, 0, 0, 23, 125, 1, 0, 0, 0, 25, 127, 1, 0, 0, 0, 27, 28, 5, 36, 0, 0, 28, 29, 5, 123, 0, 0, 29, 33, 1, 0, 0, 0, 30, 32, 3, 21, 10, 0, 31, 30, 1, 0, 0, 0, 32, 35, 1, 0, 0, 0, 33, 31, 1, 0, 0, 0, 33, 34, 1, 0, 0, 0, 34, 36, 1, 0, 0, 0, 35, 33, 1, 0, 0, 0, 36, 37, 3, 19, 9, 0, 37, 38, 5, 58, 0, 0, 38, 39, 5, 45, 0, 0, 39, 40, 1, 0, 0, 0, 40, 44, 3, 9, 4, 0, 41, 43, 3, 21, 10, 0, 42, 41, 1, 0, 0, 0, 43, 46, 1, 0, 0, 0, 44, 42, 1, 0, 0, 0, 44, 45, 1, 0, 0, 0, 45, 47, 1, 0, 0, 0, 46, 44, 1, 0, 0, 0, 47, 48, 5, 125, 0, 0, 48, 2, 1, 0, 0, 0, 49, 50, 5, 36, 0, 0, 50, 51, 5, 123, 0, 0, 51, 55, 1, 0, 0, 0, 52, 54, 3, 21, 10, 0, 53, 52, 1, 0, 0, 0, 54, 57, 1, 0, 0, 0, 55, 53, 1, 0, 0, 0, 55, 56, 1, 0, 0, 0, 56, 58, 1, 0, 0, 0, 57, 55, 1, 0, 0, 0, 58, 59, 3, 19, 9, 0, 59, 60, 5, 45, 0, 0, 60, 64, 3, 9, 4, 0, 61, 63, 3, 21, 10, 0, 62, 61, 1, 0, 0, 0, 63, 66, 1, 0, 0, 0, 64, 62, 1, 0, 0, 0, 64, 65, 1, 0, 0, 0, 65, 67, 1, 0, 0, 0, 66, 64, 1, 0, 0, 0, 67, 68, 5, 125, 0, 0, 68, 4, 1, 0, 0, 0, 69, 70, 5, 36, 0, 0, 70, 71, 5, 123, 0, 0, 71, 75, 1, 0, 0, 0, 72, 74, 3, 21, 10, 0, 73, 72, 1, 0, 0, 0, 74, 77, 1, 0, 0, 0, 75, 73, 1, 0, 0, 0, 75, 76, 1, 0, 0, 0, 76, 78, 1, 0, 0, 0, 77, 75, 1, 0, 0, 0, 78, 82, 3, 19, 9, 0, 79, 81, 3, 21, 10, 0, 80, 79, 1, 0, 0, 0, 81, 84, 1, 0, 0, 0, 82, 80, 1, 0, 0, 0, 82, 83, 1, 0, 0, 0, 83, 85, 1, 0, 0, 0, 84, 82, 1, 0, 0, 0, 85, 86, 5, 125, 0, 0, 86, 6, 1, 0, 0, 0, 87, 88, 5, 36, 0, 0, 88, 89, 3, 19, 9, 0, 89, 8, 1, 0, 0, 0, 90, 94, 3, 13, 6, 0, 91, 93, 3, 15, 7, 0, 92, 91, 1, 0, 0, 0, 93, 96, 1, 0, 0, 0, 94, 92, 1, 0, 0, 0, 94, 95, 1, 0, 0, 0, 95, 10, 1, 0, 0, 0, 96, 94, 1, 0, 0, 0, 97, 98, 5, 36, 0, 0, 98, 12, 1, 0, 0, 0, 99, 100, 8, 0, 0, 0, 100, 14, 1, 0, 0, 0, 101, 102, 8, 1, 0, 0, 102, 16, 1, 0, 0, 0, 103, 105, 7, 2, 0, 0, 104, 103, 1, 0, 0, 0, 105, 106, 1, 0, 0, 0, 106, 104, 1, 0, 0, 0, 106, 107, 1, 0, 0, 0, 107, 18, 1, 0, 0, 0, 108, 117, 3, 17, 8, 0, 109, 113, 7, 3, 0, 0, 110, 112, 7, 4, 0, 0, 111, 110, 1, 0, 0, 0, 112, 115, 1, 0, 0, 0, 113, 111, 1, 0, 0, 0, 113, 114, 1, 0, 0, 0, 114, 117, 1, 0, 0, 0, 115, 113, 1, 0, 0, 0, 116, 108, 1, 0, 0, 0, 116, 109, 1, 0, 0, 0, 117, 20, 1, 0, 0, 0, 118, 119, 7, 5, 0, 0, 119, 22, 1, 0, 0, 0, 120, 122, 5, 13, 0, 0, 121, 120, 1, 0, 0, 0, 121, 122, 1, 0, 0, 0, 122, 123, 1, 0, 0, 0, 123, 126, 5, 10, 0, 0, 124, 126, 5, 13, 0, 0, 125, 121, 1, 0, 0, 0, 125, 124, 1, 0, 0, 0, 126, 24, 1, 0, 0, 0, 127, 128, 9, 0, 0, 0, 128, 26, 1, 0, 0, 0, 13, 0, 33, 44, 55, 64, 75, 82, 94, 106, 113, 116, 121, 125, 0]

‎gen/valueparser/EnvLangValueLexer.tokens

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
1-
STRICT_VAR=1
2-
SIMPLE_VAR=2
3-
STR=3
4-
SPACE=4
5-
CRLF=5
6-
ANY=6
1+
STRICT_VAR_WITH_DEFAULT_IF_UNSET_OR_EMPTY=1
2+
STRICT_VAR_WITH_DEFAULT_IF_UNSET=2
3+
SIMPLE_STRICT_VAR=3
4+
SIMPLE_VAR=4
5+
STR=5
6+
PESO_SIGN=6
7+
FIRST_CHAR=7
8+
REST_OF_STRING=8
9+
NUMBER=9
10+
VAR_ID=10
11+
SPACE=11
12+
CRLF=12
13+
ANY=13
14+
'$'=6

‎gen/valueparser/envlangvalue_base_listener.go

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)