Fixed deadlock.

Updated np++ Highlighting

.gitignore

@@ -1,3 +1,4 @@
 /bin/
 /pkg/
 /out/
+/in/

.project

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>asl</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.googlecode.goclipse.goBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.googlecode.goclipse.core.goNature</nature>
-	</natures>
-</projectDescription>

CHANGELOG.md

@@ -0,0 +1,36 @@
+# Changelog
+
+**1.2.2**
+
+* bugfix: deadlock on compiling multile files at once
+
+**1.2.1**
+
+* bugfix: new line after while for pretty printing
+* bugfix: build in unary function with multiple arguments
+
+**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
+* simpler syntax for "null" and unary buildin functions
+
+**1.1.1**
+
+* arrays can now be declared within expressions
+* code keyword bug fix
+
+**1.1.0**
+
+* changed syntax of foreach
+* private function variables
+* default values for function parameters
+* added preprocessor
+* code inlining using new keyword "code"
+* some code and repo cleanup
+
+**1.0.0**
+
+* first release

README.md

@@ -11,30 +11,44 @@ Main reasons for ASL:
 * easy to learn and understand
 * full replacement of SQF
 * compatible with Arma wiki and commands
+* comfortable
 
 ## Usage
 
-ASL is a command line tool. After you have downloaded it, navigation to the binary and execute it:
+ASL is a command line tool. After you have downloaded it, navigate to the binary and execute it:
 
 ```
-asl [-v|-r|-pretty|--help] <input directory> <output directory>
+asl.exe [-v|-r|-pretty|--help] <input directory> <output directory>
 ```
 
-| Parameter | Optional/Required | Meaning |
+| Parameter | Optional/Required | Description |
-| --------- | ----------------- | ------- |
+| --------- | ----------------- | ----------- |
-| -v | optional | Shows ASL version. |
+| -v | optional | Show ASL version. |
 | -r | optional | Read input directory recursively. |
 | -pretty | optional | Enable pretty printing to SQF. |
 | --help | optional | Show usage. |
-| input directory | required | Directory to read ASL files from (use ./ for relative paths). |
+| input directory | required | Input directory for ASL files (use ./ for relative paths). |
-| output directory | required | Directory for SQF output. Can be the same as input directory (use ./ for relative paths). |
+| output directory | required | Output directory for SQF files. Can be the same as input directory (use ./ for relative paths). |
 
 **Example:**
 
 ```
-asl ./missions/myMission/myScripts ./missions/myMission/compiledScripts
+asl.exe ./missions/myMission/myScripts ./missions/myMission/compiledScripts
 ```
 
