sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(LuaInstance) Added Lua 5.3 operators 

Former-commit-id: 17d1c8e325a1ee5441dac1f8d86d0a01dc5d8270
This commit is contained in:
Lynix 2015-03-24 13:12:35 +01:00
parent 88c3b9d482
commit bcefe9462d
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/Nazara/Lua/Enums.hpp
View File

@ -19,8 +19,15 @@ enum nzLuaComparison
enum nzLuaOperation enum nzLuaOperation
{ {
nzLuaOperation_Addition, nzLuaOperation_Addition,
nzLuaOperation_BitwiseAnd,
nzLuaOperation_BitwiseLeftShift,
nzLuaOperation_BitwiseNot,
nzLuaOperation_BitwiseOr,
nzLuaOperation_BitwideRightShift,
nzLuaOperation_BitwiseXOr,
nzLuaOperation_Division, nzLuaOperation_Division,
nzLuaOperation_Exponentiation, nzLuaOperation_Exponentiation,
nzLuaOperation_FloorDivision,
nzLuaOperation_Modulo, nzLuaOperation_Modulo,
nzLuaOperation_Multiplication, nzLuaOperation_Multiplication,
nzLuaOperation_Negation, nzLuaOperation_Negation,

21
src/Nazara/Lua/LuaInstance.cpp
View File

@ -95,13 +95,20 @@ namespace
static_assert(sizeof(s_comparisons)/sizeof(int) == nzLuaComparison_Max+1, "Lua comparison array is incomplete"); static_assert(sizeof(s_comparisons)/sizeof(int) == nzLuaComparison_Max+1, "Lua comparison array is incomplete");
int s_operations[] = { int s_operations[] = {
LUA_OPADD, // nzLuaOperation_Addition LUA_OPADD, // nzLuaOperation_Addition
LUA_OPDIV, // nzLuaOperation_Division LUA_OPBAND, // nzLuaOperation_BitwiseAnd
LUA_OPPOW, // nzLuaOperation_Exponentiation LUA_OPSHL, // nzLuaOperation_BitwiseLeftShift
LUA_OPMOD, // nzLuaOperation_Modulo LUA_OPBNOT, // nzLuaOperation_BitwiseNot
LUA_OPMUL, // nzLuaOperation_Multiplication LUA_OPBOR, // nzLuaOperation_BitwiseOr
LUA_OPUNM, // nzLuaOperation_Negation LUA_OPSHR, // nzLuaOperation_BitwiseRightShift
LUA_OPSUB // nzLuaOperation_Substraction LUA_OPBXOR, // nzLuaOperation_BitwiseXOr
LUA_OPDIV, // nzLuaOperation_Division
LUA_OPPOW, // nzLuaOperation_Exponentiation
LUA_OPIDIV, // nzLuaOperation_FloorDivision
LUA_OPMUL, // nzLuaOperation_Multiplication
LUA_OPMOD, // nzLuaOperation_Modulo
LUA_OPUNM, // nzLuaOperation_Negation
LUA_OPSUB // nzLuaOperation_Substraction
}; };
static_assert(sizeof(s_operations)/sizeof(int) == nzLuaOperation_Max+1, "Lua operation array is incomplete"); static_assert(sizeof(s_operations)/sizeof(int) == nzLuaOperation_Max+1, "Lua operation array is incomplete");