X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast_t.h;h=ca796a80f68fae560968f90c922b0d53784a2a21;hb=e3de7eaecb549e58c466d70b8f24d1f53aa9fc8a;hp=516e6f7041497498c8889a23d8d5d322b4cfdc62;hpb=296ba6e16420b89723d1a5b1217d6ecfc2fb0c7d;p=cparser

diff --git a/ast_t.h b/ast_t.h
index 516e6f7..ca796a8 100644
--- a/ast_t.h
+++ b/ast_t.h
@@ -1,21 +1,6 @@
 /*
  * This file is part of cparser.
- * Copyright (C) 2007-2009 Matthias Braun <matze@braunis.de>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Copyright (C) 2012 Matthias Braun <matze@braunis.de>
  */
 #ifndef AST_T_H
 #define AST_T_H
@@ -93,7 +78,7 @@ typedef enum expression_kind_t {
 	EXPR_UNARY_FIRST,
 	EXPR_UNARY_NEGATE = EXPR_UNARY_FIRST,
 	EXPR_UNARY_PLUS,
-	EXPR_UNARY_BITWISE_NEGATE,
+	EXPR_UNARY_COMPLEMENT,
 	EXPR_UNARY_NOT,
 	EXPR_UNARY_DEREFERENCE,
 	EXPR_UNARY_TAKE_ADDRESS,
@@ -106,7 +91,9 @@ typedef enum expression_kind_t {
 	EXPR_UNARY_DELETE,
 	EXPR_UNARY_DELETE_ARRAY,
 	EXPR_UNARY_THROW,
-	EXPR_UNARY_LAST = EXPR_UNARY_THROW,
+	EXPR_UNARY_REAL,
+	EXPR_UNARY_IMAG,
+	EXPR_UNARY_LAST = EXPR_UNARY_IMAG,
 
 	EXPR_BINARY_FIRST,
 	EXPR_BINARY_ADD = EXPR_BINARY_FIRST,
@@ -201,7 +188,7 @@ typedef enum funcname_kind_t {
 #define EXPR_UNARY_CASES_MANDATORY   \
 	     EXPR_UNARY_NEGATE:            \
 	case EXPR_UNARY_PLUS:              \
-	case EXPR_UNARY_BITWISE_NEGATE:    \
+	case EXPR_UNARY_COMPLEMENT:        \
 	case EXPR_UNARY_NOT:               \
 	case EXPR_UNARY_DEREFERENCE:       \
 	case EXPR_UNARY_TAKE_ADDRESS:      \
@@ -212,7 +199,9 @@ typedef enum funcname_kind_t {
 	case EXPR_UNARY_CAST:              \
 	case EXPR_UNARY_ASSUME:            \
 	case EXPR_UNARY_DELETE:            \
-	case EXPR_UNARY_DELETE_ARRAY
+	case EXPR_UNARY_DELETE_ARRAY:      \
+	case EXPR_UNARY_IMAG:              \
+	case EXPR_UNARY_REAL
 
 /**
  * unary expression with optional operand
@@ -234,18 +223,16 @@ typedef enum funcname_kind_t {
  * The base class of every expression.
  */
 struct expression_base_t {
-	expression_kind_t   kind;            /**< The expression kind. */
-	type_t             *type;            /**< The type of the expression. */
-	source_position_t   source_position; /**< The source position of this expression. */
-	bool                parenthesized : 1;
+	expression_kind_t kind;     /**< The expression kind. */
+	type_t           *type;     /**< The type of the expression. */
+	position_t        pos;      /**< The source position of this expression. */
+	bool              parenthesized : 1;
 #ifndef NDEBUG
-	bool                transformed : 1;     /**< Set if this expression was transformed. */
+	bool              transformed : 1; /**< Set if this expression was transformed. */
 #endif
-	bool                implicit : 1;    /**< compiler generated expression.
-	                                          Examples:
-	                                             select into anonymous structs
-	                                             implicit casts
-	                                      */
+	bool              implicit : 1;  /**< compiler generated expression.
+	                                    Examples: select into anonymous structs,
+	                                    implicit casts */
 };
 
 /**
@@ -277,6 +264,7 @@ struct compound_literal_expression_t {
 	expression_base_t  base;
 	type_t            *type;
 	initializer_t     *initializer;
+	bool               global_scope;
 };
 
 struct builtin_constant_expression_t {
@@ -342,10 +330,11 @@ struct typeprop_expression_t {
 };
 
 struct designator_t {
-	source_position_t  source_position;
-	symbol_t          *symbol;      /**< the symbol if any */
-	expression_t      *array_index; /**< the array index if any */
-	designator_t      *next;
+	position_t    pos;
+	symbol_t     *symbol;      /**< the symbol if any */
+	expression_t *array_index; /**< the array index if any */
+	expression_t *range_last;  /**< last index of a range initializer, if any */
+	designator_t *next;
 };
 
 struct offsetof_expression_t {
@@ -490,13 +479,13 @@ typedef enum statement_kind_t {
  * The base class of every statement.
  */
 struct statement_base_t {
-	statement_kind_t   kind;
-	statement_t       *next;         /**< Point to the next statement in a compound statement. */
-	source_position_t  source_position;
-	statement_t       *parent;       /**< The Parent statement that controls the execution. */
-	bool               reachable;    /**< True, if this statement is reachable. */
+	statement_kind_t kind;
+	statement_t     *next;      /**< Point to the next statement in a compound statement. */
+	position_t       pos;
+	statement_t     *parent;    /**< The Parent statement that controls the execution. */
+	bool             reachable; /**< True, if this statement is reachable. */
 #ifndef NDEBUG
-	bool               transformed;
+	bool             transformed;
 #endif
 };
 
@@ -601,12 +590,18 @@ struct asm_clobber_t {
 	asm_clobber_t *next;
 };
 
+struct asm_label_t {
+	label_t     *label;
+	asm_label_t *next;
+};
+
 struct asm_statement_t {
 	statement_base_t base;
 	string_t         asm_text;
 	asm_argument_t  *inputs;
 	asm_argument_t  *outputs;
 	asm_clobber_t   *clobbers;
+	asm_label_t     *labels;
 	bool             is_volatile;
 };