+Since 1.2.0 ASL requires a [supportInfo](https://community.bistudio.com/wiki/supportInfo) file, which must be generated, named "types" and placed right next to the binary. The content looks like:
+
+```
+...
+t:DIARY_RECORD
+t:LOCATION
+b:ARRAY waypointattachobject SCALAR,OBJECT
+b:OBJECT,GROUP enableattack BOOL
+...
+```
+
+The types file will be delivered with the current release, but not updated when Arma is.
+
 ## Syntax
 
 ### Comments
@@ -67,44 +81,51 @@ var one = array[0];
 
 // accessing using a statement:
 var zwo = array[33/3-2];
+
+// it is possble to use arrays in expressions:
+var emptyArray = one-[1];
 ```
 
 ### Control structures
 
-Controll structure syntax is C-like. Notice they are all using the same brackets and do not require to set a semicolon at the end, unlike in SQF.
+Controll structure syntax is C-like. Notice the same brackets for all structures and no semicolon at the end, unlike in SQF:
 
 ```
 if 1 < 2 {
     // ...
+} else { // no else if yet
+    // ...
 }
 
 while 1 < 2 {
     // ...
 }
 
-for var _i = 0; _i < 100; _i = _i+1 { // var before identifier is optional
+for var _i = 0; _i < 100; _i = _i+1 {
     // ...
 }
 
-each allUnits { // foreach, iterates over all units in this case
+for _i = 0; _i < 100; _i = _i+1 { // same as above, var is optional before identifier "_i"
-    // element is available as _x here
+    // ...
 }
 
-switch x {
+foreach _unit => allUnits { // iterates over all units in this case
+    // element is available as "_unit" AND "_x" here ("_x" is used by SQF's foreach)
+}
+
+switch x { // there is no "break" in SQF
     case 1:
         // ...
-        break;
     case 2:
         // ...
-        break;
     default:
         // ...
 }
 
-try {
+try { // handles errors in "catch" block
-    // ...
+    // errors thrown here...
 } catch {
-    // ...
+    // ... will be handled here
 }
 ```
 
@@ -118,14 +139,25 @@ func add(_a, _b) {
 }
 
 // Call it:
-
+var _x = add(1, 2); // result in _x is 3
-var _x = add(1, 2);
-// result in _x is 3
 ```
 
+Functions support predefined parameters:
+
+```
+func add(_a = 0, _b = 0) {
+    return _a+_b;
+}
+
+// Call it:
+var _x = add(); // result in _x is 0
+```
+
+When trying to define a function with a name that exists in SQF's build in function set, you'll get an compile error. So declaring "func hint()..." won't compile.
+
 ### Call build in commands
 
-To call SQF build in commands (like hint, getDir, addItem, ...) we have to use a different syntax.
+To call SQF build in commands (like hint, getDir, addItem, ...) use the same syntax when using functions. An exception are "binary" functions. These are functions which accept parameters on both sides of the function name. Here is an example for "addItem":
 
 ```
 addItem(someUnit)("NVGoogles");
@@ -134,7 +166,7 @@ addItem(someUnit)("NVGoogles");
 someUnit addItem "NVGoogles";
 ```
 
-Where the first brackets contain the parameters used in front of SQF command and the second ones behind SQF command. If more than one parameter is passed, it will be converted to an array.
+Where the first brackets contain the parameters used in front of SQF command and the second ones the parameters behind the SQF command. If more than one parameter is passed, it will be converted to an array. This syntax can be used for **all** build in functions.
 
 ```
 foo(x, y, z)(1, 2, 3);
@@ -143,11 +175,18 @@ foo(x, y, z)(1, 2, 3);
 [x, y, z] foo [1, 2, 3];
 ```
 
+If the build in function accepts no parameters (null function) or on one side only (unary function), it can be called with a single pair of brackets:
+
+```
+hint("your text");
+shownWatch();
+```
+
 ### Special functions
 
-There are some special functions in SQF, which also require special syntax in ASL. The examples presented here show how they are written in ASL and what the output will look like. Remember that ASL is case sensitive!
+There are some special functions in SQF, which also require special syntax in ASL. The examples presented here shows how they are written in ASL and what the output will look like. Remember that ASL is case sensitive!
 
-**exitWith**
+**exitwith**
 
 ```
 exitwith { // NOT exitWith!
@@ -160,7 +199,7 @@ if (true) exitWith {
 };
 ```
 
-**waitUntil**
+**waituntil**
 
 ```
 waituntil(condition); // NOT waitUntil!
@@ -173,16 +212,49 @@ waitUntil {condition};
 waitUntil {expression;condition};
 ```
 
+**code**
+
+The code function is used to compile inline code. This does **not** replace SQF's compile build in function, but will return the contained ASL code as SQF:
+
+```
+var x = code("var y = 5;"); // pass as string
+
+// output:
+x = {y = 5;};
+```
+
+## Preprocessor
+
+The preprocessor works like the original one, with some limitations.
+Please visit the link at the bottom, to read about the preprocessor and how to use it. Generally, preprocessor lines must start with the hash key (#) and must stay in their own line. They are always printed as seperate lines in SQF. These features are not supported:
+
+* replacing parts of words
+* multi line preprocessor commands
+* EXEC (not used in SQF anyway)
+
+If you use *EXEC*, it will be replaced by a function call to it ([] call __EXEC).
+*LINE* and *FILE* can be used like normal identifiers:
+
+```
+if __LINE__ == 22 {
+    // ...
+}
+
+if __FILE__ == "myScript.sqf" {
+    // ...
+}
+```
+
 ## List of all keywords
 
-Keywords should not be used as identifiers. Here is a full list of all keywords in ASL. Remember that build in function names should not be used neither.
+Keywords must not be used as identifiers. Here is a full list of all keywords in ASL. Remember that build in function names must not be used neither, else you'll get an compile error.
 
 | Keyword |
 | ------- |
 | var |
 | if |
 | while |
-| witch |
+| switch |
 | for |
 | foreach |
 | func |
@@ -195,6 +267,23 @@ Keywords should not be used as identifiers. Here is a full list of all keywords
 | catch |
 | exitwith |
 | waituntil |
+| code |
+
+## What's missing?
+
+The following features are not implemented yet, but maybe will be in 1.3.0 or a future version:
+
+* scopes
+* else if
+* selector in expression
+
+scopes won't be supported, since it's a stupid concept and can be replaced by functions.
+
+Selectors in expressions do not work (yet), so this is not possible:
+
+```
+var x = ([1, 2, 3]-[1, 2])[0]; // should result in 3
+```
 
 ## Contribute
 
@@ -206,6 +295,12 @@ For further information you can read the SQF tutorial and documentation of scrip
 
 * [Arma Wiki](https://community.bistudio.com/wiki/Main_Page)
 * [Scripting commands](https://community.bistudio.com/wiki/Category:Scripting_Commands_Arma_3)
+* [Scripting preprocessor](https://community.bistudio.com/wiki/PreProcessor_Commands)
+
+Interesting pages to visit:
+
+* [Bohemia forum topic](https://forums.bistudio.com/topic/185649-asl-arma-scripting-language-compiler/)
+* [Armaholic page](http://www.armaholic.com/page.php?id=29720)
 
 ## License
 

ToDo.md

@@ -1,22 +0,0 @@
-# ToDo
-
-* ~~assign to returned values~~
-* ~~sqf: ... sqf whitespace~~
-* ~~solution for build in commands which do not require left values~~
-* ~~pretty/minified printing~~
-* ~~usage~~
-* ~~recursive 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
-    - recover panic
-    - line, column
-
-## Special cases
-
-* ~~exitWith...~~
-* ~~waitUntil...~~
-* ~~!buildInFunc()()...~~

build

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+export GOROOT=/usr/local/go
+export PATH=$PATH:$GOROOT/bin
+export GOPATH=/home/marvin/Projekte/asl
+go build -ldflags "-s -w" src/main/asl.go

in/simple.asl

@@ -1,6 +0,0 @@
-var array = [1, 2, 3];
-var x = array[0];
-
-if array[(1-1)+10/10] == 2 {
-    foo();
-}

run

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+export GOROOT=/usr/local/go
+export PATH=$PATH:$GOROOT/bin
+export GOPATH=/home/marvin/Projekte/asl
+go run src/main/asl.go $1 $2

run_tests

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+export GOROOT=/usr/local/go
+export PATH=$PATH:$GOROOT/bin
+export GOPATH=/home/marvin/Projekte/asl
+go test parser tokenizer types

src/asl/parser.go

@@ -1,485 +0,0 @@
-package asl
-
-import (
-	"strconv"
-)
-
-const TAB = "    "
-
-// Parses tokens, validates code to a specific degree
-// and writes SQF code into desired location.
-func Parse(token []Token, prettyPrinting bool) string {
-	if !initParser(token, prettyPrinting) {
-	    return ""
-	}
-
-	for tokenIndex < len(token) {
-		parseBlock()
-	}
-
-	return out
-}
-
-func parseBlock() {
-	if accept("var") {
-		parseVar()
-	} else if accept("if") {
-		parseIf()
-	} else if accept("while") {
-		parseWhile()
-	} else if accept("switch") {
-		parseSwitch()
-	} else if accept("for") {
-		parseFor()
-	} else if accept("foreach") {
-		parseForeach()
-	} else if accept("func") {
-		parseFunction()
-	} else if accept("return") {
-		parseReturn()
-	} else if accept("try") {
-		parseTryCatch()
-	} else if accept("exitwith") {
-	    parseExitWith()
-	} else if accept("waituntil") {
-	    parseWaitUntil()
-	} else if accept("case") || accept("default") {
-		return
-	} else {
-		parseStatement()
-	}
-
-	if !end() && !accept("}") {
-		parseBlock()
-	}
-}
-
-func parseVar() {
-	expect("var")
-	appendOut(get().token, false)
-	next()
-
-	if accept("=") {
-		next()
-		appendOut(" = ", false)
-
-		if accept("[") {
-			parseArray()
-		} else {
-			parseExpression(true)
-		}
-	}
-
-	expect(";")
-	appendOut(";", true)
-}
-
-func parseArray() {
-	expect("[")
-	appendOut("[", false)
-
-	if !accept("]") {
-		parseExpression(true)
-
-		for accept(",") {
-			next()
-			appendOut(",", false)
-			parseExpression(true)
-		}
-	}
-
-	expect("]")
-	appendOut("]", false)
-}
-
-func parseIf() {
-	expect("if")
-	appendOut("if (", false)
-	parseExpression(true)
-	appendOut(") then {", true)
-	expect("{")
-	parseBlock()
-	expect("}")
-
-	if accept("else") {
-		next()
-		expect("{")
-		appendOut("} else {", true)
-		parseBlock()
-		expect("}")
-	}
-
-	appendOut("};", true)
-}
-
-func parseWhile() {
-	expect("while")
-	appendOut("while {", false)
-	parseExpression(true)
-	appendOut("} do {", true)
-	expect("{")
-	parseBlock()
-	expect("}")
-	appendOut("};", false)
-}
-
-func parseSwitch() {
-	expect("switch")
-	appendOut("switch (", false)
-	parseExpression(true)
-	appendOut(") do {", true)
-	expect("{")
-	parseSwitchBlock()
-	expect("}")
-	appendOut("};", true)
-}
-
-func parseSwitchBlock() {
-	if accept("}") {
-		return
-	}
-
-	if accept("case") {
-		next()
-		appendOut("case ", false)
-		parseExpression(true)
-		expect(":")
-		appendOut(":", true)
-
-		if !accept("case") && !accept("}") && !accept("default") {
-			appendOut("{", true)
-			parseBlock()
-			appendOut("};", true)
-		}
-	} else if accept("default") {
-		next()
-		expect(":")
-		appendOut("default:", true)
-
-		if !accept("}") {
-			appendOut("{", true)
-			parseBlock()
-			appendOut("};", true)
-		}
-	}
-
-	parseSwitchBlock()
-}
-
-func parseFor() {
-	expect("for")
-	appendOut("for [{", false)
-
-	// var in first assignment is optional
-	if accept("var") {
-		next()
-	}
-
-	parseExpression(true)
-	expect(";")
-	appendOut("}, {", false)
-	parseExpression(true)
-	expect(";")
-	appendOut("}, {", false)
-	parseExpression(true)
-	appendOut("}] do {", true)
-	expect("{")
-	parseBlock()
-	expect("}")
-	appendOut("};", true)
-}
-
-func parseForeach() {
-	expect("foreach")
-	expr := parseExpression(false)
-	expect("{")
-	appendOut("{", true)
-	parseBlock()
-	expect("}")
-	appendOut("} forEach ("+expr+");", true)
-}
-
-func parseFunction() {
-	expect("func")
-	appendOut(get().token+" = {", true)
-	next()
-	expect("(")
-	parseFunctionParameter()
-	expect(")")
-	expect("{")
-	parseBlock()
-	expect("}")
-	appendOut("};", true)
-}
-
-func parseFunctionParameter() {
-	// empty parameter list
-	if accept("{") {
-		return
-	}
-
-	i := int64(0)
-
-	for !accept(")") {
-		name := get().token
-		next()
-		appendOut(name+" = _this select "+strconv.FormatInt(i, 10)+";", true)
-		i++
-
-		if !accept(")") {
-			expect(",")
-		}
-	}
-}
-
-func parseReturn() {
-	expect("return")
-	appendOut("return ", false)
-	parseExpression(true)
-	expect(";")
-	appendOut(";", true)
-}
-
-func parseTryCatch() {
-	expect("try")
-	expect("{")
-	appendOut("try {", true)
-	parseBlock()
-	expect("}")
-	expect("catch")
-	expect("{")
-	appendOut("} catch {", true)
-	parseBlock()
-	expect("}")
-	appendOut("};", true)
-}
-
-func parseExitWith() {
-    expect("exitwith")
-    expect("{")
-    appendOut("if (true) exitWith {", true)
-    parseBlock()
-    expect("}")
-    appendOut("};", true)
-}
-
-func parseWaitUntil() {
-    expect("waituntil")
-    expect("(")
-    appendOut("waitUntil {", false)
-    parseExpression(true)
-    
-    if accept(";") {
-        next()
-        appendOut(";", false)
-        parseExpression(true)
-    }
-    
-    expect(")")
-    expect(";")
-    appendOut("};", true)
-}
-
-// Everything that does not start with a keyword.
-func parseStatement() {
-	// empty block
-	if accept("}") || accept("case") || accept("default") {
-		return
-	}
-
-	// variable or function name
-	name := get().token
-	next()
-
-	if accept("=") {
-		appendOut(name, false)
-		parseAssignment()
-	} else {
-		parseFunctionCall(true, name)
-		expect(";")
-		appendOut(";", true)
-	}
-
-	if !end() {
-		parseBlock()
-	}
-}
-
-func parseAssignment() {
-	expect("=")
-	appendOut(" = ", false)
-	parseExpression(true)
-	expect(";")
-	appendOut(";", true)
-}
-
-func parseFunctionCall(out bool, name string) string {
-	output := ""
-
-	expect("(")
-	leftParams, leftParamCount := parseParameter(false)
-	expect(")")
-
-	if accept("(") {
-		// buildin function
-		next()
-		rightParams, rightParamCount := parseParameter(false)
-		expect(")")
-
-		if leftParamCount > 1 {
-			leftParams = "[" + leftParams + "]"
-		}
-
-		if rightParamCount > 1 {
-			rightParams = "[" + rightParams + "]"
-		}
-
-		if leftParamCount > 0 {
-			output = leftParams + " " + name + " " + rightParams
-		} else {
-			output = name + " " + rightParams
-		}
-	} else {
-		output = "[" + leftParams + "] call " + name
-	}
-
-	if out {
-		appendOut(output, false)
-	}
-
-	return output
-}
-
-func parseParameter(out bool) (string, int) {
-	output := ""
-	count := 0
-
-	for !accept(")") {
-		output += parseExpression(out)
-		count++
-
-		if !accept(")") {
-			expect(",")
-			output += ", "
-		}
-	}
-
-	if out {
-		appendOut(output, false)
-	}
-
-	return output, count
-}
-
-func parseExpression(out bool) string {
-	output := parseArith()
-
-	for accept("<") || accept(">") || accept("&") || accept("|") || accept("=") || accept("!") {
-		if accept("<") {
-			output += "<"
-			next()
-		} else if accept(">") {
-			output += ">"
-			next()
-		} else if accept("&") {
-			next()
-			expect("&")
-			output += "&&"
-		} else if accept("|") {
-			next()
-			expect("|")
-			output += "||"
-		} else if accept("=") {
-			output += "="
-			next()
-		} else {
-			next()
-			expect("=")
-			output += "!="
-		}
-
-		if accept("=") {
-			output += "="
-			next()
-		}
-
-		output += parseExpression(false)
-	}
-
-	if out {
-		appendOut(output, false)
-	}
-
-	return output
-}
-
-func parseIdentifier() string {
-	output := ""
-
-	if seek("(") && !accept("!") && !accept("-") {
-		name := get().token
-		next()
-		output = "(" + parseFunctionCall(false, name) + ")"
-	} else if seek("[") {
-	    output += "("+get().token
-	    next()
-	    expect("[")
-	    output += " select ("+parseExpression(false)+"))"
-	    expect("]")
-	} else if accept("!") || accept("-") {
-		output = get().token
-		next()
-		output += parseTerm()
-	} else {
-		output = get().token
-		next()
-	}
-
-	return output
-}
-
-func parseTerm() string {
-	if accept("(") {
-		expect("(")
-		output := "(" + parseExpression(false) + ")"
-		expect(")")
-
-		return output
-	}
-
-	return parseIdentifier()
-}
-
-func parseFactor() string {
-	output := parseTerm()
-
-	for accept("*") || accept("/") { // TODO: modulo?
-		if accept("*") {
-			output += "*"
-		} else {
-			output += "/"
-		}
-
-		next()
-		output += parseExpression(false)
-	}
-
-	return output
-}
-
-func parseArith() string {
-	output := parseFactor()
-
-	for accept("+") || accept("-") {
-		if accept("+") {
-			output += "+"
-		} else {
-			output += "-"
-		}
-
-		next()
-		output += parseExpression(false)
-	}
-
-	return output
-}

src/asl/parserHelper.go

@@ -1,81 +0,0 @@
-package asl
-
-var tokens []Token
-var tokenIndex int
-var out string
-var offset int
-var pretty bool
-
-// Initilizes the parser.
-func initParser(token []Token, prettyPrinting bool) bool {
-	if len(token) == 0 {
-		return false
-	}
-
-	tokens = token
-	tokenIndex = 0
-	out = ""
-	offset = 0
-	pretty = prettyPrinting
-	
-	return true
-}
-
-// Returns true, if current token matches expected one.
-// Does not throw parse errors and checks if token is available.
-func accept(token string) bool {
-	return tokenIndex < len(tokens) && tokenEqual(token, get())
-}
-
-// Hard version of "accept".
-// Throws if current token does not match expected one.
-func expect(token string) {
-	if !tokenEqual(token, get()) {
-		panic("Parse error, expected '" + token + "' but was '" + get().token + "'")
-	}
-
-	next()
-}
-
-// Returns true, if the next token matches expected one.
-// Does not throw parse errors and checks if token is available.
-func seek(token string) bool {
-	if tokenIndex+1 >= len(tokens) {
-		return false
-	}
-
-	return tokenEqual(token, tokens[tokenIndex+1])
-}
-
-// Increases token counter, so that the next token is compared.
-func next() {
-	tokenIndex++
-}
-
-// Returns current token or throws, if no more tokens are available.
-func get() Token {
-	if tokenIndex >= len(tokens) {
-		panic("No more tokens")
-	}
-
-	return tokens[tokenIndex]
-}
-
-// Returns true if the end of input code was reached.
-func end() bool {
-	return tokenIndex == len(tokens)
-}
-
-// Checks if two strings match.
-func tokenEqual(a string, b Token) bool {
-	return a == b.token
-}
-
-// Appends the output string to current SQF code output.
-func appendOut(str string, newLine bool) {
-	out += str
-
-	if newLine && pretty {
-		out += "\r\n"
-	}
-}

src/asl/parser_test.go

@@ -1,160 +0,0 @@
-package asl_test
-
-import (
-	"asl"
-	"io/ioutil"
-	"testing"
-)
-
-func TestParserDeclaration(t *testing.T) {
-	got := getCompiled(t, "test/tokenizer_var.asl")
-	want := "x = 1;\narray = [1,2,3];\n"
-
-	equal(t, got, want)
-}
-
-func TestParserAssignment(t *testing.T) {
-	got := getCompiled(t, "test/parser_assignment.asl")
-	want := "x = 1;\n"
-
-	equal(t, got, want)
-}
-
-func TestParserIf(t *testing.T) {
-	got := getCompiled(t, "test/tokenizer_if.asl")
-	want := "if (a<b) then {\n};\n"
-
-	equal(t, got, want)
-}
-
-func TestParserWhile(t *testing.T) {
-	got := getCompiled(t, "test/tokenizer_while.asl")
-	want := "while {true} do {\n};"
-
-	equal(t, got, want)
-}
-
-func TestParserFor(t *testing.T) {
-	got := getCompiled(t, "test/tokenizer_for.asl")
-	want := "for [{i=0}, {i<100}, {i=i+1}] do {\n};\n"
-
-	equal(t, got, want)
-}
-
-func TestParserForeach(t *testing.T) {
-	got := getCompiled(t, "test/tokenizer_foreach.asl")
-	want := "{\n} forEach (allUnits);\n"
-
-	equal(t, got, want)
-}
-
-func TestParserSwitch(t *testing.T) {
-
-}
-
-func TestParserFunction(t *testing.T) {
-	got := getCompiled(t, "test/tokenizer_func.asl")
-	want := "TestFunction = {\nparam0 = _this select 0;\nparam1 = _this select 1;\nreturn true;\n};\n"
-
-	equal(t, got, want)
-}
-
-func TestParserAssignResult(t *testing.T) {
-	got := getCompiled(t, "test/parser_assign_result.asl")
-	want := "x = ([1, 2, 3] call foo);\ny = ([1, 2, 3] call bar);\n"
-
-	equal(t, got, want)
-}
-
-func TestParserExpression(t *testing.T) {
-	got := getCompiled(t, "test/parser_expression.asl")
-	want := "x = -(1+(2+3))/(6*(someVariable+99-100))-(20)+!anotherVariable+([] call foo);\n"
-
-	equal(t, got, want)
-}
-
-func TestParserExpression2(t *testing.T) {
-	got := getCompiled(t, "test/parser_expression2.asl")
-	want := "x = true||(3>=4&&5<8);\n"
-
-	equal(t, got, want)
-}
-
-func TestParserFunctionCall(t *testing.T) {
-	got := getCompiled(t, "test/parser_func_call.asl")
-	want := "myFunc = {\na = _this select 0;\nb = _this select 1;\nreturn a>b;\n};\n[1+3/4, 2-(66*22)/3-((123))] call myFunc;\n"
-
-	equal(t, got, want)
-}
-
-func TestParserBuildinFunctionCall(t *testing.T) {
-	got := getCompiled(t, "test/parser_buildin_func.asl")
-	want := "_x = (([player, foo] getVar bar) setHit [\"head\", \"tail\"]);\n"
-
-	equal(t, got, want)
-}
-
-func TestParserOperator(t *testing.T) {
-	got := getCompiled(t, "test/parser_operator.asl")
-	want := "if (x==y&&x!=y&&x<=y&&x>=y&&x<y&&x>y) then {\n};\n"
-
-	equal(t, got, want)
-}
-
-func TestParserTryCatch(t *testing.T) {
-	got := getCompiled(t, "test/parser_try_catch.asl")
-	want := "try {\n} catch {\n};\n"
-
-	equal(t, got, want)
-}
-
-func TestParserNegationFunctionCall(t *testing.T) {
-	got := getCompiled(t, "test/parser_negation.asl")
-	want := "x = !([] call foo);\n"
-
-	equal(t, got, want)
-}
-
-func TestParserExitWith(t *testing.T) {
-	got := getCompiled(t, "test/parser_exitwith.asl")
-	want := "if (true) exitWith {\n};\n"
-
-	equal(t, got, want)
-}
-
-func TestParserWaitUntil(t *testing.T) {
-	got := getCompiled(t, "test/parser_waituntil.asl")
-	want := "waitUntil {x=x+1;x<100};\n"
-
-	equal(t, got, want)
-}
-
-func TestParserArray(t *testing.T) {
-	got := getCompiled(t, "test/parser_array.asl")
-	want := "x = [1,2,3];\ny = (x select (1));\n"
-
-	equal(t, got, want)
-}
-
-func getCompiled(t *testing.T, file string) string {
-	code, err := ioutil.ReadFile(file)
-
-	if err != nil {
-		t.Error("Could not read test file: " + file)
-		t.FailNow()
-	}
-
-	tokens := asl.Tokenize(code)
-
-	return asl.Parse(tokens, true)
-}
-
-func equal(t *testing.T, got, want string) {
-	if got != want {
-		t.Error("Results do not equal, got:")
-		t.Log(got)
-		t.Log("expected:")
-		t.Log(want)
-		t.FailNow()
-	}
-}

src/main/asl.go

@@ -1,29 +1,37 @@
 package main
 
 import (
-	"asl"
 	"fmt"
 	"io/ioutil"
-	"path/filepath"
 	"os"
+	"parser"
+	"path/filepath"
 	"strings"
+	"tokenizer"
+	"types"
 )
 
-const version = "1.0.0"
+const (
-const extension = ".asl"
+	version       = "1.2.2"
-const sqfextension = ".sqf"
+	extension     = ".asl"
+	sqfextension  = ".sqf"
+	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
+var (
-var pretty bool = false
+	recursive bool = false
-var exit bool = false
+	pretty    bool = false
-var aslFiles []ASLFile
+	exit      bool = false
-var inDir string
+	aslFiles  []ASLFile
+	inDir     string
+)
 
 func usage() {
 	fmt.Println("Usage: asl [-v|-r|-pretty|--help] <input directory> <output directory>\n")
@@ -35,77 +43,106 @@ 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+"/"+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+"/"+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) {
+	if r := recover(); r != nil {
+		fmt.Println("Compile error in file "+file+":", r)
+	}
+}
+
+// Compiles a single ASL file.
+func compileFile(path string, file ASLFile) {
+	defer recoverCompileError(file.in)
+
+	// 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)
+	}
+}
+
+// Compiles ASL files.
 func compile(path string) {
-    for i := 0; i < len(aslFiles); i++ {
+	for i := 0; i < len(aslFiles); i++ {
-        out := filepath.FromSlash(path+"/"+aslFiles[i].out+"/"+aslFiles[i].newname+sqfextension)
+		compileFile(path, aslFiles[i])
-        fmt.Println(aslFiles[i].in+" -> "+out)
+	}
-        code, err := ioutil.ReadFile(aslFiles[i].in)
-        
-        if err != nil {
-            fmt.Println("Error reading file: "+aslFiles[i].in)
-            continue
-        }
-        
-    	token := asl.Tokenize(code)
-    	sqf := asl.Parse(token, pretty)
-    	
-    	os.MkdirAll(filepath.FromSlash(path+"/"+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() {
@@ -113,29 +150,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

@@ -0,0 +1,568 @@
+package parser
+
+import (
+	"errors"
+	"tokenizer"
+	"types"
+)
+
+const new_line = "\r\n"
+
+// Parses tokens, validates code to a specific degree
+// and writes SQF code into desired location.
+func (c *Compiler) Parse(token []tokenizer.Token, prettyPrinting bool) string {
+	if !c.initParser(token, prettyPrinting) {
+		return ""
+	}
+
+	for c.tokenIndex < len(token) {
+		c.parseBlock()
+	}
+
+	return c.out
+}
+
+func (c *Compiler) parseBlock() {
+	if c.get().Preprocessor {
+		c.parsePreprocessor()
+	} else if c.accept("var") {
+		c.parseVar()
+	} else if c.accept("if") {
+		c.parseIf()
+	} else if c.accept("while") {
+		c.parseWhile()
+	} else if c.accept("switch") {
+		c.parseSwitch()
+	} else if c.accept("for") {
+		c.parseFor()
+	} else if c.accept("foreach") {
+		c.parseForeach()
+	} else if c.accept("func") {
+		c.parseFunction()
+	} else if c.accept("return") {
+		c.parseReturn()
+	} else if c.accept("try") {
+		c.parseTryCatch()
+	} else if c.accept("exitwith") {
+		c.parseExitWith()
+	} else if c.accept("waituntil") {
+		c.parseWaitUntil()
+	} else if c.accept("case") || c.accept("default") {
+		return
+	} else {
+		c.parseStatement()
+	}
+
+	if !c.end() && !c.accept("}") {
+		c.parseBlock()
+	}
+}
+
+func (c *Compiler) parsePreprocessor() {
+	// we definitely want a new line before and after
+	c.appendOut(new_line+c.get().Token+new_line, false)
+	c.next()
+}
+
+func (c *Compiler) parseVar() {
+	c.expect("var")
+	c.appendOut(c.get().Token, false)
+	c.next()
+
+	if c.accept("=") {
+		c.next()
+		c.appendOut(" = ", false)
+		c.parseExpression(true)
+	}
+
+	c.expect(";")
+	c.appendOut(";", true)
+}
+
+func (c *Compiler) parseArray(out bool) string {
+	output := ""
+	c.expect("[")
+	output += "["
+
+	if !c.accept("]") {
+		output += c.parseExpression(false)
+
+		for c.accept(",") {
+			c.next()
+			output += "," + c.parseExpression(false)
+		}
+	}
+
+	c.expect("]")
+	output += "]"
+
+	if out {
+		c.appendOut(output, false)
+	}
+
+	return output
+}
+
+func (c *Compiler) parseIf() {
+	c.expect("if")
+	c.appendOut("if (", false)
+	c.parseExpression(true)
+	c.appendOut(") then {", true)
+	c.expect("{")
+	c.parseBlock()
+	c.expect("}")
+
+	if c.accept("else") {
+		c.next()
+		c.expect("{")
+		c.appendOut("} else {", true)
+		c.parseBlock()
+		c.expect("}")
+	}
+
+	c.appendOut("};", true)
+}
+
+func (c *Compiler) parseWhile() {
+	c.expect("while")
+	c.appendOut("while {", false)
+	c.parseExpression(true)
+	c.appendOut("} do {", true)
+	c.expect("{")
+	c.parseBlock()
+	c.expect("}")
+	c.appendOut("};", true)
+}
+
+func (c *Compiler) parseSwitch() {
+	c.expect("switch")
+	c.appendOut("switch (", false)
+	c.parseExpression(true)
+	c.appendOut(") do {", true)
+	c.expect("{")
+	c.parseSwitchBlock()
+	c.expect("}")
+	c.appendOut("};", true)
+}
+
+func (c *Compiler) parseSwitchBlock() {
+	if c.accept("}") {
+		return
+	}
+
+	if c.accept("case") {
+		c.next()
+		c.appendOut("case ", false)
+		c.parseExpression(true)
+		c.expect(":")
+		c.appendOut(":", true)
+
+		if !c.accept("case") && !c.accept("}") && !c.accept("default") {
+			c.appendOut("{", true)
+			c.parseBlock()
+			c.appendOut("};", true)
+		}
+	} else if c.accept("default") {
+		c.next()
+		c.expect(":")
+		c.appendOut("default:", true)
+
+		if !c.accept("}") {
+			c.appendOut("{", true)
+			c.parseBlock()
+			c.appendOut("};", true)
+		}
+	}
+
+	c.parseSwitchBlock()
+}
+
+func (c *Compiler) parseFor() {
+	c.expect("for")
+	c.appendOut("for [{", false)
+
+	// var in first assignment is optional
+	if c.accept("var") {
+		c.next()
+	}
+
+	c.parseExpression(true)
+	c.expect(";")
+	c.appendOut("}, {", false)
+	c.parseExpression(true)
+	c.expect(";")
+	c.appendOut("}, {", false)
+	c.parseExpression(true)
+	c.appendOut("}] do {", true)
+	c.expect("{")
+	c.parseBlock()
+	c.expect("}")
+	c.appendOut("};", true)
+}
+
+func (c *Compiler) parseForeach() {
+	c.expect("foreach")
+	element := c.get().Token
+	c.next()
+	c.expect("=")
+	c.expect(">")
+	expr := c.parseExpression(false)
+	c.expect("{")
+	c.appendOut("{", true)
+	c.appendOut(element+" = _x;", true)
+	c.parseBlock()
+	c.expect("}")
+	c.appendOut("} forEach ("+expr+");", true)
+}
+
+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("(")
+	c.parseFunctionParameter()
+	c.expect(")")
+	c.expect("{")
+	c.parseBlock()
+	c.expect("}")
+	c.appendOut("};", true)
+}
+
+func (c *Compiler) parseFunctionParameter() {
+	// empty parameter list
+	if c.accept("{") {
+		return
+	}
+
+	c.appendOut("params [", false)
+
+	for !c.accept(")") {
+		name := c.get().Token
+		c.next()
+
+		if c.accept("=") {
+			c.next()
+			value := c.get().Token
+			c.next()
+			c.appendOut("[\""+name+"\","+value+"]", false)
+		} else {
+			c.appendOut("\""+name+"\"", false)
+		}
+
+		if !c.accept(")") {
+			c.expect(",")
+			c.appendOut(",", false)
+		}
+	}
+
+	c.appendOut("];", true)
+}
+
+func (c *Compiler) parseReturn() {
+	c.expect("return")
+	c.appendOut("return ", false)
+	c.parseExpression(true)
+	c.expect(";")
+	c.appendOut(";", true)
+}
+
+func (c *Compiler) parseTryCatch() {
+	c.expect("try")
+	c.expect("{")
+	c.appendOut("try {", true)
+	c.parseBlock()
+	c.expect("}")
+	c.expect("catch")
+	c.expect("{")
+	c.appendOut("} catch {", true)
+	c.parseBlock()
+	c.expect("}")
+	c.appendOut("};", true)
+}
+
+func (c *Compiler) parseExitWith() {
+	c.expect("exitwith")
+	c.expect("{")
+	c.appendOut("if (true) exitWith {", true)
+	c.parseBlock()
+	c.expect("}")
+	c.appendOut("};", true)
+}
+
+func (c *Compiler) parseWaitUntil() {
+	c.expect("waituntil")
+	c.expect("(")
+	c.appendOut("waitUntil {", false)
+	c.parseExpression(true)
+
+	if c.accept(";") {
+		c.next()
+		c.appendOut(";", false)
+		c.parseExpression(true)
+	}
+
+	c.expect(")")
+	c.expect(";")
+	c.appendOut("};", true)
+}
+
+func (c *Compiler) parseInlineCode() string {
+	c.expect("code")
+	c.expect("(")
+
+	code := c.get().Token
+	c.next()
+	output := "{}"
+
+	if len(code) > 2 {
+		compiler := Compiler{}
+		output = "{" + compiler.Parse(tokenizer.Tokenize([]byte(code[1:len(code)-1]), true), false) + "}"
+	}
+
+	c.expect(")")
+
+	return output
+}
+
+// Everything that does not start with a keyword.
+func (c *Compiler) parseStatement() {
+	// empty block
+	if c.accept("}") || c.accept("case") || c.accept("default") {
+		return
+	}
+
+	// variable or function name
+	name := c.get().Token
+	c.next()
+
+	if c.accept("=") {
+		c.appendOut(name, false)
+		c.parseAssignment()
+	} else {
+		c.parseFunctionCall(true, name)
+		c.expect(";")
+		c.appendOut(";", true)
+	}
+
+	if !c.end() {
+		c.parseBlock()
+	}
+}
+
+func (c *Compiler) parseAssignment() {
+	c.expect("=")
+	c.appendOut(" = ", false)
+	c.parseExpression(true)
+	c.expect(";")
+	c.appendOut(";", true)
+}
+
+func (c *Compiler) parseFunctionCall(out bool, name string) string {
+	output := ""
+
+	c.expect("(")
+	paramsStr, paramCount := c.parseParameter(false)
+	c.expect(")")
+
+	// buildin function
+	buildin := types.GetFunction(name)
+	
+	if buildin != nil {
+		if buildin.Type == types.NULL {
+			output = name
+		} else if buildin.Type == types.UNARY {
+			output = c.parseUnaryFunction(name, paramsStr, paramCount)
+		} else {
+			output = c.parseBinaryFunction(name, paramsStr, buildin, paramCount)
+		}
+	} else {
+		output = "[" + paramsStr + "] call " + name
+	}
+
+	if out {
+		c.appendOut(output, false)
+	}
+
+	return output
+}
+
+func (c *Compiler) parseUnaryFunction(name, paramsStr string, paramCount int) string {
+	output := ""
+
+	if paramCount == 1 {
+		output = name + " " + paramsStr
+	} else {
+		output = name + " [" + paramsStr + "]"
+	}
+
+	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(")") {
+		expr := c.parseExpression(out)
+		output += expr
+		count++
+
+		if !c.accept(")") {
+			c.expect(",")
+			output += ", "
+		}
+	}
+
+	if out {
+		c.appendOut(output, false)
+	}
+
+	return output, count
+}
+
+func (c *Compiler) parseExpression(out bool) string {
+	output := c.parseArith()
+
+	for c.accept("<") || c.accept(">") || c.accept("&") || c.accept("|") || c.accept("=") || c.accept("!") {
+		if c.accept("<") {
+			output += "<"
+			c.next()
+		} else if c.accept(">") {
+			output += ">"
+			c.next()
+		} else if c.accept("&") {
+			c.next()
+			c.expect("&")
+			output += "&&"
+		} else if c.accept("|") {
+			c.next()
+			c.expect("|")
+			output += "||"
+		} else if c.accept("=") {
+			output += "="
+			c.next()
+		} else {
+			c.next()
+			c.expect("=")
+			output += "!="
+		}
+
+		if c.accept("=") {
+			output += "="
+			c.next()
+		}
+
+		output += c.parseExpression(false)
+	}
+
+	if out {
+		c.appendOut(output, false)
+	}
+
+	return output
+}
+
+func (c *Compiler) parseIdentifier() string {
+	output := ""
+
+	if c.accept("code") {
+		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)
+	} else if c.seek("[") {
+		output += "(" + c.get().Token
+		c.next()
+		c.expect("[")
+		output += " select (" + c.parseExpression(false) + "))"
+		c.expect("]")
+	} else if c.accept("!") || c.accept("-") {
+		output = c.get().Token
+		c.next()
+		output += c.parseTerm()
+	} else {
+		output = c.get().Token
+		c.next()
+	}
+
+	return output
+}
+
+func (c *Compiler) parseTerm() string {
+	if c.accept("(") {
+		c.expect("(")
+		output := "(" + c.parseExpression(false) + ")"
+		c.expect(")")
+
+		return output
+	}
+
+	return c.parseIdentifier()
+}
+
+func (c *Compiler) parseFactor() string {
+	output := c.parseTerm()
+
+	for c.accept("*") || c.accept("/") { // TODO: modulo?
+		if c.accept("*") {
+			output += "*"
+		} else {
+			output += "/"
+		}
+
+		c.next()
+		output += c.parseExpression(false)
+	}
+
+	return output
+}
+
+func (c *Compiler) parseArith() string {
+	output := c.parseFactor()
+
+	for c.accept("+") || c.accept("-") {
+		if c.accept("+") {
+			output += "+"
+		} else {
+			output += "-"
+		}
+
+		c.next()
+		output += c.parseExpression(false)
+	}
+
+	return output
+}

src/parser/parser_helper.go

@@ -0,0 +1,89 @@
+package parser
+
+import (
+	"errors"
+	"strconv"
+	"tokenizer"
+)
+
+type Compiler struct {
+	tokens     []tokenizer.Token
+	tokenIndex int
+	out        string
+	offset     int
+	pretty     bool
+}
+
+// Initilizes the parser.
+func (c *Compiler) initParser(token []tokenizer.Token, prettyPrinting bool) bool {
+	if len(token) == 0 {
+		return false
+	}
+
+	c.tokens = token
+	c.tokenIndex = 0
+	c.out = ""
+	c.offset = 0
+	c.pretty = prettyPrinting
+
+	return true
+}
+
+// Returns true, if current token matches expected one.
+// Does not throw parse errors and checks if token is available.
+func (c *Compiler) accept(token string) bool {
+	return c.tokenIndex < len(c.tokens) && c.tokenEqual(token, c.get())
+}
+
+// Hard version of "accept".
+// Throws if current token does not match expected one.
+func (c *Compiler) expect(token string) {
+	if !c.tokenEqual(token, c.get()) {
+		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()
+}
+
+// Returns true, if the next token matches expected one.
+// Does not throw parse errors and checks if token is available.
+func (c *Compiler) seek(token string) bool {
+	if c.tokenIndex+1 >= len(c.tokens) {
+		return false
+	}
+
+	return c.tokenEqual(token, c.tokens[c.tokenIndex+1])
+}
+
+// Increases token counter, so that the next token is compared.
+func (c *Compiler) next() {
+	c.tokenIndex++
+}
+
+// Returns current token or throws, if no more tokens are available.
+func (c *Compiler) get() tokenizer.Token {
+	if c.tokenIndex >= len(c.tokens) {
+		panic(errors.New("No more tokens"))
+	}
+
+	return c.tokens[c.tokenIndex]
+}
+
+// Returns true if the end of input code was reached.
+func (c *Compiler) end() bool {
+	return c.tokenIndex == len(c.tokens)
+}
+
+// Checks if two strings match.
+func (c *Compiler) tokenEqual(a string, b tokenizer.Token) bool {
+	return a == b.Token
+}
+
+// Appends the output string to current SQF code output.
+func (c *Compiler) appendOut(str string, newLine bool) {
+	c.out += str
+
+	if newLine && c.pretty {
+		c.out += "\r\n"
+	}
+}

src/parser/parser_test.go

@@ -0,0 +1,228 @@
+package parser_test
+
+import (
+	"io/ioutil"
+	"parser"
+	"testing"
+	"tokenizer"
+	"types"
+)
+
+const (
+	types_file = "../../test/types"
+)
+
+func TestParserDeclaration(t *testing.T) {
+	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")
+	want := "x = 1;\r\n"
+
+	equal(t, got, want)
+}
+
+func TestParserIf(t *testing.T) {
+	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")
+	want := "while {true} do {\r\n};\r\n"
+
+	equal(t, got, want)
+}
+
+func TestParserFor(t *testing.T) {
+	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")
+	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")
+	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")
+	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")
+	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")
+	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")
+	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")
+	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 TestParserNullBuildinFunctionCall(t *testing.T) {
+	types.LoadTypes(types_file)
+
+	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")
+	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")
+	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")
+	want := "x = !([] call foo);\r\n"
+
+	equal(t, got, want)
+}
+
+func TestParserExitWith(t *testing.T) {
+	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")
+	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")
+	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")
+	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")
+	want := "inline_code = {a = 1;b = 2;if (a<b) then {[] call foo;};};\r\n"
+
+	equal(t, got, want)
+}
+
+func TestParserPreprocessor(t *testing.T) {
+	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")
+	want := "x = [1,2,3]-[2,3];\r\n"
+
+	equal(t, got, want)
+}
+
+// bugfix: unary function parsing (e.g. "format")
+func TestBugfixParserUnaryFunction(t *testing.T) {
+	got := getCompiled(t, "../../test/bugfix_unary_func_format.asl")
+	want := "format [\"%1 %2\", \"value1\", \"value2\"];\r\n[\"a\", \"b\", \"c\"] call someFunc;\r\n"
+
+	equal(t, got, want)
+}
+
+func getCompiled(t *testing.T, file string) string {
+	code, err := ioutil.ReadFile(file)
+
+	if err != nil {
+		t.Error("Could not read test file: " + file)
+		t.FailNow()
+	}
+
+	tokens := tokenizer.Tokenize(code, false)
+	compiler := parser.Compiler{}
+
+	return compiler.Parse(tokens, true)
+}
+
+func equal(t *testing.T, got, want string) {
+	if got != want {
+		t.Error("Results do not equal, got:")
+		t.Log(got)
+		t.Log("expected:")
+		t.Log(want)
+		t.FailNow()
+	}
+}

src/tokenizer/tokenizer.go

@@ -1,64 +1,82 @@
-package asl
+package tokenizer
 
 import (
 	"strings"
 )
 
 type Token struct {
-	token string
+	Token        string
+	Preprocessor bool
+	Line         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"}
 
-var whitespace = []byte{' ', '\n', '\t', '\r'}
+	whitespace   = []byte{' ', '\n', '\t', '\r'}
-var identifier = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_"
+	identifier   = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_"
+	preprocessor = byte('#')
+	new_line     = []byte{'\r', '\n'}
+)
 
 // Tokenizes the given byte array into syntax tokens,
 // which can be parsed later.
-func Tokenize(code []byte) []Token {
+func Tokenize(code []byte, doStripSlashes bool) []Token {
+	if doStripSlashes {
+		code = stripSlashes(code)
+	}
+
 	code = removeComments(code)
 	tokens := make([]Token, 0)
-	token, mask, isstring := "", false, false
+	token, mask, isstring, line, column := "", false, false, 0, 0
 
-	for i := range code {
+	for i := 0; i < len(code); i++ {
 		c := code[i]
+		column++
+
+		if byteArrayContains(new_line, c) {
+			line++
+			column = 0
+		}
 
 		// string masks (backslash)
 		if c == '\\' && !mask {
@@ -77,16 +95,19 @@ func Tokenize(code []byte) []Token {
 		if isstring {
 			token += string(c)
 		} else {
-			// delimeter, keyword or variable/expression
+			// preprocessor, delimeter, keyword or variable/expression
-			if byteArrayContains(delimiter, c) {
+			if c == preprocessor {
+				tokens = append(tokens, preprocessorLine(code, &i, line, column))
+				token = ""
+			} else if byteArrayContains(delimiter, c) {
 				if token != "" {
-					tokens = append(tokens, Token{token})
+					tokens = append(tokens, Token{token, false, line, column})
 				}
 
-				tokens = append(tokens, Token{string(c)})
+				tokens = append(tokens, Token{string(c), false, line, column})
 				token = ""
 			} else if stringArrayContains(strings.ToLower(token)) && !isIdentifierCharacter(c) {
-				tokens = append(tokens, Token{token})
+				tokens = append(tokens, Token{token, false, line, column})
 				token = ""
 			} else if !byteArrayContains(whitespace, c) {
 				token += string(c)
@@ -99,6 +120,28 @@ func Tokenize(code []byte) []Token {
 	return tokens
 }
 
+// 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))
+	j, mask := 0, false
+
+	for i := 0; i < len(code); i++ {
+		c := code[i]
+
+		if c == '\\' && !mask {
+			mask = true
+			continue
+		}
+
+		newcode[j] = code[i]
+		mask = false
+		j++
+	}
+
+	return newcode
+}
+
 // Removes all comments from input byte array.
 // Comments are single line comments, starting with // (two slashes),
 // multi line comments with /* ... */ (slash star, star slash).
@@ -137,6 +180,35 @@ func removeComments(code []byte) []byte {
 	return newcode[:j]
 }
 
+// Reads preprocessor command until end of line
+func preprocessorLine(code []byte, i *int, lineNr, column int) Token {
+	c := byte('0')
+	var line string
+
+	for *i < len(code) {
+		c = code[*i]
+
+		if byteArrayContains(new_line, c) {
+			break
+		}
+
+		line += string(c)
+		(*i)++
+	}
+
+	// read all new line characters (\r and \n)
+	c = code[*i]
+
+	for byteArrayContains(new_line, c) {
+		(*i)++
+		c = code[*i]
+	}
+
+	(*i)-- // for will count up 1, so subtract it here
+
+	return Token{line, true, lineNr, column}
+}
+
 // Returns the next character in code starting at i.
 // If no character is left, '0' will be returned.
 func nextChar(code []byte, i int) byte {

src/tokenizer/tokenizer_test.go

@@ -1,12 +1,13 @@
-package asl
+package tokenizer_test
 
 import (
 	"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)
@@ -14,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)
@@ -22,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)
@@ -30,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)
@@ -38,23 +39,23 @@ 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", "allUnits", "{", "}"}
+	want := []string{"foreach", "unit", "=", ">", "allUnits", "{", "}"}
 
 	compareLength(t, &got, &want)
 	compareTokens(t, &got, &want)
 }
 
 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", ";", "break", ";", "case", "2", ":", "x", "=", "2", ";", "break", ";", "default", ":", "x", "=", "3", ";", "}"}
+	want := []string{"switch", "x", "{", "case", "1", ":", "x", "=", "1", ";", "case", "2", ":", "x", "=", "2", ";", "default", ":", "x", "=", "3", ";", "}"}
 
 	compareLength(t, &got, &want)
 	compareTokens(t, &got, &want)
 }
 
 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)
@@ -62,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)
@@ -70,20 +71,45 @@ 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)
 	compareTokens(t, &got, &want)
 }
 
-func compareLength(t *testing.T, got *[]Token, want *[]string) {
+func TestTokenizerInlineCode(t *testing.T) {
+	got := getTokens(t, "../../test/tokenizer_code.asl")
+	want := []string{"var", "x", "=", "code", "(", "\"var x = 5;\"", ")", ";"}
+
+	compareLength(t, &got, &want)
+	compareTokens(t, &got, &want)
+}
+
+func TestTokenizerPreprocessor(t *testing.T) {
+	got := getTokens(t, "../../test/tokenizer_preprocessor.asl")
+	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")
+	want := []string{"var", "x", "=", "\"Hello \\\"World\\\"\"", ";",
+		"var", "y", "=", "code", "(", "\"var z = \\\"Hello \\\\\"World\\\\\"\\\";\"", ")", ";"}
+
+	compareLength(t, &got, &want)
+	compareTokens(t, &got, &want)
+}
+
+func compareLength(t *testing.T, got *[]tokenizer.Token, want *[]string) {
 	if len(*got) != len(*want) {
 		t.Error("Length of tokens got and expected tokens not equal, was:")
 		gotlist, wantlist := "", ""
 
 		for i := range *got {
-			gotlist += (*got)[i].token + " "
+			gotlist += (*got)[i].Token + " "
 		}
 
 		for i := range *want {
@@ -97,15 +123,15 @@ func compareLength(t *testing.T, got *[]Token, want *[]string) {
 	}
 }
 
-func compareTokens(t *testing.T, got *[]Token, want *[]string) {
+func compareTokens(t *testing.T, got *[]tokenizer.Token, want *[]string) {
 	for i := range *got {
-		if (*got)[i].token != (*want)[i] {
+		if (*got)[i].Token != (*want)[i] {
-			t.Error("Tokens do not match: " + (*got)[i].token + " != " + (*want)[i])
+			t.Error("Tokens do not match: " + (*got)[i].Token + " != " + (*want)[i])
 		}
 	}
 }
 
-func getTokens(t *testing.T, file string) []Token {
+func getTokens(t *testing.T, file string) []tokenizer.Token {
 	code, err := ioutil.ReadFile(file)
 
 	if err != nil {
@@ -113,5 +139,5 @@ func getTokens(t *testing.T, file string) []Token {
 		t.FailNow()
 	}
 
-	return Tokenize(code)
+	return tokenizer.Tokenize(code, false)
 }

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/bugfix_unary_func_format.asl

@@ -0,0 +1,2 @@
+format("%1 %2", "value1", "value2"); // must result in format [...];
+someFunc("a", "b", "c"); // must result in ... call someFunc;

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_code.asl

@@ -0,0 +1 @@
+var inline_code = code("var a = 1;var b = 2;if a < b {foo();}");

test/parser_expression_array.asl

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

test/parser_func_params.asl

@@ -0,0 +1,3 @@
+func myFunc(a = 1, b = 2) {
+    return a+b;
+}

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_code.asl

@@ -0,0 +1 @@
+var x = code("var x = 5;");

test/tokenizer_foreach.asl

@@ -1,3 +1,3 @@
-foreach allUnits {
+foreach unit => allUnits {
     // ...
 }

test/tokenizer_mask.asl

@@ -0,0 +1,2 @@
+var x = "Hello \"World\"";
+var y = code("var z = \"Hello \\"World\\"\";");

test/tokenizer_preprocessor.asl

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

test/tokenizer_switch.asl

@@ -1,10 +1,8 @@
 switch x {
     case 1:
         x = 1;
-        break;
     case 2:
         x = 2;
-        break;
     default:
         x = 3;
 }

tools/README.md

@@ -0,0 +1,20 @@
+#ASL Tools
+A visual tool set to ease the work of asl developers.
+Maintained by yours truly: [654wak654](https://github.com/654wak654/)
+
+**Notepad++ Syntax Higligthing**: https://github.com/DeKugelschieber/asl/blob/master/tools/asl.xml
+
+Feel free to contribute with another text editor's syntax higligthing plugin.
+
+##ASL GUI <img src="https://img.shields.io/badge/version-1.1.0.0-orange.svg" alt="version">
+An optional Java interface to make the compile procces of ASL faster and more user-friendly. It's released under the MIT licence just like the core project. It also helps with error reporting of asl.
+
+**Version 1.1.0.0**
+- New Arma 3-themed look, and error reporting straight from asl.
+- Program now depends on asl.exe, they need to be in the same directory.
+
+**Version 1.0.0.0**
+- More style changes and bug fixes, marked ready for release.
+
+**Version 0.3.0.0:**
+- Fixed some possible bugs, did some style fixes and other code adjustments. It's now is readable without getting cataracts. Mostly anyway...