Simplify printing string initializers.

[cparser] / ast.h

diff --git a/ast.h b/ast.h
index 6c14da9..5603584 100644 (file)
--- a/ast.h
+++ b/ast.h
@@ -25,15 +25,13 @@
 #include "entity.h"
 
 typedef struct expression_base_t                     expression_base_t;
-typedef struct const_expression_t                    const_expression_t;
+typedef struct literal_expression_t                  literal_expression_t;
 typedef struct string_literal_expression_t           string_literal_expression_t;
 typedef struct funcname_expression_t                 funcname_expression_t;
-typedef struct wide_string_literal_expression_t      wide_string_literal_expression_t;
 typedef struct compound_literal_expression_t         compound_literal_expression_t;
 typedef struct reference_expression_t                reference_expression_t;
 typedef struct cast_expression_t                     cast_expression_t;
 typedef struct call_argument_t                       call_argument_t;
-typedef struct type_argument_t                       type_argument_t;
 typedef struct call_expression_t                     call_expression_t;
 typedef struct binary_expression_t                   binary_expression_t;
 typedef struct unary_expression_t                    unary_expression_t;
@@ -52,15 +50,12 @@ typedef struct va_copy_expression_t                  va_copy_expression_t;
 typedef struct builtin_constant_expression_t         builtin_constant_expression_t;
 typedef struct builtin_types_compatible_expression_t builtin_types_compatible_expression_t;
 typedef struct classify_type_expression_t            classify_type_expression_t;
-typedef struct bitfield_extract_expression_t         bitfield_extract_expression_t;
 typedef struct label_address_expression_t            label_address_expression_t;
 typedef union  expression_t                          expression_t;
 
 typedef struct initializer_base_t                    initializer_base_t;
 typedef struct initializer_list_t                    initializer_list_t;
 typedef struct initializer_value_t                   initializer_value_t;
-typedef struct initializer_string_t                  initializer_string_t;
-typedef struct initializer_wide_string_t             initializer_wide_string_t;
 typedef struct initializer_designator_t              initializer_designator_t;
 typedef union  initializer_t                         initializer_t;
 
@@ -73,6 +68,7 @@ typedef struct if_statement_t                        if_statement_t;
 typedef struct switch_statement_t                    switch_statement_t;
 typedef struct declaration_statement_t               declaration_statement_t;
 typedef struct expression_statement_t                expression_statement_t;
+typedef struct computed_goto_statement_t             computed_goto_statement_t;
 typedef struct goto_statement_t                      goto_statement_t;
 typedef struct label_statement_t                     label_statement_t;
 typedef struct case_label_statement_t                case_label_statement_t;
@@ -88,26 +84,35 @@ typedef union  statement_t                           statement_t;
 
 typedef struct translation_unit_t                    translation_unit_t;
 
-void  init_ast(void);
-void  exit_ast(void);
+/**
+ * Initialize the AST construction.
+ */
+void init_ast(void);
+
+/**
+ * Free the AST.
+ */
+void exit_ast(void);
+
+void print_expression(const expression_t *expression);
+void print_initializer(const initializer_t *initializer);
+void print_ast(const translation_unit_t *unit);
+void print_indent(void);
+void print_declaration(const entity_t *entity);
+void print_entity(const entity_t *entity);
+void change_indent(int delta);
 
-void  ast_set_output(FILE *out);
-void  print_expression(const expression_t *expression);
-void  print_initializer(const initializer_t *initializer);
-void  print_ast(const translation_unit_t *unit);
-void  print_indent(void);
-void  print_declaration(const entity_t *entity);
-void  print_entity(const entity_t *entity);
-void  change_indent(int delta);
-void *allocate_ast(size_t size);
+typedef enum expression_classification_t {
+       EXPR_CLASS_VARIABLE,
+       EXPR_CLASS_ERROR,
+       EXPR_CLASS_CONSTANT
+} expression_classification_t;
 
 /**
- * Returns true if a given expression is a compile time
- * constant. §6.6
- *
- * @param expression  the expression to check
+ * Returns true when an initializer contains only constants/linker_constant
+ * values.
  */
-bool is_constant_initializer(const initializer_t *initializer);
+expression_classification_t is_constant_initializer(const initializer_t *initializer);
 
 /**
  * Returns true if a given expression is a compile time
@@ -115,15 +120,26 @@ bool is_constant_initializer(const initializer_t *initializer);
  *
  * @param expression  the expression to check
  */
-bool is_constant_expression(const expression_t *expression);
+expression_classification_t is_constant_expression(const expression_t *expression);
 
 /**
- * An object with a fixed but at compiletime unknown adress which will be known
- * at link/load time.
+ * Checks if an expression is a constant/known value to the linker. Examples:
+ *  - all constant/linker constant expression casted to a pointer type
+ *  - "&x", with x being a global variable.
+ *  - "array" or "a.array" in case array is an array and array and a,
+ *  respectively is an object with link time constant address
  */
-bool is_address_constant(const expression_t *expression);
+expression_classification_t is_linker_constant(const expression_t *expression);
 
 long fold_constant_to_int(const expression_t *expression);
 bool fold_constant_to_bool(const expression_t *expression);
+bool constant_is_negative(const expression_t *constant);
+
+/**
+ * the type of a literal is usually the biggest type that can hold the value.
+ * Since this is backend dependent the parses needs this call exposed.
+ * Works for EXPR_LITERAL_* expressions.
+ */
+void determine_literal_type(literal_expression_t *literal);
 
 #endif