__signed is a synonym for signed
[cparser] / ast.c
diff --git a/ast.c b/ast.c
index 1ee1e14..175f632 100644 (file)
--- a/ast.c
+++ b/ast.c
 #include <config.h>
 
 #include "ast_t.h"
+#include "symbol_t.h"
 #include "type_t.h"
+#include "parser.h"
+#include "lang_features.h"
 
 #include <assert.h>
 #include <stdio.h>
@@ -98,7 +101,8 @@ static unsigned get_expression_precedence(expression_kind_t kind)
                [EXPR_UNKNOWN]                   = PREC_PRIM,
                [EXPR_INVALID]                   = PREC_PRIM,
                [EXPR_REFERENCE]                 = PREC_PRIM,
-               [EXPR_CHAR_CONST]                = PREC_PRIM,
+               [EXPR_CHARACTER_CONSTANT]        = PREC_PRIM,
+               [EXPR_WIDE_CHARACTER_CONSTANT]   = PREC_PRIM,
                [EXPR_CONST]                     = PREC_PRIM,
                [EXPR_STRING_LITERAL]            = PREC_PRIM,
                [EXPR_WIDE_STRING_LITERAL]       = PREC_PRIM,
@@ -111,8 +115,7 @@ static unsigned get_expression_precedence(expression_kind_t kind)
                [EXPR_CLASSIFY_TYPE]             = PREC_UNARY,
                [EXPR_ALIGNOF]                   = PREC_UNARY,
 
-               [EXPR_FUNCTION]                  = PREC_PRIM,
-               [EXPR_PRETTY_FUNCTION]           = PREC_PRIM,
+               [EXPR_FUNCNAME]                  = PREC_PRIM,
                [EXPR_BUILTIN_SYMBOL]            = PREC_PRIM,
                [EXPR_BUILTIN_CONSTANT_P]        = PREC_PRIM,
                [EXPR_BUILTIN_PREFETCH]          = PREC_PRIM,
@@ -239,36 +242,17 @@ static void print_quoted_string(const string_t *const string, char border)
        fputc(border, out);
 }
 
-/**
- * Print a constant character expression.
- *
- * @param cnst  the constant character expression
- */
-static void print_char_const(const const_expression_t *cnst)
-{
-       print_quoted_string(&cnst->v.chars, '\'');
-}
-
-/**
- * Prints a string literal expression.
- *
- * @param string_literal  the string literal expression
- */
-static void print_string_literal(
-               const string_literal_expression_t *string_literal)
-{
-       print_quoted_string(&string_literal->value, '"');
-}
-
 /**
  * Prints a wide string literal expression.
  *
  * @param wstr  the wide string literal expression
  */
