15 Commits

Author SHA1 Message Date
Marvin Blum
737b96d5ac Fixed binary buildin functions and tests. 2016-01-14 11:44:02 +01:00
Marvin Blum
e3a7c5d6ac Missunderstood supportInfo parameter. 2016-01-06 23:01:07 +01:00
Marvin Blum
e1bf92f4aa Unary buildin functions, need to fix test! 2016-01-06 22:37:59 +01:00
Marvin Blum
fbfbb8a55c Fixed NaN type, updated changelog for future release, added support for null and unary build in functions. Need to add binary build in functions. 2016-01-06 22:15:09 +01:00
Marvin Blum
9d909a0b8a Finished loading type file. 2016-01-06 21:43:17 +01:00
Marvin Blum
3f6b854a09 Now splits by windows and unix new lines, added parsing structure. 2015-12-17 23:23:49 +01:00
Marvin Blum
05e6937201 Started loading type information. 2015-12-17 22:49:56 +01:00
Marvin Blum
ed1d19851e Updated ToDo. 2015-12-15 23:56:20 +01:00
Marvin Blum
4dfa2ee3ef Issue #17 and concurrent compiling. 2015-12-15 23:53:47 +01:00
Marvin Blum
29804f0d20 Renamed parser helper, upcounted version number. 2015-12-15 23:23:24 +01:00
Marvin Blum
59831fed32 Merge branch 'master' of https://github.com/DeKugelschieber/asl 2015-12-15 23:19:56 +01:00
Marvin Blum
69e684a230 go fmt. 2015-12-15 23:19:41 +01:00
Marvin Blum
d07611c3a5 Fixed "switch" in keyword list. 2015-11-26 15:26:53 +01:00
Marvin Blum
afbc290281 Merge pull request #29 from 654wak654/master
Recompiled for previous fix
2015-11-23 16:17:45 +01:00
Ozan Eğitmen
2e94cf8efb Recompiled for previous fix 2015-11-23 17:14:16 +02:00
19 changed files with 5020 additions and 333 deletions

View File

@@ -1,5 +1,13 @@
# Changelog # 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** **1.1.1**
* arrays can now be declared within expressions * arrays can now be declared within expressions

View File

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

View File

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

Binary file not shown.

View File

