StackInfos structure

sbarisic · Sep 30, 2015 · 2bf65ab · 2bf65ab
1 parent d1bd414
commit 2bf65ab
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 11 deletions.
diff --git a/SqNet/Program.cs b/SqNet/Program.cs
@@ -65,6 +65,15 @@ static void Main(string[] args) {
 				return 0;
 			});
 
+			RegisterFunction(S, "StackInfos", (SS) => {
+				SQStackInfos SInf;
+				int Int;
+				Sq.GetInt(SS, -1, out Int);
+				Sq.StackInfos(SS, Int, out SInf);
+				Console.WriteLine("Name: {0}; Line: {1}", SInf.FuncName, SInf.Line);
+				return 0;
+			});
+
 			Console.WriteLine("Running .NET version of Squirrel {0}\n", String.Join(".", Sq.GetVersion().ToString().ToCharArray()));
 
 			while (true) {

diff --git a/SqNet/SqNet.csproj b/SqNet/SqNet.csproj
@@ -36,6 +36,10 @@
     <UseVSHostingProcess>false</UseVSHostingProcess>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="SquirrelNET, Version=1.0.5748.35766, Culture=neutral, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\bin\SquirrelNET.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -51,12 +55,6 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\SquirrelNET\SquirrelNET\SquirrelNET.vcxproj">
-      <Project>{98f309a2-9b16-4bad-8620-f8126aea50f7}</Project>
-      <Name>SquirrelNET</Name>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>

diff --git a/SquirrelNet/SquirrelNET/Misc.cpp b/SquirrelNet/SquirrelNET/Misc.cpp
@@ -41,10 +41,12 @@ namespace SquirrelNET {
 		sq_free(p.ToPointer(), size);
 	}
 
-	SQRESULT Sq::StackInfos(IntPtr v, SQInteger level, IntPtr si) {
-		tagSQStackInfos* SInf = 0;
-		auto R = sq_stackinfos(ToVM(v), level, SInf); 
-		si = IntPtr(SInf);
+	SQRESULT Sq::StackInfos(IntPtr v, SQInteger level, OUT(SQStackInfos) si) {
+		tagSQStackInfos SInf;
+		auto R = sq_stackinfos(ToVM(v), level, &SInf); 
+		si.FuncName = PtrToString(SInf.funcname);
+		si.Source = PtrToString(SInf.source);
+		si.Line = SInf.line;
 		return R;
 	}
 

diff --git a/SquirrelNet/SquirrelNET/SquirrelNET.h b/SquirrelNet/SquirrelNET/SquirrelNET.h
@@ -38,6 +38,13 @@ namespace SquirrelNET {
 		String^ Source;
 	};
 
+	public value class SQStackInfos {
+	public:
+		String^ FuncName;
+		String^ Source;
+		SQInteger Line;
+	};
+
 	public ref class Sq {
 	public:
 		// Implement function pointers as delegates. Use UniString^ instead of String^
@@ -193,7 +200,7 @@ namespace SquirrelNET {
 		static IntPtr Malloc(SQUnsignedInteger size);
 		static IntPtr Realloc(IntPtr p, SQUnsignedInteger oldsize, SQUnsignedInteger newsize);
 		static void Free(IntPtr p, SQUnsignedInteger size);
-		static SQRESULT StackInfos(IntPtr v, SQInteger level, IntPtr si);
+		static SQRESULT StackInfos(IntPtr v, SQInteger level, OUT(SQStackInfos) si);
 		static void SetDebugHook(IntPtr v);
 		static void SetNativeDebugHook(IntPtr v, DebugHook^ hook);
 	};

diff --git a/SquirrelNet/SquirrelNET/Stdafx.h b/SquirrelNet/SquirrelNET/Stdafx.h
@@ -21,6 +21,7 @@
 #define OUT(Typ) [Out] Typ%
 #define ToVM(S) ((HSQUIRRELVM)S.ToPointer())
 #define GetSQCharPtr(Str, Name) pin_ptr<const SQChar> Name = PtrToStringChars(Str)
+#define PtrToString(Ptr) Marshal::PtrToStringAuto(IntPtr((void*)Ptr))
 
 #define usings\
 	using namespace System; \