#include "diagnostic.h"
#include "lexer.h"
+#include "symbol_t.h"
#include "token_t.h"
#include "symbol_table_t.h"
#include "adt/error.h"
*/
static void parse_error(const char *msg)
{
- errorf(lexer_token.source_position, "%s", msg);
+ errorf(&lexer_token.source_position, "%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_token.source_position, "%s", msg);
}
static inline void next_real_char(void)
if(v >= TARGET_LONG_MIN && v <= TARGET_LONG_MAX) {
lexer_token.datatype = type_long;
return;
- } else if(is_oct_hex && v >= 0 && v <= TARGET_ULONG_MAX) {
+ } else if(is_oct_hex && v >= 0 && (unsigned long long)v <= (unsigned long long)TARGET_ULONG_MAX) {
lexer_token.datatype = type_unsigned_long;
return;
}
if(c == '.' || c == 'p' || c == 'P') {
next_char();
- panic("Hex floating point numbers not implemented yet");
+ internal_error("Hex floating point numbers not implemented yet");
}
if(*string == '\0') {
parse_error("invalid hex number");
case 'f':
case 'F': return 15;
default:
- panic("wrong character given");
+ internal_error("wrong character given");
}
}
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");
+ errorf(&source_position, "string has no end");
lexer_token.type = T_ERROR;
return;
}
*/
static void parse_wide_character_constant(void)
{
+ const unsigned start_linenr = lexer_token.source_position.linenr;
+
eat('\'');
- int found_char = 0;
while(1) {
switch(c) {
- case '\\':
- found_char = parse_escape_sequence();
+ case '\\': {
+ wchar_rep_t tc = parse_escape_sequence();
+ obstack_grow(&symbol_obstack, &tc, sizeof(tc));
break;
+ }
MATCH_NEWLINE(
parse_error("newline while parsing character constant");
next_char();
goto end_of_wide_char_constant;
- case EOF:
- parse_error("EOF while parsing character 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;
return;
+ }
- default:
- if(found_char != 0) {
- parse_error("more than 1 characters in character "
- "constant");
- goto end_of_wide_char_constant;
- } else {
- found_char = c;
- next_char();
- }
+ default: {
+ wchar_rep_t tc = (wchar_rep_t) c;
+ obstack_grow(&symbol_obstack, &tc, sizeof(tc));
+ next_char();
break;
}
+ }
}
-end_of_wide_char_constant:
- lexer_token.type = T_INTEGER;
- lexer_token.v.intvalue = found_char;
- lexer_token.datatype = type_wchar_t;
+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);
+
+ const wchar_rep_t *string = obstack_finish(&symbol_obstack);
+
+ 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;
}
/**
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");
+ errorf(&source_position, "string has no end");
lexer_token.type = T_ERROR;
return;
}
eat('\'');
- int tc;
while(1) {
switch(c) {
- case '\\':
- tc = parse_escape_sequence();
+ case '\\': {
+ int tc = parse_escape_sequence();
obstack_1grow(&symbol_obstack, (char) tc);
break;
+ }
MATCH_NEWLINE(
parse_error("newline while parsing character constant");
break;
)
+ case '\'':
+ next_char();
+ 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");
+ errorf(&source_position, "EOF while parsing character constant");
lexer_token.type = T_ERROR;
return;
}
- case '\'':
- next_char();
- goto end_of_char_constant;
-
default:
obstack_1grow(&symbol_obstack, (char) c);
next_char();
const size_t size = (size_t)obstack_object_size(&symbol_obstack);
const char *const string = obstack_finish(&symbol_obstack);
- lexer_token.type = T_CHARS;
+ lexer_token.type = T_CHARACTER_CONSTANT;
lexer_token.v.string.begin = string;
lexer_token.v.string.size = size;
lexer_token.datatype = type_int;
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(&source_position, "at end of file while looking for comment end");
return;
}
if (value != STDC_VALUE_UNKNOWN) {
unknown_pragma = false;
} else {
- errorf(pp_token.source_position, "bad STDC pragma argument");
+ errorf(&pp_token.source_position, "bad STDC pragma argument");
}
}
}
}
eat_until_newline();
if (unknown_pragma && warning.unknown_pragmas) {
- warningf(pp_token.source_position, "encountered unknown #pragma");
+ warningf(&pp_token.source_position, "encountered unknown #pragma");
}
}
#define ELSE_CODE(code) \
default: \
- code; \
+ code \
} \
} /* end of while(1) */ \
break;
ELSE('/')
case '%':
MAYBE_PROLOG
- MAYBE('>', T_PERCENTGREATER)
+ MAYBE('>', '}')
MAYBE('=', T_PERCENTEQUAL)
case ':':
MAYBE_PROLOG
case '%':
MAYBE_PROLOG
- MAYBE(':', T_PERCENTCOLONPERCENTCOLON)
+ MAYBE(':', T_HASHHASH)
ELSE_CODE(
put_back(c);
c = '%';
- lexer_token.type = T_PERCENTCOLON;
+ lexer_token.type = '#';
return;
)
- ELSE(T_PERCENTCOLON)
+ ELSE('#')
ELSE('%')
case '<':
MAYBE_PROLOG
- MAYBE(':', T_LESSCOLON)
- MAYBE('%', T_LESSPERCENT)
+ MAYBE(':', '[')
+ MAYBE('%', '{')
MAYBE('=', T_LESSEQUAL)
case '<':
MAYBE_PROLOG
ELSE('|')
case ':':
MAYBE_PROLOG
- MAYBE('>', T_COLONGREATER)
+ MAYBE('>', ']')
ELSE(':')
case '=':
MAYBE_PROLOG
default:
next_char();
- errorf(lexer_token.source_position, "unknown character '%c' found\n", c);
+ errorf(&lexer_token.source_position, "unknown character '%c' found\n", c);
lexer_token.type = T_ERROR;
return;
}