@@ -1,19 +1,21 @@
package main package main
import ( import (
"parser"
"tokenizer"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"path/filepath"
"os" "os"
"parser"
"path/filepath"
"strings" "strings"
"tokenizer"
"types"
) )
const ( const (
version = "1.1.1" version = "1.2.0"
extension = ".asl" extension = ".asl"
sqfextension = ".sqf" sqfextension = ".sqf"
typeinfo = "types"
PathSeparator = string(os.PathSeparator) PathSeparator = string(os.PathSeparator)
) )
@@ -41,10 +43,14 @@ func usage() {
fmt.Println("<output directory> output directory, directory structure will be created corresponding to input directory") fmt.Println("<output directory> output directory, directory structure will be created corresponding to input directory")
} }
// Parses compiler flags.
func flags(flag string) bool { func flags(flag string) bool {
flag = strings.ToLower(flag) flag = strings.ToLower(flag)
if flag[0] == '-' { if flag[0] != '-' {
return false
}
if flag == "-v" { if flag == "-v" {
fmt.Println("asl version " + version) fmt.Println("asl version " + version)
exit = true exit = true
@@ -60,9 +66,16 @@ func flags(flag string) bool {
return true return true
} }
return false // 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) { func readAslFiles(path string) {
dir, err := ioutil.ReadDir(path) dir, err := ioutil.ReadDir(path)
@@ -90,28 +103,57 @@ func readAslFiles(path string) {
} }
} }
func compile(path string) { // Recovers and prints thrown error.
for i := 0; i < len(aslFiles); i++ { func recoverCompileError(file string, waiter chan bool) {
out := filepath.FromSlash(path+PathSeparator+aslFiles[i].out+PathSeparator+aslFiles[i].newname+sqfextension) if r := recover(); r != nil {
fmt.Println(aslFiles[i].in+" -> "+out) fmt.Println("Compile error in file "+file+":", r)
code, err := ioutil.ReadFile(aslFiles[i].in)
if err != nil {
fmt.Println("Error reading file: "+aslFiles[i].in)
continue
} }
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) token := tokenizer.Tokenize(code, false)
compiler := parser.Compiler{} compiler := parser.Compiler{}
sqf := compiler.Parse(token, pretty) sqf := compiler.Parse(token, pretty)
os.MkdirAll(filepath.FromSlash(path+PathSeparator+aslFiles[i].out), 0777) os.MkdirAll(filepath.FromSlash(path+PathSeparator+file.out), 0777)
err = ioutil.WriteFile(out, []byte(sqf), 0666) err = ioutil.WriteFile(out, []byte(sqf), 0666)
if err != nil { if err != nil {
fmt.Println("Error writing file: "+aslFiles[i].out) fmt.Println("Error writing file: " + file.out)
fmt.Println(err) fmt.Println(err)
} }
waiter <- true // done
}
// Compiles ASL files concurrently.
func compile(path string) {
waiter := make(chan bool, len(aslFiles))
// fire compile
for i := 0; i < len(aslFiles); i++ {
go compileFile(path, aslFiles[i], waiter)
}
// wait until all files are compiled
for i := 0; i < len(aslFiles); i++ {
<-waiter
} }
} }
@@ -125,7 +167,15 @@ func main() {
} }
var i int 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
}
// load type information
loadTypes()
if exit { if exit {
return return

View File

@@ -1,7 +1,9 @@
package parser package parser
import ( import (
"errors"
"tokenizer" "tokenizer"
"types"
) )
const new_line = "\r\n" const new_line = "\r\n"
@@ -215,6 +217,12 @@ func (c *Compiler) parseForeach() {
func (c *Compiler) parseFunction() { func (c *Compiler) parseFunction() {
c.expect("func") 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.appendOut(c.get().Token+" = {", true)
c.next() c.next()
c.expect("(") c.expect("(")
@@ -359,30 +367,22 @@ func (c *Compiler) parseFunctionCall(out bool, name string) string {
output := "" output := ""
c.expect("(") c.expect("(")
leftParams, leftParamCount := c.parseParameter(false) paramsStr, paramCount := c.parseParameter(false)
c.expect(")") c.expect(")")
if c.accept("(") {
// buildin function // buildin function
c.next() buildin := types.GetFunction(name)
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 { } else {
output = name + " " + rightParams output = c.parseBinaryFunction(name, paramsStr, buildin, paramCount)
} }
} else { } else {
output = "[" + leftParams + "] call " + name output = "[" + paramsStr + "] call " + name
} }
if out { if out {
@@ -392,12 +392,49 @@ func (c *Compiler) parseFunctionCall(out bool, name string) string {
return output 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) { func (c *Compiler) parseParameter(out bool) (string, int) {
output := "" output := ""
count := 0 count := 0
for !c.accept(")") { for !c.accept(")") {
output += c.parseExpression(out) expr := c.parseExpression(out)
output += expr
count++ count++
if !c.accept(")") { if !c.accept(")") {

View File

@@ -1,6 +1,7 @@
package parser package parser
import ( import (
"errors"
"strconv" "strconv"
"tokenizer" "tokenizer"
) )
@@ -38,7 +39,7 @@ func (c *Compiler) accept(token string) bool {
// Throws if current token does not match expected one. // Throws if current token does not match expected one.
func (c *Compiler) expect(token string) { func (c *Compiler) expect(token string) {
if !c.tokenEqual(token, c.get()) { 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() c.next()
@@ -62,7 +63,7 @@ func (c *Compiler) next() {
// Returns current token or throws, if no more tokens are available. // Returns current token or throws, if no more tokens are available.
func (c *Compiler) get() tokenizer.Token { func (c *Compiler) get() tokenizer.Token {
if c.tokenIndex >= len(c.tokens) { if c.tokenIndex >= len(c.tokens) {
panic("No more tokens") panic(errors.New("No more tokens"))
} }
return c.tokens[c.tokenIndex] return c.tokens[c.tokenIndex]

View File

@@ -1,168 +1,195 @@
package parser_test package parser_test
import ( import (
"tokenizer"
"parser"
"io/ioutil" "io/ioutil"
"parser"
"testing" "testing"
"tokenizer"
"types"
)
const (
types_file = "../../test/types"
) )
func TestParserDeclaration(t *testing.T) { 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" want := "x = 1;\r\narray = [1,2,3];\r\n"
equal(t, got, want) equal(t, got, want)
} }
func TestParserAssignment(t *testing.T) { func TestParserAssignment(t *testing.T) {
got := getCompiled(t, "test/parser_assignment.asl") got := getCompiled(t, "../../test/parser_assignment.asl")
want := "x = 1;\r\n" want := "x = 1;\r\n"
equal(t, got, want) equal(t, got, want)
} }
func TestParserIf(t *testing.T) { 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" want := "if (a<b) then {\r\n};\r\n"
equal(t, got, want) equal(t, got, want)
} }
func TestParserWhile(t *testing.T) { 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};" want := "while {true} do {\r\n};"
equal(t, got, want) equal(t, got, want)
} }
func TestParserFor(t *testing.T) { 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" want := "for [{i=0}, {i<100}, {i=i+1}] do {\r\n};\r\n"
equal(t, got, want) equal(t, got, want)
} }
func TestParserForeach(t *testing.T) { 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" want := "{\r\nunit = _x;\r\n} forEach (allUnits);\r\n"
equal(t, got, want) equal(t, got, want)
} }
func TestParserSwitch(t *testing.T) { 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" 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) equal(t, got, want)
} }
func TestParserFunction(t *testing.T) { func TestParserFunction(t *testing.T) {
got := getCompiled(t, "test/tokenizer_func.asl") got := getCompiled(t, "../../test/tokenizer_func.asl")
want := "TestFunction = {\r\nparams [\"param0\",\"param1\"];\r\nreturn true;\r\n};\r\n" want := "TestFunction = {\r\nparams [\"param0\",\"param1\"];\r\nreturn true;\r\n};\r\n"
equal(t, got, want) equal(t, got, want)
} }
func TestParserAssignResult(t *testing.T) { 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" want := "x = ([1, 2, 3] call foo);\r\ny = ([1, 2, 3] call bar);\r\n"
equal(t, got, want) equal(t, got, want)
} }
func TestParserExpression(t *testing.T) { 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" want := "x = -(1+(2+3))/(6*(someVariable+99-100))-(20)+!anotherVariable+([] call foo);\r\n"
equal(t, got, want) equal(t, got, want)
} }
func TestParserExpression2(t *testing.T) { 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" want := "x = true||(3>=4&&5<8);\r\n"
equal(t, got, want) equal(t, got, want)
} }
func TestParserFunctionCall(t *testing.T) { func TestParserFunctionCall(t *testing.T) {
got := getCompiled(t, "test/parser_func_call.asl") got := getCompiled(t, "../../test/parser_func_call.asl")
want := "myFunc = {\r\nparams [\"a\",\"b\"];\r\nreturn a>b;\r\n};\r\n[1+3/4, 2-(66*22)/3-((123))] call myFunc;\r\n" want := "myFunc = {\r\nparams [\"a\",\"b\"];\r\nreturn a>b;\r\n};\r\n[1+3/4, 2-(66*22)/3-((123))] call myFunc;\r\n"
equal(t, got, want) equal(t, got, want)
} }
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) equal(t, got, want)
} }
func TestParserOperator(t *testing.T) { 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" want := "if (x==y&&x!=y&&x<=y&&x>=y&&x<y&&x>y) then {\r\n};\r\n"
equal(t, got, want) equal(t, got, want)
} }
func TestParserTryCatch(t *testing.T) { 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" want := "try {\r\n} catch {\r\n};\r\n"
equal(t, got, want) equal(t, got, want)
} }
func TestParserNegationFunctionCall(t *testing.T) { 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" want := "x = !([] call foo);\r\n"
equal(t, got, want) equal(t, got, want)
} }
func TestParserExitWith(t *testing.T) { 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" want := "if (true) exitWith {\r\n};\r\n"
equal(t, got, want) equal(t, got, want)
} }
func TestParserWaitUntil(t *testing.T) { 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" want := "waitUntil {x=x+1;x<100};\r\n"
equal(t, got, want) equal(t, got, want)
} }
func TestParserArray(t *testing.T) { 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" want := "x = [1,2,3];\r\ny = (x select (1));\r\n"
equal(t, got, want) equal(t, got, want)
} }
func TestParserFunctionParams(t *testing.T) { 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" want := "myFunc = {\r\nparams [[\"a\",1],[\"b\",2]];\r\nreturn a+b;\r\n};\r\n"
equal(t, got, want) equal(t, got, want)
} }
func TestParserInlineCode(t *testing.T) { 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" want := "inline_code = {a = 1;b = 2;if (a<b) then {[] call foo;};};\r\n"
equal(t, got, want) equal(t, got, want)
} }
func TestParserPreprocessor(t *testing.T) { 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" want := "\r\n#define HELLO_WORLD \"Hello World!\"\r\nhint HELLO_WORLD;\r\n"
equal(t, got, want) equal(t, got, want)
} }
func TestParserExpressionArray(t *testing.T) { 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" want := "x = [1,2,3]-[2,3];\r\n"
equal(t, got, want) equal(t, got, want)
@@ -176,7 +203,7 @@ func getCompiled(t *testing.T, file string) string {
t.FailNow() t.FailNow()
} }
tokens := tokenizer.Tokenize(code) tokens := tokenizer.Tokenize(code, false)
compiler := parser.Compiler{} compiler := parser.Compiler{}
return compiler.Parse(tokens, true) return compiler.Parse(tokens, true)

