*/
#include <config.h>
+#include "adt/strutil.h"
+#include "input.h"
#include "diagnostic.h"
#include "lexer.h"
#include "symbol_t.h"
#include <strings.h>
#endif
-//#define DEBUG_CHARS
-#define MAX_PUTBACK 3
+#define MAX_PUTBACK 16 // 3 would be enough, but 16 gives a nicer alignment
#define BUF_SIZE 1024
-#if defined(_WIN32) || defined(__CYGWIN__)
-/* No strtold on windows and no replacement yet */
-#define strtold(s, e) strtod(s, e)
-#endif
-
-typedef unsigned int utf32;
-
-static utf32 c;
-token_t lexer_token;
-symbol_t *symbol_L;
-static FILE *input;
-static utf32 buf[BUF_SIZE + MAX_PUTBACK];
-static const utf32 *bufend;
-static const utf32 *bufpos;
-static strset_t stringset;
-bool allow_dollar_in_symbol = true;
+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.
*/
static void parse_error(const char *msg)
{
- errorf(&lexer_token.source_position, "%s", msg);
+ errorf(&lexer_pos, "%s", msg);
}
/**
*/
static NORETURN internal_error(const char *msg)
{
- internal_errorf(&lexer_token.source_position, "%s", msg);
-}
-
-static size_t read_block(unsigned char *const read_buf, size_t const n)
-{
- size_t const s = fread(read_buf, 1, n, input);
- if (s == 0) {
- if (ferror(input))
- parse_error("read from input failed");
- buf[MAX_PUTBACK] = EOF;
- bufpos = buf + MAX_PUTBACK;
- bufend = buf + MAX_PUTBACK + 1;
- }
- return s;
-}
-
-static void decode_iso_8859_1(void)
-{
- unsigned char read_buf[BUF_SIZE];
- size_t const s = read_block(read_buf, sizeof(read_buf));
- if (s == 0)
- return;
-
- unsigned char const *src = read_buf;
- unsigned char const *end = read_buf + s;
- utf32 *dst = buf + MAX_PUTBACK;
- while (src != end)
- *dst++ = *src++;
-
- bufpos = buf + MAX_PUTBACK;
- bufend = dst;
-}
-
-static void decode_iso_8859_15(void)
-{
- unsigned char read_buf[BUF_SIZE];
- size_t const s = read_block(read_buf, sizeof(read_buf));
- if (s == 0)
- return;
-
- unsigned char const *src = read_buf;
- unsigned char const *end = read_buf + s;
- utf32 *dst = buf + MAX_PUTBACK;
- while (src != end) {
- utf32 tc = *src++;
- switch (tc) {
- case 0xA4: tc = 0x20AC; break; // €
- case 0xA6: tc = 0x0160; break; // Š
- case 0xA8: tc = 0x0161; break; // š
- case 0xB4: tc = 0x017D; break; // Ž
- case 0xB8: tc = 0x017E; break; // ž
- case 0xBC: tc = 0x0152; break; // Œ
- case 0xBD: tc = 0x0153; break; // œ
- case 0xBE: tc = 0x0178; break; // Ÿ
- }
- *dst++ = tc;
- }
-
- bufpos = buf + MAX_PUTBACK;
- bufend = dst;
-}
-
-static void decode_utf8(void)
-{
- static utf32 part_decoded_min_code;
- static utf32 part_decoded_char;
- static size_t part_decoded_rest_len;
-
- do {
- unsigned char read_buf[BUF_SIZE];
- size_t const s = read_block(read_buf, sizeof(read_buf));
- if (s == 0) {
- if (part_decoded_rest_len > 0)
- parse_error("incomplete input char at end of input");
- return;
- }
-
- unsigned char const *src = read_buf;
- unsigned char const *end = read_buf + s;
- utf32 *dst = buf + MAX_PUTBACK;
- utf32 decoded;
- utf32 min_code;
-
- if (part_decoded_rest_len != 0) {
- min_code = part_decoded_min_code;
- decoded = part_decoded_char;
- size_t const rest_len = part_decoded_rest_len;
- part_decoded_rest_len = 0;
- switch (rest_len) {
- case 4: goto realign;
- case 3: goto three_more;
- case 2: goto two_more;
- default: goto one_more;
- }
- }
-
- while (src != end) {
- if ((*src & 0x80) == 0) {
- decoded = *src++;
- } else if ((*src & 0xE0) == 0xC0) {
- min_code = 0x80;
- decoded = *src++ & 0x1F;
-one_more:
- if (src == end) {
- part_decoded_min_code = min_code;
- part_decoded_char = decoded;
- part_decoded_rest_len = 1;
- break;
- }
- if ((*src & 0xC0) == 0x80) {
- decoded = (decoded << 6) | (*src++ & 0x3F);
- } else {
- goto invalid_char;
- }
- if (decoded < min_code ||
- decoded > 0x10FFFF ||
- (0xD800 <= decoded && decoded < 0xE000) || // high/low surrogates
- (0xFDD0 <= decoded && decoded < 0xFDF0) || // noncharacters
- (decoded & 0xFFFE) == 0xFFFE) { // noncharacters
- parse_error("invalid byte sequence in input");
- }
- } else if ((*src & 0xF0) == 0xE0) {
- min_code = 0x800;
- decoded = *src++ & 0x0F;
-two_more:
- if (src == end) {
- part_decoded_min_code = min_code;
- part_decoded_char = decoded;
- part_decoded_rest_len = 2;
- break;
- }
- if ((*src & 0xC0) == 0x80) {
- decoded = (decoded << 6) | (*src++ & 0x3F);
- } else {
- goto invalid_char;
- }
- goto one_more;
- } else if ((*src & 0xF8) == 0xF0) {
- min_code = 0x10000;
- decoded = *src++ & 0x07;
-three_more:
- if (src == end) {
- part_decoded_min_code = min_code;
- part_decoded_char = decoded;
- part_decoded_rest_len = 3;
- break;
- }
- if ((*src & 0xC0) == 0x80) {
- decoded = (decoded << 6) | (*src++ & 0x3F);
- } else {
- goto invalid_char;
- }
- goto two_more;
- } else {
-invalid_char:
- parse_error("invalid byte sequence in input");
-realign:
- do {
- ++src;
- if (src == end) {
- part_decoded_rest_len = 4;
- break;
- }
- } while ((*src & 0xC0) == 0x80 || (*src & 0xF8) == 0xF8);
- continue;
- }
- *dst++ = decoded;
- }
-
- bufpos = buf + MAX_PUTBACK;
- bufend = dst;
- } while (bufpos == bufend);
-}
-
-static void decode_windows_1252(void)
-{
- unsigned char read_buf[BUF_SIZE];
- size_t const s = read_block(read_buf, sizeof(read_buf));
- if (s == 0)
- return;
-
- unsigned char const *src = read_buf;
- unsigned char const *end = read_buf + s;
- utf32 *dst = buf + MAX_PUTBACK;
- while (src != end) {
- utf32 tc = *src++;
- switch (tc) {
- case 0x80: tc = 0x20AC; break; // €
- case 0x82: tc = 0x201A; break; // ‚
- case 0x83: tc = 0x0192; break; // ƒ
- case 0x84: tc = 0x201E; break; // „
- case 0x85: tc = 0x2026; break; // …
- case 0x86: tc = 0x2020; break; // †
- case 0x87: tc = 0x2021; break; // ‡
- case 0x88: tc = 0x02C6; break; // ˆ
- case 0x89: tc = 0x2030; break; // ‰
- case 0x8A: tc = 0x0160; break; // Š
- case 0x8B: tc = 0x2039; break; // ‹
- case 0x8C: tc = 0x0152; break; // Œ
- case 0x8E: tc = 0x017D; break; // Ž
- case 0x91: tc = 0x2018; break; // ‘
- case 0x92: tc = 0x2019; break; // ’
- case 0x93: tc = 0x201C; break; // “
- case 0x94: tc = 0x201D; break; // ”
- case 0x95: tc = 0x2022; break; // •
- case 0x96: tc = 0x2013; break; // –
- case 0x97: tc = 0x2014; break; // —
- case 0x98: tc = 0x02DC; break; // ˜
- case 0x99: tc = 0x2122; break; // ™
- case 0x9A: tc = 0x0161; break; // š
- case 0x9B: tc = 0x203A; break; // ›
- case 0x9C: tc = 0x0153; break; // œ
- case 0x9E: tc = 0x017E; break; // ž
- case 0x9F: tc = 0x0178; break; // Ÿ
- }
- *dst++ = tc;
- }
-
- bufpos = buf + MAX_PUTBACK;
- bufend = dst;
-}
-
-typedef void (*decoder_t)(void);
-
-static decoder_t decoder = decode_utf8;
-
-typedef struct named_decoder_t {
- char const *name;
- decoder_t decoder;
-} named_decoder_t;
-
-static named_decoder_t const decoders[] = {
- { "CP819", decode_iso_8859_1 }, // offical alias
- { "IBM819", decode_iso_8859_1 }, // offical alias
- { "ISO-8859-1", decode_iso_8859_1 }, // offical alias
- { "ISO-8859-15", decode_iso_8859_15 }, // offical name
- { "ISO8859-1", decode_iso_8859_1 },
- { "ISO8859-15", decode_iso_8859_15 },
- { "ISO_8859-1", decode_iso_8859_1 }, // offical alias
- { "ISO_8859-15", decode_iso_8859_15 }, // offical alias
- { "ISO_8859-1:1987", decode_iso_8859_1 }, // offical name
- { "Latin-9", decode_iso_8859_15 }, // offical alias
- { "UTF-8", decode_utf8 }, // offical name
- { "csISOLatin1", decode_iso_8859_1 }, // offical alias
- { "cp1252", decode_windows_1252 },
- { "iso-ir-100", decode_iso_8859_1 }, // offical alias
- { "l1", decode_iso_8859_1 }, // offical alias
- { "latin1", decode_iso_8859_1 }, // offical alias
- { "windows-1252", decode_windows_1252 }, // official name
-
- { NULL, NULL }
-};
-
-void select_input_encoding(char const* const encoding)
-{
- for (named_decoder_t const *i = decoders; i->name != NULL; ++i) {
- if (strcasecmp(encoding, i->name) != 0)
- continue;
- decoder = i->decoder;
- return;
- }
- fprintf(stderr, "error: input encoding \"%s\" not supported\n", encoding);
+ internal_errorf(&lexer_pos, "%s", msg);
}
static inline void next_real_char(void)
{
assert(bufpos <= bufend);
if (bufpos >= bufend) {
- if (input == NULL) {
+ size_t n = decode(input, input_buf+MAX_PUTBACK, BUF_SIZE);
+ if (n == 0) {
c = EOF;
return;
}
- decoder();
+ bufpos = input_buf + MAX_PUTBACK;
+ bufend = bufpos + n;
}
c = *bufpos++;
+ ++lexer_pos.colno;
}
/**
*/
static inline void put_back(utf32 const pc)
{
- assert(bufpos > buf);
- *(--bufpos - buf + buf) = pc;
-
-#ifdef DEBUG_CHARS
- printf("putback '%lc'\n", pc);
-#endif
+ *(--bufpos - input_buf + input_buf) = pc;
+ --lexer_pos.colno;
}
static inline void next_char(void);
-#define MATCH_NEWLINE(code) \
- case '\r': \
- next_char(); \
- if(c == '\n') { \
- next_char(); \
- } \
- lexer_token.source_position.linenr++; \
- code \
- case '\n': \
- next_char(); \
- lexer_token.source_position.linenr++; \
+#define MATCH_NEWLINE(code) \
+ case '\r': \
+ next_char(); \
+ if (c == '\n') { \
+ case '\n': \
+ next_char(); \
+ } \
+ lexer_pos.lineno++; \
+ lexer_pos.colno = 1; \
code
-#define eat(c_type) do { assert(c == c_type); next_char(); } while(0)
+#define eat(c_type) (assert(c == c_type), next_char())
static void maybe_concat_lines(void)
{
eat('\\');
- switch(c) {
+ switch (c) {
MATCH_NEWLINE(return;)
default:
next_real_char();
/* filter trigraphs */
- if(UNLIKELY(c == '\\')) {
+ if (UNLIKELY(c == '\\')) {
maybe_concat_lines();
- goto end_of_next_char;
+ return;
}
- if(LIKELY(c != '?'))
- goto end_of_next_char;
+ if (LIKELY(c != '?'))
+ return;
next_real_char();
- if(LIKELY(c != '?')) {
+ if (LIKELY(c != '?')) {
put_back(c);
c = '?';
- goto end_of_next_char;
+ return;
}
next_real_char();
- switch(c) {
+ switch (c) {
case '=': c = '#'; break;
case '(': c = '['; break;
case '/': c = '\\'; maybe_concat_lines(); break;
c = '?';
break;
}
-
-end_of_next_char:;
-#ifdef DEBUG_CHARS
- printf("nchar '%c'\n", c);
-#endif
}
#define SYMBOL_CHARS \
*/
static void parse_symbol(void)
{
- symbol_t *symbol;
- char *string;
-
obstack_1grow(&symbol_obstack, (char) c);
next_char();
- while(1) {
- switch(c) {
+ while (true) {
+ switch (c) {
DIGITS
SYMBOL_CHARS
obstack_1grow(&symbol_obstack, (char) c);
end_symbol:
obstack_1grow(&symbol_obstack, '\0');
- string = obstack_finish(&symbol_obstack);
- symbol = symbol_table_insert(string);
+ char *string = obstack_finish(&symbol_obstack);
+ symbol_t *symbol = symbol_table_insert(string);
- lexer_token.type = symbol->ID;
- lexer_token.v.symbol = symbol;
+ lexer_token.kind = symbol->ID;
+ lexer_token.identifier.symbol = symbol;
- if(symbol->string != string) {
+ if (symbol->string != string) {
obstack_free(&symbol_obstack, string);
}
}
-static void parse_integer_suffix(bool is_oct_hex)
-{
- bool is_unsigned = false;
- bool min_long = false;
- bool min_longlong = false;
- bool not_traditional = false;
- int pos = 0;
- char suffix[4];
-
- if (c == 'U' || c == 'u') {
- not_traditional = true;
- suffix[pos++] = toupper(c);
- is_unsigned = true;
- next_char();
- if (c == 'L' || c == 'l') {
- suffix[pos++] = toupper(c);
- min_long = true;
- next_char();
- if (c == 'L' || c == 'l') {
- suffix[pos++] = toupper(c);
- min_longlong = true;
- next_char();
- }
- }
- } else if (c == 'l' || c == 'L') {
- suffix[pos++] = toupper(c);
- min_long = true;
- next_char();
- if (c == 'l' || c == 'L') {
- not_traditional = true;
- suffix[pos++] = toupper(c);
- min_longlong = true;
- next_char();
- if (c == 'u' || c == 'U') {
- suffix[pos++] = toupper(c);
- is_unsigned = true;
- next_char();
- }
- } else if (c == 'u' || c == 'U') {
- not_traditional = true;
- suffix[pos++] = toupper(c);
- is_unsigned = true;
- next_char();
- lexer_token.datatype = type_unsigned_long;
- }
- }
-
- if (warning.traditional && not_traditional) {
- suffix[pos] = '\0';
- warningf(&lexer_token.source_position,
- "traditional C rejects the '%s' suffix", suffix);
- }
- if (!is_unsigned) {
- long long v = lexer_token.v.intvalue;
- if (!min_long) {
- if (v >= TARGET_INT_MIN && v <= TARGET_INT_MAX) {
- lexer_token.datatype = type_int;
- return;
- } else if (is_oct_hex && v >= 0 && v <= TARGET_UINT_MAX) {
- lexer_token.datatype = type_unsigned_int;
- return;
- }
- }
- if (!min_longlong) {
- if (v >= TARGET_LONG_MIN && v <= TARGET_LONG_MAX) {
- lexer_token.datatype = type_long;
- return;
- } else if (is_oct_hex && v >= 0 && (unsigned long long)v <= (unsigned long long)TARGET_ULONG_MAX) {
- lexer_token.datatype = type_unsigned_long;
- return;
- }
- }
- unsigned long long uv = (unsigned long long) v;
- if (is_oct_hex && uv > (unsigned long long) TARGET_LONGLONG_MAX) {
- lexer_token.datatype = type_unsigned_long_long;
- return;
- }
-
- lexer_token.datatype = type_long_long;
- } else {
- unsigned long long v = (unsigned long long) lexer_token.v.intvalue;
- if (!min_long && v <= TARGET_UINT_MAX) {
- lexer_token.datatype = type_unsigned_int;
- return;
- }
- if (!min_longlong && v <= TARGET_ULONG_MAX) {
- lexer_token.datatype = type_unsigned_long;
- return;
- }
- lexer_token.datatype = type_unsigned_long_long;
- }
-}
-
-static void parse_floating_suffix(void)
+static string_t identify_string(char *string, size_t len)
{
- switch(c) {
- /* TODO: do something useful with the suffixes... */
- case 'f':
- case 'F':
- if (warning.traditional) {
- warningf(&lexer_token.source_position,
- "traditional C rejects the 'F' suffix");
- }
- next_char();
- lexer_token.datatype = type_float;
- break;
- case 'l':
- case 'L':
- if (warning.traditional) {
- warningf(&lexer_token.source_position,
- "traditional C rejects the 'F' suffix");
- }
- next_char();
- lexer_token.datatype = type_long_double;
- break;
- default:
- lexer_token.datatype = type_double;
- break;
+ /* 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};
}
/**
- * A replacement for strtoull. Only those parts needed for
- * our parser are implemented.
+ * parse suffixes like 'LU' or 'f' after numbers
*/
-static unsigned long long parse_int_string(const char *s, const char **endptr, int base)
+static void parse_number_suffix(void)
{
- unsigned long long v = 0;
-
- switch (base) {
- case 16:
- for (;; ++s) {
- /* check for overrun */
- if (v >= 0x1000000000000000ULL)
- break;
- switch (tolower(*s)) {
- case '0': v <<= 4; break;
- case '1': v <<= 4; v |= 0x1; break;
- case '2': v <<= 4; v |= 0x2; break;
- case '3': v <<= 4; v |= 0x3; break;
- case '4': v <<= 4; v |= 0x4; break;
- case '5': v <<= 4; v |= 0x5; break;
- case '6': v <<= 4; v |= 0x6; break;
- case '7': v <<= 4; v |= 0x7; break;
- case '8': v <<= 4; v |= 0x8; break;
- case '9': v <<= 4; v |= 0x9; break;
- case 'a': v <<= 4; v |= 0xa; break;
- case 'b': v <<= 4; v |= 0xb; break;
- case 'c': v <<= 4; v |= 0xc; break;
- case 'd': v <<= 4; v |= 0xd; break;
- case 'e': v <<= 4; v |= 0xe; break;
- case 'f': v <<= 4; v |= 0xf; break;
- default:
- goto end;
- }
- }
- break;
- case 8:
- for (;; ++s) {
- /* check for overrun */
- if (v >= 0x2000000000000000ULL)
- break;
- switch (tolower(*s)) {
- case '0': v <<= 3; break;
- case '1': v <<= 3; v |= 1; break;
- case '2': v <<= 3; v |= 2; break;
- case '3': v <<= 3; v |= 3; break;
- case '4': v <<= 3; v |= 4; break;
- case '5': v <<= 3; v |= 5; break;
- case '6': v <<= 3; v |= 6; break;
- case '7': v <<= 3; v |= 7; break;
- default:
- goto end;
- }
- }
- break;
- case 10:
- for (;; ++s) {
- /* check for overrun */
- if (v > 0x1999999999999999ULL)
- break;
- switch (tolower(*s)) {
- case '0': v *= 10; break;
- case '1': v *= 10; v += 1; break;
- case '2': v *= 10; v += 2; break;
- case '3': v *= 10; v += 3; break;
- case '4': v *= 10; v += 4; break;
- case '5': v *= 10; v += 5; break;
- case '6': v *= 10; v += 6; break;
- case '7': v *= 10; v += 7; break;
- case '8': v *= 10; v += 8; break;
- case '9': v *= 10; v += 9; break;
- default:
- goto end;
- }
+ assert(obstack_object_size(&symbol_obstack) == 0);
+ while (true) {
+ switch (c) {
+ SYMBOL_CHARS
+ obstack_1grow(&symbol_obstack, (char) c);
+ next_char();
+ break;
+ default:
+ dollar_sign:
+ goto finish_suffix;
}
- break;
- default:
- assert(0);
- break;
}
-end:
- *endptr = s;
- return v;
+finish_suffix:
+ if (obstack_object_size(&symbol_obstack) == 0) {
+ lexer_token.number.suffix.begin = NULL;
+ lexer_token.number.suffix.size = 0;
+ return;
+ }
+
+ obstack_1grow(&symbol_obstack, '\0');
+ size_t size = obstack_object_size(&symbol_obstack);
+ char *string = obstack_finish(&symbol_obstack);
+
+ lexer_token.number.suffix = identify_string(string, size);
}
/**
*/
static void parse_number_hex(void)
{
- bool is_float = false;
- assert(c == 'x' || c == 'X');
- next_char();
-
- obstack_1grow(&symbol_obstack, '0');
- obstack_1grow(&symbol_obstack, 'x');
+ bool is_float = false;
+ bool has_digits = false;
- while(isxdigit(c)) {
+ assert(obstack_object_size(&symbol_obstack) == 0);
+ while (isxdigit(c)) {
+ has_digits = true;
obstack_1grow(&symbol_obstack, (char) c);
next_char();
}
if (c == '.') {
+ is_float = true;
obstack_1grow(&symbol_obstack, (char) c);
next_char();
while (isxdigit(c)) {
+ has_digits = true;
obstack_1grow(&symbol_obstack, (char) c);
next_char();
}
- is_float = true;
}
if (c == 'p' || c == 'P') {
+ is_float = true;
obstack_1grow(&symbol_obstack, (char) c);
next_char();
obstack_1grow(&symbol_obstack, (char) c);
next_char();
}
- is_float = true;
+ } else if (is_float) {
+ errorf(&lexer_token.base.source_position,
+ "hexadecimal floatingpoint constant requires an exponent");
}
-
obstack_1grow(&symbol_obstack, '\0');
- char *string = obstack_finish(&symbol_obstack);
- if(*string == '\0') {
- parse_error("invalid hex number");
- lexer_token.type = T_ERROR;
- obstack_free(&symbol_obstack, string);
- return;
- }
- if (is_float) {
- char *endptr;
- lexer_token.type = T_FLOATINGPOINT;
- lexer_token.v.floatvalue = strtold(string, &endptr);
+ size_t size = obstack_object_size(&symbol_obstack) - 1;
+ char *string = obstack_finish(&symbol_obstack);
+ lexer_token.number.number = identify_string(string, size);
- if(*endptr != '\0') {
- parse_error("invalid hex float literal");
- }
+ lexer_token.kind =
+ is_float ? T_FLOATINGPOINT_HEXADECIMAL : T_INTEGER_HEXADECIMAL;
- parse_floating_suffix();
- } else {
- const char *endptr;
- lexer_token.type = T_INTEGER;
- lexer_token.v.intvalue = parse_int_string(string + 2, &endptr, 16);
- if(*endptr != '\0') {
- parse_error("hex number literal too long");
- }
- parse_integer_suffix(true);
+ if (!has_digits) {
+ errorf(&lexer_token.base.source_position,
+ "invalid number literal '0x%S'", &lexer_token.number.number);
+ lexer_token.number.number.begin = "0";
+ lexer_token.number.number.size = 1;
}
- obstack_free(&symbol_obstack, string);
+ parse_number_suffix();
}
/**
*
* @param char the character to check
*/
-static inline bool is_octal_digit(utf32 chr)
+static bool is_octal_digit(utf32 chr)
{
- switch(chr) {
- case '0':
- case '1':
- case '2':
- case '3':
- case '4':
- case '5':
- case '6':
- case '7':
- return true;
- default:
- return false;
- }
+ return '0' <= chr && chr <= '7';
}
/**
- * Parses a octal number and set the lexer_token.
+ * Parses a number and sets the lexer_token.
*/
-static void parse_number_oct(void)
+static void parse_number(void)
{
- while(is_octal_digit(c)) {
- obstack_1grow(&symbol_obstack, (char) c);
- next_char();
- }
- obstack_1grow(&symbol_obstack, '\0');
- char *string = obstack_finish(&symbol_obstack);
+ bool is_float = false;
+ bool has_digits = false;
- const char *endptr;
- lexer_token.type = T_INTEGER;
- lexer_token.v.intvalue = parse_int_string(string, &endptr, 8);
- if(*endptr != '\0') {
- parse_error("octal number literal too long");
+ assert(obstack_object_size(&symbol_obstack) == 0);
+ if (c == '0') {
+ next_char();
+ if (c == 'x' || c == 'X') {
+ next_char();
+ parse_number_hex();
+ return;
+ } else {
+ has_digits = true;
+ }
+ obstack_1grow(&symbol_obstack, '0');
}
- obstack_free(&symbol_obstack, string);
- parse_integer_suffix(true);
-}
-
-/**
- * Parses a decimal including float number and set the
- * lexer_token.
- */
-static void parse_number_dec(void)
-{
- bool is_float = false;
while (isdigit(c)) {
+ has_digits = true;
obstack_1grow(&symbol_obstack, (char) c);
next_char();
}
if (c == '.') {
+ is_float = true;
obstack_1grow(&symbol_obstack, '.');
next_char();
while (isdigit(c)) {
+ has_digits = true;
obstack_1grow(&symbol_obstack, (char) c);
next_char();
}
- is_float = true;
}
- if(c == 'e' || c == 'E') {
- obstack_1grow(&symbol_obstack, (char) c);
+ if (c == 'e' || c == 'E') {
+ is_float = true;
+ obstack_1grow(&symbol_obstack, 'e');
next_char();
- if(c == '-' || c == '+') {
+ if (c == '-' || c == '+') {
obstack_1grow(&symbol_obstack, (char) c);
next_char();
}
- while(isdigit(c)) {
+ while (isdigit(c)) {
obstack_1grow(&symbol_obstack, (char) c);
next_char();
}
- is_float = true;
}
obstack_1grow(&symbol_obstack, '\0');
- char *string = obstack_finish(&symbol_obstack);
+ size_t size = obstack_object_size(&symbol_obstack) - 1;
+ char *string = obstack_finish(&symbol_obstack);
+ lexer_token.number.number = identify_string(string, size);
- if(is_float) {
- char *endptr;
- lexer_token.type = T_FLOATINGPOINT;
- lexer_token.v.floatvalue = strtold(string, &endptr);
-
- if(*endptr != '\0') {
- parse_error("invalid number literal");
+ /* is it an octal number? */
+ if (is_float) {
+ lexer_token.kind = T_FLOATINGPOINT;
+ } else if (string[0] == '0') {
+ lexer_token.kind = T_INTEGER_OCTAL;
+
+ /* check for invalid octal digits */
+ for (size_t i= 0; i < size; ++i) {
+ char t = string[i];
+ if (t >= '8')
+ errorf(&lexer_token.base.source_position,
+ "invalid digit '%c' in octal number", t);
}
-
- parse_floating_suffix();
} else {
- const char *endptr;
- lexer_token.type = T_INTEGER;
- lexer_token.v.intvalue = parse_int_string(string, &endptr, 10);
-
- if(*endptr != '\0') {
- parse_error("invalid number literal");
- }
-
- parse_integer_suffix(false);
+ lexer_token.kind = T_INTEGER;
}
- obstack_free(&symbol_obstack, string);
-}
-/**
- * Parses a number and sets the lexer_token.
- */
-static void parse_number(void)
-{
- if (c == '0') {
- next_char();
- switch (c) {
- case 'X':
- case 'x':
- parse_number_hex();
- break;
- case '0':
- case '1':
- case '2':
- case '3':
- case '4':
- case '5':
- case '6':
- case '7':
- parse_number_oct();
- break;
- case '8':
- case '9':
- next_char();
- parse_error("invalid octal number");
- lexer_token.type = T_ERROR;
- return;
- case '.':
- case 'e':
- case 'E':
- default:
- obstack_1grow(&symbol_obstack, '0');
- parse_number_dec();
- return;
- }
- } else {
- parse_number_dec();
+ if (!has_digits) {
+ errorf(&lexer_token.base.source_position, "invalid number literal '%S'",
+ &lexer_token.number.number);
}
+
+ parse_number_suffix();
}
/**
static utf32 parse_hex_sequence(void)
{
utf32 value = 0;
- while(isxdigit(c)) {
+ while (isxdigit(c)) {
value = 16 * value + digit_value(c);
next_char();
}
case 'e':
if (c_mode & _GNUC)
return 27; /* hopefully 27 is ALWAYS the code for ESCAPE */
- /* FALLTHROUGH */
- default:
- /* §6.4.4.4:8 footnote 64 */
- parse_error("unknown escape sequence");
+ break;
+ case 'u':
+ case 'U':
+ parse_error("universal character parsing not implemented yet");
return EOF;
+ default:
+ break;
}
+ /* §6.4.4.4:8 footnote 64 */
+ parse_error("unknown escape sequence");
+ return EOF;
}
/**
memcpy(concat, s1->begin, len1);
memcpy(concat + len1, s2->begin, len2 + 1);
- if (warning.traditional) {
- warningf(&lexer_token.source_position,
- "traditional C rejects string constant concatenation");
- }
-#if 0 /* TODO hash */
- const char *result = strset_insert(&stringset, concat);
- if(result != concat) {
- obstack_free(&symbol_obstack, concat);
- }
-
- return result;
-#else
- return (string_t){ concat, len1 + len2 + 1 };
-#endif
+ return identify_string(concat, len1 + len2 + 1);
}
-/**
- * Concatenate a string and a wide string.
- */
-wide_string_t concat_string_wide_string(const string_t *const s1, const wide_string_t *const s2)
+string_t make_string(const char *string)
{
- const size_t len1 = s1->size - 1;
- const size_t len2 = s2->size - 1;
-
- wchar_rep_t *const concat = obstack_alloc(&symbol_obstack, (len1 + len2 + 1) * sizeof(*concat));
- const char *const src = s1->begin;
- for (size_t i = 0; i != len1; ++i) {
- concat[i] = src[i];
- }
- memcpy(concat + len1, s2->begin, (len2 + 1) * sizeof(*concat));
- if (warning.traditional) {
- warningf(&lexer_token.source_position,
- "traditional C rejects string constant concatenation");
- }
+ size_t len = strlen(string) + 1;
+ char *const space = obstack_alloc(&symbol_obstack, len);
+ memcpy(space, string, len);
- return (wide_string_t){ concat, len1 + len2 + 1 };
-}
-
-/**
- * Concatenate two wide strings.
- */
-wide_string_t concat_wide_strings(const wide_string_t *const s1, const wide_string_t *const s2)
-{
- const size_t len1 = s1->size - 1;
- const size_t len2 = s2->size - 1;
-
- wchar_rep_t *const concat = obstack_alloc(&symbol_obstack, (len1 + len2 + 1) * sizeof(*concat));
- memcpy(concat, s1->begin, len1 * sizeof(*concat));
- memcpy(concat + len1, s2->begin, (len2 + 1) * sizeof(*concat));
- if (warning.traditional) {
- warningf(&lexer_token.source_position,
- "traditional C rejects string constant concatenation");
- }
-
- return (wide_string_t){ concat, len1 + len2 + 1 };
-}
-
-/**
- * Concatenate a wide string and a string.
- */
-wide_string_t concat_wide_string_string(const wide_string_t *const s1, const string_t *const s2)
-{
- const size_t len1 = s1->size - 1;
- const size_t len2 = s2->size - 1;
-
- wchar_rep_t *const concat = obstack_alloc(&symbol_obstack, (len1 + len2 + 1) * sizeof(*concat));
- memcpy(concat, s1->begin, len1 * sizeof(*concat));
- const char *const src = s2->begin;
- wchar_rep_t *const dst = concat + len1;
- for (size_t i = 0; i != len2 + 1; ++i) {
- dst[i] = src[i];
- }
- if (warning.traditional) {
- warningf(&lexer_token.source_position,
- "traditional C rejects string constant concatenation");
- }
-
- return (wide_string_t){ concat, len1 + len2 + 1 };
-}
-
-static void grow_symbol(utf32 const tc)
-{
- struct obstack *const o = &symbol_obstack;
- if (tc < 0x80U) {
- obstack_1grow(o, tc);
- } else if (tc < 0x800) {
- obstack_1grow(o, 0xC0 | (tc >> 6));
- obstack_1grow(o, 0x80 | (tc & 0x3F));
- } else if (tc < 0x10000) {
- obstack_1grow(o, 0xE0 | ( tc >> 12));
- obstack_1grow(o, 0x80 | ((tc >> 6) & 0x3F));
- obstack_1grow(o, 0x80 | ( tc & 0x3F));
- } else {
- obstack_1grow(o, 0xF0 | ( tc >> 18));
- obstack_1grow(o, 0x80 | ((tc >> 12) & 0x3F));
- obstack_1grow(o, 0x80 | ((tc >> 6) & 0x3F));
- obstack_1grow(o, 0x80 | ( tc & 0x3F));
- }
+ return identify_string(space, len);
}
/**
*/
static void parse_string_literal(void)
{
- const unsigned start_linenr = lexer_token.source_position.linenr;
-
eat('"');
- while(1) {
- switch(c) {
+ while (true) {
+ switch (c) {
case '\\': {
utf32 const tc = parse_escape_sequence();
if (tc >= 0x100) {
- warningf(&lexer_token.source_position,
- "escape sequence out of range");
+ warningf(WARN_OTHER, &lexer_pos, "escape sequence out of range");
}
obstack_1grow(&symbol_obstack, tc);
break;
}
case EOF: {
- source_position_t source_position;
- source_position.input_name = lexer_token.source_position.input_name;
- source_position.linenr = start_linenr;
- errorf(&source_position, "string has no end");
- lexer_token.type = T_ERROR;
+ errorf(&lexer_token.base.source_position, "string has no end");
+ lexer_token.kind = T_ERROR;
return;
}
goto end_of_string;
default:
- grow_symbol(c);
+ obstack_grow_symbol(&symbol_obstack, c);
next_char();
break;
}
/* add finishing 0 to the string */
obstack_1grow(&symbol_obstack, '\0');
- const size_t size = (size_t)obstack_object_size(&symbol_obstack);
- const char *const string = obstack_finish(&symbol_obstack);
-
-#if 0 /* TODO hash */
- /* check if there is already a copy of the string */
- result = strset_insert(&stringset, string);
- if(result != string) {
- obstack_free(&symbol_obstack, string);
- }
-#else
- const char *const result = string;
-#endif
+ const size_t size = (size_t)obstack_object_size(&symbol_obstack);
+ char *string = obstack_finish(&symbol_obstack);
- lexer_token.type = T_STRING_LITERAL;
- lexer_token.v.string.begin = result;
- lexer_token.v.string.size = size;
+ lexer_token.kind = T_STRING_LITERAL;
+ lexer_token.string.string = identify_string(string, size);
}
/**
*/
static void parse_wide_character_constant(void)
{
- const unsigned start_linenr = lexer_token.source_position.linenr;
-
eat('\'');
- while(1) {
- switch(c) {
+ while (true) {
+ switch (c) {
case '\\': {
- wchar_rep_t tc = parse_escape_sequence();
- obstack_grow(&symbol_obstack, &tc, sizeof(tc));
+ const utf32 tc = parse_escape_sequence();
+ obstack_grow_symbol(&symbol_obstack, tc);
break;
}
goto end_of_wide_char_constant;
case EOF: {
- source_position_t source_position = lexer_token.source_position;
- source_position.linenr = start_linenr;
- errorf(&source_position, "EOF while parsing character constant");
- lexer_token.type = T_ERROR;
+ errorf(&lexer_token.base.source_position,
+ "EOF while parsing character constant");
+ lexer_token.kind = T_ERROR;
return;
}
- default: {
- wchar_rep_t tc = (wchar_rep_t) c;
- obstack_grow(&symbol_obstack, &tc, sizeof(tc));
+ default:
+ obstack_grow_symbol(&symbol_obstack, c);
next_char();
break;
}
- }
}
end_of_wide_char_constant:;
- size_t size = (size_t) obstack_object_size(&symbol_obstack);
- assert(size % sizeof(wchar_rep_t) == 0);
- size /= sizeof(wchar_rep_t);
+ obstack_1grow(&symbol_obstack, '\0');
+ size_t size = (size_t) obstack_object_size(&symbol_obstack) - 1;
+ char *string = obstack_finish(&symbol_obstack);
- const wchar_rep_t *string = obstack_finish(&symbol_obstack);
+ lexer_token.kind = T_WIDE_CHARACTER_CONSTANT;
+ lexer_token.string.string = identify_string(string, size);
- lexer_token.type = T_WIDE_CHARACTER_CONSTANT;
- lexer_token.v.wide_string.begin = string;
- lexer_token.v.wide_string.size = size;
- lexer_token.datatype = type_wchar_t;
+ if (size == 0) {
+ errorf(&lexer_token.base.source_position, "empty character constant");
+ }
}
/**
*/
static void parse_wide_string_literal(void)
{
- const unsigned start_linenr = lexer_token.source_position.linenr;
-
- assert(c == '"');
- next_char();
-
- while(1) {
- switch(c) {
- case '\\': {
- wchar_rep_t tc = parse_escape_sequence();
- obstack_grow(&symbol_obstack, &tc, sizeof(tc));
- break;
- }
-
- case EOF: {
- source_position_t source_position;
- source_position.input_name = lexer_token.source_position.input_name;
- source_position.linenr = start_linenr;
- errorf(&source_position, "string has no end");
- lexer_token.type = T_ERROR;
- return;
- }
-
- case '"':
- next_char();
- goto end_of_string;
-
- default: {
- wchar_rep_t tc = c;
- obstack_grow(&symbol_obstack, &tc, sizeof(tc));
- next_char();
- break;
- }
- }
- }
-
-end_of_string:;
-
- /* TODO: concatenate multiple strings separated by whitespace... */
-
- /* add finishing 0 to the string */
- wchar_rep_t nul = L'\0';
- obstack_grow(&symbol_obstack, &nul, sizeof(nul));
- const size_t size = (size_t)obstack_object_size(&symbol_obstack) / sizeof(wchar_rep_t);
- const wchar_rep_t *const string = obstack_finish(&symbol_obstack);
-
-#if 0 /* TODO hash */
- /* check if there is already a copy of the string */
- const wchar_rep_t *const result = strset_insert(&stringset, string);
- if(result != string) {
- obstack_free(&symbol_obstack, string);
- }
-#else
- const wchar_rep_t *const result = string;
-#endif
-
- lexer_token.type = T_WIDE_STRING_LITERAL;
- lexer_token.v.wide_string.begin = result;
- lexer_token.v.wide_string.size = size;
+ parse_string_literal();
+ if (lexer_token.kind == T_STRING_LITERAL)
+ lexer_token.kind = T_WIDE_STRING_LITERAL;
}
/**
*/
static void parse_character_constant(void)
{
- const unsigned start_linenr = lexer_token.source_position.linenr;
-
eat('\'');
- while(1) {
- switch(c) {
+ while (true) {
+ switch (c) {
case '\\': {
utf32 const tc = parse_escape_sequence();
if (tc >= 0x100) {
- warningf(&lexer_token.source_position,
- "escape sequence out of range");
+ warningf(WARN_OTHER, &lexer_pos, "escape sequence out of range");
}
obstack_1grow(&symbol_obstack, tc);
break;
goto end_of_char_constant;
case EOF: {
- source_position_t source_position;
- source_position.input_name = lexer_token.source_position.input_name;
- source_position.linenr = start_linenr;
- errorf(&source_position, "EOF while parsing character constant");
- lexer_token.type = T_ERROR;
+ errorf(&lexer_token.base.source_position,
+ "EOF while parsing character constant");
+ lexer_token.kind = T_ERROR;
return;
}
default:
- grow_symbol(c);
+ obstack_grow_symbol(&symbol_obstack, c);
next_char();
break;
}
end_of_char_constant:;
- const size_t size = (size_t)obstack_object_size(&symbol_obstack);
- const char *const string = obstack_finish(&symbol_obstack);
+ obstack_1grow(&symbol_obstack, '\0');
+ const size_t size = (size_t)obstack_object_size(&symbol_obstack)-1;
+ char *const string = obstack_finish(&symbol_obstack);
- lexer_token.type = T_CHARACTER_CONSTANT;
- lexer_token.v.string.begin = string;
- lexer_token.v.string.size = size;
- lexer_token.datatype = c_mode & _CXX && size == 1 ? type_char : type_int;
+ lexer_token.kind = T_CHARACTER_CONSTANT;
+ lexer_token.string.string = identify_string(string, size);
+
+ if (size == 0) {
+ errorf(&lexer_token.base.source_position, "empty character constant");
+ }
}
/**
*/
static void skip_multiline_comment(void)
{
- unsigned start_linenr = lexer_token.source_position.linenr;
-
- while(1) {
- switch(c) {
+ while (true) {
+ switch (c) {
case '/':
next_char();
if (c == '*') {
/* nested comment, warn here */
- if (warning.comment) {
- warningf(&lexer_token.source_position, "'/*' within comment");
- }
+ warningf(WARN_COMMENT, &lexer_pos, "'/*' within comment");
}
break;
case '*':
next_char();
- if(c == '/') {
+ if (c == '/') {
next_char();
return;
}
MATCH_NEWLINE(break;)
case EOF: {
- source_position_t source_position;
- source_position.input_name = lexer_token.source_position.input_name;
- source_position.linenr = start_linenr;
- errorf(&source_position, "at end of file while looking for comment end");
+ errorf(&lexer_token.base.source_position,
+ "at end of file while looking for comment end");
return;
}
*/
static void skip_line_comment(void)
{
- while(1) {
- switch(c) {
+ while (true) {
+ switch (c) {
case EOF:
return;
case '\\':
next_char();
if (c == '\n' || c == '\r') {
- if (warning.comment)
- warningf(&lexer_token.source_position, "multi-line comment");
+ warningf(WARN_COMMENT, &lexer_pos, "multi-line comment");
return;
}
break;
*/
static void eat_until_newline(void)
{
- while(pp_token.type != '\n' && pp_token.type != T_EOF) {
+ while (pp_token.kind != '\n' && pp_token.kind != T_EOF) {
next_pp_token();
}
}
-/**
- * Handle the define directive.
- */
-static void define_directive(void)
-{
- lexer_next_preprocessing_token();
- if(lexer_token.type != T_IDENTIFIER) {
- parse_error("expected identifier after #define\n");
- eat_until_newline();
- }
-}
-
-/**
- * Handle the ifdef directive.
- */
-static void ifdef_directive(int is_ifndef)
-{
- (void) is_ifndef;
- lexer_next_preprocessing_token();
- //expect_identifier();
- //extect_newline();
-}
-
-/**
- * Handle the endif directive.
- */
-static void endif_directive(void)
-{
- //expect_newline();
-}
-
/**
* Parse the line directive.
*/
static void parse_line_directive(void)
{
- if(pp_token.type != T_INTEGER) {
+ if (pp_token.kind != T_INTEGER) {
parse_error("expected integer");
} else {
- lexer_token.source_position.linenr = (unsigned int)(pp_token.v.intvalue - 1);
+ /* use offset -1 as this is about the next line */
+ lexer_pos.lineno = atoi(pp_token.number.number.begin) - 1;
next_pp_token();
}
- if(pp_token.type == T_STRING_LITERAL) {
- lexer_token.source_position.input_name = pp_token.v.string.begin;
+ if (pp_token.kind == T_STRING_LITERAL) {
+ lexer_pos.input_name = pp_token.string.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_INTEGER) {
+ /* 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.number.number.begin, "3")) {
+ lexer_pos.is_system_header = true;
+ }
+ next_pp_token();
+ }
}
eat_until_newline();
bool unknown_pragma = true;
next_pp_token();
- if (pp_token.v.symbol->pp_ID == TP_STDC) {
+ if (pp_token.kind != T_IDENTIFIER) {
+ warningf(WARN_UNKNOWN_PRAGMAS, &pp_token.base.source_position,
+ "expected identifier after #pragma");
+ eat_until_newline();
+ return;
+ }
+
+ symbol_t *symbol = pp_token.identifier.symbol;
+ if (symbol->pp_ID == TP_STDC) {
stdc_pragma_kind_t kind = STDC_UNKNOWN;
/* a STDC pragma */
if (c_mode & _C99) {
next_pp_token();
- switch (pp_token.v.symbol->pp_ID) {
+ switch (pp_token.identifier.symbol->pp_ID) {
case TP_FP_CONTRACT:
kind = STDC_FP_CONTRACT;
break;
if (kind != STDC_UNKNOWN) {
stdc_pragma_value_kind_t value = STDC_VALUE_UNKNOWN;
next_pp_token();
- switch (pp_token.v.symbol->pp_ID) {
+ switch (pp_token.identifier.symbol->pp_ID) {
case TP_ON:
value = STDC_VALUE_ON;
break;
if (value != STDC_VALUE_UNKNOWN) {
unknown_pragma = false;
} else {
- errorf(&pp_token.source_position, "bad STDC pragma argument");
+ errorf(&pp_token.base.source_position,
+ "bad STDC pragma argument");
}
}
}
unknown_pragma = true;
}
eat_until_newline();
- if (unknown_pragma && warning.unknown_pragmas) {
- warningf(&pp_token.source_position, "encountered unknown #pragma");
+ if (unknown_pragma) {
+ warningf(WARN_UNKNOWN_PRAGMAS, &pp_token.base.source_position,
+ "encountered unknown #pragma");
}
}
*/
static void parse_preprocessor_identifier(void)
{
- assert(pp_token.type == T_IDENTIFIER);
- symbol_t *symbol = pp_token.v.symbol;
+ assert(pp_token.kind == T_IDENTIFIER);
+ symbol_t *symbol = pp_token.identifier.symbol;
- switch(symbol->pp_ID) {
- case TP_include:
- printf("include - enable header name parsing!\n");
- break;
- case TP_define:
- define_directive();
- break;
- case TP_ifdef:
- ifdef_directive(0);
- break;
- case TP_ifndef:
- ifdef_directive(1);
- break;
- case TP_endif:
- endif_directive();
- break;
+ switch (symbol->pp_ID) {
case TP_line:
next_pp_token();
parse_line_directive();
break;
- case TP_if:
- case TP_else:
- case TP_elif:
- case TP_undef:
- case TP_error:
- /* TODO; output the rest of the line */
- parse_error("#error directive: ");
- break;
case TP_pragma:
parse_pragma();
break;
+ case TP_error:
+ /* TODO; output the rest of the line */
+ parse_error("#error directive");
+ break;
}
}
{
next_pp_token();
- switch(pp_token.type) {
+ switch (pp_token.kind) {
case T_IDENTIFIER:
parse_preprocessor_identifier();
break;
#define MAYBE_PROLOG \
next_char(); \
- while(1) { \
- switch(c) {
+ while (true) { \
+ switch (c) {
#define MAYBE(ch, set_type) \
case ch: \
next_char(); \
- lexer_token.type = set_type; \
+ lexer_token.kind = set_type; \
return;
/* must use this as last thing */
case ch: \
if (c_mode & mode) { \
next_char(); \
- lexer_token.type = set_type; \
+ lexer_token.kind = set_type; \
return; \
} \
/* fallthrough */
#define ELSE_CODE(code) \
default: \
code \
+ return; \
} \
- } /* end of while(1) */ \
- break;
+ } /* end of while (true) */ \
#define ELSE(set_type) \
ELSE_CODE( \
- lexer_token.type = set_type; \
- return; \
+ lexer_token.kind = set_type; \
)
void lexer_next_preprocessing_token(void)
{
- while(1) {
- switch(c) {
+ while (true) {
+ lexer_token.base.source_position = lexer_pos;
+
+ switch (c) {
case ' ':
case '\t':
next_char();
break;
MATCH_NEWLINE(
- lexer_token.type = '\n';
+ lexer_token.kind = '\n';
return;
)
SYMBOL_CHARS
parse_symbol();
/* might be a wide string ( L"string" ) */
- if (lexer_token.v.symbol == symbol_L) {
+ if (lexer_token.identifier.symbol == symbol_L) {
switch (c) {
case '"': parse_wide_string_literal(); break;
case '\'': parse_wide_character_constant(); break;
DIGITS
put_back(c);
c = '.';
- parse_number_dec();
+ parse_number();
return;
case '.':
ELSE_CODE(
put_back(c);
c = '.';
- lexer_token.type = '.';
- return;
+ lexer_token.kind = '.';
)
ELSE('.')
case '&':
ELSE_CODE(
put_back(c);
c = '%';
- lexer_token.type = '#';
- return;
+ lexer_token.kind = '#';
)
ELSE('#')
ELSE('%')
case ';':
case ',':
case '\\':
- lexer_token.type = c;
+ lexer_token.kind = c;
next_char();
return;
case EOF:
- lexer_token.type = T_EOF;
+ lexer_token.kind = T_EOF;
return;
default:
dollar_sign:
- errorf(&lexer_token.source_position, "unknown character '%c' found", c);
+ errorf(&lexer_pos, "unknown character '%c' found", c);
next_char();
- lexer_token.type = T_ERROR;
+ lexer_token.kind = T_ERROR;
return;
}
}
{
lexer_next_preprocessing_token();
- while (lexer_token.type == '\n') {
+ while (lexer_token.kind == '\n') {
newline_found:
lexer_next_preprocessing_token();
}
- if (lexer_token.type == '#') {
+ if (lexer_token.kind == '#') {
parse_preprocessor_directive();
goto newline_found;
}
symbol_L = symbol_table_insert("L");
}
-void lexer_open_stream(FILE *stream, const char *input_name)
+static void input_error(unsigned delta_lines, unsigned delta_cols,
+ const char *message)
{
- input = stream;
- lexer_token.source_position.linenr = 0;
- lexer_token.source_position.input_name = input_name;
-
- 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';
+ lexer_pos.lineno += delta_lines;
+ lexer_pos.colno += delta_cols;
+ errorf(&lexer_pos, "%s", message);
}
-void lexer_open_buffer(const char *buffer, size_t len, const char *input_name)
+void lexer_switch_input(input_t *new_input, const char *input_name)
{
- input = NULL;
- lexer_token.source_position.linenr = 0;
- lexer_token.source_position.input_name = input_name;
+ lexer_pos.lineno = 0;
+ lexer_pos.colno = 0;
+ lexer_pos.input_name = input_name;
-#if 0 // TODO
- bufpos = buffer;
- bufend = buffer + len;
-#else
- (void)buffer;
- (void)len;
- panic("builtin lexing not done yet");
-#endif
+ 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 */
static __attribute__((unused))
void dbg_pos(const source_position_t source_position)
{
- fprintf(stdout, "%s:%u\n", source_position.input_name,
- source_position.linenr);
+ fprintf(stdout, "%s:%u:%u\n", source_position.input_name,
+ source_position.lineno, (unsigned)source_position.colno);
fflush(stdout);
}
projects / cparser / blobdiff