X-Git-Url: https://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/6e77e91bbb048a0ee1a072715c0ce808c169ab38..5b42e9400440d86723a27747b2191ab8cd59c2ee:/src/tree.h

diff --git a/src/tree.h b/src/tree.h
index f6b8caf..91fae23 100644
--- a/src/tree.h
+++ b/src/tree.h
@@ -35,13 +35,23 @@ enum {
 	VARIABLE_NODE
 };
 
+/* for ccode type */
+enum {
+	A_CCODE,
+	AT_CCODE,
+	C_CCODE,
+	H_CCODE,
+	HT_CCODE,
+	PH_CCODE
+};
+
 typedef union _Node Node;
 
 typedef struct _CCode CCode;
 struct _CCode {
 	int type;
-	int header;
-	GString *cbuf;
+	int cctype;
+	char *cbuf;
 	int line_no;
 };
 
@@ -58,6 +68,7 @@ struct _Type {
 	int type;
 	int stars;
 	char *name;
+	char *postfix;
 };
 
 enum {
@@ -90,44 +101,51 @@ typedef struct _Argument Argument;
 struct _Argument {
 	int type;
 	char *gtktype;
+	Type *atype;
 	GList *flags;
 	char *name;
-	GString *get;
+	char *get;
 	int get_line;
-	GString *set;
+	char *set;
 	int set_line;
 	int line_no;
 };
 	
 /*scope type*/
 enum {
+	NO_SCOPE,
 	PUBLIC_SCOPE,
 	PRIVATE_SCOPE,
+	PROTECTED_SCOPE
+};
+
+/* method type */
+enum {
+	REGULAR_METHOD,
 	INIT_METHOD,
 	CLASS_INIT_METHOD,
 	VIRTUAL_METHOD,
-	PRIVATE_VIRTUAL_METHOD,
 	SIGNAL_LAST_METHOD,
 	SIGNAL_FIRST_METHOD,
-	PRIVATE_SIGNAL_LAST_METHOD,
-	PRIVATE_SIGNAL_FIRST_METHOD,
 	OVERRIDE_METHOD
 };
 
 typedef struct _Method Method;
 struct _Method {
 	int type;
-	int scope;
+	int scope; /* scope type */
+	int method; /* method type */
 	Type *mtype;
 	char *otype; /*for override methods*/
 	GList *gtktypes; /*GTK types for a signal*/
+	GList *flags; /* GTK_RUN_* flags for a signal */
 	char *id;
 	GList *args;
 	char *onerror;
-	GString *cbuf;
+	char *cbuf;
 	int line_no;
 	int ccode_line;
-	int vararg;
+	gboolean vararg;
 };
 
 typedef struct _Variable Variable;
@@ -137,6 +155,11 @@ struct _Variable {
 	Type *vtype;
 	char *id;
 	int line_no;
+	char *destructor;
+	int destructor_line;
+	gboolean destructor_simple;
+	char *initializer;
+	int initializer_line;
 };
 
 union _Node {
@@ -150,13 +173,23 @@ union _Node {
 	Variable variable;
 };
 
-Node *new_ccode(int header, GString *cbuf, int line_no);
+Node *new_ccode(int cctype, char *cbuf, int line_no);
 Node *new_class(char *otype, char *ptype, GList *nodes);
-Node *new_type(int stars, char *name);
+Node *new_type(int stars, char *name, char *postfix);
 Node *new_check(int chtype, char *number);
 Node *new_funcarg(Type *atype, char *name, GList *checks);
-Node *new_method(int scope, Type *mtype, char *otype, GList *gtktypes, char *id, GList *args, char *onerror, GString *cbuf,int line_no,int ccode_line, int vararg);
-Node *new_argument(char *gtktype, GList *flags, char *name, GString *get, int get_line, GString *set, int set_line, int line_no);
-Node *new_variable(int scope, Type *vtype, char *id,int line_no);
+Node *new_method(int scope, int method, Type *mtype, char *otype,
+		 GList *gtktypes, GList *flags, char *id, GList *args,
+		 char *onerror, char *cbuf, int line_no, int ccode_line,
+		 gboolean vararg);
+Node *new_argument(char *gtktype, Type *atype, GList *flags, char *name,
+		   char *get, int get_line, char *set, int set_line,
+		   int line_no);
+Node *new_variable(int scope, Type *vtype, char *id, int line_no,
+		   char *destructor, int destructor_line,
+		   gboolean destructor_simple,
+		   char *initializer, int initializer_line);
+
+Type *copy_type(Type *type);
 
 #endif