Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
NLua
Commits
cce28468
Commit
cce28468
authored
Sep 07, 2014
by
Vinicius Jarina
Browse files
Bumped KeraLua - Fixed x64 build
parent
77c0416c
Changes
5
Hide whitespace changes
Inline
Side-by-side
KeraLua
@
0a329ac8
Compare
cba84e46
...
0a329ac8
Subproject commit
cba84e46f7868813665886ed40268f6179acd733
Subproject commit
0a329ac81cac05510600a8f8e3a03f32bab9eb0d
Core/NLua/Event/EventCodes.cs
100644 → 100755
View file @
cce28468
...
@@ -33,7 +33,6 @@ namespace NLua.Event
...
@@ -33,7 +33,6 @@ namespace NLua.Event
/// <remarks>
/// <remarks>
/// Do not change any of the values because they must match the lua values
/// Do not change any of the values because they must match the lua values
/// </remarks>
/// </remarks>
/// <author>Reinhard Ostermeier</author>
public
enum
EventCodes
public
enum
EventCodes
{
{
LUA_HOOKCALL
=
0
,
LUA_HOOKCALL
=
0
,
...
...
Core/NLua/Event/EventMasks.cs
100644 → 100755
View file @
cce28468
...
@@ -33,7 +33,6 @@ namespace NLua.Event
...
@@ -33,7 +33,6 @@ namespace NLua.Event
/// <remarks>
/// <remarks>
/// Do not change any of the values because they must match the lua values
/// Do not change any of the values because they must match the lua values
/// </remarks>
/// </remarks>
/// <author>Reinhard Ostermeier</author>
[
Flags
]
[
Flags
]
public
enum
EventMasks
public
enum
EventMasks
{
{
...
...
Core/NLua/Lua.cs
View file @
cce28468
...
@@ -70,7 +70,6 @@ namespace NLua
...
@@ -70,7 +70,6 @@ namespace NLua
/// <summary>
/// <summary>
/// Event that is raised when an exception occures during a hook call.
/// Event that is raised when an exception occures during a hook call.
/// </summary>
/// </summary>
/// <author>Reinhard Ostermeier</author>
public
event
EventHandler
<
HookExceptionEventArgs
>
HookException
;
public
event
EventHandler
<
HookExceptionEventArgs
>
HookException
;
/// <summary>
/// <summary>
/// Event when lua hook callback is called
/// Event when lua hook callback is called
...
@@ -78,12 +77,10 @@ namespace NLua
...
@@ -78,12 +77,10 @@ namespace NLua
/// <remarks>
/// <remarks>
/// Is only raised if SetDebugHook is called before.
/// Is only raised if SetDebugHook is called before.
/// </remarks>
/// </remarks>
/// <author>Reinhard Ostermeier</author>
public
event
EventHandler
<
DebugHookEventArgs
>
DebugHook
;
public
event
EventHandler
<
DebugHookEventArgs
>
DebugHook
;
/// <summary>
/// <summary>
/// lua hook calback delegate
/// lua hook calback delegate
/// </summary>
/// </summary>
/// <author>Reinhard Ostermeier</author>
private
LuaHook
hookCallback
=
null
;
private
LuaHook
hookCallback
=
null
;
#
endregion
#
endregion
#
region
Globals
auto
-
complete
#
region
Globals
auto
-
complete
...
@@ -903,50 +900,7 @@ end
...
@@ -903,50 +900,7 @@ end
return
LuaCore
.
LuaGetHookCount
(
luaState
);
return
LuaCore
.
LuaGetHookCount
(
luaState
);
}
}
/// <summary>
/// Gets the stack entry on a given level
/// </summary>
/// <param name = "level">level</param>
/// <param name = "luaDebug">lua debug structure</param>
/// <returns>Returns true if level was allowed, false if level was invalid.</returns>
/*public bool GetStack(int level, out LuaCore.lua_Debug luaDebug)
{
luaDebug = new LuaDebug();
LuaState ld = System.Runtime.InteropServices.Marshal.AllocHGlobal(System.Runtime.InteropServices.Marshal.SizeOf(luaDebug));
System.Runtime.InteropServices.Marshal.StructureToPtr(luaDebug, ld, false);
try
{
return LuaLib.lua_getstack(luaState, level, luaDebug) != 0;
}
finally
{
luaDebug = (LuaDebug)System.Runtime.InteropServices.Marshal.PtrToStructure(ld, typeof(LuaDebug));
System.Runtime.InteropServices.Marshal.FreeHGlobal(ld);
}
}*/
/// <summary>
/// Gets info (see lua docs)
/// </summary>
/// <param name = "what">what (see lua docs)</param>
/// <param name = "luaDebug">lua debug structure</param>
/// <returns>see lua docs</returns>
/// <author>Reinhard Ostermeier</author>
/*public int GetInfo(String what, ref LuaCore.lua_Debug luaDebug)
{
LuaState ld = System.Runtime.InteropServices.Marshal.AllocHGlobal(System.Runtime.InteropServices.Marshal.SizeOf(luaDebug));
System.Runtime.InteropServices.Marshal.StructureToPtr(luaDebug, ld, false);
try
{
return LuaLib.lua_getinfo(luaState, what, ld);
}
finally
{
luaDebug = (LuaDebug)System.Runtime.InteropServices.Marshal.PtrToStructure(ld, typeof(LuaDebug));
System.Runtime.InteropServices.Marshal.FreeHGlobal(ld);
}
}*/
/// <summary>
/// <summary>
/// Gets local (see lua docs)
/// Gets local (see lua docs)
/// </summary>
/// </summary>
...
@@ -1047,7 +1001,6 @@ end
...
@@ -1047,7 +1001,6 @@ end
/// Pops a value from the lua stack.
/// Pops a value from the lua stack.
/// </summary>
/// </summary>
/// <returns>Returns the top value from the lua stack.</returns>
/// <returns>Returns the top value from the lua stack.</returns>
/// <author>Reinhard Ostermeier</author>
public
object
Pop
()
public
object
Pop
()
{
{
int
top
=
LuaLib
.
LuaGetTop
(
luaState
);
int
top
=
LuaLib
.
LuaGetTop
(
luaState
);
...
...
tests/Core.cs
View file @
cce28468
...
@@ -93,7 +93,7 @@ namespace NLuaTest
...
@@ -93,7 +93,7 @@ namespace NLuaTest
[
Test
]
[
Test
]
public
void
Life
()
public
void
Life
()
{
{
//
TestLuaFile ("life");
TestLuaFile
(
"life"
);
}
}
[
Test
]
[
Test
]
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment