static token_t pp_token;
static bool resolve_escape_sequences = false;
static bool ignore_unknown_chars = true;
-static bool in_pp_directive;
static bool skip_mode;
static FILE *out;
static struct obstack pp_obstack;
--input.position.colno;
}
-#define MATCH_NEWLINE(code) \
- case '\r': \
- next_char(); \
- if (input.c == '\n') { \
- case '\n': \
- next_char(); \
- } \
- info.whitespace = 0; \
- ++input.position.lineno; \
- input.position.colno = 1; \
- code
+#define NEWLINE \
+ '\r': \
+ next_char(); \
+ if (input.c == '\n') { \
+ case '\n': \
+ next_char(); \
+ } \
+ info.whitespace = 0; \
+ ++input.position.lineno; \
+ input.position.colno = 1; \
+ goto newline; \
+ newline // Let it look like an ordinary case label.
#define eat(c_type) (assert(input.c == c_type), next_char())
eat('\\');
switch (input.c) {
- MATCH_NEWLINE(
+ case NEWLINE:
return;
- )
default:
break;
return (string_t) {result, len};
}
-static void parse_string_literal(void)
+static void parse_string(utf32 const delimiter, preprocessor_token_kind_t const kind, string_encoding_t const enc, char const *const context)
{
const unsigned start_linenr = input.position.lineno;
- eat('"');
+ eat(delimiter);
while (true) {
switch (input.c) {
case '\\': {
- utf32 tc;
if (resolve_escape_sequences) {
- tc = parse_escape_sequence();
- obstack_1grow(&symbol_obstack, (char) tc);
+ utf32 const tc = parse_escape_sequence();
+ if (enc == STRING_ENCODING_CHAR) {
+ if (tc >= 0x100) {
+ warningf(WARN_OTHER, &pp_token.base.source_position, "escape sequence out of range");
+ }
+ obstack_1grow(&symbol_obstack, tc);
+ } else {
+ obstack_grow_symbol(&symbol_obstack, tc);
+ }
} else {
- obstack_1grow(&symbol_obstack, (char) input.c);
+ obstack_1grow(&symbol_obstack, (char)input.c);
next_char();
- obstack_1grow(&symbol_obstack, (char) input.c);
+ obstack_1grow(&symbol_obstack, (char)input.c);
next_char();
}
break;
}
+ case NEWLINE:
+ errorf(&pp_token.base.source_position, "newline while parsing %s", context);
+ break;
+
case EOF: {
source_position_t source_position;
source_position.input_name = pp_token.base.source_position.input_name;
source_position.lineno = start_linenr;
- errorf(&source_position, "string has no end");
+ errorf(&source_position, "EOF while parsing %s", context);
goto end_of_string;
}
- case '"':
- next_char();
- goto end_of_string;
-
default:
- obstack_grow_symbol(&symbol_obstack, input.c);
- next_char();
- break;
+ if (input.c == delimiter) {
+ next_char();
+ goto end_of_string;
+ } else {
+ obstack_grow_symbol(&symbol_obstack, input.c);
+ next_char();
+ break;
+ }
}
}
-end_of_string:
- /* add finishing 0 to the string */
+end_of_string:;
obstack_1grow(&symbol_obstack, '\0');
- const size_t size = (size_t)obstack_object_size(&symbol_obstack);
- char *const string = obstack_finish(&symbol_obstack);
+ size_t const size = obstack_object_size(&symbol_obstack) - 1;
+ char *const string = obstack_finish(&symbol_obstack);
- pp_token.kind = TP_STRING_LITERAL;
- pp_token.string.string = make_string(string, size);
+ pp_token.kind = kind;
+ pp_token.string.encoding = enc;
+ pp_token.string.string = make_string(string, size);
}
-/**
- * Parse a wide string literal and set lexer_token.
- */
-static void parse_wide_string_literal(void)
+static void parse_string_literal(string_encoding_t const enc)
{
- parse_string_literal();
- if (pp_token.kind == TP_STRING_LITERAL)
- pp_token.kind = TP_WIDE_STRING_LITERAL;
-}
-
-static void parse_wide_character_constant(void)
-{
- eat('\'');
-
- while (true) {
- switch (input.c) {
- case '\\': {
- const utf32 tc = parse_escape_sequence();
- obstack_grow_symbol(&symbol_obstack, tc);
- break;
- }
-
- MATCH_NEWLINE(
- parse_error("newline while parsing character constant");
- break;
- )
-
- case '\'':
- next_char();
- goto end_of_wide_char_constant;
-
- case EOF:
- parse_error("EOF while parsing character constant");
- goto end_of_wide_char_constant;
-
- default:
- obstack_grow_symbol(&symbol_obstack, input.c);
- next_char();
- break;
- }
- }
-
-end_of_wide_char_constant:
- obstack_1grow(&symbol_obstack, '\0');
- size_t size = (size_t) obstack_object_size(&symbol_obstack)-1;
- char *string = obstack_finish(&symbol_obstack);
- pp_token.kind = TP_WIDE_CHARACTER_CONSTANT;
- pp_token.string.string = make_string(string, size);
-
- if (size == 0) {
- parse_error("empty character constant");
- }
+ parse_string('"', TP_STRING_LITERAL, enc, "string literal");
}
-static void parse_character_constant(void)
+static void parse_character_constant(string_encoding_t const enc)
{
- const unsigned start_linenr = input.position.lineno;
-
- eat('\'');
-
- int tc;
- while (true) {
- switch (input.c) {
- case '\\':
- tc = parse_escape_sequence();
- obstack_1grow(&symbol_obstack, (char) tc);
- break;
-
- MATCH_NEWLINE(
- parse_error("newline while parsing character constant");
- break;
- )
-
- case EOF: {
- source_position_t source_position;
- source_position.input_name = pp_token.base.source_position.input_name;
- source_position.lineno = start_linenr;
- errorf(&source_position, "EOF while parsing character constant");
- goto end_of_char_constant;
- }
-
- case '\'':
- next_char();
- goto end_of_char_constant;
-
- default:
- obstack_1grow(&symbol_obstack, (char) input.c);
- next_char();
- break;
-
- }
- }
-
-end_of_char_constant:;
- obstack_1grow(&symbol_obstack, '\0');
- const size_t size = (size_t)obstack_object_size(&symbol_obstack);
- char *const string = obstack_finish(&symbol_obstack);
-
- pp_token.kind = TP_CHARACTER_CONSTANT;
- pp_token.string.string = make_string(string, size);
-
- if (size == 0) {
+ parse_string('\'', TP_CHARACTER_CONSTANT, enc, "character constant");
+ if (pp_token.string.string.size == 0) {
parse_error("empty character constant");
}
}
case '*':
next_char();
if (input.c == '/') {
+ if (input.position.lineno != input.output_line)
+ info.whitespace = input.position.colno;
next_char();
- info.whitespace += input.position.colno-1;
return;
}
break;
- MATCH_NEWLINE(
- info.at_line_begin |= !in_pp_directive;
+ case NEWLINE:
break;
- )
case EOF: {
source_position_t source_position;
next_char();
continue;
- MATCH_NEWLINE(
+ case NEWLINE:
info.at_line_begin = true;
return;
- )
case '/':
next_char();
/* might be a wide string or character constant ( L"string"/L'c' ) */
if (input.c == '"' && string[0] == 'L' && string[1] == '\0') {
obstack_free(&symbol_obstack, string);
- parse_wide_string_literal();
+ parse_string_literal(STRING_ENCODING_WIDE);
return;
} else if (input.c == '\'' && string[0] == 'L' && string[1] == '\0') {
obstack_free(&symbol_obstack, string);
- parse_wide_character_constant();
+ parse_character_constant(STRING_ENCODING_WIDE);
return;
}
next_char();
goto restart;
- MATCH_NEWLINE(
+ case NEWLINE:
info.at_line_begin = true;
info.had_whitespace = true;
goto restart;
- )
SYMBOL_CHARS
parse_symbol();
return;
case '"':
- parse_string_literal();
+ parse_string_literal(STRING_ENCODING_CHAR);
return;
case '\'':
- parse_character_constant();
+ parse_character_constant(STRING_ENCODING_CHAR);
return;
case '.':
input.output_line = pos->lineno-1;
}
-static void emit_newlines(void)
+static bool emit_newlines(void)
{
unsigned delta = pp_token.base.source_position.lineno - input.output_line;
+ if (delta == 0)
+ return false;
if (delta >= 9) {
fputc('\n', out);
}
}
input.output_line = pp_token.base.source_position.lineno;
+
+ for (unsigned i = 0; i < info.whitespace; ++i)
+ fputc(' ', out);
+
+ return true;
}
static void emit_pp_token(void)
if (skip_mode)
return;
- if (info.at_line_begin) {
- emit_newlines();
-
- for (unsigned i = 0; i < info.whitespace; ++i)
- fputc(' ', out);
-
- } else if (info.had_whitespace ||
- tokens_would_paste(last_token, pp_token.kind)) {
+ if (!emit_newlines() &&
+ (info.had_whitespace || tokens_would_paste(last_token, pp_token.kind)))
fputc(' ', out);
- }
switch (pp_token.kind) {
case TP_IDENTIFIER:
case TP_NUMBER:
fputs(pp_token.number.number.begin, out);
break;
- case TP_WIDE_STRING_LITERAL:
- fputc('L', out);
+
case TP_STRING_LITERAL:
+ fputs(get_string_encoding_prefix(pp_token.string.encoding), out);
fputc('"', out);
fputs(pp_token.string.string.begin, out);
fputc('"', out);
break;
- case TP_WIDE_CHARACTER_CONSTANT:
- fputc('L', out);
+
case TP_CHARACTER_CONSTANT:
+ fputs(get_string_encoding_prefix(pp_token.string.encoding), out);
fputc('\'', out);
fputs(pp_token.string.string.begin, out);
fputc('\'', out);
eat_pp_directive();
}
-static const char *parse_headername(void)
+static void parse_headername(void)
{
+ const source_position_t start_position = input.position;
+ string_t string = {NULL, 0};
+ assert(obstack_object_size(&symbol_obstack) == 0);
+
/* behind an #include we can have the special headername lexems.
* They're only allowed behind an #include so they're not recognized
* by the normal next_preprocessing_token. We handle them as a special
* exception here */
if (info.at_line_begin) {
parse_error("expected headername after #include");
- return NULL;
+ goto finish_error;
}
- assert(obstack_object_size(&symbol_obstack) == 0);
-
/* check wether we have a "... or <... headername */
switch (input.c) {
- case '<':
+ {
+ utf32 delimiter;
+ case '<': delimiter = '>'; goto parse_name;
+ case '"': delimiter = '"'; goto parse_name;
+parse_name:
next_char();
while (true) {
switch (input.c) {
+ case NEWLINE:
case EOF:
- /* fallthrough */
- MATCH_NEWLINE(
- parse_error("header name without closing '>'");
- return NULL;
- )
- case '>':
- next_char();
- goto finished_headername;
- }
- obstack_1grow(&symbol_obstack, (char) input.c);
- next_char();
- }
- /* we should never be here */
+ errorf(&pp_token.base.source_position, "header name without closing '%c'", (char)delimiter);
+ goto finish_error;
- case '"':
- next_char();
- while (true) {
- switch (input.c) {
- case EOF:
- /* fallthrough */
- MATCH_NEWLINE(
- parse_error("header name without closing '>'");
- return NULL;
- )
- case '"':
- next_char();
- goto finished_headername;
+ default:
+ if (input.c == delimiter) {
+ next_char();
+ goto finished_headername;
+ } else {
+ obstack_1grow(&symbol_obstack, (char)input.c);
+ next_char();
+ }
+ break;
}
- obstack_1grow(&symbol_obstack, (char) input.c);
- next_char();
}
/* we should never be here */
+ }
default:
/* TODO: do normal pp_token parsing and concatenate results */
finished_headername:
obstack_1grow(&symbol_obstack, '\0');
- char *headername = obstack_finish(&symbol_obstack);
-
- /* TODO: iterate search-path to find the file */
-
- skip_whitespace();
-
- return identify_string(headername);
+ const size_t size = (size_t)obstack_object_size(&symbol_obstack);
+ char *const headername = obstack_finish(&symbol_obstack);
+ string = make_string(headername, size);
+
+finish_error:
+ pp_token.base.source_position = start_position;
+ pp_token.kind = TP_HEADERNAME;
+ pp_token.string.string = string;
}
static bool do_include(bool system_include, const char *headername)
{
+ size_t headername_len = strlen(headername);
if (!system_include) {
- /* for "bla" includes first try current dir
- * TODO: this isn't correct, should be the directory of the source file
- */
+ /* put dirname of current input on obstack */
+ const char *filename = input.position.input_name;
+ const char *last_slash = strrchr(filename, '/');
+ if (last_slash != NULL) {
+ size_t len = last_slash - filename;
+ obstack_grow(&symbol_obstack, filename, len + 1);
+ obstack_grow0(&symbol_obstack, headername, headername_len);
+ char *complete_path = obstack_finish(&symbol_obstack);
+ headername = identify_string(complete_path);
+ }
+
FILE *file = fopen(headername, "r");
if (file != NULL) {
switch_input(file, headername);
}
}
- size_t headername_len = strlen(headername);
- assert(obstack_object_size(&pp_obstack) == 0);
+ assert(obstack_object_size(&symbol_obstack) == 0);
/* check searchpath */
for (searchpath_entry_t *entry = searchpath; entry != NULL;
entry = entry->next) {
const char *path = entry->path;
size_t len = strlen(path);
- obstack_grow(&pp_obstack, path, len);
+ obstack_grow(&symbol_obstack, path, len);
if (path[len-1] != '/')
- obstack_1grow(&pp_obstack, '/');
- obstack_grow(&pp_obstack, headername, headername_len+1);
+ obstack_1grow(&symbol_obstack, '/');
+ obstack_grow(&symbol_obstack, headername, headername_len+1);
- char *complete_path = obstack_finish(&pp_obstack);
+ char *complete_path = obstack_finish(&symbol_obstack);
FILE *file = fopen(complete_path, "r");
if (file != NULL) {
const char *filename = identify_string(complete_path);
switch_input(file, filename);
return true;
+ } else {
+ obstack_free(&symbol_obstack, complete_path);
}
- obstack_free(&pp_obstack, complete_path);
}
return false;
}
+/* read till next newline character, only for parse_include_directive(),
+ * use eat_pp_directive() in all other cases */
+static void skip_till_newline(void)
+{
+ /* skip till newline */
+ while (true) {
+ switch (input.c) {
+ case NEWLINE:
+ case EOF:
+ return;
+ }
+ next_char();
+ }
+}
+
static bool parse_include_directive(void)
{
/* don't eat the TP_include here!
* we need an alternative parsing for the next token */
skip_whitespace();
bool system_include = input.c == '<';
- const char *headername = parse_headername();
- if (headername == NULL) {
+ parse_headername();
+ string_t headername = pp_token.string.string;
+ if (headername.begin == NULL) {
eat_pp_directive();
return false;
}
+ skip_whitespace();
if (!info.at_line_begin) {
warningf(WARN_OTHER, &pp_token.base.source_position,
"extra tokens at end of #include directive");
- eat_pp_directive();
+ skip_till_newline();
}
if (n_inputs > INCLUDE_LIMIT) {
return false;
}
- /* we have to reenable space counting and macro expansion here,
- * because it is still disabled in directive parsing,
- * but we will trigger a preprocessing token reading of the new file
- * now and need expansions/space counting */
- in_pp_directive = false;
-
/* switch inputs */
emit_newlines();
push_input();
- bool res = do_include(system_include, headername);
+ bool res = do_include(system_include, pp_token.string.string.begin);
if (!res) {
errorf(&pp_token.base.source_position,
- "failed including '%s': %s", headername, strerror(errno));
+ "failed including '%S': %s", pp_token.string, strerror(errno));
pop_restore_input();
return false;
}
/* just take the true case in the hope to avoid further errors */
condition = true;
} else {
- pp_definition_t *const pp_definition = pp_token.base.symbol->pp_definition;
+ /* evaluate wether we are in true or false case */
+ condition = !pp_token.base.symbol->pp_definition == is_ifndef;
+
next_preprocessing_token();
if (!info.at_line_begin) {
is_ifndef ? "ifndef" : "ifdef");
eat_pp_directive();
}
-
- /* evaluate wether we are in true or false case */
- condition = is_ifndef ? pp_definition == NULL : pp_definition != NULL;
}
pp_conditional_t *conditional = push_conditional();
static void parse_preprocessing_directive(void)
{
- in_pp_directive = true;
eat_pp('#');
+ if (info.at_line_begin) {
+ /* empty directive */
+ return;
+ }
+
if (skip_mode) {
switch (pp_token.kind) {
case TP_ifdef:
}
}
- in_pp_directive = false;
assert(info.at_line_begin);
}
/* simplistic commandline parser */
const char *filename = NULL;
+ const char *output = NULL;
for (int i = 1; i < argc; ++i) {
const char *opt = argv[i];
if (streq(opt, "-I")) {
continue;
} else if (streq(opt, "-E")) {
/* ignore */
+ } else if (streq(opt, "-o")) {
+ output = argv[++i];
+ continue;
} else if (opt[0] == '-') {
fprintf(stderr, "Unknown option '%s'\n", opt);
} else {
return 1;
}
- out = stdout;
+ if (output == NULL) {
+ out = stdout;
+ } else {
+ out = fopen(output, "w");
+ if (out == NULL) {
+ fprintf(stderr, "Couldn't open output '%s'\n", output);
+ return 1;
+ }
+ }
/* just here for gcc compatibility */
fprintf(out, "# 1 \"%s\"\n", filename);
continue;
} else if (pp_token.kind == TP_EOF) {
goto end_of_main_loop;
- } else if (pp_token.kind == TP_IDENTIFIER && !in_pp_directive) {
+ } else if (pp_token.kind == TP_IDENTIFIER) {
symbol_t *const symbol = pp_token.base.symbol;
pp_definition_t *const pp_definition = symbol->pp_definition;
if (pp_definition != NULL && !pp_definition->is_expanding) {
fputc('\n', out);
check_unclosed_conditionals();
close_input();
+ if (out != stdout)
+ fclose(out);
obstack_free(&input_obstack, NULL);
obstack_free(&pp_obstack, NULL);