-static void print_quoted_wide_string(const wide_string_t *const wstr)
+static void print_quoted_wide_string(const wide_string_t *const wstr,
+                                     char border)
 {
-       fputs("L\"", out);
-       for (const wchar_rep_t *c = wstr->begin, *end = wstr->begin + wstr->size - 1;
+       fputc('L', out);
+       fputc(border, out);
+       for (const wchar_rep_t *c = wstr->begin, *end = wstr->begin + wstr->size-1;
             c != end; ++c) {
                switch (*c) {
                        case L'\"':  fputs("\\\"", out); break;
@@ -305,13 +289,57 @@ static void print_quoted_wide_string(const wide_string_t *const wstr)
                        }
                }
        }
+       fputc(border, out);
+}
+
+/**
+ * Print a constant character expression.
+ *
+ * @param cnst  the constant character expression
+ */
+static void print_character_constant(const const_expression_t *cnst)
+{
+       print_quoted_string(&cnst->v.character, '\'');
+}
+
+static void print_wide_character_constant(const const_expression_t *cnst)
+{
+       print_quoted_wide_string(&cnst->v.wide_character, '\'');
+}
+
+/**
+ * Prints a string literal expression.
+ *
+ * @param string_literal  the string literal expression
+ */
+static void print_string_literal(
+               const string_literal_expression_t *string_literal)
+{
+       print_quoted_string(&string_literal->value, '"');
+}
+
+/**
+ * Prints a predefined symbol.
+ */
+static void print_funcname(
+               const funcname_expression_t *funcname)
+{
+       const char *s = "";
+       switch(funcname->kind) {
+       case FUNCNAME_FUNCTION:        s = (c_mode & _C99) ? "__func__" : "__FUNCTION__"; break;
+       case FUNCNAME_PRETTY_FUNCTION: s = "__PRETTY_FUNCTION__"; break;
+       case FUNCNAME_FUNCSIG:         s = "__FUNCSIG__"; break;
+       case FUNCNAME_FUNCDNAME:       s = "__FUNCDNAME__"; break;
+       }
+       fputc('"', out);
+       fputs(s, out);
        fputc('"', out);
 }
 
 static void print_wide_string_literal(
        const wide_string_literal_expression_t *const wstr)
 {
-       print_quoted_wide_string(&wstr->value);
+       print_quoted_wide_string(&wstr->value, '"');
 }
 
 static void print_compound_literal(
@@ -696,16 +724,20 @@ static void print_expression_prec(const expression_t *expression, unsigned top_p
        switch(expression->kind) {
        case EXPR_UNKNOWN:
        case EXPR_INVALID:
-               fprintf(out, "*invalid expression*");
+               fprintf(out, "$invalid expression$");
+               break;
+       case EXPR_CHARACTER_CONSTANT:
+               print_character_constant(&expression->conste);
                break;
-       case EXPR_CHAR_CONST:
-               print_char_const(&expression->conste);
+       case EXPR_WIDE_CHARACTER_CONSTANT:
+               print_wide_character_constant(&expression->conste);
                break;
        case EXPR_CONST:
                print_const(&expression->conste);
                break;
-       case EXPR_FUNCTION:
-       case EXPR_PRETTY_FUNCTION:
+       case EXPR_FUNCNAME:
+               print_funcname(&expression->funcname);
+               break;
        case EXPR_STRING_LITERAL:
                print_string_literal(&expression->string);
                break;
@@ -844,9 +876,7 @@ static void print_label_statement(const label_statement_t *statement)
 {
        fprintf(stderr, "(%p)", (void*) statement->label);
        fprintf(out, "%s:\n", statement->label->symbol->string);
-       if(statement->statement != NULL) {
-               print_statement(statement->statement);
-       }
+       print_statement(statement->statement);
 }
 
 /**
@@ -856,12 +886,10 @@ static void print_label_statement(const label_statement_t *statement)
  */
 static void print_if_statement(const if_statement_t *statement)
 {
-       fputs("if(", out);
+       fputs("if (", out);
        print_expression(statement->condition);
        fputs(") ", out);
-       if(statement->true_statement != NULL) {
-               print_statement(statement->true_statement);
-       }
+       print_statement(statement->true_statement);
 
        if(statement->false_statement != NULL) {
                print_indent();
@@ -877,7 +905,7 @@ static void print_if_statement(const if_statement_t *statement)
  */
 static void print_switch_statement(const switch_statement_t *statement)
 {
-       fputs("switch(", out);
+       fputs("switch (", out);
        print_expression(statement->expression);
        fputs(") ", out);
        print_statement(statement->body);
@@ -923,6 +951,9 @@ static void print_declaration_statement(
        declaration_t *declaration = statement->declarations_begin;
        for( ; declaration != statement->declarations_end->next;
               declaration = declaration->next) {
+           if(declaration->storage_class == STORAGE_CLASS_ENUM_ENTRY)
+               continue;
+
                if(!first) {
                        print_indent();
                } else {
@@ -940,7 +971,7 @@ static void print_declaration_statement(
  */
 static void print_while_statement(const while_statement_t *statement)
 {
-       fputs("while(", out);
+       fputs("while (", out);
        print_expression(statement->condition);
        fputs(") ", out);
        print_statement(statement->body);
@@ -956,7 +987,7 @@ static void print_do_while_statement(const do_while_statement_t *statement)
        fputs("do ", out);
        print_statement(statement->body);
        print_indent();
-       fputs("while(", out);
+       fputs("while (", out);
        print_expression(statement->condition);
        fputs(");\n", out);
 }
@@ -968,7 +999,7 @@ static void print_do_while_statement(const do_while_statement_t *statement)
  */
 static void print_for_statement(const for_statement_t *statement)
 {
-       fputs("for(", out);
+       fputs("for (", out);
        if(statement->scope.declarations != NULL) {
                assert(statement->initialisation == NULL);
                print_declaration(statement->scope.declarations);
@@ -1073,6 +1104,9 @@ end_of_print_asm_statement:
 void print_statement(const statement_t *statement)
 {
        switch(statement->kind) {
+       case STATEMENT_EMPTY:
+               fputs(";\n", out);
+               break;
        case STATEMENT_COMPOUND:
                print_compound_statement(&statement->compound);
                break;
@@ -1119,7 +1153,7 @@ void print_statement(const statement_t *statement)
                print_asm_statement(&statement->asms);
                break;
        case STATEMENT_INVALID:
-               fprintf(out, "*invalid statement*");
+               fprintf(out, "$invalid statement$");
                break;
        }
 }
@@ -1154,7 +1188,7 @@ static void print_storage_class(storage_class_tag_t storage_class)
 void print_initializer(const initializer_t *initializer)
 {
        if(initializer == NULL) {
-               fputs("{ NIL-INITIALIZER }", out);
+               fputs("{}", out);
                return;
        }
 
@@ -1172,8 +1206,9 @@ void print_initializer(const initializer_t *initializer)
                for(size_t i = 0 ; i < list->len; ++i) {
                        const initializer_t *sub_init = list->initializers[i];
                        print_initializer(list->initializers[i]);
-                       if(i < list->len-1 && sub_init->kind != INITIALIZER_DESIGNATOR) {
-                               fputs(", ", out);
+                       if(i < list->len-1) {
+                               if(sub_init == NULL || sub_init->kind != INITIALIZER_DESIGNATOR)
+                                       fputs(", ", out);
                        }
                }
                fputs(" }", out);
@@ -1183,7 +1218,7 @@ void print_initializer(const initializer_t *initializer)
                print_quoted_string(&initializer->string.string, '"');
                return;
        case INITIALIZER_WIDE_STRING:
-               print_quoted_wide_string(&initializer->wide_string.string);
+               print_quoted_wide_string(&initializer->wide_string.string, '"');
                return;
        case INITIALIZER_DESIGNATOR:
                print_designator(initializer->designator.designator);
@@ -1194,6 +1229,78 @@ void print_initializer(const initializer_t *initializer)
        panic("invalid initializer kind found");
 }
 
+/**
+ * Print microsoft extended declaration modifiers.
+ */
+static void print_ms_modifiers(const declaration_t *declaration) {
+       if((c_mode & _MS) == 0)
+               return;
+
+       decl_modifiers_t modifiers = declaration->modifiers;
+
+       /* DM_FORCEINLINE handled outside. */
+       if((modifiers & ~DM_FORCEINLINE) != 0 ||
+           declaration->alignment != 0 || declaration->deprecated != 0 ||
+           declaration->get_property_sym != NULL || declaration->put_property_sym != NULL) {
+               char *next = "(";
+
+               fputs("__declspec", out);
+               if(modifiers & DM_DLLIMPORT) {
+                       fputs(next, out); next = ", "; fputs("dllimport", out);
+               }
+               if(modifiers & DM_DLLEXPORT) {
+                       fputs(next, out); next = ", "; fputs("dllexport", out);
+               }
+               if(modifiers & DM_THREAD) {
+                       fputs(next, out); next = ", "; fputs("thread", out);
+               }
+               if(modifiers & DM_NAKED) {
+                       fputs(next, out); next = ", "; fputs("naked", out);
+               }
+               if(modifiers & DM_THREAD) {
+                       fputs(next, out); next = ", "; fputs("thread", out);
+               }
+               if(modifiers & DM_SELECTANY) {
+                       fputs(next, out); next = ", "; fputs("selectany", out);
+               }
+               if(modifiers & DM_NOTHROW) {
+                       fputs(next, out); next = ", "; fputs("nothrow", out);
+               }
+               if(modifiers & DM_NORETURN) {
+                       fputs(next, out); next = ", "; fputs("noreturn", out);
+               }
+               if(modifiers & DM_NOINLINE) {
+                       fputs(next, out); next = ", "; fputs("noinline", out);
+               }
+               if(declaration->deprecated != 0) {
+                       fputs(next, out); next = ", "; fputs("deprecated", out);
+                       if(declaration->deprecated_string != NULL)
+                               fprintf(out, "(\"%s\")", declaration->deprecated_string);
+               }
+               if(declaration->alignment != 0) {
+                       fputs(next, out); next = ", "; fprintf(out, "align(%u)", declaration->alignment);
+               }
+               if(modifiers & DM_RESTRICT) {
+                       fputs(next, out); next = ", "; fputs("restrict", out);
+               }
+               if(modifiers & DM_NOALIAS) {
+                       fputs(next, out); next = ", "; fputs("noalias", out);
+               }
+           if(declaration->get_property_sym != NULL || declaration->put_property_sym != NULL) {
+               char *comma = "";
+                       fputs(next, out); next = ", "; fprintf(out, "property(");
+               if(declaration->get_property_sym != NULL) {
+                       fprintf(out, "get=%s", declaration->get_property_sym->string);
+                       comma = ", ";
+                       }
+               if(declaration->put_property_sym != NULL)
+                       fprintf(out, "%sput=%s", comma, declaration->put_property_sym->string);
+                       fputc(')', out);
+               }
+               fputs(") ", out);
+       }
+}
+
 /**
  * Print a declaration in the NORMAL namespace.
  *
@@ -1203,11 +1310,16 @@ static void print_normal_declaration(const declaration_t *declaration)
 {
        print_storage_class((storage_class_tag_t) declaration->declared_storage_class);
        if(declaration->is_inline) {
-               if (declaration->modifiers & DM_FORCEINLINE)
+               if(declaration->modifiers & DM_FORCEINLINE)
                        fputs("__forceinline ", out);
-               else
-                       fputs("inline ", out);
+               else {
+                       if(declaration->modifiers & DM_MICROSOFT_INLINE)
+                               fputs("__inline ", out);
+                       else
+                               fputs("inline ", out);
+               }
        }
+       print_ms_modifiers(declaration);
        print_type_ext(declaration->type, declaration->symbol,
                       &declaration->scope);
 
@@ -1306,7 +1418,7 @@ bool is_constant_initializer(const initializer_t *initializer)
        case INITIALIZER_VALUE:
                return is_constant_expression(initializer->value.value);
 
-       case INITIALIZER_LIST: {
+       case INITIALIZER_LIST:
                for(size_t i = 0; i < initializer->list.len; ++i) {
                        initializer_t *sub_initializer = initializer->list.initializers[i];
                        if(!is_constant_initializer(sub_initializer))
@@ -1314,7 +1426,6 @@ bool is_constant_initializer(const initializer_t *initializer)
                }
                return true;
        }
-       }
        panic("invalid initializer kind found");
 }
 
@@ -1360,6 +1471,14 @@ bool is_address_constant(const expression_t *expression)
        case EXPR_UNARY_TAKE_ADDRESS:
                return is_object_with_constant_address(expression->unary.value);
 
+       case EXPR_UNARY_DEREFERENCE: {
+               type_t *real_type = revert_automatic_type_conversion(expression->unary.value);
+               /* dereferencing a function is a NOP */
+               if(is_type_function(real_type)) {
+                       return is_address_constant(expression->unary.value);
+               }
+       }
+
        case EXPR_UNARY_CAST:
                return is_type_pointer(skip_typeref(expression->base.type))
                        && (is_constant_expression(expression->unary.value)
@@ -1400,13 +1519,13 @@ bool is_constant_expression(const expression_t *expression)
        switch(expression->kind) {
 
        case EXPR_CONST:
-       case EXPR_CHAR_CONST:
+       case EXPR_CHARACTER_CONSTANT:
+       case EXPR_WIDE_CHARACTER_CONSTANT:
        case EXPR_STRING_LITERAL:
        case EXPR_WIDE_STRING_LITERAL:
        case EXPR_SIZEOF:
        case EXPR_CLASSIFY_TYPE:
-       case EXPR_FUNCTION:
-       case EXPR_PRETTY_FUNCTION:
+       case EXPR_FUNCNAME:
        case EXPR_OFFSETOF:
        case EXPR_ALIGNOF:
        case EXPR_BUILTIN_CONSTANT_P:
@@ -1425,8 +1544,8 @@ bool is_constant_expression(const expression_t *expression)
        case EXPR_UNARY_PREFIX_DECREMENT:
        case EXPR_UNARY_BITFIELD_EXTRACT:
        case EXPR_UNARY_ASSUME: /* has VOID type */
-       case EXPR_UNARY_DEREFERENCE:
        case EXPR_UNARY_TAKE_ADDRESS:
+       case EXPR_UNARY_DEREFERENCE:
        case EXPR_BINARY_ASSIGN:
        case EXPR_BINARY_MUL_ASSIGN:
        case EXPR_BINARY_DIV_ASSIGN:
@@ -1507,8 +1626,10 @@ bool is_constant_expression(const expression_t *expression)
                return false;
        }
 
-       case EXPR_UNKNOWN:
        case EXPR_INVALID:
+               return true;
+
+       case EXPR_UNKNOWN:
                break;
        }
        panic("invalid expression found (is constant expression)");