X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Flibspiderscript.so_src%2Fast.h;h=8ee56d778adef851f45cc44a602688e7fd4c5f48;hb=a01827f4eeade250266325ce61f829175de2dba8;hp=c6593acf8e5b8264c429c9c0ed37e7b1a4ca00b5;hpb=5e007006d5b007c29268e4c949a8c9d472233257;p=tpg%2Facess2.git diff --git a/Usermode/Libraries/libspiderscript.so_src/ast.h b/Usermode/Libraries/libspiderscript.so_src/ast.h index c6593acf..8ee56d77 100644 --- a/Usermode/Libraries/libspiderscript.so_src/ast.h +++ b/Usermode/Libraries/libspiderscript.so_src/ast.h @@ -34,7 +34,11 @@ enum eAST_NodeTypes 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 @@ -44,14 +48,18 @@ enum eAST_NodeTypes 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 @@ -60,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 @@ -67,37 +76,18 @@ 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 -{ - // TODO: Namespaces and Classes - 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; tAST_NodeType Type; - + 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 { @@ -124,6 +114,7 @@ struct sAST_Node tAST_Node *Object; tAST_Node *FirstArg; tAST_Node *LastArg; + int NumArgs; char Name[]; } FunctionCall; @@ -139,11 +130,11 @@ struct sAST_Node tAST_Node *Condition; tAST_Node *Increment; tAST_Node *Code; + char Tag[]; } For; /** - * \note Used for \a NODETYPE_VARIABLE, \a NODETYPE_CONSTANT and - * \a NODETYPE_SCOPE + * \note Used for \a NODETYPE_VARIABLE and \a NODETYPE_CONSTANT */ struct { char _unused; // Shut GCC up @@ -159,6 +150,7 @@ struct sAST_Node int DataType; tAST_Node *LevelSizes; tAST_Node *LevelSizes_Last; + tAST_Node *InitialValue; char Name[]; } DefVar; @@ -167,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; }; }; @@ -188,6 +175,9 @@ struct sAST_BlockState 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 @@ -200,15 +190,16 @@ 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); @@ -223,12 +214,13 @@ 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); @@ -237,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