This commit is contained in:
Marvin Blum
2015-11-14 16:22:39 +01:00
parent 3990a20cb0
commit 1208bda68c
4 changed files with 27 additions and 20 deletions

View File

@@ -252,18 +252,14 @@ The following features are not implemented yet, but will be in 1.1.0 or a future
* scopes * scopes
* else if * else if
* arrays within expressions (like someArray-[someEntity]) * selector in expression
scopes won't be supported, since they are a stupid concept and can be replaced by functions. scopes won't be supported, since they are a stupid concept and can be replaced by functions.
There is a simple workaround for arrays within expressions:
Selectors in expressions do not work (yet):
``` ```
// want: ... forEach allCurators-[myCurator]; var x = ([1, 2, 3]-[1, 2])[0]; // should result in 3
var myCuratorArray = [myCurator]; // or a more complex expression within array
foreach allCurators-myCuratorArray {
// ...
}
``` ```
## Contribute ## Contribute

View File

@@ -70,34 +70,35 @@ func (c *Compiler) parseVar() {
if c.accept("=") { if c.accept("=") {
c.next() c.next()
c.appendOut(" = ", false) c.appendOut(" = ", false)
if c.accept("[") {
c.parseArray()
} else {
c.parseExpression(true) c.parseExpression(true)
} }
}
c.expect(";") c.expect(";")
c.appendOut(";", true) c.appendOut(";", true)
} }
func (c *Compiler) parseArray() { func (c *Compiler) parseArray(out bool) string {
output := ""
c.expect("[") c.expect("[")
c.appendOut("[", false) output += "["
if !c.accept("]") { if !c.accept("]") {
c.parseExpression(true) output += c.parseExpression(false)
for c.accept(",") { for c.accept(",") {
c.next() c.next()
c.appendOut(",", false) output += ","+c.parseExpression(false)
c.parseExpression(true)
} }
} }
c.expect("]") c.expect("]")
c.appendOut("]", false) output += "]"
if out {
c.appendOut(output, false)
}
return output
} }
func (c *Compiler) parseIf() { func (c *Compiler) parseIf() {
@@ -463,6 +464,8 @@ func (c *Compiler) parseIdentifier() string {
name := c.get().Token name := c.get().Token
c.next() c.next()
output = "(" + c.parseFunctionCall(false, name) + ")" output = "(" + c.parseFunctionCall(false, name) + ")"
} else if c.accept("[") {
output += c.parseArray(false)
} else if c.seek("[") { } else if c.seek("[") {
output += "("+c.get().Token output += "("+c.get().Token
c.next() c.next()

View File

@@ -161,6 +161,13 @@ func TestParserPreprocessor(t *testing.T) {
equal(t, got, want) equal(t, got, want)
} }
func TestParserExpressionArray(t *testing.T) {
got := getCompiled(t, "test/parser_expression_array.asl")
want := "x = [1,2,3]-[2,3];\r\n"
equal(t, got, want)
}
func getCompiled(t *testing.T, file string) string { func getCompiled(t *testing.T, file string) string {
code, err := ioutil.ReadFile(file) code, err := ioutil.ReadFile(file)

View File

@@ -0,0 +1 @@
var x = [1, 2, 3]-[2, 3];