X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=ast_t.h;h=0b7f9f6f602fbbb9feba2b040c1c6011961b8caa;hb=9e9141455d9e7a9028d7ffa1d5656b1e9bb25c74;hp=446c92370f641ec8d70e38a05948378a6019547f;hpb=0f15057a5b66c97d32658bb937abcc7e8ee22932;p=cparser

diff --git a/ast_t.h b/ast_t.h
index 446c923..0b7f9f6 100644
--- a/ast_t.h
+++ b/ast_t.h
@@ -189,6 +189,9 @@ typedef enum funcname_kind_t {
 struct scope_t {
 	declaration_t *declarations;      /**< List of declarations in this scope. */
 	declaration_t *last_declaration;  /**< last declaration in this scope. */
+	scope_t       *parent;            /**< points to the parent scope. */
+	unsigned      depth;              /**< while parsing, the depth of this scope in the scope stack. */
+	bool          is_parameter;       /**< Set if this scope is a parameter scope. */
 };
 
 struct expression_base_t {
@@ -254,6 +257,8 @@ struct builtin_prefetch_expression_t {
 struct reference_expression_t {
 	expression_base_t  base;
 	declaration_t     *declaration;
+	bool               is_outer_ref;  /**< Set, if this referenced a variable
+	                                       outside of an inner function */
 };
 
 struct call_argument_t {
@@ -288,7 +293,7 @@ struct array_access_expression_t {
 	expression_base_t  base;
 	expression_t      *array_ref;
 	expression_t      *index;
-	bool               flipped; /* index/ref was written in a 5[a] way */
+	bool               flipped; /**< index/ref was written in a 5[a] way */
 };
 
 struct typeprop_expression_t {
@@ -531,16 +536,17 @@ typedef enum decl_modifier_t {
 	DM_NOALIAS           = 1 << 12,
 	DM_PACKED            = 1 << 13,
 	DM_TRANSPARENT_UNION = 1 << 14,
-	DM_PURE              = 1 << 15,
-	DM_CONSTRUCTOR       = 1 << 16,
-	DM_DESTRUCTOR        = 1 << 17,
-	DM_UNUSED            = 1 << 18,
-	DM_USED              = 1 << 19,
-	DM_CDECL             = 1 << 20,
-	DM_FASTCALL          = 1 << 21,
-	DM_STDCALL           = 1 << 22,
-	DM_THISCALL          = 1 << 23,
-	DM_DEPRECATED        = 1 << 24
+	DM_CONST             = 1 << 15,
+	DM_PURE              = 1 << 16,
+	DM_CONSTRUCTOR       = 1 << 17,
+	DM_DESTRUCTOR        = 1 << 18,
+	DM_UNUSED            = 1 << 19,
+	DM_USED              = 1 << 20,
+	DM_CDECL             = 1 << 21,
+	DM_FASTCALL          = 1 << 22,
+	DM_STDCALL           = 1 << 23,
+	DM_THISCALL          = 1 << 24,
+	DM_DEPRECATED        = 1 << 25
 } decl_modifier_t;
 
 typedef unsigned decl_modifiers_t;
@@ -558,6 +564,8 @@ struct declaration_t {
 	unsigned int        is_inline     : 1;
 	unsigned int        used          : 1;  /**< Set if the declaration is used. */
 	unsigned int        implicit      : 1;  /**< Set for implicit (not found in source code) declarations. */
+	unsigned int        need_closure  : 1;  /**< Inner function needs closure. */
+	unsigned int        goto_to_outer : 1;  /**< Inner function has goto to outer function. */
 	type_t             *type;
 	il_size_t           offset;             /**< The offset of this member inside a compound. */
 	symbol_t           *symbol;
@@ -607,8 +615,8 @@ typedef enum statement_kind_t {
 	STATEMENT_DO_WHILE,
 	STATEMENT_FOR,
 	STATEMENT_ASM,
-	STATEMENT_MS_TRY,
-	STATEMENT_LEAVE
+	STATEMENT_MS_TRY,          /**< MS __try/__finally or __try/__except */
+	STATEMENT_LEAVE            /**< MS __leave */
 } statement_kind_t;
 
 struct statement_base_t {
@@ -659,27 +667,28 @@ struct switch_statement_t {
 	expression_t           *expression;
 	statement_t            *body;
 	case_label_statement_t *first_case, *last_case;  /**< List of all cases, including default. */
-	case_label_statement_t *default_label;    /**< The default label if existent. */
-	unsigned long           default_proj_nr;  /**< The Proj-number for the default Proj. */
+	case_label_statement_t *default_label;           /**< The default label if existent. */
+	unsigned long           default_proj_nr;         /**< The Proj-number for the default Proj. */
 };
 
 struct goto_statement_t {
 	statement_base_t  base;
-	declaration_t    *label;      /**< The destination label. */
-	expression_t     *expression; /**< The expression for an assigned goto. */
-	goto_statement_t *next;       /**< links all goto statements of a function */
+	declaration_t    *label;         /**< The destination label. */
+	expression_t     *expression;    /**< The expression for an assigned goto. */
+	goto_statement_t *next;          /**< links all goto statements of a function */
+	bool              outer_fkt_jmp; /**< Set if this goto jump to an outer function. */
 };
 
 struct case_label_statement_t {
 	statement_base_t        base;
-	expression_t           *expression;  /**< The case label expression, NULL for default label. */
-	expression_t           *end_range;   /**< For GNUC case a .. b: the end range expression, NULL else. */
-	case_label_statement_t *next;        /**< link to the next case label in switch */
+	expression_t           *expression;    /**< The case label expression, NULL for default label. */
+	expression_t           *end_range;     /**< For GNUC case a .. b: the end range expression, NULL else. */
+	case_label_statement_t *next;          /**< link to the next case label in switch */
 	statement_t            *statement;
-	long                   first_case;   /**< The folded value of expression. */
-	long                   last_case;    /**< The folded value of end_range. */
-	bool                   is_bad;       /**< If set marked as bad to supress warnings. */
-	bool                   is_empty;     /**< If set marked this is a empty range. */
+	long                   first_case;     /**< The folded value of expression. */
+	long                   last_case;      /**< The folded value of end_range. */
+	bool                   is_bad;         /**< If set marked as bad to suppress warnings. */
+	bool                   is_empty_range; /**< If set marked this as an empty range. */
 };
 
 struct label_statement_t {