Fixed binary buildin functions and tests.

Recompiled for previous fix

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+**1.2.0**
+
+* better error output
+* concurrent compiling
+* errors are handled per file and won't stop the whole compilation
+* function name check for build in functions
+* function parameter count check for build in functions
+
 **1.1.1**
 
 * arrays can now be declared within expressions

README.md

@@ -234,7 +234,7 @@ Keywords should not be used as identifiers. Here is a full list of all keywords
 | var |
 | if |
 | while |
-| witch |
+| switch |
 | for |
 | foreach |
 | func |

ToDo.md

@@ -6,14 +6,15 @@
 * ~~pretty/minified printing~~
 * ~~usage~~
 * ~~recursive compiling~~
-* concurrent compiling
+* ~~concurrent compiling~~
 * ~~inline buildin function call -> foo(a)(bar(x)(y));~~
 * ~~negative values e.g. -1, operator !~~
 * ~~tokenizer splits commands like "format" -> for, mat~~
 * ~~try ... catch~~
-* better error reporting
+* ~~better error reporting~~
-    - recover panic
+    - ~~recover panic~~
-    - line, column
+    - ~~line, column~~
+* type check for functions
 
 ## Special cases
 

src/main/asl.go

@@ -1,34 +1,36 @@
 package main
 
 import (
-	"parser"
-	"tokenizer"
 	"fmt"
 	"io/ioutil"
-	"path/filepath"
 	"os"
+	"parser"
+	"path/filepath"
 	"strings"
+	"tokenizer"
+	"types"
 )
 
 const (
-    version = "1.1.1"
+	version       = "1.2.0"
-    extension = ".asl"
+	extension     = ".asl"
-    sqfextension = ".sqf"
+	sqfextension  = ".sqf"
-    PathSeparator = string(os.PathSeparator)
+	typeinfo      = "types"
+	PathSeparator = string(os.PathSeparator)
 )
 
 type ASLFile struct {
-    in string
+	in      string
-    out string
+	out     string
-    newname string
+	newname string
 }
 
 var (
-    recursive bool = false
+	recursive bool = false
-    pretty bool = false
+	pretty    bool = false
-    exit bool = false
+	exit      bool = false
-    aslFiles []ASLFile
+	aslFiles  []ASLFile
-    inDir string
+	inDir     string
 )
 
 func usage() {
@@ -41,78 +43,118 @@ func usage() {
 	fmt.Println("<output directory> output directory, directory structure will be created corresponding to input directory")
 }
 
+// Parses compiler flags.
 func flags(flag string) bool {
-    flag = strings.ToLower(flag)
+	flag = strings.ToLower(flag)
 
-    if flag[0] == '-' {
+	if flag[0] != '-' {
-        if flag == "-v" {
+		return false
-            fmt.Println("asl version "+version)
+	}
-            exit = true
-        } else if flag == "-r" {
-            recursive = true
-        } else if flag == "-pretty" {
-            pretty = true
-        } else if flag == "--help" {
-            usage()
-            exit = true
-        }
 
-        return true
+	if flag == "-v" {
-    }
+		fmt.Println("asl version " + version)
+		exit = true
+	} else if flag == "-r" {
+		recursive = true
+	} else if flag == "-pretty" {
+		pretty = true
+	} else if flag == "--help" {
+		usage()
+		exit = true
+	}
 
-    return false
+	return true
 }
 
+// Loads types from types file.
+// If none is provided, an error will be printed.
+func loadTypes() {
+	if err := types.LoadTypes(typeinfo); err != nil {
+		fmt.Println("No 'types' file provided. Please add type information to this file from 'supportInfo' script command output.")
+		exit = true
+	}
+}
+
+// Creates a list of all ASL files to compile.
 func readAslFiles(path string) {
-    dir, err := ioutil.ReadDir(path)
+	dir, err := ioutil.ReadDir(path)
 
-    if err != nil {
+	if err != nil {
-        fmt.Println("Error reading in directory!")
+		fmt.Println("Error reading in directory!")
-        return
+		return
-    }
+	}
 
-    for i := 0; i < len(dir); i++ {
+	for i := 0; i < len(dir); i++ {
-        name := dir[i].Name()
+		name := dir[i].Name()
 
-        if dir[i].IsDir() && recursive {
+		if dir[i].IsDir() && recursive {
-            readAslFiles(filepath.FromSlash(path+PathSeparator+name))
+			readAslFiles(filepath.FromSlash(path + PathSeparator + name))
-            continue
+			continue
-        }
+		}
 
-        if !dir[i].IsDir() && strings.ToLower(filepath.Ext(name)) == extension {
+		if !dir[i].IsDir() && strings.ToLower(filepath.Ext(name)) == extension {
-            in := filepath.FromSlash(path+PathSeparator+dir[i].Name())
+			in := filepath.FromSlash(path + PathSeparator + dir[i].Name())
-            out := filepath.FromSlash("./"+path[len(inDir):len(path)])
+			out := filepath.FromSlash("./" + path[len(inDir):len(path)])
-            newname := name[:len(name)-len(filepath.Ext(name))] 
+			newname := name[:len(name)-len(filepath.Ext(name))]
 
-            file := ASLFile{in, out, newname}
+			file := ASLFile{in, out, newname}
-            aslFiles = append(aslFiles, file)
+			aslFiles = append(aslFiles, file)
-        }
+		}
-    }
+	}
 }
 
+// Recovers and prints thrown error.
+func recoverCompileError(file string, waiter chan bool) {
+	if r := recover(); r != nil {
+		fmt.Println("Compile error in file "+file+":", r)
+	}
+
+	waiter <- true // the show must go on
+}
+
+// Compiles a single ASL file.
+func compileFile(path string, file ASLFile, waiter chan bool) {
+	defer recoverCompileError(file.in, waiter)
+
+	// read file
+	out := filepath.FromSlash(path + PathSeparator + file.out + PathSeparator + file.newname + sqfextension)
+	fmt.Println(file.in + " -> " + out)
+	code, err := ioutil.ReadFile(file.in)
+
+	if err != nil {
+		fmt.Println("Error reading file: " + file.in)
+		return
+	}
+
+	// compile
+	token := tokenizer.Tokenize(code, false)
+	compiler := parser.Compiler{}
+	sqf := compiler.Parse(token, pretty)
+
+	os.MkdirAll(filepath.FromSlash(path+PathSeparator+file.out), 0777)
+	err = ioutil.WriteFile(out, []byte(sqf), 0666)
+
+	if err != nil {
+		fmt.Println("Error writing file: " + file.out)
+		fmt.Println(err)
+	}
+
+	waiter <- true // done
+}
+
+// Compiles ASL files concurrently.
 func compile(path string) {
-    for i := 0; i < len(aslFiles); i++ {
+	waiter := make(chan bool, len(aslFiles))
-        out := filepath.FromSlash(path+PathSeparator+aslFiles[i].out+PathSeparator+aslFiles[i].newname+sqfextension)
-        fmt.Println(aslFiles[i].in+" -> "+out)
-        code, err := ioutil.ReadFile(aslFiles[i].in)
 
-        if err != nil {
+	// fire compile
-            fmt.Println("Error reading file: "+aslFiles[i].in)
+	for i := 0; i < len(aslFiles); i++ {
-            continue
+		go compileFile(path, aslFiles[i], waiter)
-        }
+	}
 
-    	token := tokenizer.Tokenize(code, false)
+	// wait until all files are compiled
-    	compiler := parser.Compiler{}
+	for i := 0; i < len(aslFiles); i++ {
-    	sqf := compiler.Parse(token, pretty)
+		<-waiter
-    	
+	}
-    	os.MkdirAll(filepath.FromSlash(path+PathSeparator+aslFiles[i].out), 0777)
-    	err = ioutil.WriteFile(out, []byte(sqf), 0666)
-    	
-    	if err != nil {
-    	    fmt.Println("Error writing file: "+aslFiles[i].out)
-    	    fmt.Println(err)
-    	}
-    }
 }
 
 func main() {
@@ -120,29 +162,37 @@ func main() {
 
 	// flags
 	if len(args) < 2 {
-	    usage()
+		usage()
-	    return
+		return
 	}
 
 	var i int
-	for i = 1; i < len(args) && flags(args[i]); i++ {}
+	for i = 1; i < len(args) && flags(args[i]); i++ {
+	}
 
 	if exit {
-	    return
+		return
+	}
+
+	// load type information
+	loadTypes()
+
+	if exit {
+		return
 	}
 
 	// in/out parameter
 	out := ""
 
 	if i < len(args) {
-	    inDir = args[i]
+		inDir = args[i]
-	    i++
+		i++
 	} else {
-	    return
+		return
 	}
 
 	if i < len(args) {
-	    out = args[i]
+		out = args[i]
 	}
 
 	readAslFiles(inDir)

src/parser/parser.go

@@ -1,7 +1,9 @@
 package parser
 
 import (
+	"errors"
 	"tokenizer"
+	"types"
 )
 
 const new_line = "\r\n"
@@ -10,7 +12,7 @@ const new_line = "\r\n"
 // and writes SQF code into desired location.
 func (c *Compiler) Parse(token []tokenizer.Token, prettyPrinting bool) string {
 	if !c.initParser(token, prettyPrinting) {
-	    return ""
+		return ""
 	}
 
 	for c.tokenIndex < len(token) {
@@ -21,9 +23,9 @@ func (c *Compiler) Parse(token []tokenizer.Token, prettyPrinting bool) string {
 }
 
 func (c *Compiler) parseBlock() {
-    if c.get().Preprocessor {
+	if c.get().Preprocessor {
-        c.parsePreprocessor()
+		c.parsePreprocessor()
-    } else if c.accept("var") {
+	} else if c.accept("var") {
 		c.parseVar()
 	} else if c.accept("if") {
 		c.parseIf()
@@ -42,9 +44,9 @@ func (c *Compiler) parseBlock() {
 	} else if c.accept("try") {
 		c.parseTryCatch()
 	} else if c.accept("exitwith") {
-	    c.parseExitWith()
+		c.parseExitWith()
 	} else if c.accept("waituntil") {
-	    c.parseWaitUntil()
+		c.parseWaitUntil()
 	} else if c.accept("case") || c.accept("default") {
 		return
 	} else {
@@ -57,9 +59,9 @@ func (c *Compiler) parseBlock() {
 }
 
 func (c *Compiler) parsePreprocessor() {
-    // we definitely want a new line before and after
+	// we definitely want a new line before and after
-    c.appendOut(new_line+c.get().Token+new_line, false)
+	c.appendOut(new_line+c.get().Token+new_line, false)
-    c.next()
+	c.next()
 }
 
 func (c *Compiler) parseVar() {
@@ -78,7 +80,7 @@ func (c *Compiler) parseVar() {
 }
 
 func (c *Compiler) parseArray(out bool) string {
-    output := ""
+	output := ""
 	c.expect("[")
 	output += "["
 
@@ -87,7 +89,7 @@ func (c *Compiler) parseArray(out bool) string {
 
 		for c.accept(",") {
 			c.next()
-			output += ","+c.parseExpression(false)
+			output += "," + c.parseExpression(false)
 		}
 	}
 
@@ -95,7 +97,7 @@ func (c *Compiler) parseArray(out bool) string {
 	output += "]"
 
 	if out {
-	    c.appendOut(output, false)
+		c.appendOut(output, false)
 	}
 
 	return output
@@ -215,6 +217,12 @@ func (c *Compiler) parseForeach() {
 
 func (c *Compiler) parseFunction() {
 	c.expect("func")
+
+	// check for build in function
+	if buildin := types.GetFunction(c.get().Token); buildin != nil {
+		panic(errors.New(c.get().Token + " is a build in function, choose a different name"))
+	}
+
 	c.appendOut(c.get().Token+" = {", true)
 	c.next()
 	c.expect("(")
@@ -239,12 +247,12 @@ func (c *Compiler) parseFunctionParameter() {
 		c.next()
 
 		if c.accept("=") {
-		    c.next()
+			c.next()
-		    value := c.get().Token
+			value := c.get().Token
-		    c.next()
+			c.next()
-		    c.appendOut("[\""+name+"\","+value+"]", false)
+			c.appendOut("[\""+name+"\","+value+"]", false)
 		} else {
-		    c.appendOut("\""+name+"\"", false)
+			c.appendOut("\""+name+"\"", false)
 		}
 
 		if !c.accept(")") {
@@ -279,47 +287,47 @@ func (c *Compiler) parseTryCatch() {
 }
 
 func (c *Compiler) parseExitWith() {
-    c.expect("exitwith")
+	c.expect("exitwith")
-    c.expect("{")
+	c.expect("{")
-    c.appendOut("if (true) exitWith {", true)
+	c.appendOut("if (true) exitWith {", true)
-    c.parseBlock()
+	c.parseBlock()
-    c.expect("}")
+	c.expect("}")
-    c.appendOut("};", true)
+	c.appendOut("};", true)
 }
 
 func (c *Compiler) parseWaitUntil() {
-    c.expect("waituntil")
+	c.expect("waituntil")
-    c.expect("(")
+	c.expect("(")
-    c.appendOut("waitUntil {", false)
+	c.appendOut("waitUntil {", false)
-    c.parseExpression(true)
+	c.parseExpression(true)
 
-    if c.accept(";") {
+	if c.accept(";") {
-        c.next()
+		c.next()
-        c.appendOut(";", false)
+		c.appendOut(";", false)
-        c.parseExpression(true)
+		c.parseExpression(true)
-    }
+	}
 
-    c.expect(")")
+	c.expect(")")
-    c.expect(";")
+	c.expect(";")
-    c.appendOut("};", true)
+	c.appendOut("};", true)
 }
 
 func (c *Compiler) parseInlineCode() string {
-    c.expect("code")
+	c.expect("code")
-    c.expect("(")
+	c.expect("(")
 
-    code := c.get().Token
+	code := c.get().Token
-    c.next()
+	c.next()
-    output := "{}"
+	output := "{}"
 
-    if len(code) > 2 {
+	if len(code) > 2 {
-        compiler := Compiler{}
+		compiler := Compiler{}
-        output = "{"+compiler.Parse(tokenizer.Tokenize([]byte(code[1:len(code)-1]), true), false)+"}"
+		output = "{" + compiler.Parse(tokenizer.Tokenize([]byte(code[1:len(code)-1]), true), false) + "}"
-    }
+	}
 
-    c.expect(")")
+	c.expect(")")
 
-    return output
+	return output
 }
 
 // Everything that does not start with a keyword.
@@ -359,30 +367,22 @@ func (c *Compiler) parseFunctionCall(out bool, name string) string {
 	output := ""
 
 	c.expect("(")
-	leftParams, leftParamCount := c.parseParameter(false)
+	paramsStr, paramCount := c.parseParameter(false)
 	c.expect(")")
 
-	if c.accept("(") {
+	// buildin function
-		// buildin function
+	buildin := types.GetFunction(name)
-		c.next()
-		rightParams, rightParamCount := c.parseParameter(false)
-		c.expect(")")
 
-		if leftParamCount > 1 {
+	if buildin != nil {
-			leftParams = "[" + leftParams + "]"
+		if buildin.Type == types.NULL {
-		}
+			output = name
-
+		} else if buildin.Type == types.UNARY {
-		if rightParamCount > 1 {
+			output = c.parseUnaryFunction(name, paramsStr, paramCount)
-			rightParams = "[" + rightParams + "]"
-		}
-
-		if leftParamCount > 0 {
-			output = leftParams + " " + name + " " + rightParams
 		} else {
-			output = name + " " + rightParams
+			output = c.parseBinaryFunction(name, paramsStr, buildin, paramCount)
 		}
 	} else {
-		output = "[" + leftParams + "] call " + name
+		output = "[" + paramsStr + "] call " + name
 	}
 
 	if out {
@@ -392,12 +392,49 @@ func (c *Compiler) parseFunctionCall(out bool, name string) string {
 	return output
 }
 
+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, leftParamsStr string, buildin *types.FunctionType, paramCount int) string {
+	output := ""
+
+	c.next()
+	rightParamsStr, rightParamCount := c.parseParameter(false)
+	c.expect(")")
+
+	if paramCount > 1 {
+		leftParamsStr = "[" + leftParamsStr + "]"
+	}
+
+	if rightParamCount > 1 {
+		rightParamsStr = "[" + rightParamsStr + "]"
+	}
+
+	if paramCount > 0 {
+		output = leftParamsStr + " " + name + " " + rightParamsStr
+	} else {
+		output = name + " " + rightParamsStr
+	}
+
+	return output
+}
+
 func (c *Compiler) parseParameter(out bool) (string, int) {
 	output := ""
 	count := 0
 
 	for !c.accept(")") {
-		output += c.parseExpression(out)
+		expr := c.parseExpression(out)
+		output += expr
 		count++
 
 		if !c.accept(")") {
@@ -459,19 +496,19 @@ func (c *Compiler) parseIdentifier() string {
 	output := ""
 
 	if c.accept("code") {
-	    output += c.parseInlineCode()
+		output += c.parseInlineCode()
 	} else if c.seek("(") && !c.accept("!") && !c.accept("-") {
 		name := c.get().Token
 		c.next()
 		output = "(" + c.parseFunctionCall(false, name) + ")"
 	} else if c.accept("[") {
-	    output += c.parseArray(false)
+		output += c.parseArray(false)
 	} else if c.seek("[") {
-	    output += "("+c.get().Token
+		output += "(" + c.get().Token
-	    c.next()
+		c.next()
-	    c.expect("[")
+		c.expect("[")
-	    output += " select ("+c.parseExpression(false)+"))"
+		output += " select (" + c.parseExpression(false) + "))"
-	    c.expect("]")
+		c.expect("]")
 	} else if c.accept("!") || c.accept("-") {
 		output = c.get().Token
 		c.next()

src/parser/parser_helper.go

@@ -1,16 +1,17 @@
 package parser
 
 import (
-    "strconv"
+	"errors"
-    "tokenizer"
+	"strconv"
+	"tokenizer"
 )
 
 type Compiler struct {
-    tokens []tokenizer.Token
+	tokens     []tokenizer.Token
-    tokenIndex int
+	tokenIndex int
-    out string
+	out        string
-    offset int
+	offset     int
-    pretty bool
+	pretty     bool
 }
 
 // Initilizes the parser.
@@ -38,7 +39,7 @@ func (c *Compiler) accept(token string) bool {
 // Throws if current token does not match expected one.
 func (c *Compiler) expect(token string) {
 	if !c.tokenEqual(token, c.get()) {
-		panic("Parse error, expected '" + token + "' but was '" + c.get().Token + "' in line "+strconv.Itoa(c.get().Line)+" at "+strconv.Itoa(c.get().Column))
+		panic(errors.New("Parse error, expected '" + token + "' but was '" + c.get().Token + "' in line " + strconv.Itoa(c.get().Line) + " at " + strconv.Itoa(c.get().Column)))
 	}
 
 	c.next()
@@ -62,7 +63,7 @@ func (c *Compiler) next() {
 // Returns current token or throws, if no more tokens are available.
 func (c *Compiler) get() tokenizer.Token {
 	if c.tokenIndex >= len(c.tokens) {
-		panic("No more tokens")
+		panic(errors.New("No more tokens"))
 	}
 
 	return c.tokens[c.tokenIndex]

src/parser/parser_test.go

@@ -1,168 +1,195 @@
 package parser_test
 
 import (
-    "tokenizer"
-	"parser"
 	"io/ioutil"
+	"parser"
 	"testing"
+	"tokenizer"
+	"types"
+)
+
+const (
+	types_file = "../../test/types"
 )
 
 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) {
+func TestParserNullBuildinFunctionCall(t *testing.T) {
-	got := getCompiled(t, "test/parser_buildin_func.asl")
+	types.LoadTypes(types_file)
-	want := "_x = (([player, foo] getVar bar) setHit [\"head\", \"tail\"]);\r\n"
+
+	got := getCompiled(t, "../../test/parser_null_buildin_func.asl")
+	want := "_volume = (radioVolume);\r\n"
+
+	equal(t, got, want)
+}
+
+func TestParserUnaryBuildinFunctionCall(t *testing.T) {
+	types.LoadTypes(types_file)
+
+	got := getCompiled(t, "../../test/parser_unary_buildin_func.asl")
+	want := "_isReady = (unitReady soldier);\r\n"
+
+	equal(t, got, want)
+}
+
+func TestParserBinaryBuildinFunctionCall(t *testing.T) {
+	types.LoadTypes(types_file)
+
+	got := getCompiled(t, "../../test/parser_binary_buildin_func.asl")
+	want := "someCar setHit [\"motor\", 1];\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")
+	types.LoadTypes(types_file)
+
+	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 +203,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)

src/tokenizer/tokenizer.go

@@ -5,63 +5,65 @@ import (
 )
 
 type Token struct {
-	Token string
+	Token        string
 	Preprocessor bool
-	Line int
+	Line         int
-	Column int
+	Column       int
 }
 
-var delimiter = []byte{
+var (
-	'=',
+	delimiter = []byte{
-	';',
+		'=',
-	'{',
+		';',
-	'}',
+		'{',
-	'(',
+		'}',
-	')',
+		'(',
-	'[',
+		')',
-	']',
+		'[',
-	'<',
+		']',
-	'>',
+		'<',
-	'!',
+		'>',
-	',',
+		'!',
-	':',
+		',',
-	'&',
+		':',
-	'|',
+		'&',
-	'+',
+		'|',
-	'-',
+		'+',
-	'*',
+		'-',
-	'/'} // TODO: modulo?
+		'*',
+		'/'} // TODO: modulo?
 
-var keywords = []string{
+	keywords = []string{
-	"var",
+		"var",
-	"if",
+		"if",
-	"while",
+		"while",
-	"switch",
+		"switch",
-	"for",
+		"for",
-	"foreach",
+		"foreach",
-	"func",
+		"func",
-	"true",
+		"true",
-	"false",
+		"false",
-	"case",
+		"case",
-	"default",
+		"default",
-	"return",
+		"return",
-	"try",
+		"try",
-	"catch",
+		"catch",
-	"exitwith",
+		"exitwith",
-	"waituntil",
+		"waituntil",
-	"code"}
+		"code"}
 
-var whitespace = []byte{' ', '\n', '\t', '\r'}
+	whitespace   = []byte{' ', '\n', '\t', '\r'}
-var identifier = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_"
+	identifier   = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_"
-var preprocessor = byte('#')
+	preprocessor = byte('#')
-var new_line = []byte{'\r', '\n'}
+	new_line     = []byte{'\r', '\n'}
+)
 
 // Tokenizes the given byte array into syntax tokens,
 // which can be parsed later.
 func Tokenize(code []byte, doStripSlashes bool) []Token {
-    if doStripSlashes {
+	if doStripSlashes {
-        code = stripSlashes(code);
+		code = stripSlashes(code)
-    }
+	}
 
 	code = removeComments(code)
 	tokens := make([]Token, 0)
@@ -72,8 +74,8 @@ func Tokenize(code []byte, doStripSlashes bool) []Token {
 		column++
 
 		if byteArrayContains(new_line, c) {
-		    line++
+			line++
-		    column = 0
+			column = 0
 		}
 
 		// string masks (backslash)
@@ -95,8 +97,8 @@ func Tokenize(code []byte, doStripSlashes bool) []Token {
 		} else {
 			// preprocessor, delimeter, keyword or variable/expression
 			if c == preprocessor {
-			    tokens = append(tokens, preprocessorLine(code, &i, line, column))
+				tokens = append(tokens, preprocessorLine(code, &i, line, column))
-			    token = ""
+				token = ""
 			} else if byteArrayContains(delimiter, c) {
 				if token != "" {
 					tokens = append(tokens, Token{token, false, line, column})
@@ -121,23 +123,23 @@ func Tokenize(code []byte, doStripSlashes bool) []Token {
 // Removes slashes from input code.
 // This is used for the "code" keyword for correct strings in resulting code.
 func stripSlashes(code []byte) []byte {
-    newcode := make([]byte, len(code))
+	newcode := make([]byte, len(code))
-    j, mask := 0, false
+	j, mask := 0, false
 
-    for i := 0; i < len(code); i++ {
+	for i := 0; i < len(code); i++ {
-        c := code[i]
+		c := code[i]
 
-        if c == '\\' && !mask {
+		if c == '\\' && !mask {
 			mask = true
 			continue
 		}
 
-        newcode[j] = code[i]
+		newcode[j] = code[i]
-        mask = false
+		mask = false
-        j++
+		j++
-    }
+	}
 
-    return newcode
+	return newcode
 }
 
 // Removes all comments from input byte array.
@@ -180,31 +182,31 @@ func removeComments(code []byte) []byte {
 
 // Reads preprocessor command until end of line
 func preprocessorLine(code []byte, i *int, lineNr, column int) Token {
-    c := byte('0')
+	c := byte('0')
-    var line string
+	var line string
 
-    for *i < len(code) {
+	for *i < len(code) {
-        c = code[*i]
+		c = code[*i]
 
-        if byteArrayContains(new_line, c) {
+		if byteArrayContains(new_line, c) {
-            break
+			break
-        }
+		}
 
-        line += string(c)
+		line += string(c)
-        (*i)++
+		(*i)++
-    }
+	}
 
-    // read all new line characters (\r and \n)
+	// read all new line characters (\r and \n)
-    c = code[*i]
+	c = code[*i]
 
-    for byteArrayContains(new_line, c) {
+	for byteArrayContains(new_line, c) {
-        (*i)++
+		(*i)++
-        c = code[*i]
+		c = code[*i]
-    }
+	}
 
-    (*i)-- // for will count up 1, so subtract it here
+	(*i)-- // for will count up 1, so subtract it here
 
-    return Token{line, true, lineNr, column}
+	return Token{line, true, lineNr, column}
 }
 
 // Returns the next character in code starting at i.

src/tokenizer/tokenizer_test.go

@@ -1,13 +1,13 @@
 package tokenizer_test
 
 import (
-    "tokenizer"
 	"io/ioutil"
 	"testing"
+	"tokenizer"
 )
 
 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,18 +87,17 @@ 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", ")", ";"}
+	want := []string{"#define HELLO_WORLD \"Hello World!\"", "hint", "(", "HELLO_WORLD", ")", ";"}
 
 	compareLength(t, &got, &want)
 	compareTokens(t, &got, &want)
 }
 
 func TestTokenizerMask(t *testing.T) {
-	got := getTokens(t, "test/tokenizer_mask.asl")
+	got := getTokens(t, "../../test/tokenizer_mask.asl")
-    //var y = code("var z = \"Hello \\"World\\"\";");
 	want := []string{"var", "x", "=", "\"Hello \\\"World\\\"\"", ";",
-	    "var", "y", "=", "code", "(", "\"var z = \\\"Hello \\\\\"World\\\\\"\\\";\"", ")", ";"}
+		"var", "y", "=", "code", "(", "\"var z = \\\"Hello \\\\\"World\\\\\"\\\";\"", ")", ";"}
 
 	compareLength(t, &got, &want)
 	compareTokens(t, &got, &want)

src/types/loader.go

@@ -0,0 +1,146 @@
+package types
+
+import (
+	"io/ioutil"
+	"strings"
+)
+
+const (
+	// type for object types
+	TYPE  = 1
+	NAN   = "NaN"
+	ARRAY = "ARRAY"
+
+	// types for functions
+	NULL   = 2
+	UNARY  = 3
+	BINARY = 4
+
+	win_new_line  = "\r\n"
+	unix_new_line = "\n"
+)
+
+type FunctionType struct {
+	Name      string
+	Type      int // one of the constants NULL, UNARY, BINARY
+	ArgsLeft  int
+	ArgsRight int // number of args on left side for binary functions
+}
+
+var functions []FunctionType
+
+// Returns function type information by name.
+// 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 &function
+		}
+	}
+
+	return nil
+}
+
+// Loads type information from file.
+// The format is specified by 'supportInfo' command: https://community.bistudio.com/wiki/supportInfo
+func LoadTypes(path string) error {
+	content, err := ioutil.ReadFile(path)
+
+	if err != nil {
+		return err
+	}
+
+	data := strings.Replace(win_new_line, unix_new_line, string(content), -1) // make this work on windows and unix
+	functions = make([]FunctionType, 0)
+	parseTypes(data)
+
+	return nil
+}
+
+func parseTypes(content string) {
+	lines := strings.Split(content, unix_new_line)
+
+	for _, line := range lines {
+		if len(line) < 3 {
+			continue
+		}
+
+		if line[0] == 'n' {
+			parseNullFunction(line)
+		} else if line[0] == 'u' {
+			parseUnaryFunction(line)
+		} else if line[0] == 'b' {
+			parseBinaryFunction(line)
+		}
+	}
+}
+
+func parseNullFunction(line string) {
+	parts := getParts(line)
+	functions = append(functions, FunctionType{parts[0], NULL, 0, 0})
+}
+
+func parseUnaryFunction(line string) {
+	parts := getParts(line)
+
+	if len(parts) < 2 {
+		return
+	}
+
+	args := getArgs(parts[1])
+
+	var argsCount int
+
+	if args[0] != ARRAY {
+		argsCount = len(args) - getNaNArgs(args)
+	}
+
+	functions = append(functions, FunctionType{parts[0], UNARY, argsCount, 0})
+}
+
+func parseBinaryFunction(line string) {
+	parts := getParts(line)
+
+	if len(parts) < 3 {
+		return
+	}
+
+	argsLeft := getArgs(parts[0])
+	argsRight := getArgs(parts[2])
+
+	var argsLeftCount int
+	var argsRightCount int
+
+	if argsLeft[0] != ARRAY {
+		argsLeftCount = len(argsLeft) - getNaNArgs(argsLeft)
+	}
+
+	if argsRight[0] != ARRAY {
+		argsRightCount = len(argsRight) - getNaNArgs(argsRight)
+	}
+
+	functions = append(functions, FunctionType{parts[1], BINARY, argsLeftCount, argsRightCount})
+}
+
+func getParts(line string) []string {
+	line = line[2:]
+	return strings.Split(line, " ")
+}
+
+func getArgs(part string) []string {
+	return strings.Split(part, ",")
+}
+
+func getNaNArgs(args []string) int {
+	nan := 0
+
+	for _, arg := range args {
+		if arg == NAN {
+			nan++
+		}
+	}
+
+	return nan
+}

src/types/loader_test.go

@@ -0,0 +1,18 @@
+package types_test
+
+import (
+	"testing"
+	"types"
+)
+
+func TestTypesGetFunction(t *testing.T) {
+	if err := types.LoadTypes("../../test/types"); err != nil {
+		t.Error(err)
+	}
+
+	function := types.GetFunction("hint")
+
+	if function == nil {
+		t.Error("Function 'hint' not found in type list")
+	}
+}

test/parser_binary_buildin_func.asl

@@ -0,0 +1 @@
+setHit(someCar)("motor", 1);

test/parser_buildin_func.asl

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

test/parser_null_buildin_func.asl

@@ -0,0 +1 @@
+var _volume = radioVolume();

test/parser_unary_buildin_func.asl

@@ -0,0 +1 @@
+var _isReady = unitReady(soldier);

test/tokenizer_preprocessor.asl

@@ -1,2 +1,2 @@
 #define HELLO_WORLD "Hello World!"
-hint()(HELLO_WORLD);
+hint(HELLO_WORLD);