X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Flibspiderscript.so_src%2Fast.h;h=39ea294712e5d3217319160ae0c8552f40072053;hb=239f2374299c1471a40b1087725b32f3f163d9b3;hp=1118130e057ff9b5d620c54c69a63ce3bb61dad9;hpb=ec4d050568da0f3f18a20969bd118b5c67f03ee2;p=tpg%2Facess2.git diff --git a/Usermode/Libraries/libspiderscript.so_src/ast.h b/Usermode/Libraries/libspiderscript.so_src/ast.h index 1118130e..39ea2947 100644 --- a/Usermode/Libraries/libspiderscript.so_src/ast.h +++ b/Usermode/Libraries/libspiderscript.so_src/ast.h @@ -29,25 +29,37 @@ enum eAST_NodeTypes NODETYPE_REAL, //!< Real Constant NODETYPE_DEFVAR, //!< Define a variable (Variable) + NODETYPE_SCOPE, //!< Dereference a Namespace/Class static + NODETYPE_ELEMENT, //!< Reference a class attribute NODETYPE_CAST, //!< Cast a value to another (Uniop) NODETYPE_RETURN, //!< Return from a function (reserved word) + NODETYPE_BREAK, //!< Break out of a loop + NODETYPE_CONTINUE, //!< Next loop iteration NODETYPE_ASSIGN, //!< Variable assignment operator + NODETYPE_POSTINC, //!< Post-increment (i++) - Uniop + NODETYPE_POSTDEC, //!< Post-decrement (i--) - Uniop NODETYPE_FUNCTIONCALL, //!< Call a function + NODETYPE_METHODCALL, //!< Call a class method + NODETYPE_CREATEOBJECT, //!< Create an object NODETYPE_IF, //!< Conditional NODETYPE_LOOP, //!< Looping Construct NODETYPE_INDEX, //!< Index into an array + NODETYPE_LOGICALNOT, //!< Logical NOT operator NODETYPE_LOGICALAND, //!< Logical AND operator NODETYPE_LOGICALOR, //!< Logical OR operator NODETYPE_LOGICALXOR, //!< Logical XOR operator NODETYPE_EQUALS, //!< Comparison Equals NODETYPE_LESSTHAN, //!< Comparison Less Than + NODETYPE_LESSTHANEQUAL, //!< Comparison Less Than or Equal NODETYPE_GREATERTHAN, //!< Comparison Greater Than + NODETYPE_GREATERTHANEQUAL, //!< Comparison Greater Than or Equal + NODETYPE_BWNOT, //!< Bitwise NOT NODETYPE_BWAND, //!< Bitwise AND NODETYPE_BWOR, //!< Bitwise OR NODETYPE_BWXOR, //!< Bitwise XOR @@ -56,6 +68,7 @@ enum eAST_NodeTypes NODETYPE_BITSHIFTRIGHT, //!< Bitwise Shift Right (Shrink) NODETYPE_BITROTATELEFT, //!< Bitwise Rotate Left (Grow) + NODETYPE_NEGATE, //!< Negagte NODETYPE_ADD, //!< Add NODETYPE_SUBTRACT, //!< Subtract NODETYPE_MULTIPLY, //!< Multiply @@ -63,28 +76,6 @@ enum eAST_NodeTypes NODETYPE_MODULO, //!< Modulus }; -struct sSpiderScript -{ - tSpiderVariant *Variant; - tAST_Script *Script; - char *CurNamespace; //!< Current namespace prefix (NULL = Root) - No trailing . -}; - -struct sAST_Script -{ - tAST_Function *Functions; - tAST_Function *LastFunction; -}; - -struct sAST_Function -{ - tAST_Function *Next; //!< Next function in list - tAST_Node *Code; //!< Function Code - tAST_Node *Arguments; // HACKJOB (Only NODETYPE_DEFVAR is allowed) - tAST_Node *Arguments_Last; - char Name[]; //!< Function Name -}; - struct sAST_Node { tAST_Node *NextSibling; @@ -93,6 +84,10 @@ struct sAST_Node const char *File; int Line; + void *BlockState; //!< BlockState pointer (for cache integrity) + int BlockIdent; //!< Ident (same as above) + void *ValueCache; //!< Cached value / pointer + union { struct { @@ -116,8 +111,10 @@ struct sAST_Node } BinOp; struct { + tAST_Node *Object; tAST_Node *FirstArg; tAST_Node *LastArg; + int NumArgs; char Name[]; } FunctionCall; @@ -133,6 +130,7 @@ struct sAST_Node tAST_Node *Condition; tAST_Node *Increment; tAST_Node *Code; + char Tag[]; } For; /** @@ -143,11 +141,16 @@ struct sAST_Node char Name[]; } Variable; + struct { + tAST_Node *Element; + char Name[]; + } Scope; // Used by NODETYPE_SCOPE and NODETYPE_ELEMENT + struct { int DataType; - int Depth; tAST_Node *LevelSizes; tAST_Node *LevelSizes_Last; + tAST_Node *InitialValue; char Name[]; } DefVar; @@ -156,13 +159,8 @@ struct sAST_Node tAST_Node *Value; } Cast; - struct { - int Length; - char Data[]; - } String; - - uint64_t Integer; - double Real; + // Used for NODETYPE_REAL, NODETYPE_INTEGER and NODETYPE_STRING + tSpiderValue Constant; }; }; @@ -175,6 +173,11 @@ struct sAST_BlockState tSpiderScript *Script; //!< Script tAST_Variable *FirstVar; //!< First variable in the list tSpiderValue *RetVal; + tSpiderNamespace *BaseNamespace; //!< Base namespace (for entire block) + tSpiderNamespace *CurNamespace; //!< Currently selected namespace + int Ident; //!< ID number used for variable lookup caching + const char *BreakTarget; + int BreakType; }; struct sAST_Variable @@ -187,30 +190,38 @@ struct sAST_Variable // === FUNCTIONS === extern tAST_Script *AST_NewScript(void); -extern size_t AST_WriteScript(void *Buffer, tAST_Script *Script); +extern size_t AST_WriteScript(void *Buffer, tSpiderScript *Script); extern size_t AST_WriteNode(void *Buffer, size_t Offset, tAST_Node *Node); -extern tAST_Function *AST_AppendFunction(tAST_Script *Script, const char *Name); -extern void AST_AppendFunctionArg(tAST_Function *Function, tAST_Node *Arg); -extern void AST_SetFunctionCode(tAST_Function *Function, tAST_Node *Root); +extern int AST_AppendFunction(tSpiderScript *Script, const char *Name, int ReturnType, tAST_Node *FirstArg, tAST_Node *Code); + +extern tAST_Node *AST_NewNop(tParser *Parser); + extern tAST_Node *AST_NewString(tParser *Parser, const char *String, int Length); -extern tAST_Node *AST_NewInteger(tParser *Parser, uint64_t Value); +extern tAST_Node *AST_NewInteger(tParser *Parser, int64_t Value); +extern tAST_Node *AST_NewReal(tParser *Parser, double Value); extern tAST_Node *AST_NewVariable(tParser *Parser, const char *Name); extern tAST_Node *AST_NewDefineVar(tParser *Parser, int Type, const char *Name); extern tAST_Node *AST_NewConstant(tParser *Parser, const char *Name); +extern tAST_Node *AST_NewClassElement(tParser *Parser, tAST_Node *Object, const char *Name); + extern tAST_Node *AST_NewFunctionCall(tParser *Parser, const char *Name); +extern tAST_Node *AST_NewCreateObject(tParser *Parser, const char *Name); +extern tAST_Node *AST_NewMethodCall(tParser *Parser, tAST_Node *Object, const char *Name); extern void AST_AppendFunctionCallArg(tAST_Node *Node, tAST_Node *Arg); -extern tAST_Node *AST_NewCodeBlock(void); +extern tAST_Node *AST_NewCodeBlock(tParser *Parser); extern void AST_AppendNode(tAST_Node *Parent, tAST_Node *Child); extern tAST_Node *AST_NewIf(tParser *Parser, tAST_Node *Condition, tAST_Node *True, tAST_Node *False); -extern tAST_Node *AST_NewLoop(tParser *Parser, tAST_Node *Init, int bPostCheck, tAST_Node *Condition, tAST_Node *Increment, tAST_Node *Code); +extern tAST_Node *AST_NewLoop(tParser *Parser, const char *Tag, tAST_Node *Init, int bPostCheck, tAST_Node *Condition, tAST_Node *Increment, tAST_Node *Code); extern tAST_Node *AST_NewAssign(tParser *Parser, int Operation, tAST_Node *Dest, tAST_Node *Value); extern tAST_Node *AST_NewCast(tParser *Parser, int Target, tAST_Node *Value); extern tAST_Node *AST_NewBinOp(tParser *Parser, int Operation, tAST_Node *Left, tAST_Node *Right); extern tAST_Node *AST_NewUniOp(tParser *Parser, int Operation, tAST_Node *Value); +extern tAST_Node *AST_NewBreakout(tParser *Parser, int Type, const char *DestTag); +extern tAST_Node *AST_NewScopeDereference(tParser *Parser, const char *Name, tAST_Node *Child); extern void AST_FreeNode(tAST_Node *Node); @@ -218,5 +229,7 @@ extern void AST_FreeNode(tAST_Node *Node); extern void Object_Dereference(tSpiderValue *Object); extern void Object_Reference(tSpiderValue *Object); extern tSpiderValue *AST_ExecuteNode(tAST_BlockState *Block, tAST_Node *Node); +extern tSpiderValue *AST_ExecuteNode_BinOp(tSpiderScript *Script, tAST_Node *Node, int Operation, tSpiderValue *Left, tSpiderValue *Right); +extern tSpiderValue *AST_ExecuteNode_UniOp(tSpiderScript *Script, tAST_Node *Node, int Operation, tSpiderValue *Value); #endif