loreline 0.9.0 → 0.9.1

package/README.md

@@ -29,6 +29,7 @@ npm install    # Install Node.js dependencies (esbuild, tsx, etc.)
 node ./setup --js          # Build JavaScript library (js/loreline.js)
 node ./setup --cs          # Export C# source files (cs/Loreline/)
 node ./setup --cs --cs-dll # Export C# + build Loreline.dll
+node ./setup --cs-generics # Export C# test runner without erase-generics (see CS_COMPATIBILITY.md)
 node ./setup --py          # Build Python package (py/loreline/)
 node ./setup --lua         # Build Lua module (lua/loreline/)
 node ./setup --cpp         # Build native CLI (loreline / loreline.exe)
@@ -62,7 +63,7 @@ python3 py/test-runner.py ./test        # Run Python tests only
 lua5.4 lua/test-runner.lua ./test       # Run Lua tests only
 npx tsx js/test-runner.ts ./test        # Run JS tests only
 java -cp jvm/loreline.jar:build/jvm/test TestRunner ./test  # Run JVM tests only
-node ./setup --test                     # Build and run all test suites (Neko + C# + C# AOT + JS + C++ lib + Python + Lua + JVM)
+node ./setup --test                     # Build and run all test suites (Neko + C# + C# AOT + C# (with generics) + JS + C++ lib + Python + Lua + JVM)
 ```
 
 ## License

package/js/loreline.js

@@ -5484,8 +5484,8 @@ class loreline_Functions {
 		if(typeof(value) == "string") {
 			return value.length > 0;
 		}
-		if(((value) instanceof Array)) {
-			return value.length > 0;
+		if(loreline_Arrays.isArray(value)) {
+			return loreline_Arrays.arrayLength(value) > 0;
 		}
 		if(typeof(value) == "number" && ((value | 0) === value)) {
 			return value != 0;
@@ -7711,7 +7711,7 @@ class loreline_Interpreter {
 					let optionsDone = _gthis.wrapNext(function() {
 						_gthis.presentChoice(choice,options,next);
 					});
-					_gthis.evalChoiceOptionsAndInsertions(parentBeat,choice,options,optionsDone.cb,nextIndex);
+					_gthis.evalChoiceOptionsAndInsertions(parentBeat,choice,options,optionsDone.cb,nextIndex,true);
 					optionsDone.sync = false;
 				});
 			} else {
@@ -8081,7 +8081,7 @@ class loreline_Interpreter {
 				let _g_key = key;
 				let key1 = _g_key;
 				let func = _g_value;
-				this.topLevelFunctions.h[key1] = func;
+				this.registerTopLevelFunction(key1,func);
 			}
 		}
 		let h = this.topLevelFunctions.h;
@@ -8106,6 +8106,15 @@ class loreline_Interpreter {
 			}
 		}
 	}
+	registerTopLevelFunction(key,func) {
+		let userFunc = func;
+		let _gthis = this;
+		let this1 = this.topLevelFunctions;
+		let value = Reflect.makeVarArgs(function(args) {
+			return userFunc.apply(null,[_gthis,args]);
+		});
+		this1.h[key] = value;
+	}
 	initializeStringLiteralProcessors(processors) {
 		let _gthis = this;
 		this.stringLiteralProcessors.push(function(str) {
@@ -8412,7 +8421,7 @@ class loreline_Interpreter {
 		let optionsDone = this.wrapNext(function() {
 			_gthis.presentChoice(choice,options,next);
 		});
-		this.evalChoiceOptionsAndInsertions(this.get_currentScope().beat,choice,options,optionsDone.cb);
+		this.evalChoiceOptionsAndInsertions(this.get_currentScope().beat,choice,options,optionsDone.cb,null,this.get_currentInsertion() == null);
 		optionsDone.sync = false;
 	}
 	presentChoice(choice,options,next) {
@@ -8480,10 +8489,22 @@ class loreline_Interpreter {
 		});
 		choiceCallback.sync = false;
 	}
-	evalChoiceOptionsAndInsertions(beat,choice,result,next,startIndex) {
+	evalChoiceOptionsAndInsertions(beat,choice,result,next,startIndex,isChoiceRoot) {
+		if(isChoiceRoot == null) {
+			isChoiceRoot = true;
+		}
 		let options = choice.options;
-		this._choiceEvalTexts.length = 0;
-		this._choiceEvalEnabled.length = 0;
+		if(isChoiceRoot) {
+			this._choiceEvalTexts.length = 0;
+			this._choiceEvalEnabled.length = 0;
+			let _g = 0;
+			while(_g < result.length) {
+				let opt = result[_g];
+				++_g;
+				this._choiceEvalTexts.push(opt.text);
+				this._choiceEvalEnabled.push(opt.enabled);
+			}
+		}
 		let index = startIndex != null ? startIndex : 0;
 		let moveNext = null;
 		let insertion = null;
@@ -8496,8 +8517,10 @@ class loreline_Interpreter {
 					let i = _g++;
 					let opt = insertion.options[i];
 					result.push(opt);
-					_gthis._choiceEvalTexts.push(opt.text);
-					_gthis._choiceEvalEnabled.push(opt.enabled);
+					if(isChoiceRoot) {
+						_gthis._choiceEvalTexts.push(opt.text);
+						_gthis._choiceEvalEnabled.push(opt.enabled);
+					}
 				}
 				insertion = null;
 			}
@@ -8511,8 +8534,10 @@ class loreline_Interpreter {
 					let str = _gthis.getTranslatedString(option,option.text);
 					let content = _gthis.evaluateString(str);
 					result.push(new loreline_ChoiceOption(content.text,content.tags,enabled,option,_gthis.get_currentInsertion()));
-					_gthis._choiceEvalTexts.push(content.text);
-					_gthis._choiceEvalEnabled.push(enabled);
+					if(isChoiceRoot) {
+						_gthis._choiceEvalTexts.push(content.text);
+						_gthis._choiceEvalEnabled.push(enabled);
+					}
 					done.cb();
 					done.sync = false;
 				} else if(option.insertion != null) {
@@ -9373,8 +9398,8 @@ class loreline_Interpreter {
 			return value == true;
 		} else if(typeof(value) == "string") {
 			return value.length > 0;
-		} else if(((value) instanceof Array)) {
-			return value.length > 0;
+		} else if(loreline_Arrays.isArray(value)) {
+			return loreline_Arrays.arrayLength(value) > 0;
 		} else if(typeof(value) == "number" && ((value | 0) === value)) {
 			return value != 0;
 		} else if(typeof(value) == "number") {
@@ -9612,13 +9637,8 @@ class loreline_Interpreter {
 					} else {
 						return true;
 					}
-				} else if(((operand) instanceof Array)) {
-					let v = operand;
-					if(v != null) {
-						return v.length == 0;
-					} else {
-						return true;
-					}
+				} else if(loreline_Arrays.isArray(operand)) {
+					return loreline_Arrays.arrayLength(operand) == 0;
 				} else if(typeof(operand) == "number" && ((operand | 0) === operand)) {
 					let v = operand;
 					return v == 0;
@@ -15523,7 +15543,13 @@ class loreline_Lexer {
 		if(pos == startPos && startPos < this.length) {
 			let c = HxOverrides.cca(this.input,startPos);
 			let c1 = c == null ? -1 : c;
-			tmp1 = c1 >= 97 && c1 <= 122 || c1 >= 65 && c1 <= 90 || c1 == 95;
+			if(!(c1 >= 97 && c1 <= 122 || c1 >= 65 && c1 <= 90 || c1 == 95)) {
+				let c = HxOverrides.cca(this.input,startPos);
+				let c1 = c == null ? -1 : c;
+				tmp1 = c1 >= 48 && c1 <= 57;
+			} else {
+				tmp1 = true;
+			}
 		} else {
 			tmp1 = false;
 		}
@@ -15534,7 +15560,13 @@ class loreline_Lexer {
 		if(pos < this.length) {
 			let c = HxOverrides.cca(this.input,pos);
 			let c1 = c == null ? -1 : c;
-			tmp2 = !(c1 >= 97 && c1 <= 122 || c1 >= 65 && c1 <= 90 || c1 == 95);
+			if(!(c1 >= 97 && c1 <= 122 || c1 >= 65 && c1 <= 90 || c1 == 95)) {
+				let c = HxOverrides.cca(this.input,pos);
+				let c1 = c == null ? -1 : c;
+				tmp2 = !(c1 >= 48 && c1 <= 57);
+			} else {
+				tmp2 = false;
+			}
 		} else {
 			tmp2 = true;
 		}
@@ -15547,65 +15579,52 @@ class loreline_Lexer {
 			if((c == null ? -1 : c) == 40) {
 				return true;
 			} else {
-				let result = true;
-				let len = _gthis.length;
-				if(pos >= len) {
-					result = false;
-				} else {
-					let tmp;
-					let tmp1;
-					let tmp2;
-					if(pos + 1 < len) {
-						let c = HxOverrides.cca(_gthis.input,pos);
-						tmp2 = (c == null ? -1 : c) == 111;
-					} else {
-						tmp2 = false;
-					}
-					if(tmp2) {
-						let c = HxOverrides.cca(_gthis.input,pos + 1);
-						tmp1 = (c == null ? -1 : c) == 114;
-					} else {
-						tmp1 = false;
-					}
-					if(tmp1) {
-						if(pos + 2 < len) {
-							let c = HxOverrides.cca(_gthis.input,pos + 2);
+				let c = HxOverrides.cca(this.input,pos);
+				let c1 = c == null ? -1 : c;
+				if(c1 >= 48 && c1 <= 57) {
+					while(true) {
+						let tmp;
+						if(pos < this.length) {
+							let c = HxOverrides.cca(this.input,pos);
 							let c1 = c == null ? -1 : c;
-							tmp = !(c1 >= 97 && c1 <= 122 || c1 >= 65 && c1 <= 90 || c1 == 95);
+							if(!(c1 >= 48 && c1 <= 57)) {
+								let c = HxOverrides.cca(this.input,pos);
+								tmp = (c == null ? -1 : c) == 46;
+							} else {
+								tmp = true;
+							}
 						} else {
-							tmp = true;
+							tmp = false;
 						}
-					} else {
-						tmp = false;
+						if(!tmp) {
+							break;
+						}
+						++pos;
 					}
-					if(tmp) {
+				} else {
+					let result = true;
+					let len = _gthis.length;
+					if(pos >= len) {
 						result = false;
 					} else {
 						let tmp;
 						let tmp1;
 						let tmp2;
-						let tmp3;
-						if(pos + 2 < len) {
+						if(pos + 1 < len) {
 							let c = HxOverrides.cca(_gthis.input,pos);
-							tmp3 = (c == null ? -1 : c) == 97;
-						} else {
-							tmp3 = false;
-						}
-						if(tmp3) {
-							let c = HxOverrides.cca(_gthis.input,pos + 1);
-							tmp2 = (c == null ? -1 : c) == 110;
+							tmp2 = (c == null ? -1 : c) == 111;
 						} else {
 							tmp2 = false;
 						}
 						if(tmp2) {
-							let c = HxOverrides.cca(_gthis.input,pos + 2);
-							tmp1 = (c == null ? -1 : c) == 100;
+							let c = HxOverrides.cca(_gthis.input,pos + 1);
+							tmp1 = (c == null ? -1 : c) == 114;
 						} else {
 							tmp1 = false;
 						}
 						if(tmp1) {
-							if(pos + 3 < len) {
-								let c = HxOverrides.cca(_gthis.input,pos + 3);
+							if(pos + 2 < len) {
+								let c = HxOverrides.cca(_gthis.input,pos + 2);
 								let c1 = c == null ? -1 : c;
 								tmp = !(c1 >= 97 && c1 <= 122 || c1 >= 65 && c1 <= 90 || c1 == 95);
 							} else {
@@ -15617,26 +15636,63 @@ class loreline_Lexer {
 						if(tmp) {
 							result = false;
 						} else {
-							let c = HxOverrides.cca(_gthis.input,pos);
-							let c1 = c == null ? -1 : c;
-							if(!(c1 >= 97 && c1 <= 122 || c1 >= 65 && c1 <= 90 || c1 == 95)) {
+							let tmp;
+							let tmp1;
+							let tmp2;
+							let tmp3;
+							if(pos + 2 < len) {
+								let c = HxOverrides.cca(_gthis.input,pos);
+								tmp3 = (c == null ? -1 : c) == 97;
+							} else {
+								tmp3 = false;
+							}
+							if(tmp3) {
+								let c = HxOverrides.cca(_gthis.input,pos + 1);
+								tmp2 = (c == null ? -1 : c) == 110;
+							} else {
+								tmp2 = false;
+							}
+							if(tmp2) {
+								let c = HxOverrides.cca(_gthis.input,pos + 2);
+								tmp1 = (c == null ? -1 : c) == 100;
+							} else {
+								tmp1 = false;
+							}
+							if(tmp1) {
+								if(pos + 3 < len) {
+									let c = HxOverrides.cca(_gthis.input,pos + 3);
+									let c1 = c == null ? -1 : c;
+									tmp = !(c1 >= 97 && c1 <= 122 || c1 >= 65 && c1 <= 90 || c1 == 95);
+								} else {
+									tmp = true;
+								}
+							} else {
+								tmp = false;
+							}
+							if(tmp) {
 								result = false;
 							} else {
-								++pos;
-								while(pos < _gthis.length) {
-									let c = HxOverrides.cca(_gthis.input,pos);
-									c1 = c == null ? -1 : c;
-									if(!(c1 >= 97 && c1 <= 122 || c1 >= 65 && c1 <= 90 || c1 == 95 || c1 >= 48 && c1 <= 57)) {
-										break;
-									}
+								let c = HxOverrides.cca(_gthis.input,pos);
+								let c1 = c == null ? -1 : c;
+								if(!(c1 >= 97 && c1 <= 122 || c1 >= 65 && c1 <= 90 || c1 == 95)) {
+									result = false;
+								} else {
 									++pos;
+									while(pos < _gthis.length) {
+										let c = HxOverrides.cca(_gthis.input,pos);
+										c1 = c == null ? -1 : c;
+										if(!(c1 >= 97 && c1 <= 122 || c1 >= 65 && c1 <= 90 || c1 == 95 || c1 >= 48 && c1 <= 57)) {
+											break;
+										}
+										++pos;
+									}
 								}
 							}
 						}
 					}
-				}
-				if(!result) {
-					return false;
+					if(!result) {
+						return false;
+					}
 				}
 			}
 			pos = this._skipWhitespaceAndComments(pos,false);
@@ -16919,7 +16975,13 @@ class loreline_Lexer {
 			if(loreline_TokenTypeHelpers.isComment(token.type) || token.type == loreline_TokenType.Indent || token.type == loreline_TokenType.Unindent) {
 				--i;
 			} else if(token.type == loreline_TokenType.OpMinus) {
-				return true;
+				--i;
+				while(i >= 0 && (loreline_TokenTypeHelpers.isComment(this.tokenized[i].type) || this.tokenized[i].type == loreline_TokenType.Indent || this.tokenized[i].type == loreline_TokenType.Unindent)) --i;
+				if(i >= 0) {
+					return this.tokenized[i].type == loreline_TokenType.LineBreak;
+				} else {
+					return true;
+				}
 			} else {
 				return false;
 			}
@@ -22968,6 +23030,7 @@ Object.assign(loreline_ParserContext.prototype, {
 });
 class loreline_Parser {
 	constructor(tokens,context) {
+		this.parsingCondition = false;
 		this.tokens = tokens;
 		this.current = 0;
 		this.errors = null;
@@ -23061,6 +23124,9 @@ class loreline_Parser {
 		if(advanceLineBreaks == null) {
 			advanceLineBreaks = true;
 		}
+		if(this.parsingCondition) {
+			advanceLineBreaks = false;
+		}
 		let prev = this.tokens[this.current];
 		if(!this.isAtEnd()) {
 			this.lastTokenEnd = prev.pos;
@@ -24872,7 +24938,7 @@ class loreline_Parser {
 				elements.push(this.parseExpression());
 			}
 			let prev = this.previous();
-			needsSeparator = prev.type != loreline_TokenType.Colon && prev.type != loreline_TokenType.LineBreak;
+			needsSeparator = prev.type != loreline_TokenType.Colon && prev.type != loreline_TokenType.LineBreak && prev.type != loreline_TokenType.Unindent;
 		}
 		while(this.match(loreline_TokenType.LineBreak) || this.match(loreline_TokenType.Indent) || this.match(loreline_TokenType.Unindent)) {
 		}
@@ -24905,7 +24971,7 @@ class loreline_Parser {
 				fields.push(this.parseObjectField());
 			}
 			let prev = this.previous();
-			needsSeparator = prev.type != loreline_TokenType.Colon && prev.type != loreline_TokenType.LineBreak;
+			needsSeparator = prev.type != loreline_TokenType.Colon && prev.type != loreline_TokenType.LineBreak && prev.type != loreline_TokenType.Unindent;
 		}
 		while(this.match(loreline_TokenType.LineBreak) || blockEnd != loreline_TokenType.Unindent && this.match(loreline_TokenType.Unindent)) {
 		}
@@ -24928,6 +24994,8 @@ class loreline_Parser {
 		return args;
 	}
 	parseConditionExpression() {
+		let prevParsingCondition = this.parsingCondition;
+		this.parsingCondition = true;
 		let hasParen = this.match(loreline_TokenType.LParen);
 		let expr = null;
 		try {
@@ -24947,6 +25015,7 @@ class loreline_Parser {
 				throw _g;
 			}
 		}
+		this.parsingCondition = prevParsingCondition;
 		if(hasParen) {
 			this.expect(loreline_TokenType.RParen);
 		}