Generic extension exception and multiple extension methos for single userdata: fixes

.gitignore

@@ -16,6 +16,9 @@ build/
 [Oo]bj/
 bin-debug/
 
+# VS2017 .vs directory
+src/.vs/
+
 
 # Remove generated docs
 

LICENSE

@@ -1,15 +1,17 @@
-Copyright (c) 2014, Marco Mastropaolo
+Copyright (c) 2014-2016, Marco Mastropaolo
 All rights reserved.
 
 Parts of the string library are based on the KopiLua project (https://github.com/NLua/KopiLua)
 Copyright (c) 2012 LoDC
 
-Debugger icons are from the Eclipse project (https://www.eclipse.org/).
+Visual Studio Code debugger code is based on code from Microsoft vscode-mono-debug project (https://github.com/Microsoft/vscode-mono-debug).
+Copyright (c) Microsoft Corporation - released under MIT license.
+
+Remote Debugger icons are from the Eclipse project (https://www.eclipse.org/).
 Copyright of The Eclipse Foundation
 
 The MoonSharp icon is (c) Isaac, 2014-2015
 
-
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 

README.md

@@ -10,16 +10,19 @@ Features:
 * 99% compatible with Lua 5.2 (with the only unsupported feature being weak tables support) 
 * Support for metalua style anonymous functions (lambda-style)
 * Easy to use API
-* Source based remote **debugger** accessible with a web browser and Flash (PCL targets not supported)
-* Runs on .NET 3.5, .NET 4.x, Mono, Xamarin and Unity3D
+* **Debugger** support for Visual Studio Code (PCL targets not supported)
+* Remote debugger accessible with a web browser and Flash (PCL targets not supported)
+* Runs on .NET 3.5, .NET 4.x, .NET Core, Mono, Xamarin and Unity3D
 * Runs on Ahead-of-time platforms like iOS
+* Runs on IL2CPP converted code
 * Runs on platforms requiring a .NET 4.x portable class library (e.g. Windows Phone)
 * No external dependencies, implemented in as few targets as possible
 * Easy and performant interop with CLR objects, with runtime code generation where supported
 * Interop with methods, extension methods, overloads, fields, properties and indexers supported
-* Support for the complete Lua standard library with very few exceptions (mostly located on the 'debug' module)
+* Support for the complete Lua standard library with very few exceptions (mostly located on the 'debug' module) and a few extensions (in the string library, mostly)
 * Async methods for .NET 4.x targets
 * Supports dumping/loading bytecode for obfuscation and quicker parsing at runtime
+* An embedded JSON parser (with no dependencies) to convert between JSON and Lua tables
 * Easy opt-out of Lua standard library modules to sandbox what scripts can access
 * Easy to use error handling (script errors are exceptions)
 * Support for coroutines, including invocation of coroutines as C# iterators 

src/.vs/restore.dg

@@ -0,0 +1,7 @@
+#:Z:\git\my\moonsharp\src\MoonSharp.VsCodeDebugger\_Projects\MoonSharp.VsCodeDebugger.netcore\MoonSharp.VsCodeDebugger.netcore.xproj
+Z:\git\my\moonsharp\src\MoonSharp.VsCodeDebugger\_Projects\MoonSharp.VsCodeDebugger.netcore\MoonSharp.VsCodeDebugger.netcore.xproj|Z:\git\my\moonsharp\src\MoonSharp.Interpreter\_Projects\MoonSharp.Interpreter.netcore\MoonSharp.Interpreter.netcore.xproj
+#:Z:\git\my\moonsharp\src\TestRunners\DotNetCoreTestRunner\DotNetCoreTestRunner.xproj
+Z:\git\my\moonsharp\src\TestRunners\DotNetCoreTestRunner\DotNetCoreTestRunner.xproj|Z:\git\my\moonsharp\src\MoonSharp.Interpreter\_Projects\MoonSharp.Interpreter.netcore\MoonSharp.Interpreter.netcore.xproj
+Z:\git\my\moonsharp\src\TestRunners\DotNetCoreTestRunner\DotNetCoreTestRunner.xproj|Z:\git\my\moonsharp\src\MoonSharp.VsCodeDebugger\_Projects\MoonSharp.VsCodeDebugger.netcore\MoonSharp.VsCodeDebugger.netcore.xproj
+Z:\git\my\moonsharp\src\MoonSharp.VsCodeDebugger\_Projects\MoonSharp.VsCodeDebugger.netcore\MoonSharp.VsCodeDebugger.netcore.xproj|Z:\git\my\moonsharp\src\MoonSharp.Interpreter\_Projects\MoonSharp.Interpreter.netcore\MoonSharp.Interpreter.netcore.xproj
+#:Z:\git\my\moonsharp\src\MoonSharp.Interpreter\_Projects\MoonSharp.Interpreter.netcore\MoonSharp.Interpreter.netcore.xproj

src/DevTools/MoonSharp.VmDebugger/MainForm.cs

@@ -31,7 +31,7 @@ private void MainForm_Load(object sender, EventArgs e)
 		{
 			m_Ctx = SynchronizationContext.Current;
 			Script.WarmUp();
-			Script.DefaultOptions.TailCallOptimizationThreshold = 1;
+			//Script.DefaultOptions.TailCallOptimizationThreshold = 1;
 		}
 
 		private void openToolStripMenuItem_Click(object sender, EventArgs e)
@@ -67,15 +67,17 @@ private void Console_WriteLine(string fmt, params object[] args)
 
 		private void DebugScript(string filename)
 		{
-			m_Script = new Script(CoreModules.Preset_HardSandbox);
-			m_Script.Options.UseLuaErrorLocations = true;
+			m_Script = new Script(CoreModules.Basic | CoreModules.Table | CoreModules.TableIterators | CoreModules.Metatables);
+			// m_Script.Options.UseLuaErrorLocations = true;
 			m_Script.Options.DebugPrint = s => { Console_WriteLine("{0}", s); };
 
-			((ScriptLoaderBase)m_Script.Options.ScriptLoader).ModulePaths = ScriptLoaderBase.UnpackStringPaths("Modules/?;Modules/?.lua");
+			// ((ScriptLoaderBase)m_Script.Options.ScriptLoader).ModulePaths = ScriptLoaderBase.UnpackStringPaths("Modules/?;Modules/?.lua");
+
+			DynValue fn;
 
 			try
 			{
-				m_Script.LoadFile(filename, null, filename.Replace(':', '|'));
+				fn = m_Script.LoadFile(filename, null, filename.Replace(':', '|'));
 			}
 			catch (Exception ex)
 			{
@@ -86,7 +88,7 @@ private void DebugScript(string filename)
 
 			m_Script.AttachDebugger(this);
 
-			Thread m_Debugger = new Thread(DebugMain);
+			Thread m_Debugger = new Thread(() => DebugMain(fn));
 			m_Debugger.Name = "MoonSharp Execution Thread";
 			m_Debugger.IsBackground = true;
 			m_Debugger.Start();
@@ -171,11 +173,11 @@ void DebugAction(DebuggerAction action)
 		}
 
 
-		void DebugMain()
+		void DebugMain(DynValue fn)
 		{
 			try
 			{
-				m_Script.Call(m_Script.GetMainChunk());
+				fn.Function.Call();
 			}
 			catch (ScriptRuntimeException ex)
 			{
@@ -439,5 +441,14 @@ private void btnOpenTest_Click(object sender, EventArgs e)
 		{
 
 		}
+
+		public void SetDebugService(DebugService debugService)
+		{
+		}
+
+		public DebuggerCaps GetDebuggerCaps()
+		{
+			return DebuggerCaps.CanDebugByteCode;
+		}
 	}
 }

src/DevTools/Playground/Playground.csproj

@@ -47,6 +47,15 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
+    <None Include="test.lua">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="test2.lua">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="core.lua">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\MoonSharp.Hardwire\MoonSharp.Hardwire.net35-client.csproj">

src/DevTools/Playground/Program.cs

@@ -1,34 +1,39 @@
 using MoonSharp.Interpreter;
 using System;
+using System.Diagnostics;
+using System.IO;
+using MoonSharp.Interpreter.Loaders;
 
 namespace Test
 {
-	[MoonSharpUserData]
-	class MyClass
-	{
-		public double calcHypotenuse(double a, double b)
-		{
-			return Math.Sqrt(a * a + b * b);
-		}
-	}
-
 	class Program
 	{
 		static void Main(string[] args)
 		{
-			string scriptCode = @"return obj.calcHypotenuse(3, 4);";
+			((ScriptLoaderBase)Script.DefaultOptions.ScriptLoader).ModulePaths = new string[] { "./?", "./?.lua" };
+
+			try
+			{
+				Script S = new Script();
+				S.Options.ColonOperatorClrCallbackBehaviour = ColonOperatorBehaviour.TreatAsDotOnUserData;
+
+				S.DoString(@"
+
+require 'test'
+require 'test2'
 
-			// Automatically register all MoonSharpUserData types
-			UserData.RegisterAssembly();
+");
 
-			Script script = new Script();
 
-			// Pass an instance of MyClass to the script in a global
-			script.Globals["obj"] = new MyClass();
+			}
+			catch (InterpreterException ex)
+			{
+				Console.WriteLine(ex.DecoratedMessage);
+			}
 
-			DynValue res = script.DoString(scriptCode);
+			Console.WriteLine(">> DONE");
 
-			return;
+			Console.ReadKey();
 		}
 	}
 }

src/DevTools/Playground/core.lua

@@ -0,0 +1,5 @@
+
+print "in core.lua"
+
+print(os.date("*t", os.time()).hour)
+print(os.date("!*t", os.time()).hour)

src/DevTools/Playground/test.lua

@@ -0,0 +1,2 @@
+require "core"
+print("in test 1")

src/DevTools/Playground/test2.lua

@@ -0,0 +1,2 @@
+require "core"
+print("in test 2")

src/DevTools/SynchProjects/Program.cs

@@ -99,6 +99,12 @@ private static string AdjustBasePath(string str)
 
 		static void Main(string[] args)
 		{
+			Console.ForegroundColor = ConsoleColor.Magenta;
+			Console.WriteLine("********************************************************");
+			Console.WriteLine("* !! REMEMBER TO RSYNC UNITY AND .NET CORE PROJECTS !! *");
+			Console.WriteLine("********************************************************");
+
+
 			const string INTERPRETER_PROJECT = @"{BASEPATH}\MoonSharp.Interpreter\MoonSharp.Interpreter.net35-client.csproj";
 			const string INTERPRETER_SUBPROJECTS_PATHS = @"{BASEPATH}\MoonSharp.Interpreter\_Projects\MoonSharp.Interpreter.{0}\MoonSharp.Interpreter.{0}.csproj";
 			const string INTERPRETER_PATH_PREFIX = @"..\..\";
@@ -107,12 +113,17 @@ static void Main(string[] args)
 			const string DEBUGGER_SUBPROJECTS_PATHS = @"{BASEPATH}\MoonSharp.RemoteDebugger\_Projects\MoonSharp.RemoteDebugger.{0}\MoonSharp.RemoteDebugger.{0}.csproj";
 			const string DEBUGGER_PATH_PREFIX = @"..\..\";
 
+			const string VSCODEDEBUGGER_PROJECT = @"{BASEPATH}\MoonSharp.VsCodeDebugger\MoonSharp.VsCodeDebugger.net35-client.csproj";
+			const string VSCODEDEBUGGER_SUBPROJECTS_PATHS = @"{BASEPATH}\MoonSharp.VsCodeDebugger\_Projects\MoonSharp.VsCodeDebugger.{0}\MoonSharp.VsCodeDebugger.{0}.csproj";
+			const string VSCODEDEBUGGER_PATH_PREFIX = @"..\..\";
+
 			const string TESTS_PROJECT = @"{BASEPATH}\MoonSharp.Interpreter.Tests\MoonSharp.Interpreter.Tests.net35-client.csproj";
 			const string TESTS_SUBPROJECTS_PATHS = @"{BASEPATH}\MoonSharp.Interpreter.Tests\_Projects\MoonSharp.Interpreter.Tests.{0}\MoonSharp.Interpreter.Tests.{0}.csproj";
 			const string TESTS_PATH_PREFIX = @"..\..\";
 
 			string[] INTERPRETER_PLATFORMS = new string[] { "net40-client", "portable40" };
 			string[] DEBUGGER_PLATFORMS = new string[] { "net40-client" };
+			string[] VSCODEDEBUGGER_PLATFORMS = new string[] { "net40-client" };
 			string[] TESTS_PLATFORMS = new string[] { "net40-client", "portable40", "Embeddable.portable40" };
 
 			CalcBasePath();
@@ -123,6 +134,9 @@ static void Main(string[] args)
 			foreach (string platform in DEBUGGER_PLATFORMS)
 				CopyCompileFilesAsLinks(platform, DEBUGGER_PROJECT, DEBUGGER_SUBPROJECTS_PATHS, DEBUGGER_PATH_PREFIX);
 
+			foreach (string platform in VSCODEDEBUGGER_PLATFORMS)
+				CopyCompileFilesAsLinks(platform, VSCODEDEBUGGER_PROJECT, VSCODEDEBUGGER_SUBPROJECTS_PATHS, VSCODEDEBUGGER_PATH_PREFIX);
+
 			foreach (string platform in TESTS_PLATFORMS)
 				CopyCompileFilesAsLinks(platform, TESTS_PROJECT, TESTS_SUBPROJECTS_PATHS, TESTS_PATH_PREFIX);
 

src/DevTools/VsCodeDebugger_Testbed/Program.cs

@@ -0,0 +1,63 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Net.Sockets;
+using System.Text;
+using MoonSharp.Interpreter;
+using MoonSharp.VsCodeDebugger;
+using MoonSharp.VsCodeDebugger.SDK;
+
+namespace VsCodeDebugger_Testbed
+{
+	class Program
+	{
+		public static void Main(string[] argv)
+		{
+			MoonSharpVsCodeDebugServer server = new MoonSharpVsCodeDebugServer();
+			server.Logger = s => Console.WriteLine(s);
+			server.Start();
+
+			Script script1 = new Script();
+			script1.DoFile(@"Z:/HDD/temp/lua/fact.lua");
+			server.AttachToScript(script1, "Script #1");
+			Closure func1 = script1.Globals.Get("run").Function;
+
+			Script script2 = new Script();
+			script2.DoFile(@"Z:/HDD/temp/lua/fact2.lua");
+			server.AttachToScript(script2, "Script #2");
+			Closure func2 = script2.Globals.Get("run").Function;
+
+			Console.WriteLine("READY.");
+			int i = 0;
+
+			server.Current = null;
+
+			while (true)//(Console.ReadKey().Key != ConsoleKey.Escape)
+			{
+				if (Console.KeyAvailable)
+				{
+					Console.ReadKey();
+					server.Detach(script2);
+					Console.WriteLine("Detached");
+				}
+
+				Closure func = ((++i) % 2) == 0 ? func1 : func2;
+
+				try
+				{
+					var val = func.Call(5);
+					Console.ForegroundColor = ConsoleColor.Magenta;
+					Console.WriteLine(val.Number);
+					System.Threading.Thread.Sleep(1000);
+				}
+				catch (InterpreterException ex)
+				{
+					Console.ForegroundColor = ConsoleColor.Red;
+					Console.Write(ex.DecoratedMessage);
+				}
+			}
+		}
+	}
+}

src/DevTools/VsCodeDebugger_Testbed/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("VsCodeDebugger_Testbed")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("VsCodeDebugger_Testbed")]
+[assembly: AssemblyCopyright("Copyright ©  2016")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("d17dd647-76cf-4d87-bdf7-75e1704e8783")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]