Fixes, kvtable support

* Added hexadecimal support to the tokenizer
* Fixed tokenizer picking up function names with keywords in them as keywords done -> do
* Added vector4
* Added kvtable instruction which transpiles directly to a lua table.
* Added and, or, mod, greater than, less than ops

Author: thevurv

script.e2

@@ -45,4 +45,16 @@ try {
 T = table()
 T[1, vector] = vec()
 
-print( T[1, vector] )
+print( T[1, vector] )
+
+local Tbl = table(
+    "width" = Width,
+    "height" = Height,
+    "done" = 0,
+    "output" = table(),
+    "png" = 1,
+    "type" = Type,
+
+    "crc" = 0,
+    "adler" = 1
+)

src/Base/Parser.hx

@@ -454,14 +454,9 @@ class Parser {
 		var type = "number";
 
 		var name = this.getTokenRaw();
-
 		if (name == null)
 			this.error("Variable required");
 
-		var first_char = name.charAt(0);
-		if (first_char != first_char.toUpperCase())
-			this.error("Variable must start with uppercased letter");
-
 		if (used_vars.exists(name))
 			this.error('Variable \'$name\' is already used as an argument,');
 
@@ -486,16 +481,12 @@ class Parser {
 		if (this.hasTokens()) {
 			var vars: Array<String> = [];
 			while (true) {
-				if (this.acceptRoamingToken("lower_ident") || this.acceptRoamingToken("ident")) {
+				if (this.acceptRoamingToken("ident")) {
 					var name = this.getTokenRaw();
 
 					if (name == null)
 						this.error("Variable required");
 
-					var first_char = name.charAt(0);
-					if ( first_char != first_char.toUpperCase() )
-						this.error("Variable must start with uppercased letter");
-
 					if ( used_vars.exists(name) )
 						this.error('Variable \'$name\' is already used as an argument');
 
@@ -620,7 +611,7 @@ class Parser {
 
 				keytype = this.getTokenRaw();
 
-				var typ = wire_expression_types.get(keytype.toUpperCase());
+				var typ = wire_expression_types.get(keytype);
 				if (typ == null)
 					this.error('Unknown type: $keytype');
 
@@ -890,7 +881,6 @@ class Parser {
 			if (first_char != first_char.toLowerCase())
 				this.error("Function name must start with a lower case letter", name_token);
 
-
 			if ( !this.acceptRoamingToken("grammar", "(") )
 				this.error("Left parenthesis (() must appear after function name");
 

src/Base/Tokenizer.hx

@@ -138,13 +138,13 @@ class Tokenizer {
 
 			new TokenMatch( "grammar", ~/{|}|,|;|:|\(|\)|\[|\]/, TokenType.Grammar),
 
-			new TokenMatch( "keyword", ~/elseif|if|else|break|continue|local|while|switch|case|default|try|catch|foreach|for|function|return|do/, TokenType.Keyword ),
+			new TokenMatch( "keyword", ~/\belseif|if|else|break|continue|local|while|switch|case|default|try|catch|foreach|for|function|return|do\b/, TokenType.Keyword ),
 
 			new TokenMatch( "string", ~/("[^"\\]*(?:\\.[^"\\]*)*")/, TokenType.Literal, TokenFlag.None, function(token, pattern) {
 				token.literal = E2Type.String( pattern.matched(0) );
 			}),
 
-			new TokenMatch( "number", ~/-?(\d*\.)?\d+/, TokenType.Literal, TokenFlag.None, function(token, pattern) {
+			new TokenMatch( "number", ~/-?(0[xX][0-9a-fA-F]+)|(-?(\d*\.)?\d+)/, TokenType.Literal, TokenFlag.None, function(token, pattern) {
 				// In the future make this allow for rust strings etc
 				var value = Std.parseFloat( pattern.matched(0) );
 				if (Math.isNaN(value))

src/Base/Transpiler/Lua.hx

@@ -140,6 +140,15 @@ class Instructions {
 	static function instr_not(v: Instruction)
 		return 'not ${ callInline(v) }';
 
+	static function instr_and(v1: Instruction, v2: Instruction)
+		return '${ callInline(v1) } and ${ callInline(v2) }';
+
+	static function instr_or(v1: Instruction, v2: Instruction)
+		return '${ callInline(v1) } or ${ callInline(v2) }';
+
+	static function instr_mod(v1: Instruction, v2: Instruction)
+		return '${ callInline(v1) } % ${ callInline(v2) }';
+
 	static function instr_add(v: Instruction, addend: Instruction)
 		return '${ callInline(v) } + ${ callInline(addend) }';
 
@@ -164,6 +173,14 @@ class Instructions {
 	static function instr_geq(v1: Instruction, v2: Instruction)
 		return '${ callInline(v1) } >= ${ callInline(v2) }';
 
+	// Greater than
+	static function instr_gt(v1: Instruction, v2: Instruction)
+		return '${ callInline(v1) } > ${ callInline(v2) }';
+
+	// Less than
+	static function instr_lt(v1: Instruction, v2: Instruction)
+		return '${ callInline(v1) } < ${ callInline(v2) }';
+
 	static function instr_grouped_equation(v1: Instruction)
 		return '(${ callInline(v1) })';
 
@@ -199,6 +216,18 @@ class Instructions {
 	static function instr_index_set(tbl: Instruction, key: Instruction, value: Instruction, type: Null<String>)
 		return '${ callInline(tbl) }[${ callInline(key) }] = ${ callInline(value) }';
 
+	static function instr_kvtable(kvmap: Map<Instruction, Instruction>, imap: Array<Instruction>) {
+		var kvargs = [ for (k => v in kvmap.keyValueIterator()) '[${ callInline(k) }] = ${ callInline(v) }' ];
+
+		return '{\n' +
+			'\t${ kvargs.join(",\n\t") }\n' +
+			'\t${ imap.map( (x) -> callInline(x) ).join(",\n\t") }\n' +
+		'}';
+	}
+
+	static function instr_kvarray()
+		return 'todo!';
+
 	// Bitwise ops
 	static function instr_bor(v1: Instruction, v2: Instruction) {
 		#if LUA54

src/Lib/Std.hx

@@ -26,6 +26,9 @@ final types: Map<String, E2TypeDef> = [
 	}, // temporary.
 	"vector2" => {
 		id: "vector2"
+	},
+	"vector4" => {
+		id: "vector4"
 	}
 ];