marvin/asl
1
0
Fork 0
mirror of https://github.com/Kugelschieber/asl.git synced 2026-01-18 03:50:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Unary buildin functions, need to fix test!

Browse Source
This commit is contained in:
Marvin Blum
2016-01-06 22:37:59 +01:00
parent fbfbb8a55c
commit e1bf92f4aa
5 changed files with 107 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
src/parser/parser.go
View File

@@ -2,7 +2,6 @@ package parser
import (
"errors"
"fmt"
"strconv"
"tokenizer"
"types"
@@ -221,7 +220,7 @@ func (c *Compiler) parseFunction() {
c.expect("func")
// check for build in function
if buildin, _ := types.GetFunction(c.get().Token); buildin == true {
if buildin := types.GetFunction(c.get().Token); buildin != nil {
panic(errors.New(c.get().Token + " is a build in function, choose a different name"))
}
@@ -369,42 +368,27 @@ func (c *Compiler) parseFunctionCall(out bool, name string) string {
output := ""
c.expect("(")
params, paramCount := c.parseParameter(false)
paramsStr, params, paramCount := c.parseParameter(false)
c.expect(")")
// buildin function
exists, buildin := types.GetFunction(name)
buildin := types.GetFunction(name)
if exists {
if buildin != nil {
// check parameter count
if exists && paramCount < buildin.ArgsCount {
if paramCount < buildin.ArgsCount {
panic(errors.New("Function expected " + strconv.Itoa(buildin.ArgsCount) + " parameter but found " + strconv.Itoa(paramCount)))
}
if buildin.Type == types.NULL {
output = name
} else if buildin.Type == types.UNARY {
if paramCount == 1 {
output = name + " " + params
output = c.parseUnaryFunction(name, paramsStr, paramCount)
} else {
output = "[" + params + "] call " + name
output = c.parseBinaryFunction(name, params, buildin)
}
} else {
// TODO
}
fmt.Println(name)
/*if leftParamCount > 1 {
leftParams = "[" + leftParams + "]"
}
if leftParamCount > 0 {
output = leftParams + " " + name + " " + rightParams
} else {
output = name + " " + rightParams
}*/
} else {
output = "[" + params + "] call " + name
output = "[" + paramsStr + "] call " + name
}
if out {
@@ -414,12 +398,67 @@ func (c *Compiler) parseFunctionCall(out bool, name string) string {
return output
}
func (c *Compiler) parseParameter(out bool) (string, int) {
func (c *Compiler) parseUnaryFunction(name, paramsStr string, paramCount int) string {
output := ""
if paramCount == 1 {
output = name + " " + paramsStr
} else {
output = "[" + paramsStr + "] call " + name
}
return output
}
func (c *Compiler) parseBinaryFunction(name string, params []string, buildin *types.FunctionType) string {
output := ""
if buildin.ArgsLeft == 1 {
output = params[0] + " "
} else {
output = "["
for i := 0; i < buildin.ArgsLeft; i++ {
output += params[i]
if i != buildin.ArgsLeft-1 {
output += ","
}
}
output += "] "
}
output += name
if buildin.ArgsCount-buildin.ArgsLeft == 1 {
output += " " + params[1]
} else {
output += " ["
for i := buildin.ArgsLeft; i < buildin.ArgsCount; i++ {
output += params[i]
if i != buildin.ArgsCount-1 {
output += ","
}
}
output += "]"
}
return output
}
func (c *Compiler) parseParameter(out bool) (string, []string, int) {
output := ""
params := make([]string, 0)
count := 0
for !c.accept(")") {
output += c.parseExpression(out)
expr := c.parseExpression(out)
output += expr
params = append(params, expr)
count++
if !c.accept(")") {
@@ -432,7 +471,7 @@ func (c *Compiler) parseParameter(out bool) (string, int) {
c.appendOut(output, false)
}
return output, count
return output, params, count
}
func (c *Compiler) parseExpression(out bool) string {

48
src/parser/parser_test.go
View File

@@ -8,161 +8,161 @@ import (
)
func TestParserDeclaration(t *testing.T) {
got := getCompiled(t, "test/tokenizer_var.asl")
got := getCompiled(t, "../../test/tokenizer_var.asl")
want := "x = 1;\r\narray = [1,2,3];\r\n"
equal(t, got, want)
}
func TestParserAssignment(t *testing.T) {
got := getCompiled(t, "test/parser_assignment.asl")
got := getCompiled(t, "../../test/parser_assignment.asl")
want := "x = 1;\r\n"
equal(t, got, want)
}
func TestParserIf(t *testing.T) {
got := getCompiled(t, "test/tokenizer_if.asl")
got := getCompiled(t, "../../test/tokenizer_if.asl")
want := "if (a<b) then {\r\n};\r\n"
equal(t, got, want)
}
func TestParserWhile(t *testing.T) {
got := getCompiled(t, "test/tokenizer_while.asl")
got := getCompiled(t, "../../test/tokenizer_while.asl")
want := "while {true} do {\r\n};"
equal(t, got, want)
}
func TestParserFor(t *testing.T) {
got := getCompiled(t, "test/tokenizer_for.asl")
got := getCompiled(t, "../../test/tokenizer_for.asl")
want := "for [{i=0}, {i<100}, {i=i+1}] do {\r\n};\r\n"
equal(t, got, want)
}
func TestParserForeach(t *testing.T) {
got := getCompiled(t, "test/tokenizer_foreach.asl")
got := getCompiled(t, "../../test/tokenizer_foreach.asl")
want := "{\r\nunit = _x;\r\n} forEach (allUnits);\r\n"
equal(t, got, want)
}
func TestParserSwitch(t *testing.T) {
got := getCompiled(t, "test/tokenizer_switch.asl")
got := getCompiled(t, "../../test/tokenizer_switch.asl")
want := "switch (x) do {\r\ncase 1:\r\n{\r\nx = 1;\r\n};\r\ncase 2:\r\n{\r\nx = 2;\r\n};\r\ndefault:\r\n{\r\nx = 3;\r\n};\r\n};\r\n"
equal(t, got, want)
}
func TestParserFunction(t *testing.T) {
got := getCompiled(t, "test/tokenizer_func.asl")
got := getCompiled(t, "../../test/tokenizer_func.asl")
want := "TestFunction = {\r\nparams [\"param0\",\"param1\"];\r\nreturn true;\r\n};\r\n"
equal(t, got, want)
}
func TestParserAssignResult(t *testing.T) {
got := getCompiled(t, "test/parser_assign_result.asl")
got := getCompiled(t, "../../test/parser_assign_result.asl")
want := "x = ([1, 2, 3] call foo);\r\ny = ([1, 2, 3] call bar);\r\n"
equal(t, got, want)
}
func TestParserExpression(t *testing.T) {
got := getCompiled(t, "test/parser_expression.asl")
got := getCompiled(t, "../../test/parser_expression.asl")
want := "x = -(1+(2+3))/(6*(someVariable+99-100))-(20)+!anotherVariable+([] call foo);\r\n"
equal(t, got, want)
}
func TestParserExpression2(t *testing.T) {
got := getCompiled(t, "test/parser_expression2.asl")
got := getCompiled(t, "../../test/parser_expression2.asl")
want := "x = true||(3>=4&&5<8);\r\n"
equal(t, got, want)
}
func TestParserFunctionCall(t *testing.T) {
got := getCompiled(t, "test/parser_func_call.asl")
got := getCompiled(t, "../../test/parser_func_call.asl")
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)
}
func TestParserBuildinFunctionCall(t *testing.T) {
got := getCompiled(t, "test/parser_buildin_func.asl")
got := getCompiled(t, "../../test/parser_buildin_func.asl")
want := "_x = (([player, foo] getVar bar) setHit [\"head\", \"tail\"]);\r\n"
equal(t, got, want)
}
func TestParserOperator(t *testing.T) {
got := getCompiled(t, "test/parser_operator.asl")
got := getCompiled(t, "../../test/parser_operator.asl")
want := "if (x==y&&x!=y&&x<=y&&x>=y&&x<y&&x>y) then {\r\n};\r\n"
equal(t, got, want)
}
func TestParserTryCatch(t *testing.T) {
got := getCompiled(t, "test/parser_try_catch.asl")
got := getCompiled(t, "../../test/parser_try_catch.asl")
want := "try {\r\n} catch {\r\n};\r\n"
equal(t, got, want)
}
func TestParserNegationFunctionCall(t *testing.T) {
got := getCompiled(t, "test/parser_negation.asl")
got := getCompiled(t, "../../test/parser_negation.asl")
want := "x = !([] call foo);\r\n"
equal(t, got, want)
}
func TestParserExitWith(t *testing.T) {
got := getCompiled(t, "test/parser_exitwith.asl")
got := getCompiled(t, "../../test/parser_exitwith.asl")
want := "if (true) exitWith {\r\n};\r\n"
equal(t, got, want)
}
func TestParserWaitUntil(t *testing.T) {
got := getCompiled(t, "test/parser_waituntil.asl")
got := getCompiled(t, "../../test/parser_waituntil.asl")
want := "waitUntil {x=x+1;x<100};\r\n"
equal(t, got, want)
}
func TestParserArray(t *testing.T) {
got := getCompiled(t, "test/parser_array.asl")
got := getCompiled(t, "../../test/parser_array.asl")
want := "x = [1,2,3];\r\ny = (x select (1));\r\n"
equal(t, got, want)
}
func TestParserFunctionParams(t *testing.T) {
got := getCompiled(t, "test/parser_func_params.asl")
got := getCompiled(t, "../../test/parser_func_params.asl")
want := "myFunc = {\r\nparams [[\"a\",1],[\"b\",2]];\r\nreturn a+b;\r\n};\r\n"
equal(t, got, want)
}
func TestParserInlineCode(t *testing.T) {
got := getCompiled(t, "test/parser_code.asl")
got := getCompiled(t, "../../test/parser_code.asl")
want := "inline_code = {a = 1;b = 2;if (a<b) then {[] call foo;};};\r\n"
equal(t, got, want)
}
func TestParserPreprocessor(t *testing.T) {
got := getCompiled(t, "test/tokenizer_preprocessor.asl")
got := getCompiled(t, "../../test/tokenizer_preprocessor.asl")
want := "\r\n#define HELLO_WORLD \"Hello World!\"\r\nhint HELLO_WORLD;\r\n"
equal(t, got, want)
}
func TestParserExpressionArray(t *testing.T) {
got := getCompiled(t, "test/parser_expression_array.asl")
got := getCompiled(t, "../../test/parser_expression_array.asl")
want := "x = [1,2,3]-[2,3];\r\n"
equal(t, got, want)
@@ -176,7 +176,7 @@ func getCompiled(t *testing.T, file string) string {
t.FailNow()
}
tokens := tokenizer.Tokenize(code)
tokens := tokenizer.Tokenize(code, false)
compiler := parser.Compiler{}
return compiler.Parse(tokens, true)

25
src/tokenizer/tokenizer_test.go
View File

@@ -7,7 +7,7 @@ import (
)
func TestTokenizerVar(t *testing.T) {
got := getTokens(t, "test/tokenizer_var.asl")
got := getTokens(t, "../../test/tokenizer_var.asl")
want := []string{"var", "x", "=", "1", ";", "var", "array", "=", "[", "1", ",", "2", ",", "3", "]", ";"}
compareLength(t, &got, &want)
@@ -15,7 +15,7 @@ func TestTokenizerVar(t *testing.T) {
}
func TestTokenizerIf(t *testing.T) {
got := getTokens(t, "test/tokenizer_if.asl")
got := getTokens(t, "../../test/tokenizer_if.asl")
want := []string{"if", "a", "<", "b", "{", "}"}
compareLength(t, &got, &want)
@@ -23,7 +23,7 @@ func TestTokenizerIf(t *testing.T) {
}
func TestTokenizerWhile(t *testing.T) {
got := getTokens(t, "test/tokenizer_while.asl")
got := getTokens(t, "../../test/tokenizer_while.asl")
want := []string{"while", "true", "{", "}"}
compareLength(t, &got, &want)
@@ -31,7 +31,7 @@ func TestTokenizerWhile(t *testing.T) {
}
func TestTokenizerFor(t *testing.T) {
got := getTokens(t, "test/tokenizer_for.asl")
got := getTokens(t, "../../test/tokenizer_for.asl")
want := []string{"for", "var", "i", "=", "0", ";", "i", "<", "100", ";", "i", "=", "i", "+", "1", "{", "}"}
compareLength(t, &got, &want)
@@ -39,7 +39,7 @@ func TestTokenizerFor(t *testing.T) {
}
func TestTokenizerForach(t *testing.T) {
got := getTokens(t, "test/tokenizer_foreach.asl")
got := getTokens(t, "../../test/tokenizer_foreach.asl")
want := []string{"foreach", "unit", "=", ">", "allUnits", "{", "}"}
compareLength(t, &got, &want)
@@ -47,7 +47,7 @@ func TestTokenizerForach(t *testing.T) {
}
func TestTokenizerSwitch(t *testing.T) {
got := getTokens(t, "test/tokenizer_switch.asl")
got := getTokens(t, "../../test/tokenizer_switch.asl")
want := []string{"switch", "x", "{", "case", "1", ":", "x", "=", "1", ";", "case", "2", ":", "x", "=", "2", ";", "default", ":", "x", "=", "3", ";", "}"}
compareLength(t, &got, &want)
@@ -55,7 +55,7 @@ func TestTokenizerSwitch(t *testing.T) {
}
func TestTokenizerFunction(t *testing.T) {
got := getTokens(t, "test/tokenizer_func.asl")
got := getTokens(t, "../../test/tokenizer_func.asl")
want := []string{"func", "TestFunction", "(", "param0", ",", "param1", ")", "{", "return", "true", ";", "}"}
compareLength(t, &got, &want)
@@ -63,7 +63,7 @@ func TestTokenizerFunction(t *testing.T) {
}
func TestTokenizerExpression(t *testing.T) {
got := getTokens(t, "test/tokenizer_expr.asl")
got := getTokens(t, "../../test/tokenizer_expr.asl")
want := []string{"x", "=", "(", "(", "1", "+", "2", "+", "3", ")", "*", "4", "/", "2", ")", "+", "foo", "(", "1", ",", "2", ",", "3", ")", ";"}
compareLength(t, &got, &want)
@@ -71,7 +71,7 @@ func TestTokenizerExpression(t *testing.T) {
}
func TestTokenizerIdentifier(t *testing.T) {
got := getTokens(t, "test/tokenizer_identifier.asl")
got := getTokens(t, "../../test/tokenizer_identifier.asl")
want := []string{"var", "format", "=", "\"should not be for mat!\"", ";"}
compareLength(t, &got, &want)
@@ -79,7 +79,7 @@ func TestTokenizerIdentifier(t *testing.T) {
}
func TestTokenizerInlineCode(t *testing.T) {
got := getTokens(t, "test/tokenizer_code.asl")
got := getTokens(t, "../../test/tokenizer_code.asl")
want := []string{"var", "x", "=", "code", "(", "\"var x = 5;\"", ")", ";"}
compareLength(t, &got, &want)
@@ -87,7 +87,7 @@ func TestTokenizerInlineCode(t *testing.T) {
}
func TestTokenizerPreprocessor(t *testing.T) {
got := getTokens(t, "test/tokenizer_preprocessor.asl")
got := getTokens(t, "../../test/tokenizer_preprocessor.asl")
want := []string{"#define HELLO_WORLD \"Hello World!\"", "hint", "(", ")", "(", "HELLO_WORLD", ")", ";"}
compareLength(t, &got, &want)
@@ -95,8 +95,7 @@ func TestTokenizerPreprocessor(t *testing.T) {
}
func TestTokenizerMask(t *testing.T) {
got := getTokens(t, "test/tokenizer_mask.asl")
//var y = code("var z = \"Hello \\"World\\"\";");
got := getTokens(t, "../../test/tokenizer_mask.asl")
want := []string{"var", "x", "=", "\"Hello \\\"World\\\"\"", ";",
"var", "y", "=", "code", "(", "\"var z = \\\"Hello \\\\\"World\\\\\"\\\";\"", ")", ";"}

8
src/types/loader.go
View File

@@ -29,17 +29,17 @@ type FunctionType struct {
var functions []FunctionType
// Returns function type information by name.
// If not found, the first parameter will be false.
func GetFunction(name string) (bool, FunctionType) {
// If not found, the parameter will be nil.
func GetFunction(name string) *FunctionType {
name = strings.ToLower(name)
for _, function := range functions {
if function.Name == name {
return true, function
return &function
}
}
return false, FunctionType{}
return nil
}
// Loads type information from file.

2
test/parser_buildin_func.asl
View File

@@ -1 +1 @@
var _x = setHit(getVar(player, foo)(bar))("head", "tail");
var _x = setHit(getVar(player, foo, bar), "head", "tail");