From dbbd03cad1e3f6b782ac575e973c76b311bc89ee Mon Sep 17 00:00:00 2001 From: jed Date: Fri, 7 Sep 2012 07:18:47 -0700 Subject: [PATCH] . --- src/Interpreter.cpp | 23 +++++++++++++++++++++++ src/Interpreter.h | 20 ++++++++++++++------ 2 files changed, 37 insertions(+), 6 deletions(-) diff --git a/src/Interpreter.cpp b/src/Interpreter.cpp index 0b370683f..1e3c4edc8 100644 --- a/src/Interpreter.cpp +++ b/src/Interpreter.cpp @@ -238,10 +238,28 @@ Interpreter::Interpreter() mFunctionTable[INT_OP]=new IntOp(); mFunctionTable[FLOAT_OP]=new FloatOp(); mFunctionTable[UINT160_OP]=new Uint160Op(); + mFunctionTable[BOOL_OP]=new Uint160Op(); mFunctionTable[ADD_OP]=new AddOp(); mFunctionTable[SUB_OP]=new SubOp(); + /*PATH_OP, + ADD_OP,SUB_OP,MUL_OP,DIV_OP,MOD_OP, + GTR_OP,LESS_OP,EQUAL_OP,NOT_EQUAL_OP, + AND_OP,OR_OP,NOT_OP, + JUMP_OP, JUMPIF_OP, + STOP_OP, CANCEL_OP, + + BLOCK_OP, BLOCK_END_OP, + SEND_XNS_OP,SEND_OP,REMOVE_CONTRACT_OP,FEE_OP,CHANGE_CONTRACT_OWNER_OP, + STOP_REMOVE_OP, + SET_DATA_OP,GET_DATA_OP, GET_NUM_DATA_OP, + SET_REGISTER_OP,GET_REGISTER_OP, + GET_ISSUER_ID_OP, GET_OWNER_ID_OP, GET_LEDGER_TIME_OP, GET_LEDGER_NUM_OP, GET_RAND_FLOAT_OP, + GET_XNS_ESCROWED_OP, GET_RIPPLE_ESCROWED_OP, GET_RIPPLE_ESCROWED_CURRENCY_OP, GET_RIPPLE_ESCROWED_ISSUER, + GET_ACCEPT_DATA_OP, GET_ACCEPTOR_ID_OP, GET_CONTRACT_ID_OP, + */ + } Data::pointer Interpreter::popStack() @@ -361,6 +379,11 @@ Data::pointer Interpreter::getContractData(int index) return(Data::pointer(new ErrorData())); } +bool Interpreter::canSign(uint160& signer) +{ + return(true); +} + diff --git a/src/Interpreter.h b/src/Interpreter.h index 5375c1b69..d09f6d220 100644 --- a/src/Interpreter.h +++ b/src/Interpreter.h @@ -40,16 +40,24 @@ class Interpreter bool mBlockSuccess; public: + + enum { INT_OP,FLOAT_OP,UINT160_OP,BOOL_OP,PATH_OP, ADD_OP,SUB_OP,MUL_OP,DIV_OP,MOD_OP, GTR_OP,LESS_OP,EQUAL_OP,NOT_EQUAL_OP, AND_OP,OR_OP,NOT_OP, - BLOCK_OP, BLOCK_END_OP, JUMP_OP, JUMPIF_OP, - STOP_OP, - SET_DATA_OP,GET_DATA_OP, GET_ISSUER_ID_OP, GET_OWNER_ID_OP, GET_LEDGER_TIME_OP, - ACCEPT_DATA_OP, - SEND_XNS_OP, NUM_OF_OPS }; + STOP_OP, CANCEL_OP, + + BLOCK_OP, BLOCK_END_OP, + SEND_XNS_OP,SEND_OP,REMOVE_CONTRACT_OP,FEE_OP,CHANGE_CONTRACT_OWNER_OP, + STOP_REMOVE_OP, + SET_DATA_OP,GET_DATA_OP, GET_NUM_DATA_OP, + SET_REGISTER_OP,GET_REGISTER_OP, + GET_ISSUER_ID_OP, GET_OWNER_ID_OP, GET_LEDGER_TIME_OP, GET_LEDGER_NUM_OP, GET_RAND_FLOAT_OP, + GET_XNS_ESCROWED_OP, GET_RIPPLE_ESCROWED_OP, GET_RIPPLE_ESCROWED_CURRENCY_OP, GET_RIPPLE_ESCROWED_ISSUER, + GET_ACCEPT_DATA_OP, GET_ACCEPTOR_ID_OP, GET_CONTRACT_ID_OP, + NUM_OF_OPS }; Interpreter(); @@ -58,7 +66,7 @@ public: void stop(); - bool canSign(const uint160& signer); + bool canSign(uint160& signer); int getInstructionPointer(){ return(mInstructionPointer); } void setInstructionPointer(int n){ mInstructionPointer=n;}