X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Flibspiderscript.so_src%2Fast.h;h=67f77277556c3a3b15361c48032d9461ca476b79;hb=c967d91a4794ec9c0ec7dab438c033f4c0b49952;hp=3858230482e9f967c537ec779e742e9afa06fecd;hpb=be6e3ccd05add9ad319a121661c20cb4769f58d7;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/libspiderscript.so_src/ast.h b/Usermode/Libraries/libspiderscript.so_src/ast.h
index 38582304..67f77277 100644
--- a/Usermode/Libraries/libspiderscript.so_src/ast.h
+++ b/Usermode/Libraries/libspiderscript.so_src/ast.h
@@ -34,6 +34,8 @@ 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
@@ -91,6 +93,7 @@ struct sAST_Script
 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;
@@ -151,11 +154,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
@@ -196,7 +199,9 @@ struct sAST_BlockState
 	tSpiderValue	*RetVal;
 	tSpiderNamespace	*BaseNamespace;	//!< Base namespace (for entire block)
 	tSpiderNamespace	*CurNamespace;	//!< Currently selected namespace
-	 int	Ident;
+	 int	Ident;	//!< ID number used for variable lookup caching
+	const char	*BreakTarget;
+	 int	BreakType;
 };
 
 struct sAST_Variable
@@ -212,7 +217,7 @@ extern tAST_Script	*AST_NewScript(void);
 extern size_t	AST_WriteScript(void *Buffer, tAST_Script *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 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);
 
@@ -235,12 +240,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);