This commit is contained in:
Marvin Blum
2015-10-28 18:08:08 +01:00
parent bba215cd8d
commit 0b26c5bdf8
3 changed files with 11 additions and 10 deletions

View File

@@ -1,4 +1,3 @@
switch x { func myFunc(a, b) {
case 1: // ...
x = 1;
} }

View File

@@ -1,7 +1,7 @@
package asl package asl
import ( import (
"strconv"
) )
const TAB = " " const TAB = " "
@@ -218,18 +218,20 @@ func parseFunctionParameter() {
return return
} }
i := int64(0) appendOut("params [", false)
for !accept(")") { for !accept(")") {
name := get().token name := get().token
next() next()
appendOut(name+" = _this select "+strconv.FormatInt(i, 10)+";", true) appendOut("\""+name+"\"", false)
i++
if !accept(")") { if !accept(")") {
expect(",") expect(",")
appendOut(",", false)
} }
} }
appendOut("];", true)
} }
func parseReturn() { func parseReturn() {

View File

@@ -57,7 +57,7 @@ func TestParserSwitch(t *testing.T) {
func TestParserFunction(t *testing.T) { func TestParserFunction(t *testing.T) {
got := getCompiled(t, "test/tokenizer_func.asl") got := getCompiled(t, "test/tokenizer_func.asl")
want := "TestFunction = {\r\nparam0 = _this select 0;\r\nparam1 = _this select 1;\r\nreturn true;\r\n};\r\n" want := "TestFunction = {\r\nparams [\"param0\",\"param1\"];\r\nreturn true;\r\n};\r\n"
equal(t, got, want) equal(t, got, want)
} }
@@ -85,7 +85,7 @@ func TestParserExpression2(t *testing.T) {
func TestParserFunctionCall(t *testing.T) { func TestParserFunctionCall(t *testing.T) {
got := getCompiled(t, "test/parser_func_call.asl") got := getCompiled(t, "test/parser_func_call.asl")
want := "myFunc = {\r\na = _this select 0;\r\nb = _this select 1;\r\nreturn a>b;\r\n};\r\n[1+3/4, 2-(66*22)/3-((123))] call myFunc;\r\n" want := "myFunc = {\r\nparams [\"a\",\"b\"];\r\nreturn a>b;\r\n};\r\n[1+3/4, 2-(66*22)/3-((123))] call myFunc;\r\n"
equal(t, got, want) equal(t, got, want)
} }