From d7013b01c32c96acc0090e8514ff0272a0aff60b Mon Sep 17 00:00:00 2001 From: Marvin Blum Date: Wed, 28 Oct 2015 18:58:40 +0100 Subject: [PATCH] Issue #6. --- in/simple.asl | 2 +- src/asl/parser.go | 3 ++- src/asl/parser_test.go | 7 +++++++ test/parser_code.asl | 1 + 4 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 test/parser_code.asl diff --git a/in/simple.asl b/in/simple.asl index c168559..f5a6680 100644 --- a/in/simple.asl +++ b/in/simple.asl @@ -1 +1 @@ -var inline_code = code(""); +var inline_code = code("var a = 1;var b = 2;if a < b {foo();}"); diff --git a/src/asl/parser.go b/src/asl/parser.go index 8315e1b..090e4c4 100644 --- a/src/asl/parser.go +++ b/src/asl/parser.go @@ -297,7 +297,8 @@ func (c *Compiler) parseInlineCode() string { output := "{}" if len(code) > 2 { - //output = "{"+Parse(Tokenize([]byte(code[1:len(code)-1])), pretty)+"}" + compiler := Compiler{} + output = "{"+compiler.Parse(Tokenize([]byte(code[1:len(code)-1])), false)+"}" } c.expect(")") diff --git a/src/asl/parser_test.go b/src/asl/parser_test.go index a02137e..c470f9a 100644 --- a/src/asl/parser_test.go +++ b/src/asl/parser_test.go @@ -146,6 +146,13 @@ func TestParserFunctionParams(t *testing.T) { equal(t, got, want) } +func TestParserInlineCode(t *testing.T) { + got := getCompiled(t, "test/parser_code.asl") + want := "inline_code = {a = 1;b = 2;if (a