loreline 0.8.0 → 0.8.1

package/js/loreline.js

@@ -17496,6 +17496,11 @@ class loreline_Interpreter {
 			if(loreline_Arrays.isArray(target1) && (typeof(index) == "number" && ((index | 0) === index) || typeof(index) == "number")) {
 				let i = index | 0;
 				return loreline_RuntimeAccess.ArrayAccess(arrAccess.pos,target1,i);
+			} else if(typeof(index) == "string") {
+				if(target1 == null) {
+					throw haxe_Exception.thrown(new loreline_RuntimeError("Cannot access field '" + (index == null ? "null" : Std.string(index)) + "' of null",arrAccess.pos));
+				}
+				return loreline_RuntimeAccess.FieldAccess(arrAccess.pos,target1,index);
 			} else {
 				throw haxe_Exception.thrown(new loreline_RuntimeError("Invalid array access target",arrAccess.pos));
 			}
@@ -20798,6 +20803,7 @@ Object.assign(loreline_Token.prototype, {
 });
 class loreline_Lexer {
 	constructor(input) {
+		this.keepOrphanExpressions = false;
 		this.errors = null;
 		this.allowTabs = true;
 		this.detectedIndentSize = 2;
@@ -23067,6 +23073,13 @@ class loreline_Lexer {
 				while(pos < this.length && bracketLevel > 0) {
 					let c = HxOverrides.cca(this.input,pos);
 					c1 = c == null ? -1 : c;
+					if(c1 == 34) {
+						pos = this.scanStringEnd(pos,false);
+						if(pos == -1) {
+							return false;
+						}
+						continue;
+					}
 					if(c1 == 91) {
 						++bracketLevel;
 					}
@@ -23351,7 +23364,16 @@ class loreline_Lexer {
 				++pos;
 				while(pos < this.length) {
 					let c = HxOverrides.cca(this.input,pos);
-					if((c == null ? -1 : c) == 93) {
+					let bc = c == null ? -1 : c;
+					if(bc == 34) {
+						pos = this.scanStringEnd(pos,false);
+						if(pos == -1) {
+							pos = startPos;
+							return false;
+						}
+						continue;
+					}
+					if(bc == 93) {
 						++pos;
 						break;
 					}
@@ -23421,7 +23443,18 @@ class loreline_Lexer {
 			let c1 = c == null ? -1 : c;
 			let tmp;
 			if(!isEscape) {
-				if(c1 != 61) {
+				let tmp1;
+				if(c1 == 61) {
+					if(pos + 1 < this.length) {
+						let c = HxOverrides.cca(this.input,pos + 1);
+						tmp1 = (c == null ? -1 : c) != 61;
+					} else {
+						tmp1 = true;
+					}
+				} else {
+					tmp1 = false;
+				}
+				if(!tmp1) {
 					let c = HxOverrides.cca(this.input,pos + 1);
 					tmp = (c == null ? -1 : c) == 61 && (c1 == 43 || c1 == 45 || c1 == 42 || c1 == 47 || c1 == 58);
 				} else {
@@ -23481,7 +23514,15 @@ class loreline_Lexer {
 					++pos;
 					while(pos < this.length) {
 						let c = HxOverrides.cca(this.input,pos);
-						if((c == null ? -1 : c) == 93) {
+						let bc = c == null ? -1 : c;
+						if(bc == 34) {
+							pos = this.scanStringEnd(pos,false);
+							if(pos == -1) {
+								return false;
+							}
+							continue;
+						}
+						if(bc == 93) {
 							++pos;
 							break;
 						}
@@ -23495,6 +23536,11 @@ class loreline_Lexer {
 				++pos;
 			} else if(c1 == 13 || c1 == 10) {
 				return false;
+			} else if(c1 == 34) {
+				pos = this.scanStringEnd(pos,false);
+				if(pos == -1) {
+					return false;
+				}
 			} else if(c1 >= 97 && c1 <= 122 || c1 >= 65 && c1 <= 90 || c1 == 95) {
 				let result = true;
 				let startPos = pos;
@@ -23535,7 +23581,18 @@ class loreline_Lexer {
 					return false;
 				}
 			} else {
-				++pos;
+				let tmp;
+				if((c1 == 61 || c1 == 33 || c1 == 60 || c1 == 62) && pos + 1 < this.length) {
+					let c = HxOverrides.cca(this.input,pos + 1);
+					tmp = (c == null ? -1 : c) == 61;
+				} else {
+					tmp = false;
+				}
+				if(tmp) {
+					pos += 2;
+				} else {
+					++pos;
+				}
 			}
 		}
 		return false;
@@ -24459,7 +24516,7 @@ class loreline_Lexer {
 			if(this.isCallStart(this.pos) || this.isLabelStart(this.pos)) {
 				return null;
 			}
-		} else if(!isAfterLabel && identifier != "true" && identifier != "false" && identifier != "null" && (this.isIdentifierExpressionStart(this.pos,true) || this.isIfStart(this.pos) || this.isCallStart(this.pos) || this.isAssignStart(this.pos,false))) {
+		} else if(!isAfterLabel && identifier != "true" && identifier != "false" && identifier != "null" && (this.keepOrphanExpressions && this.isIdentifierExpressionStart(this.pos,true) || this.isIfStart(this.pos) || this.isCallStart(this.pos) || this.isAssignStart(this.pos,false))) {
 			return null;
 		}
 		if(!isValue) {