Skip to content

Support concatenation of arrays #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dragos merged 3 commits into from
Jul 12, 2017
Merged

Support concatenation of arrays #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c7f3607
substitution on left site of not allowed
mkurz Jul 10, 2017
4a076fe
Define Substitution
mkurz Jul 10, 2017
74edfb9
Support concatenation of arrays
mkurz Jul 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion com.typesafe.hocon.tests/src/com/typesafe/hocon/parser/ParserTest.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ class ParserTest {
// This is a map with some nested maps and arrays within it, as well as some concatenations
qux {
baz: abc 123
biz: [element1, element2] [element3, element4]
buz: [prependelementtoarray] ${arrayref}
bar: {
baz: abcdefg
bar: {
Expand Down Expand Up @@ -118,7 +120,7 @@ class ParserTest {

@Test
def void testSubstitution() {
succeeds("${foo.bar} += ${akka.timeout}\n")
succeeds("foo.bar += ${akka.timeout}\n")
Copy link
Collaborator Author

@mkurz mkurz Jul 10, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test was incorrect. HOCON does not allow a substitution on the left site of a declaration.
I check myself - a play app for example with such a statement would not start up and fail with with a parse exception.

}

@Test
Expand Down
12 changes: 8 additions & 4 deletions com.typesafe.hocon/src/com/typesafe/config/Hocon.xtext
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,18 @@ Member:
;

Literal:
(value += SimpleLiteral)+ | Object | Array ;
(value += SimpleLiteral)+ | Object | (value += Array)+ ;

SimpleLiteral returns EString:
(StringLiteral | name = Boolean | Null | NumberLiteral)
(StringLiteral | name = Boolean | Null | NumberLiteral | Substitution)
;

Array:
('[' NL*
(values+=Literal)
((',' | NL) NL* values+=Literal)*
NL*
']') | ( '[' NL* ']' )
']') | Substitution | ( '[' NL* ']' )
;

Boolean:
Expand All @@ -50,7 +50,11 @@ Null:


StringLiteral returns EString:
(name = STRING | name = UNQUOTED_STRING | '${' ('?')? UNQUOTED_STRING '}')
(name = STRING | name = UNQUOTED_STRING)
;

Substitution returns EString:
'${' ('?')? UNQUOTED_STRING '}'
;

NumberLiteral:
Expand Down