X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Flibspiderscript.so_src%2Fast.h;h=8ee56d778adef851f45cc44a602688e7fd4c5f48;hb=a01827f4eeade250266325ce61f829175de2dba8;hp=aa4486253cc7806cce29b7f61a7e180f36d86de8;hpb=1e45480331132c75898cbdd761ddd1fa48739e54;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/libspiderscript.so_src/ast.h b/Usermode/Libraries/libspiderscript.so_src/ast.h
index aa448625..8ee56d77 100644
--- a/Usermode/Libraries/libspiderscript.so_src/ast.h
+++ b/Usermode/Libraries/libspiderscript.so_src/ast.h
@@ -76,36 +76,11 @@ 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
-	 int	ReturnType;
-	tAST_Node	*Code;	//!< Function Code
-	tAST_Node	*Arguments;	// HACKJOB (Only NODETYPE_DEFVAR is allowed)
-	tAST_Node	*Arguments_Last;
-	 int	ArgumentCount;
-	char	Name[];	//!< Function Name
-};
-
 struct sAST_Node
 {
 	tAST_Node	*NextSibling;
 	tAST_NodeType	Type;
-	
+
 	const char	*File;
 	 int	Line;
 	
@@ -215,12 +190,10 @@ 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, int ReturnType);
-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);
 
@@ -256,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