amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-10 04:57:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

"div" operator for integer division,

Browse Source 
Added parser support for closure operator fun@(args)
Use equal() function for all script comparisons, better support for deciding when to use strings and when to use pointers equality.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@964 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2008-06-03 16:38:33 +00:00
parent 6912dfda09
commit c5159ebcf7
12 changed files with 197 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/script/script.hpp
+9 -7
View File
@@ -35,11 +35,12 @@ enum InstructionType
, I_MAKE_OBJECT = 8 ///< arg = int : make a list/map with n elements, pops 2n values of the stack, n key/value pairs
// Functions
, I_CALL = 9 ///< arg = int, n*var : call the top item of the stack, with the given number of arguments (set with SET_VAR, but in the activation record of the call)
, I_CLOSURE = 10 ///< arg = int, n*var : construct a call closure object with the given arguments
// Simple instructions
, I_UNARY = 10 ///< arg = 1ary instr : pop 1 value, apply a function, push the result
, I_BINARY = 11 ///< arg = 2ary instr : pop 2 values, apply a function, push the result
, I_TERNARY = 12 ///< arg = 3ary instr : pop 3 values, apply a function, push the result
, I_QUATERNARY = 13 ///< arg = 4ary instr : pop 4 values, apply a function, push the result
, I_UNARY = 11 ///< arg = 1ary instr : pop 1 value, apply a function, push the result
, I_BINARY = 12 ///< arg = 2ary instr : pop 2 values, apply a function, push the result
, I_TERNARY = 13 ///< arg = 3ary instr : pop 3 values, apply a function, push the result
, I_QUATERNARY = 14 ///< arg = 4ary instr : pop 4 values, apply a function, push the result
};
/// Types of unary instructions (taking one argument from the stack)
@@ -55,13 +56,14 @@ enum BinaryInstructionType
, I_ITERATOR_R ///< Make an iterator for a range (two integers)
, I_MEMBER ///< Member of an object
// Arithmatic
, I_ADD ///< add
, I_ADD ///< add
, I_SUB ///< subtract
, I_MUL ///< multiply
, I_DIV ///< divide
, I_FDIV ///< floating point division
, I_DIV ///< integer division
, I_MOD ///< modulus
// Logical
, I_AND ///< logical and
, I_AND ///< logical and
, I_OR ///< logical or
, I_XOR ///< logical xor
// Comparison