Chg: Lua constant script interface

neolithos · neolithos · commit 3ca4e2e4a7a2 · 2018-12-29T11:37:35.000+01:00
diff --git a/NeoLua.NuGet/common.targets b/NeoLua.NuGet/common.targets
@@ -12,7 +12,7 @@
 		<RepositoryType>git</RepositoryType>
 		
 		<AssemblyVersion>5.3.0.0</AssemblyVersion>
-		<FileVersion>1.3.4.0</FileVersion>
+		<FileVersion>1.3.5.0</FileVersion>
 
 		<VersionAdd>beta</VersionAdd>
 		<SimpleVersionPattern>^(\d+)\.(\d+)\.(\d+)</SimpleVersionPattern>
diff --git a/NeoLua.Test/Parser.cs b/NeoLua.Test/Parser.cs
@@ -340,9 +340,8 @@ public void TestPosition02()
 		public void ParsePlainTest()
 		{
 			HtmlTokenTest("<html> < a% >",
-				T(LuaToken.KwReturn, "return"),
-				T(LuaToken.String, "<html> < a% >"),
-				T(LuaToken.Semicolon, String.Empty)
+				T(LuaToken.Identifier, "print"),
+				T(LuaToken.String, "<html> < a% >")
 			);
 		}
 
diff --git a/NeoLua/Lua.cs b/NeoLua/Lua.cs
@@ -238,26 +238,47 @@ public LuaChunk CompileChunk(string code, string name, LuaCompileOptions options
 				return CompileChunkCore(lex, options, args);
 		} // func CompileChunk
 
+		/// <summary>Create a code delegate without executing it.</summary>
+		/// <param name="code">Code of the delegate..</param>
+		/// <param name="options">Options for the compile process.</param>
+		/// <param name="args">Arguments for the code block.</param>
+		/// <returns>Compiled chunk.</returns>
+		public LuaChunk CompileChunk(ILuaLexer code, LuaCompileOptions options, params KeyValuePair<string, Type>[] args)
+		{
+			if (code == null)
+				throw new ArgumentNullException(nameof(code));
+			return CompileChunkCore(code, options, args);
+		} // func CompileChunk
+
 		/// <summary>Creates a code delegate or returns a single return constant.</summary>
 		/// <param name="code"></param>
 		/// <param name="options"></param>
 		/// <param name="args"></param>
 		/// <returns></returns>
-		public object CompileOrReturnConstant(ILuaLexer code, LuaCompileOptions options, params KeyValuePair<string, Type>[] args)
+		public object CompileOrReturnPrint(ILuaLexer code, LuaCompileOptions options, params KeyValuePair<string, Type>[] args)
 		{
-			code.Next(); // get first token
-
-			if (code.Current.Typ == LuaToken.KwReturn // is first token a return
-				&& (code.LookAhead.Typ == LuaToken.String || code.LookAhead.Typ == LuaToken.Number) // we expect a string or number
-				&& (code.LookAhead2.Typ == LuaToken.Semicolon || code.LookAhead2.Typ == LuaToken.Eof)) // eof
+			if (IsConstantScript(code)) // eof
 			{
 				return code.LookAhead.Typ == LuaToken.String
 					? code.LookAhead.Value
-					: RtParseNumber(code.LookAhead.Value, FloatType == LuaFloatType.Double);
+					: ParseNumber(code.LookAhead.Value);
 			}
 			else
 				return CompileChunkCore(code, options, args);
-		} // func CompileOrReturnConstant
+		} // func CompileOrReturnPrint
+
+		/// <summary>Test for single print expression.</summary>
+		/// <param name="code"></param>
+		/// <returns></returns>
+		public static bool IsConstantScript(ILuaLexer code)
+		{
+			if (code.Current == null)
+				code.Next();
+
+			return (code.Current.Typ == LuaToken.Identifier && code.Current.Value == "print") // is first token is print
+				&& (code.LookAhead.Typ == LuaToken.String || code.LookAhead.Typ == LuaToken.Number) // we expect a string or number
+				&& (code.LookAhead2.Typ == LuaToken.Eof);
+		} // func IsConstantScript
 
 		internal LuaChunk CompileChunkCore(ILuaLexer lex, LuaCompileOptions options, IEnumerable<KeyValuePair<string, Type>> args)
 		{
@@ -381,10 +402,10 @@ public object ParseNumber(string number)
 
 		/// <summary>Parses a string to a lua number.</summary>
 		/// <param name="number">String representation of the number.</param>
-		/// <param name="iBase">Base fore the number</param>
+		/// <param name="toBase">Base fore the number</param>
 		/// <returns></returns>
-		public object ParseNumber(string number, int iBase)
-			=> RtParseNumber(null, number, 0, iBase, FloatType == LuaFloatType.Double, false);
+		public object ParseNumber(string number, int toBase)
+			=> RtParseNumber(null, number, 0, toBase, FloatType == LuaFloatType.Double, false);
 
 		internal int NumberType => numberType;
 
diff --git a/NeoLua/LuaLexer.cs b/NeoLua/LuaLexer.cs
@@ -1602,9 +1602,8 @@ private static IEnumerable<Token> CreateHtmlTokenStream(LuaCharLexer chars, bool
 			}
 			else // no code emitted --> create a return statement
 			{
-				yield return chars.CreateTokenAtStart(LuaToken.KwReturn);
+				yield return chars.CreateTokenAtStart(LuaToken.Identifier, "print");
 				yield return chars.CreateToken(LuaToken.String);
-				yield return chars.CreateTokenAtStart(LuaToken.Semicolon);
 			}
 			yield return chars.CreateToken(LuaToken.Eof);
 		} // func CreateHtmlTokenStream

Original file line number	Diff line number	Diff line change
`@@ -340,9 +340,8 @@ public void TestPosition02()`
`340`	`340`	`public void ParsePlainTest()`
`341`	`341`	`{`
`342`	`342`	`HtmlTokenTest("<html> < a% >",`
`343`		`- T(LuaToken.KwReturn, "return"),`
`344`		`- T(LuaToken.String, "<html> < a% >"),`
`345`		`- T(LuaToken.Semicolon, String.Empty)`
	`343`	`+ T(LuaToken.Identifier, "print"),`
	`344`	`+ T(LuaToken.String, "<html> < a% >")`
`346`	`345`	`);`
`347`	`346`	`}`
`348`	`347`
Original file line number	Diff line number	Diff line change
`@@ -1602,9 +1602,8 @@ private static IEnumerable<Token> CreateHtmlTokenStream(LuaCharLexer chars, bool`
`1602`	`1602`	`}`
`1603`	`1603`	`else // no code emitted --> create a return statement`
`1604`	`1604`	`{`
`1605`		`- yield return chars.CreateTokenAtStart(LuaToken.KwReturn);`
	`1605`	`+ yield return chars.CreateTokenAtStart(LuaToken.Identifier, "print");`
`1606`	`1606`	`yield return chars.CreateToken(LuaToken.String);`
`1607`		`- yield return chars.CreateTokenAtStart(LuaToken.Semicolon);`
`1608`	`1607`	`}`
`1609`	`1608`	`yield return chars.CreateToken(LuaToken.Eof);`
`1610`	`1609`	`} // func CreateHtmlTokenStream`