View File

@@ -11,7 +11,8 @@ type Token struct {
Column int Column int
} }
var delimiter = []byte{ var (
delimiter = []byte{
'=', '=',
';', ';',
'{', '{',
@@ -32,7 +33,7 @@ var delimiter = []byte{
'*', '*',
'/'} // TODO: modulo? '/'} // TODO: modulo?
var keywords = []string{ keywords = []string{
"var", "var",
"if", "if",
"while", "while",
@@ -51,16 +52,17 @@ var keywords = []string{
"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, // Tokenizes the given byte array into syntax tokens,
// which can be parsed later. // which can be parsed later.
func Tokenize(code []byte, doStripSlashes bool) []Token { func Tokenize(code []byte, doStripSlashes bool) []Token {
if doStripSlashes { if doStripSlashes {
code = stripSlashes(code); code = stripSlashes(code)
} }
code = removeComments(code) code = removeComments(code)

View File

@@ -1,13 +1,13 @@
package tokenizer_test package tokenizer_test
import ( import (
"tokenizer"
"io/ioutil" "io/ioutil"
"testing" "testing"
"tokenizer"
) )
func TestTokenizerVar(t *testing.T) { 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", "]", ";"} want := []string{"var", "x", "=", "1", ";", "var", "array", "=", "[", "1", ",", "2", ",", "3", "]", ";"}
compareLength(t, &got, &want) compareLength(t, &got, &want)
@@ -15,7 +15,7 @@ func TestTokenizerVar(t *testing.T) {
} }
func TestTokenizerIf(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", "{", "}"} want := []string{"if", "a", "<", "b", "{", "}"}
compareLength(t, &got, &want) compareLength(t, &got, &want)
@@ -23,7 +23,7 @@ func TestTokenizerIf(t *testing.T) {
} }
func TestTokenizerWhile(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", "{", "}"} want := []string{"while", "true", "{", "}"}
compareLength(t, &got, &want) compareLength(t, &got, &want)
@@ -31,7 +31,7 @@ func TestTokenizerWhile(t *testing.T) {
} }
func TestTokenizerFor(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", "{", "}"} want := []string{"for", "var", "i", "=", "0", ";", "i", "<", "100", ";", "i", "=", "i", "+", "1", "{", "}"}
compareLength(t, &got, &want) compareLength(t, &got, &want)
@@ -39,7 +39,7 @@ func TestTokenizerFor(t *testing.T) {
} }
func TestTokenizerForach(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", "{", "}"} want := []string{"foreach", "unit", "=", ">", "allUnits", "{", "}"}
compareLength(t, &got, &want) compareLength(t, &got, &want)
@@ -47,7 +47,7 @@ func TestTokenizerForach(t *testing.T) {
} }
func TestTokenizerSwitch(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", ";", "}"} want := []string{"switch", "x", "{", "case", "1", ":", "x", "=", "1", ";", "case", "2", ":", "x", "=", "2", ";", "default", ":", "x", "=", "3", ";", "}"}
compareLength(t, &got, &want) compareLength(t, &got, &want)
@@ -55,7 +55,7 @@ func TestTokenizerSwitch(t *testing.T) {
} }
func TestTokenizerFunction(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", ";", "}"} want := []string{"func", "TestFunction", "(", "param0", ",", "param1", ")", "{", "return", "true", ";", "}"}
compareLength(t, &got, &want) compareLength(t, &got, &want)
@@ -63,7 +63,7 @@ func TestTokenizerFunction(t *testing.T) {
} }
func TestTokenizerExpression(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", ")", ";"} want := []string{"x", "=", "(", "(", "1", "+", "2", "+", "3", ")", "*", "4", "/", "2", ")", "+", "foo", "(", "1", ",", "2", ",", "3", ")", ";"}
compareLength(t, &got, &want) compareLength(t, &got, &want)
@@ -71,7 +71,7 @@ func TestTokenizerExpression(t *testing.T) {
} }
func TestTokenizerIdentifier(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!\"", ";"} want := []string{"var", "format", "=", "\"should not be for mat!\"", ";"}
compareLength(t, &got, &want) compareLength(t, &got, &want)
@@ -79,7 +79,7 @@ func TestTokenizerIdentifier(t *testing.T) {
} }
func TestTokenizerInlineCode(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;\"", ")", ";"} want := []string{"var", "x", "=", "code", "(", "\"var x = 5;\"", ")", ";"}
compareLength(t, &got, &want) compareLength(t, &got, &want)
@@ -87,16 +87,15 @@ func TestTokenizerInlineCode(t *testing.T) {
} }
func TestTokenizerPreprocessor(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) compareLength(t, &got, &want)
compareTokens(t, &got, &want) compareTokens(t, &got, &want)
} }
func TestTokenizerMask(t *testing.T) { 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\\\"\"", ";", want := []string{"var", "x", "=", "\"Hello \\\"World\\\"\"", ";",
"var", "y", "=", "code", "(", "\"var z = \\\"Hello \\\\\"World\\\\\"\\\";\"", ")", ";"} "var", "y", "=", "code", "(", "\"var z = \\\"Hello \\\\\"World\\\\\"\\\";\"", ")", ";"}

146
src/types/loader.go Normal file
View File

@@ -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
}

18
src/types/loader_test.go Normal file
View File

@@ -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")
}
}

View File

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

View File

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

View File

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

View File

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

View File

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

2198
test/types Normal file

File diff suppressed because it is too large Load Diff

2198
types Normal file

File diff suppressed because it is too large Load Diff