Replace the old lexer by the new preprocessor.
authorChristoph Mallon <christoph.mallon@gmx.de>
Wed, 20 Jun 2012 19:43:35 +0000 (21:43 +0200)
committerChristoph Mallon <christoph.mallon@gmx.de>
Wed, 20 Jun 2012 19:57:17 +0000 (21:57 +0200)
Makefile
entity_t.h
input.c
lexer.c [deleted file]
lexer.h [deleted file]
main.c
parser.c
preprocessor.c
preprocessor.h [new file with mode: 0644]
vc2005/cparser.icproj
vc2005/cparser.vcproj

index 88333e1..f4c978d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -47,7 +47,6 @@ SOURCES := \
        entitymap.c \
        format_check.c \
        input.c \
-       lexer.c \
        main.c \
        mangle.c \
        preprocessor.c \
index 19db103..b836d0b 100644 (file)
 #ifndef ENTITY_T_H
 #define ENTITY_T_H
 
-#include "lexer.h"
 #include "symbol.h"
 #include "entity.h"
 #include "attribute.h"
 #include <libfirm/firm_types.h>
 #include "builtins.h"
+#include "token_t.h"
 
 typedef enum {
        ENTITY_VARIABLE = 1,
diff --git a/input.c b/input.c
index 8c5d892..02f5dce 100644 (file)
--- a/input.c
+++ b/input.c
@@ -3,7 +3,6 @@
 #include "input.h"
 
 #include <ctype.h>
-#include "lexer.h"
 
 typedef size_t (*decode_func)(input_t *input, utf32 *buffer, size_t buffer_size);
 
@@ -104,7 +103,7 @@ static size_t decode_utf8(input_t *input, utf32 *buffer, size_t buffer_size)
 {
        unsigned char read_buf[buffer_size];
 
-       while (true) {
+       for (;;) {
                size_t const s = read_block(input, read_buf, sizeof(read_buf));
                if (s == 0) {
                        if (input->utf8_part_decoded_rest_len > 0)
diff --git a/lexer.c b/lexer.c
deleted file mode 100644 (file)
index 1f0c23d..0000000
--- a/lexer.c
+++ /dev/null
@@ -1,1176 +0,0 @@
-/*
- * 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.
- */
-#include <config.h>
-
-#include "adt/strutil.h"
-#include "input.h"
-#include "diagnostic.h"
-#include "lexer.h"
-#include "symbol_t.h"
-#include "token_t.h"
-#include "symbol_table_t.h"
-#include "adt/error.h"
-#include "adt/strset.h"
-#include "adt/util.h"
-#include "types.h"
-#include "type_t.h"
-#include "parser.h"
-#include "warning.h"
-#include "lang_features.h"
-
-#include <assert.h>
-#include <errno.h>
-#include <string.h>
-#include <stdbool.h>
-#include <ctype.h>
-
-#ifndef _WIN32
-#include <strings.h>
-#endif
-
-#define MAX_PUTBACK 16    // 3 would be enough, but 16 gives a nicer alignment
-#define BUF_SIZE    1024
-
-static input_t           *input;
-static utf32              input_buf[BUF_SIZE + MAX_PUTBACK];
-static const utf32       *bufpos;
-static const utf32       *bufend;
-static utf32              c;
-static source_position_t  lexer_pos;
-token_t                   lexer_token;
-static symbol_t          *symbol_L;
-static strset_t           stringset;
-bool                      allow_dollar_in_symbol = true;
-
-/**
- * Prints a parse error message at the current token.
- *
- * @param msg   the error message
- */
-static void parse_error(const char *msg)
-{
-       errorf(&lexer_pos, "%s", msg);
-}
-
-/**
- * Prints an internal error message at the current token.
- *
- * @param msg   the error message
- */
-static NORETURN internal_error(const char *msg)
-{
-       internal_errorf(&lexer_pos, "%s", msg);
-}
-
-static inline void next_real_char(void)
-{
-       assert(bufpos <= bufend);
-       if (bufpos >= bufend) {
-               size_t n = decode(input, input_buf+MAX_PUTBACK, BUF_SIZE);
-               if (n == 0) {
-                       c = EOF;
-                       return;
-               }
-               bufpos = input_buf + MAX_PUTBACK;
-               bufend = bufpos + n;
-       }
-       c = *bufpos++;
-       ++lexer_pos.colno;
-}
-
-/**
- * Put a character back into the buffer.
- *
- * @param pc  the character to put back
- */
-static inline void put_back(utf32 const pc)
-{
-       *(--bufpos - input_buf + input_buf) = pc;
-       --lexer_pos.colno;
-}
-
-static inline void next_char(void);
-
-#define NEWLINE  \
-       '\r': \
-               next_char(); \
-               if (c == '\n') { \
-       case '\n': \
-                       next_char(); \
-               } \
-               lexer_pos.lineno++; \
-               lexer_pos.colno = 1; \
-               goto newline; \
-               newline // Let it look like an ordinary case label.
-
-#define eat(c_type) (assert(c == c_type), next_char())
-
-static void maybe_concat_lines(void)
-{
-       eat('\\');
-
-       switch (c) {
-       case NEWLINE:
-               return;
-
-       default:
-               break;
-       }
-
-       put_back(c);
-       c = '\\';
-}
-
-/**
- * Set c to the next input character, ie.
- * after expanding trigraphs.
- */
-static inline void next_char(void)
-{
-       next_real_char();
-
-       /* filter trigraphs */
-       if (UNLIKELY(c == '\\')) {
-               maybe_concat_lines();
-               return;
-       }
-
-       if (LIKELY(c != '?'))
-               return;
-
-       next_real_char();
-       if (LIKELY(c != '?')) {
-               put_back(c);
-               c = '?';
-               return;
-       }
-
-       next_real_char();
-       switch (c) {
-       case '=': c = '#'; break;
-       case '(': c = '['; break;
-       case '/': c = '\\'; maybe_concat_lines(); break;
-       case ')': c = ']'; break;
-       case '\'': c = '^'; break;
-       case '<': c = '{'; break;
-       case '!': c = '|'; break;
-       case '>': c = '}'; break;
-       case '-': c = '~'; break;
-       default:
-               put_back(c);
-               put_back('?');
-               c = '?';
-               break;
-       }
-}
-
-#define SYMBOL_CHARS_WITHOUT_E_P \
-            '$': if (!allow_dollar_in_symbol) goto dollar_sign; \
-       case 'a':         \
-       case 'b':         \
-       case 'c':         \
-       case 'd':         \
-       case 'f':         \
-       case 'g':         \
-       case 'h':         \
-       case 'i':         \
-       case 'j':         \
-       case 'k':         \
-       case 'l':         \
-       case 'm':         \
-       case 'n':         \
-       case 'o':         \
-       case 'q':         \
-       case 'r':         \
-       case 's':         \
-       case 't':         \
-       case 'u':         \
-       case 'v':         \
-       case 'w':         \
-       case 'x':         \
-       case 'y':         \
-       case 'z':         \
-       case 'A':         \
-       case 'B':         \
-       case 'C':         \
-       case 'D':         \
-       case 'F':         \
-       case 'G':         \
-       case 'H':         \
-       case 'I':         \
-       case 'J':         \
-       case 'K':         \
-       case 'L':         \
-       case 'M':         \
-       case 'N':         \
-       case 'O':         \
-       case 'Q':         \
-       case 'R':         \
-       case 'S':         \
-       case 'T':         \
-       case 'U':         \
-       case 'V':         \
-       case 'W':         \
-       case 'X':         \
-       case 'Y':         \
-       case 'Z':         \
-       case '_'
-
-#define SYMBOL_CHARS_E_P \
-            'E': \
-       case 'P': \
-       case 'e': \
-       case 'p'
-
-#define SYMBOL_CHARS  \
-            SYMBOL_CHARS_WITHOUT_E_P: \
-       case SYMBOL_CHARS_E_P
-
-#define DIGITS        \
-            '0':         \
-       case '1':         \
-       case '2':         \
-       case '3':         \
-       case '4':         \
-       case '5':         \
-       case '6':         \
-       case '7':         \
-       case '8':         \
-       case '9'
-
-static bool is_universal_char_valid(utf32 const v)
-{
-       /* C11 ยง6.4.3:2 */
-       if (v < 0xA0U && v != 0x24 && v != 0x40 && v != 0x60)
-               return false;
-       if (0xD800 <= v && v <= 0xDFFF)
-               return false;
-       return true;
-}
-
-static int digit_value(utf32 digit);
-
-static utf32 parse_universal_char(unsigned const n_digits)
-{
-       utf32 v = 0;
-       for (unsigned k = n_digits; k != 0; --k) {
-               if (isxdigit(c)) {
-                       v = 16 * v + digit_value(c);
-                       next_char();
-               } else {
-                       errorf(&lexer_pos, "short universal character name, expected %u more digits", k);
-                       break;
-               }
-       }
-       if (!is_universal_char_valid(v)) {
-               errorf(&lexer_pos, "\\%c%0*X is not a valid universal character name", n_digits == 4 ? 'u' : 'U', (int)n_digits, v);
-       }
-       return v;
-}
-
-static bool is_universal_char_valid_identifier(utf32 const v)
-{
-       /* C11 Annex D.1 */
-       if (                v == 0x000A8) return true;
-       if (                v == 0x000AA) return true;
-       if (                v == 0x000AD) return true;
-       if (                v == 0x000AF) return true;
-       if (0x000B2 <= v && v <= 0x000B5) return true;
-       if (0x000B7 <= v && v <= 0x000BA) return true;
-       if (0x000BC <= v && v <= 0x000BE) return true;
-       if (0x000C0 <= v && v <= 0x000D6) return true;
-       if (0x000D8 <= v && v <= 0x000F6) return true;
-       if (0x000F8 <= v && v <= 0x000FF) return true;
-       if (0x00100 <= v && v <= 0x0167F) return true;
-       if (0x01681 <= v && v <= 0x0180D) return true;
-       if (0x0180F <= v && v <= 0x01FFF) return true;
-       if (0x0200B <= v && v <= 0x0200D) return true;
-       if (0x0202A <= v && v <= 0x0202E) return true;
-       if (0x0203F <= v && v <= 0x02040) return true;
-       if (                v == 0x02054) return true;
-       if (0x02060 <= v && v <= 0x0206F) return true;
-       if (0x02070 <= v && v <= 0x0218F) return true;
-       if (0x02460 <= v && v <= 0x024FF) return true;
-       if (0x02776 <= v && v <= 0x02793) return true;
-       if (0x02C00 <= v && v <= 0x02DFF) return true;
-       if (0x02E80 <= v && v <= 0x02FFF) return true;
-       if (0x03004 <= v && v <= 0x03007) return true;
-       if (0x03021 <= v && v <= 0x0302F) return true;
-       if (0x03031 <= v && v <= 0x0303F) return true;
-       if (0x03040 <= v && v <= 0x0D7FF) return true;
-       if (0x0F900 <= v && v <= 0x0FD3D) return true;
-       if (0x0FD40 <= v && v <= 0x0FDCF) return true;
-       if (0x0FDF0 <= v && v <= 0x0FE44) return true;
-       if (0x0FE47 <= v && v <= 0x0FFFD) return true;
-       if (0x10000 <= v && v <= 0x1FFFD) return true;
-       if (0x20000 <= v && v <= 0x2FFFD) return true;
-       if (0x30000 <= v && v <= 0x3FFFD) return true;
-       if (0x40000 <= v && v <= 0x4FFFD) return true;
-       if (0x50000 <= v && v <= 0x5FFFD) return true;
-       if (0x60000 <= v && v <= 0x6FFFD) return true;
-       if (0x70000 <= v && v <= 0x7FFFD) return true;
-       if (0x80000 <= v && v <= 0x8FFFD) return true;
-       if (0x90000 <= v && v <= 0x9FFFD) return true;
-       if (0xA0000 <= v && v <= 0xAFFFD) return true;
-       if (0xB0000 <= v && v <= 0xBFFFD) return true;
-       if (0xC0000 <= v && v <= 0xCFFFD) return true;
-       if (0xD0000 <= v && v <= 0xDFFFD) return true;
-       if (0xE0000 <= v && v <= 0xEFFFD) return true;
-       return false;
-}
-
-static bool is_universal_char_valid_identifier_start(utf32 const v)
-{
-       /* C11 Annex D.2 */
-       if (0x0300 <= v && v <= 0x036F) return false;
-       if (0x1DC0 <= v && v <= 0x1DFF) return false;
-       if (0x20D0 <= v && v <= 0x20FF) return false;
-       if (0xFE20 <= v && v <= 0xFE2F) return false;
-       return true;
-}
-
-/**
- * Read a symbol from the input and build
- * the lexer_token.
- */
-static void parse_symbol(void)
-{
-       while (true) {
-               switch (c) {
-               case DIGITS:
-               case SYMBOL_CHARS:
-                       obstack_1grow(&symbol_obstack, (char) c);
-                       next_char();
-                       break;
-
-               case '\\':
-                       next_char();
-                       switch (c) {
-                       {
-                               unsigned n;
-                       case 'U': n = 8; goto universal;
-                       case 'u': n = 4; goto universal;
-universal:
-                               next_char();
-                               utf32 const v = parse_universal_char(n);
-                               if (!is_universal_char_valid_identifier(v)) {
-                                       if (is_universal_char_valid(v)) {
-                                               errorf(&lexer_pos, "universal character \\%c%0*X is not valid in an identifier", n == 4 ? 'u' : 'U', (int)n, v);
-                                       }
-                               } else if (obstack_object_size(&symbol_obstack) == 0 && !is_universal_char_valid_identifier_start(v)) {
-                                       errorf(&lexer_pos, "universal character \\%c%0*X is not valid as start of an identifier", n == 4 ? 'u' : 'U', (int)n, v);
-                               } else {
-                                       obstack_grow_utf8(&symbol_obstack, v);
-                               }
-                               break;
-                       }
-
-                       default:
-                               put_back(c);
-                               c = '\\';
-                               goto end_symbol;
-                       }
-
-               default:
-dollar_sign:
-                       goto end_symbol;
-               }
-       }
-
-end_symbol:
-       obstack_1grow(&symbol_obstack, '\0');
-
-       char     *string = obstack_finish(&symbol_obstack);
-       symbol_t *symbol = symbol_table_insert(string);
-
-       lexer_token.kind        = symbol->ID;
-       lexer_token.base.symbol = symbol;
-
-       if (symbol->string != string) {
-               obstack_free(&symbol_obstack, string);
-       }
-}
-
-static string_t sym_make_string(string_encoding_t const enc)
-{
-       obstack_1grow(&symbol_obstack, '\0');
-       size_t const len    = obstack_object_size(&symbol_obstack) - 1;
-       char  *const string = obstack_finish(&symbol_obstack);
-
-       /* TODO hash */
-#if 0
-       const char *result = strset_insert(&stringset, concat);
-       if (result != concat) {
-               obstack_free(&symbol_obstack, concat);
-       }
-#else
-       const char *result = string;
-#endif
-       return (string_t){ result, len, enc };
-}
-
-static void parse_pp_number(void)
-{
-       for (;;) {
-               switch (c) {
-               case SYMBOL_CHARS_E_P:
-                       obstack_1grow(&symbol_obstack, (char)c);
-                       next_char();
-                       if (c == '+' || c == '-') {
-               case '.':
-               case DIGITS:
-               case SYMBOL_CHARS_WITHOUT_E_P:
-                               obstack_1grow(&symbol_obstack, (char)c);
-                               next_char();
-                       }
-                       break;
-
-               default:
-dollar_sign:
-                       lexer_token.kind           = T_NUMBER;
-                       lexer_token.literal.string = sym_make_string(STRING_ENCODING_CHAR);
-                       return;
-               }
-       }
-}
-
-/**
- * Returns true if the given char is a octal digit.
- *
- * @param char  the character to check
- */
-static bool is_octal_digit(utf32 chr)
-{
-       return '0' <= chr && chr <= '7';
-}
-
-/**
- * Returns the value of a digit.
- * The only portable way to do it ...
- */
-static int digit_value(utf32 const digit)
-{
-       switch (digit) {
-       case '0': return 0;
-       case '1': return 1;
-       case '2': return 2;
-       case '3': return 3;
-       case '4': return 4;
-       case '5': return 5;
-       case '6': return 6;
-       case '7': return 7;
-       case '8': return 8;
-       case '9': return 9;
-       case 'a':
-       case 'A': return 10;
-       case 'b':
-       case 'B': return 11;
-       case 'c':
-       case 'C': return 12;
-       case 'd':
-       case 'D': return 13;
-       case 'e':
-       case 'E': return 14;
-       case 'f':
-       case 'F': return 15;
-       default:
-               internal_error("wrong character given");
-       }
-}
-
-/**
- * Parses an octal character sequence.
- *
- * @param first_digit  the already read first digit
- */
-static utf32 parse_octal_sequence(utf32 const first_digit)
-{
-       assert(is_octal_digit(first_digit));
-       utf32 value = digit_value(first_digit);
-       if (!is_octal_digit(c)) return value;
-       value = 8 * value + digit_value(c);
-       next_char();
-       if (!is_octal_digit(c)) return value;
-       value = 8 * value + digit_value(c);
-       next_char();
-       return value;
-}
-
-/**
- * Parses a hex character sequence.
- */
-static utf32 parse_hex_sequence(void)
-{
-       utf32 value = 0;
-       while (isxdigit(c)) {
-               value = 16 * value + digit_value(c);
-               next_char();
-       }
-       return value;
-}
-
-/**
- * Parse an escape sequence.
- */
-static utf32 parse_escape_sequence(void)
-{
-       eat('\\');
-
-       utf32 const ec = c;
-       next_char();
-
-       switch (ec) {
-       case '"':  return '"';
-       case '\'': return '\'';
-       case '\\': return '\\';
-       case '?': return '\?';
-       case 'a': return '\a';
-       case 'b': return '\b';
-       case 'f': return '\f';
-       case 'n': return '\n';
-       case 'r': return '\r';
-       case 't': return '\t';
-       case 'v': return '\v';
-       case 'x':
-               return parse_hex_sequence();
-       case '0':
-       case '1':
-       case '2':
-       case '3':
-       case '4':
-       case '5':
-       case '6':
-       case '7':
-               return parse_octal_sequence(ec);
-       case EOF:
-               parse_error("reached end of file while parsing escape sequence");
-               return EOF;
-       /* \E is not documented, but handled, by GCC.  It is acceptable according
-        * to ยง6.11.4, whereas \e is not. */
-       case 'E':
-       case 'e':
-               if (c_mode & _GNUC)
-                       return 27;   /* hopefully 27 is ALWAYS the code for ESCAPE */
-               break;
-
-       case 'U': return parse_universal_char(8);
-       case 'u': return parse_universal_char(4);
-
-       default:
-               break;
-       }
-       /* ยง6.4.4.4:8 footnote 64 */
-       parse_error("unknown escape sequence");
-       return EOF;
-}
-
-string_t make_string(const char *string)
-{
-       obstack_grow(&symbol_obstack, string, strlen(string));
-       return sym_make_string(STRING_ENCODING_CHAR);
-}
-
-static void parse_string(utf32 const delim, token_kind_t const kind, string_encoding_t const enc, char const *const context)
-{
-       eat(delim);
-
-       while (true) {
-               switch (c) {
-               case '\\': {
-                       utf32 const tc = parse_escape_sequence();
-                       if (enc == STRING_ENCODING_CHAR) {
-                               if (tc >= 0x100) {
-                                       warningf(WARN_OTHER, &lexer_pos, "escape sequence out of range");
-                               }
-                               obstack_1grow(&symbol_obstack, tc);
-                       } else {
-                               obstack_grow_utf8(&symbol_obstack, tc);
-                       }
-                       break;
-               }
-
-               case NEWLINE:
-                       errorf(&lexer_pos, "newline while parsing %s", context);
-                       break;
-
-               case EOF:
-                       errorf(&lexer_token.base.source_position, "EOF while parsing %s", context);
-                       goto end_of_string;
-
-               default:
-                       if (c == delim) {
-                               next_char();
-                               goto end_of_string;
-                       } else {
-                               obstack_grow_utf8(&symbol_obstack, c);
-                               next_char();
-                               break;
-                       }
-               }
-       }
-
-end_of_string:
-       lexer_token.kind           = kind;
-       lexer_token.literal.string = sym_make_string(enc);
-}
-
-/**
- * Parse a string literal and set lexer_token.
- */
-static void parse_string_literal(string_encoding_t const enc)
-{
-       parse_string('"', T_STRING_LITERAL, enc, "string literal");
-}
-
-/**
- * Parse a character constant and set lexer_token.
- */
-static void parse_character_constant(string_encoding_t const enc)
-{
-       parse_string('\'', T_CHARACTER_CONSTANT, enc, "character constant");
-       if (lexer_token.literal.string.size == 0) {
-               errorf(&lexer_token.base.source_position, "empty character constant");
-       }
-}
-
-/**
- * Skip a multiline comment.
- */
-static void skip_multiline_comment(void)
-{
-       while (true) {
-               switch (c) {
-               case '/':
-                       next_char();
-                       if (c == '*') {
-                               /* nested comment, warn here */
-                               warningf(WARN_COMMENT, &lexer_pos, "'/*' within comment");
-                       }
-                       break;
-               case '*':
-                       next_char();
-                       if (c == '/') {
-                               next_char();
-                               return;
-                       }
-                       break;
-
-               case NEWLINE:
-                       break;
-
-               case EOF: {
-                       errorf(&lexer_token.base.source_position,
-                              "at end of file while looking for comment end");
-                       return;
-               }
-
-               default:
-                       next_char();
-                       break;
-               }
-       }
-}
-
-/**
- * Skip a single line comment.
- */
-static void skip_line_comment(void)
-{
-       while (true) {
-               switch (c) {
-               case EOF:
-                       return;
-
-               case '\n':
-               case '\r':
-                       return;
-
-               case '\\':
-                       next_char();
-                       if (c == '\n' || c == '\r') {
-                               warningf(WARN_COMMENT, &lexer_pos, "multi-line comment");
-                               return;
-                       }
-                       break;
-
-               default:
-                       next_char();
-                       break;
-               }
-       }
-}
-
-/** The current preprocessor token. */
-static token_t pp_token;
-
-/**
- * Read the next preprocessor token.
- */
-static inline void next_pp_token(void)
-{
-       lexer_next_preprocessing_token();
-       pp_token = lexer_token;
-}
-
-/**
- * Eat all preprocessor tokens until newline.
- */
-static void eat_until_newline(void)
-{
-       while (pp_token.kind != '\n' && pp_token.kind != T_EOF) {
-               next_pp_token();
-       }
-}
-
-/**
- * Parse the line directive.
- */
-static void parse_line_directive(void)
-{
-       if (pp_token.kind != T_NUMBER) {
-               parse_error("expected integer");
-       } else {
-               /* use offset -1 as this is about the next line */
-               char      *end;
-               long const line = strtol(pp_token.literal.string.begin, &end, 0);
-               if (*end == '\0') {
-                       lexer_pos.lineno = line - 1;
-               } else {
-                       errorf(&lexer_pos, "'%S' is not a valid line number", &pp_token.literal.string);
-               }
-               next_pp_token();
-       }
-       if (pp_token.kind == T_STRING_LITERAL && pp_token.literal.string.encoding == STRING_ENCODING_CHAR) {
-               lexer_pos.input_name       = pp_token.literal.string.begin;
-               lexer_pos.is_system_header = false;
-               next_pp_token();
-
-               /* attempt to parse numeric flags as outputted by gcc preprocessor */
-               while (pp_token.kind == T_NUMBER) {
-                       /* flags:
-                        * 1 - indicates start of a new file
-                        * 2 - indicates return from a file
-                        * 3 - indicates system header
-                        * 4 - indicates implicit extern "C" in C++ mode
-                        *
-                        * currently we're only interested in "3"
-                        */
-                       if (streq(pp_token.literal.string.begin, "3")) {
-                               lexer_pos.is_system_header = true;
-                       }
-                       next_pp_token();
-               }
-       }
-
-       eat_until_newline();
-}
-
-/**
- * STDC pragmas.
- */
-typedef enum stdc_pragma_kind_t {
-       STDC_UNKNOWN,
-       STDC_FP_CONTRACT,
-       STDC_FENV_ACCESS,
-       STDC_CX_LIMITED_RANGE
-} stdc_pragma_kind_t;
-
-/**
- * STDC pragma values.
- */
-typedef enum stdc_pragma_value_kind_t {
-       STDC_VALUE_UNKNOWN,
-       STDC_VALUE_ON,
-       STDC_VALUE_OFF,
-       STDC_VALUE_DEFAULT
-} stdc_pragma_value_kind_t;
-
-/**
- * Parse a pragma directive.
- */
-static void parse_pragma(void)
-{
-       next_pp_token();
-       if (pp_token.kind != T_IDENTIFIER) {
-               warningf(WARN_UNKNOWN_PRAGMAS, &pp_token.base.source_position,
-                        "expected identifier after #pragma");
-               eat_until_newline();
-               return;
-       }
-
-       stdc_pragma_kind_t kind = STDC_UNKNOWN;
-       if (pp_token.base.symbol->pp_ID == TP_STDC && c_mode & _C99) {
-               /* a STDC pragma */
-               next_pp_token();
-
-               switch (pp_token.base.symbol->pp_ID) {
-               case TP_FP_CONTRACT:      kind = STDC_FP_CONTRACT;      break;
-               case TP_FENV_ACCESS:      kind = STDC_FENV_ACCESS;      break;
-               case TP_CX_LIMITED_RANGE: kind = STDC_CX_LIMITED_RANGE; break;
-               default:                  break;
-               }
-               if (kind != STDC_UNKNOWN) {
-                       next_pp_token();
-                       stdc_pragma_value_kind_t value;
-                       switch (pp_token.base.symbol->pp_ID) {
-                       case TP_ON:      value = STDC_VALUE_ON;      break;
-                       case TP_OFF:     value = STDC_VALUE_OFF;     break;
-                       case TP_DEFAULT: value = STDC_VALUE_DEFAULT; break;
-                       default:         value = STDC_VALUE_UNKNOWN; break;
-                       }
-                       if (value == STDC_VALUE_UNKNOWN) {
-                               kind = STDC_UNKNOWN;
-                               errorf(&pp_token.base.source_position, "bad STDC pragma argument");
-                       }
-               }
-       }
-       eat_until_newline();
-       if (kind == STDC_UNKNOWN) {
-               warningf(WARN_UNKNOWN_PRAGMAS, &pp_token.base.source_position,
-                        "encountered unknown #pragma");
-       }
-}
-
-/**
- * Parse a preprocessor non-null directive.
- */
-static void parse_preprocessor_identifier(void)
-{
-       assert(pp_token.kind == T_IDENTIFIER);
-       switch (pp_token.base.symbol->pp_ID) {
-       case TP_line:
-               next_pp_token();
-               parse_line_directive();
-               break;
-       case TP_pragma:
-               parse_pragma();
-               break;
-       case TP_error:
-               /* TODO; output the rest of the line */
-               parse_error("#error directive");
-               break;
-       }
-}
-
-/**
- * Parse a preprocessor directive.
- */
-static void parse_preprocessor_directive(void)
-{
-       next_pp_token();
-
-       switch (pp_token.kind) {
-       case T_IDENTIFIER:
-               parse_preprocessor_identifier();
-               break;
-       case T_NUMBER:
-               parse_line_directive();
-               break;
-       case '\n':
-               /* NULL directive, see ยง6.10.7 */
-               break;
-       default:
-               parse_error("invalid preprocessor directive");
-               eat_until_newline();
-               break;
-       }
-}
-
-#define MAYBE_PROLOG                                       \
-                       next_char();                                   \
-                       while (true) {                                 \
-                               switch (c) {
-
-#define MAYBE(ch, set_type)                                \
-                               case ch:                                   \
-                                       next_char();                           \
-                                       lexer_token.kind = set_type;           \
-                                       return;
-
-/* must use this as last thing */
-#define MAYBE_MODE(ch, set_type, mode)                     \
-                               case ch:                                   \
-                                       if (c_mode & mode) {                   \
-                                               next_char();                       \
-                                               lexer_token.kind = set_type;       \
-                                               return;                            \
-                                       }                                      \
-                                       /* fallthrough */
-
-#define ELSE_CODE(code)                                    \
-                               default:                                   \
-                                       code                                   \
-                                       return;                                \
-                               }                                          \
-                       } /* end of while (true) */                    \
-
-#define ELSE(set_type)                                     \
-               ELSE_CODE(                                         \
-                       lexer_token.kind = set_type;                   \
-               )
-
-void lexer_next_preprocessing_token(void)
-{
-       while (true) {
-               lexer_token.base.source_position = lexer_pos;
-               lexer_token.base.symbol          = NULL;
-
-               switch (c) {
-               case ' ':
-               case '\t':
-                       next_char();
-                       break;
-
-               case NEWLINE:
-                       lexer_token.kind = '\n';
-                       return;
-
-               case SYMBOL_CHARS: {
-                       parse_symbol();
-                       /* might be a wide string ( L"string" ) */
-                       string_encoding_t const enc = STRING_ENCODING_WIDE;
-                       if (lexer_token.base.symbol == symbol_L) {
-                               switch (c) {
-                               case '"':  parse_string_literal(enc);     break;
-                               case '\'': parse_character_constant(enc); break;
-                               }
-                       }
-                       return;
-               }
-
-               case DIGITS:
-                       parse_pp_number();
-                       return;
-
-               case '"':
-                       parse_string_literal(STRING_ENCODING_CHAR);
-                       return;
-
-               case '\'':
-                       parse_character_constant(STRING_ENCODING_CHAR);
-                       return;
-
-               case '.':
-                       MAYBE_PROLOG
-                               case DIGITS:
-                                       put_back(c);
-                                       c = '.';
-                                       parse_pp_number();
-                                       return;
-
-                               case '.':
-                                       MAYBE_PROLOG
-                                       MAYBE('.', T_DOTDOTDOT)
-                                       ELSE_CODE(
-                                               put_back(c);
-                                               c = '.';
-                                               lexer_token.kind = '.';
-                                       )
-                       ELSE('.')
-               case '&':
-                       MAYBE_PROLOG
-                       MAYBE('&', T_ANDAND)
-                       MAYBE('=', T_ANDEQUAL)
-                       ELSE('&')
-               case '*':
-                       MAYBE_PROLOG
-                       MAYBE('=', T_ASTERISKEQUAL)
-                       ELSE('*')
-               case '+':
-                       MAYBE_PROLOG
-                       MAYBE('+', T_PLUSPLUS)
-                       MAYBE('=', T_PLUSEQUAL)
-                       ELSE('+')
-               case '-':
-                       MAYBE_PROLOG
-                       MAYBE('>', T_MINUSGREATER)
-                       MAYBE('-', T_MINUSMINUS)
-                       MAYBE('=', T_MINUSEQUAL)
-                       ELSE('-')
-               case '!':
-                       MAYBE_PROLOG
-                       MAYBE('=', T_EXCLAMATIONMARKEQUAL)
-                       ELSE('!')
-               case '/':
-                       MAYBE_PROLOG
-                       MAYBE('=', T_SLASHEQUAL)
-                               case '*':
-                                       next_char();
-                                       skip_multiline_comment();
-                                       lexer_next_preprocessing_token();
-                                       return;
-                               case '/':
-                                       next_char();
-                                       skip_line_comment();
-                                       lexer_next_preprocessing_token();
-                                       return;
-                       ELSE('/')
-               case '%':
-                       MAYBE_PROLOG
-                       MAYBE('>', '}')
-                       MAYBE('=', T_PERCENTEQUAL)
-                               case ':':
-                                       MAYBE_PROLOG
-                                               case '%':
-                                                       MAYBE_PROLOG
-                                                       MAYBE(':', T_HASHHASH)
-                                                       ELSE_CODE(
-                                                               put_back(c);
-                                                               c = '%';
-                                                               lexer_token.kind = '#';
-                                                       )
-                                       ELSE('#')
-                       ELSE('%')
-               case '<':
-                       MAYBE_PROLOG
-                       MAYBE(':', '[')
-                       MAYBE('%', '{')
-                       MAYBE('=', T_LESSEQUAL)
-                               case '<':
-                                       MAYBE_PROLOG
-                                       MAYBE('=', T_LESSLESSEQUAL)
-                                       ELSE(T_LESSLESS)
-                       ELSE('<')
-               case '>':
-                       MAYBE_PROLOG
-                       MAYBE('=', T_GREATEREQUAL)
-                               case '>':
-                                       MAYBE_PROLOG
-                                       MAYBE('=', T_GREATERGREATEREQUAL)
-                                       ELSE(T_GREATERGREATER)
-                       ELSE('>')
-               case '^':
-                       MAYBE_PROLOG
-                       MAYBE('=', T_CARETEQUAL)
-                       ELSE('^')
-               case '|':
-                       MAYBE_PROLOG
-                       MAYBE('=', T_PIPEEQUAL)
-                       MAYBE('|', T_PIPEPIPE)
-                       ELSE('|')
-               case ':':
-                       MAYBE_PROLOG
-                       MAYBE('>', ']')
-                       MAYBE_MODE(':', T_COLONCOLON, _CXX)
-                       ELSE(':')
-               case '=':
-                       MAYBE_PROLOG
-                       MAYBE('=', T_EQUALEQUAL)
-                       ELSE('=')
-               case '#':
-                       MAYBE_PROLOG
-                       MAYBE('#', T_HASHHASH)
-                       ELSE('#')
-
-               case '\\':
-                       next_char();
-                       if (c == 'U' || c == 'u') {
-                               put_back(c);
-                               c = '\\';
-                               parse_symbol();
-                       } else {
-                               lexer_token.kind = '\\';
-                       }
-                       return;
-
-               case '?':
-               case '[':
-               case ']':
-               case '(':
-               case ')':
-               case '{':
-               case '}':
-               case '~':
-               case ';':
-               case ',':
-                       lexer_token.kind = c;
-                       next_char();
-                       return;
-
-               case EOF:
-                       lexer_token.kind = T_EOF;
-                       return;
-
-               default:
-dollar_sign:
-                       errorf(&lexer_pos, "unknown character '%lc' found", c);
-                       next_char();
-                       break;
-               }
-       }
-}
-
-void lexer_next_token(void)
-{
-       lexer_next_preprocessing_token();
-
-       while (lexer_token.kind == '\n') {
-newline_found:
-               lexer_next_preprocessing_token();
-       }
-
-       if (lexer_token.kind == '#') {
-               parse_preprocessor_directive();
-               goto newline_found;
-       }
-}
-
-void init_lexer(void)
-{
-       strset_init(&stringset);
-       symbol_L = symbol_table_insert("L");
-}
-
-static void input_error(unsigned delta_lines, unsigned delta_cols,
-                        const char *message)
-{
-       lexer_pos.lineno += delta_lines;
-       lexer_pos.colno  += delta_cols;
-       errorf(&lexer_pos, "%s", message);
-}
-
-void lexer_switch_input(input_t *new_input, const char *input_name)
-{
-       lexer_pos.lineno     = 0;
-       lexer_pos.colno      = 0;
-       lexer_pos.input_name = input_name;
-
-       set_input_error_callback(input_error);
-       input  = new_input;
-       bufpos = NULL;
-       bufend = NULL;
-
-       /* place a virtual \n at the beginning so the lexer knows that we're
-        * at the beginning of a line */
-       c = '\n';
-}
-
-void exit_lexer(void)
-{
-       strset_destroy(&stringset);
-}
-
-static __attribute__((unused))
-void dbg_pos(const source_position_t source_position)
-{
-       fprintf(stdout, "%s:%u:%u\n", source_position.input_name,
-               source_position.lineno, (unsigned)source_position.colno);
-       fflush(stdout);
-}
diff --git a/lexer.h b/lexer.h
deleted file mode 100644 (file)
index c50b10c..0000000
--- a/lexer.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * 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.
- */
-#ifndef LEXER_H
-#define LEXER_H
-
-#include "symbol_table_t.h"
-#include "token_t.h"
-#include "input.h"
-
-extern token_t lexer_token;
-extern bool    allow_dollar_in_symbol;
-
-void lexer_next_token(void);
-
-/* for debugging */
-void lexer_next_preprocessing_token(void);
-
-void init_lexer(void);
-void exit_lexer(void);
-
-void lexer_switch_input(input_t *input, const char *input_name);
-
-string_t make_string(const char *str);
-
-#endif
diff --git a/main.c b/main.c
index 6b1a473..5641b4e 100644 (file)
--- a/main.c
+++ b/main.c
@@ -60,7 +60,7 @@
 #include <libfirm/firm.h>
 #include <libfirm/be.h>
 
-#include "lexer.h"
+#include "preprocessor.h"
 #include "token_t.h"
 #include "types.h"
 #include "type_hash.h"
@@ -180,26 +180,23 @@ static translation_unit_t *do_parsing(FILE *const in, const char *const input_na
 {
        start_parsing();
 
-       input_t *input = input_from_stream(in, input_encoding);
-       lexer_switch_input(input, input_name);
+       switch_input(in, input_name);
        parse();
        translation_unit_t *unit = finish_parsing();
-       input_free(input);
+       close_input();
 
        return unit;
 }
 
 static void lextest(FILE *in, const char *fname)
 {
-       input_t *input = input_from_stream(in, input_encoding);
-       lexer_switch_input(input, fname);
-
+       switch_input(in, fname);
        do {
-               lexer_next_preprocessing_token();
-               print_token(stdout, &lexer_token);
+               next_preprocessing_token();
+               print_token(stdout, &pp_token);
                putchar('\n');
-       } while (lexer_token.kind != T_EOF);
-       input_free(input);
+       } while (pp_token.kind != T_EOF);
+       close_input();
 }
 
 static void add_flag(struct obstack *obst, const char *format, ...)
@@ -1673,7 +1670,7 @@ int main(int argc, char **argv)
                init_wchar_types(type_short);
        else
                panic("unexpected wchar type");
-       init_lexer();
+       init_preprocessor();
        init_ast();
        init_parser();
        init_ast2firm();
@@ -2088,7 +2085,7 @@ graph_built:
        exit_ast2firm();
        exit_parser();
        exit_ast();
-       exit_lexer();
+       exit_preprocessor();
        exit_typehash();
        exit_types();
        exit_tokens();
index 8639a7a..53f8fa2 100644 (file)
--- a/parser.c
+++ b/parser.c
@@ -28,7 +28,7 @@
 #include "parser.h"
 #include "diagnostic.h"
 #include "format_check.h"
-#include "lexer.h"
+#include "preprocessor.h"
 #include "symbol_t.h"
 #include "token_t.h"
 #include "types.h"
@@ -467,8 +467,8 @@ static size_t label_top(void)
 static inline void next_token(void)
 {
        token                              = lookahead_buffer[lookahead_bufpos];
-       lookahead_buffer[lookahead_bufpos] = lexer_token;
-       lexer_next_token();
+       lookahead_buffer[lookahead_bufpos] = pp_token;
+       next_preprocessing_token();
 
        lookahead_bufpos = (lookahead_bufpos + 1) % MAX_LOOKAHEAD;
 
index 98c0e7d..40d3208 100644 (file)
@@ -6,6 +6,7 @@
 #include <stdbool.h>
 #include <ctype.h>
 
+#include "preprocessor.h"
 #include "token_t.h"
 #include "symbol_t.h"
 #include "adt/util.h"
@@ -91,8 +92,9 @@ static struct obstack  input_obstack;
 
 static pp_conditional_t *conditional_stack;
 
-static token_t           pp_token;
-static bool              resolve_escape_sequences = false;
+token_t                  pp_token;
+bool                     allow_dollar_in_symbol   = true;
+static bool              resolve_escape_sequences = true;
 static bool              error_on_unknown_chars   = true;
 static bool              skip_mode;
 static FILE             *out;
@@ -124,8 +126,6 @@ static symbol_t *symbol_percentcolon;
 static symbol_t *symbol_percentcolonpercentcolon;
 static symbol_t *symbol_percentgreater;
 
-extern bool      allow_dollar_in_symbol;
-
 static void init_symbols(void)
 {
        symbol_colongreater             = symbol_table_insert(":>");
@@ -136,7 +136,7 @@ static void init_symbols(void)
        symbol_percentgreater           = symbol_table_insert("%>");
 }
 
-static void switch_input(FILE *file, const char *filename)
+void switch_input(FILE *const file, char const *const filename)
 {
        input.file                = file;
        input.input               = input_from_stream(file, NULL);
@@ -154,17 +154,20 @@ static void switch_input(FILE *file, const char *filename)
        input.c               = '\n';
 }
 
-static void close_input(void)
+FILE* close_input(void)
 {
        input_free(input.input);
-       assert(input.file != NULL);
 
-       fclose(input.file);
+       FILE* const file = input.file;
+       assert(file);
+
        input.input  = NULL;
        input.file   = NULL;
        input.bufend = NULL;
        input.bufpos = NULL;
        input.c      = EOF;
+
+       return file;
 }
 
 static void push_input(void)
@@ -581,6 +584,12 @@ static string_t sym_make_string(string_encoding_t const enc)
        return (string_t){ result, len, enc };
 }
 
+string_t make_string(char const *const string)
+{
+       obstack_grow(&symbol_obstack, string, strlen(string));
+       return sym_make_string(STRING_ENCODING_CHAR);
+}
+
 static void parse_string(utf32 const delimiter, token_kind_t const kind,
                          string_encoding_t const enc,
                          char const *const context)
@@ -1290,7 +1299,7 @@ digraph_percentcolon:
 
        case EOF:
                if (input_stack != NULL) {
-                       close_input();
+                       fclose(close_input());
                        pop_restore_input();
                        fputc('\n', out);
                        if (input.c == (utf32)EOF)
@@ -1366,6 +1375,9 @@ static void print_quoted_string(const char *const string)
 
 static void print_line_directive(const source_position_t *pos, const char *add)
 {
+       if (!out)
+               return;
+
        fprintf(out, "# %u ", pos->lineno);
        print_quoted_string(pos->input_name);
        if (add != NULL) {
@@ -2108,7 +2120,7 @@ static void finish_current_argument(void)
        current_argument->token_list = obstack_finish(&pp_obstack);
 }
 
-static void next_preprocessing_token(void)
+void next_preprocessing_token(void)
 {
 restart:
        if (!expand_next()) {
@@ -2274,11 +2286,8 @@ static void setup_include_path(void)
        }
 }
 
-int pptest_main(int argc, char **argv);
-int pptest_main(int argc, char **argv)
+void init_preprocessor(void)
 {
-       init_symbol_table();
-       init_tokens();
        init_symbols();
 
        obstack_init(&config_obstack);
@@ -2286,9 +2295,27 @@ int pptest_main(int argc, char **argv)
        obstack_init(&input_obstack);
        strset_init(&stringset);
 
-       error_on_unknown_chars = false;
-
        setup_include_path();
+}
+
+void exit_preprocessor(void)
+{
+       obstack_free(&input_obstack, NULL);
+       obstack_free(&pp_obstack, NULL);
+       obstack_free(&config_obstack, NULL);
+
+       strset_destroy(&stringset);
+}
+
+int pptest_main(int argc, char **argv);
+int pptest_main(int argc, char **argv)
+{
+       init_symbol_table();
+       init_preprocessor();
+       init_tokens();
+
+       error_on_unknown_chars   = false;
+       resolve_escape_sequences = false;
 
        /* simplistic commandline parser */
        const char *filename = NULL;
@@ -2347,17 +2374,12 @@ int pptest_main(int argc, char **argv)
 
        fputc('\n', out);
        check_unclosed_conditionals();
-       close_input();
+       fclose(close_input());
        if (out != stdout)
                fclose(out);
 
-       obstack_free(&input_obstack, NULL);
-       obstack_free(&pp_obstack, NULL);
-       obstack_free(&config_obstack, NULL);
-
-       strset_destroy(&stringset);
-
        exit_tokens();
+       exit_preprocessor();
        exit_symbol_table();
 
        return 0;
diff --git a/preprocessor.h b/preprocessor.h
new file mode 100644 (file)
index 0000000..ce4002f
--- /dev/null
@@ -0,0 +1,22 @@
+#ifndef PREPROCESSOR_H
+#define PREPROCESSOR_H
+
+#include "token_t.h"
+
+void init_preprocessor(void);
+
+void exit_preprocessor(void);
+
+/** Switch input to another file. The current token is not changed. */
+void switch_input(FILE *file, char const *filename);
+
+FILE* close_input(void);
+
+void next_preprocessing_token(void);
+
+string_t make_string(char const *string);
+
+extern bool    allow_dollar_in_symbol;
+extern token_t pp_token;
+
+#endif
index b2b3414..54ef10c 100644 (file)
                        RelativePath="..\format_check.c"/>\r
                <File \r
                        RelativePath="..\format_check.h"/>\r
-               <File \r
-                       RelativePath="..\lexer.c"/>\r
-               <File \r
-                       RelativePath="..\lexer.h"/>\r
                <File \r
                        RelativePath="..\main.c"/>\r
                <File \r
index b8b0093..68fc319 100644 (file)
                                RelativePath="..\format_check.h"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\lexer.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\lexer.h"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="..\main.c"\r
                                >\r