Skip to content

Commit

Permalink
Fix: incorrect file shown in lexing errors
Browse files Browse the repository at this point in the history
  • Loading branch information
@positively-charged
positively-charged committed Jan 31, 2017
1 parent fbe819b commit e1700a0
Showing 1 changed file with 49 additions and 48 deletions.
97 changes: 49 additions & 48 deletions src/parse/token/source.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,7 @@ void read_token_acs( struct parse* parse, struct token* token ) {
}
else {
struct pos pos;
t_init_pos( &pos, parse->source->file->id, parse->source->line,
t_init_pos( &pos, parse->source->file_entry_id, parse->source->line,
column );
p_diag( parse, DIAG_POS_ERR, &pos,
"invalid character" );
Expand Down Expand Up @@ -748,7 +748,7 @@ void read_token_acs( struct parse* parse, struct token* token ) {
if ( isalnum( *source_text ) || *source_text == '_' ) {
if ( copied_text == end ) {
struct pos pos;
t_init_pos( &pos, parse->source->file->id, line, column );
t_init_pos( &pos, parse->source->file_entry_id, line, column );
p_diag( parse, DIAG_POS_ERR, &pos,
"identifier too long (maximum length is %d)",
MAX_IDENTIFIER_LENGTH );
Expand Down Expand Up @@ -816,7 +816,7 @@ void read_token_acs( struct parse* parse, struct token* token ) {
}
else if ( isalpha( ch ) ) {
struct pos pos;
t_init_pos( &pos, parse->source->file->id, parse->source->line,
t_init_pos( &pos, parse->source->file_entry_id, parse->source->line,
parse->source->column );
p_diag( parse, DIAG_POS_ERR, &pos,
"invalid digit in hexadecimal literal" );
Expand All @@ -825,8 +825,8 @@ void read_token_acs( struct parse* parse, struct token* token ) {
else {
if ( parse->temp_text.length == 0 ) {
struct pos pos;
t_init_pos( &pos, parse->source->file->id, parse->source->line,
column );
t_init_pos( &pos, parse->source->file_entry_id,
parse->source->line, column );
p_diag( parse, DIAG_POS_ERR, &pos,
"no digits found in hexadecimal literal" );
p_bail( parse );
Expand Down Expand Up @@ -887,7 +887,7 @@ void read_token_acs( struct parse* parse, struct token* token ) {
}
else if ( isalpha( ch ) ) {
struct pos pos;
t_init_pos( &pos, parse->source->file->id, parse->source->line,
t_init_pos( &pos, parse->source->file_entry_id, parse->source->line,
parse->source->column );
p_diag( parse, DIAG_POS_ERR, &pos,
"invalid digit in decimal literal" );
Expand All @@ -910,7 +910,7 @@ void read_token_acs( struct parse* parse, struct token* token ) {
}
else if ( isalpha( ch ) ) {
struct pos pos;
t_init_pos( &pos, parse->source->file->id, parse->source->line,
t_init_pos( &pos, parse->source->file_entry_id, parse->source->line,
parse->source->column );
p_diag( parse, DIAG_POS_ERR, &pos,
"invalid digit in fractional part of fixed-point literal" );
Expand Down Expand Up @@ -970,7 +970,7 @@ void read_token_acs( struct parse* parse, struct token* token ) {
}
else if ( ! ch ) {
struct pos pos;
t_init_pos( &pos, parse->source->file->id, line, column );
t_init_pos( &pos, parse->source->file_entry_id, line, column );
p_diag( parse, DIAG_POS_ERR, &pos,
"unterminated string" );
p_bail( parse );
Expand Down Expand Up @@ -1014,7 +1014,7 @@ void read_token_acs( struct parse* parse, struct token* token ) {
str_clear( &parse->temp_text );
if ( ch == '\'' || ! ch ) {
struct pos pos;
t_init_pos( &pos, parse->source->file->id, parse->source->line,
t_init_pos( &pos, parse->source->file_entry_id, parse->source->line,
parse->source->column );
p_diag( parse, DIAG_POS_ERR, &pos,
"missing character in character literal" );
Expand All @@ -1036,7 +1036,8 @@ void read_token_acs( struct parse* parse, struct token* token ) {
}
if ( ch != '\'' ) {
struct pos pos;
t_init_pos( &pos, parse->source->file->id, parse->source->line, column );
t_init_pos( &pos, parse->source->file_entry_id, parse->source->line,
column );
p_diag( parse, DIAG_POS_ERR, &pos,
"multiple characters in character literal" );
p_bail( parse );
Expand All @@ -1059,7 +1060,7 @@ void read_token_acs( struct parse* parse, struct token* token ) {
while ( true ) {
if ( ! ch ) {
struct pos pos;
t_init_pos( &pos, parse->source->file->id, line, column );
t_init_pos( &pos, parse->source->file_entry_id, line, column );
p_diag( parse, DIAG_POS_ERR, &pos,
"unterminated comment" );
p_bail( parse );
Expand Down Expand Up @@ -1358,7 +1359,7 @@ void read_token_acs95( struct parse* parse, struct token* token ) {
}
else {
struct pos pos;
t_init_pos( &pos, parse->source->file->id, parse->source->line,
t_init_pos( &pos, parse->source->file_entry_id, parse->source->line,
column );
p_diag( parse, DIAG_POS_ERR, &pos,
"invalid character" );
Expand Down Expand Up @@ -1413,7 +1414,7 @@ void read_token_acs95( struct parse* parse, struct token* token ) {
if ( isalnum( *source_text ) || *source_text == '_' ) {
if ( copied_text == end ) {
struct pos pos;
t_init_pos( &pos, parse->source->file->id, line, column );
t_init_pos( &pos, parse->source->file_entry_id, line, column );
p_diag( parse, DIAG_POS_ERR, &pos,
"identifier too long (maximum length is %d)",
MAX_IDENTIFIER_LENGTH );
Expand Down Expand Up @@ -1504,7 +1505,7 @@ void read_token_acs95( struct parse* parse, struct token* token ) {
}
else if ( isalpha( ch ) ) {
struct pos pos;
t_init_pos( &pos, parse->source->file->id, parse->source->line,
t_init_pos( &pos, parse->source->file_entry_id, parse->source->line,
parse->source->column );
p_diag( parse, DIAG_POS_ERR, &pos,
"invalid digit in hexadecimal literal" );
Expand All @@ -1513,8 +1514,8 @@ void read_token_acs95( struct parse* parse, struct token* token ) {
else {
if ( parse->temp_text.length == 0 ) {
struct pos pos;
t_init_pos( &pos, parse->source->file->id, parse->source->line,
column );
t_init_pos( &pos, parse->source->file_entry_id,
parse->source->line, column );
p_diag( parse, DIAG_POS_ERR, &pos,
"no digits found in hexadecimal literal" );
p_bail( parse );
Expand Down Expand Up @@ -1575,7 +1576,7 @@ void read_token_acs95( struct parse* parse, struct token* token ) {
}
else if ( isalpha( ch ) ) {
struct pos pos;
t_init_pos( &pos, parse->source->file->id, parse->source->line,
t_init_pos( &pos, parse->source->file_entry_id, parse->source->line,
parse->source->column );
p_diag( parse, DIAG_POS_ERR, &pos,
"invalid digit in decimal literal" );
Expand All @@ -1598,7 +1599,7 @@ void read_token_acs95( struct parse* parse, struct token* token ) {
}
else if ( isalpha( ch ) ) {
struct pos pos;
t_init_pos( &pos, parse->source->file->id, parse->source->line,
t_init_pos( &pos, parse->source->file_entry_id, parse->source->line,
parse->source->column );
p_diag( parse, DIAG_POS_ERR, &pos,
"invalid digit in fractional part of fixed-point literal" );
Expand Down Expand Up @@ -1658,7 +1659,7 @@ void read_token_acs95( struct parse* parse, struct token* token ) {
}
else if ( ! ch ) {
struct pos pos;
t_init_pos( &pos, parse->source->file->id, line, column );
t_init_pos( &pos, parse->source->file_entry_id, line, column );
p_diag( parse, DIAG_POS_ERR, &pos,
"unterminated string" );
p_bail( parse );
Expand Down Expand Up @@ -1699,7 +1700,7 @@ void read_token_acs95( struct parse* parse, struct token* token ) {
while ( true ) {
if ( ! ch ) {
struct pos pos;
t_init_pos( &pos, parse->source->file->id, line, column );
t_init_pos( &pos, parse->source->file_entry_id, line, column );
p_diag( parse, DIAG_POS_ERR, &pos,
"unterminated comment" );
p_bail( parse );
Expand Down Expand Up @@ -1821,7 +1822,7 @@ void read_token( struct parse* parse, struct token* token ) {
struct pos pos = {
.line = parse->source->line,
.column = parse->source->column,
.id = parse->source->file->id
.id = parse->source->file_entry_id
};
p_diag( parse, DIAG_POS_ERR, &pos,
"missing character in character literal" );
Expand Down Expand Up @@ -1851,7 +1852,7 @@ void read_token( struct parse* parse, struct token* token ) {
}
if ( ch != '\'' ) {
struct pos pos = { parse->source->line, column,
parse->source->file->id };
parse->source->file_entry_id };
p_diag( parse, DIAG_POS_ERR, &pos,
"multiple characters in character literal" );
p_bail( parse );
Expand Down Expand Up @@ -2100,7 +2101,7 @@ void read_token( struct parse* parse, struct token* token ) {
}
else if ( ! singles[ i ] ) {
struct pos pos = { parse->source->line, column,
parse->source->file->id };
parse->source->file_entry_id };
p_diag( parse, DIAG_POS_ERR, &pos, "invalid character" );
p_bail( parse );
}
Expand All @@ -2123,7 +2124,7 @@ void read_token( struct parse* parse, struct token* token ) {
if ( strcmp( text->value, "__VA_ARGS__" ) == 0 &&
! parse->variadic_macro_context ) {
struct pos pos;
t_init_pos( &pos, parse->source->file->id, line, column );
t_init_pos( &pos, parse->source->file_entry_id, line, column );
p_diag( parse, DIAG_POS_ERR, &pos,
"`__VA_ARGS__` can only appear in the body of a variadic macro" );
p_bail( parse );
Expand All @@ -2147,23 +2148,23 @@ void read_token( struct parse* parse, struct token* token ) {
ch = read_ch( parse );
if ( ! ( ch == '0' || ch == '1' ) ) {
struct pos pos;
t_init_pos( &pos, parse->source->file->id, parse->source->line,
parse->source->column );
t_init_pos( &pos, parse->source->file_entry_id,
parse->source->line, parse->source->column );
p_diag( parse, DIAG_POS_ERR, &pos,
"missing binary digit after digit separator" );
p_bail( parse );
}
}
else if ( isalnum( ch ) ) {
struct pos pos = { parse->source->line, parse->source->column,
parse->source->file->id };
parse->source->file_entry_id };
p_diag( parse, DIAG_POS_ERR, &pos,
"invalid digit in binary literal" );
p_bail( parse );
}
else if ( text->length == 0 ) {
struct pos pos = { parse->source->line, column,
parse->source->file->id };
parse->source->file_entry_id };
p_diag( parse, DIAG_POS_ERR, &pos,
"no digits found in binary literal" );
p_bail( parse );
Expand All @@ -2187,23 +2188,23 @@ void read_token( struct parse* parse, struct token* token ) {
ch = read_ch( parse );
if ( ! isxdigit( ch ) ) {
struct pos pos;
t_init_pos( &pos, parse->source->file->id, parse->source->line,
parse->source->column );
t_init_pos( &pos, parse->source->file_entry_id,
parse->source->line, parse->source->column );
p_diag( parse, DIAG_POS_ERR, &pos,
"missing hexadecimal digit after digit separator" );
p_bail( parse );
}
}
else if ( isalnum( ch ) ) {
struct pos pos = { parse->source->line, parse->source->column,
parse->source->file->id };
parse->source->file_entry_id };
p_diag( parse, DIAG_POS_ERR, &pos,
"invalid digit in hexadecimal literal" );
p_bail( parse );
}
else if ( text->length == 0 ) {
struct pos pos = { parse->source->line, column,
parse->source->file->id };
parse->source->file_entry_id };
p_diag( parse, DIAG_POS_ERR, &pos,
"no digits found in hexadecimal literal" );
p_bail( parse );
Expand All @@ -2226,16 +2227,16 @@ void read_token( struct parse* parse, struct token* token ) {
ch = read_ch( parse );
if ( ! ( ch >= '0' && ch <= '7' ) ) {
struct pos pos;
t_init_pos( &pos, parse->source->file->id, parse->source->line,
parse->source->column );
t_init_pos( &pos, parse->source->file_entry_id,
parse->source->line, parse->source->column );
p_diag( parse, DIAG_POS_ERR, &pos,
"missing octal digit after digit separator" );
p_bail( parse );
}
}
else if ( isalnum( ch ) ) {
struct pos pos = { parse->source->line, parse->source->column,
parse->source->file->id };
parse->source->file_entry_id };
p_diag( parse, DIAG_POS_ERR, &pos,
"invalid digit in octal literal" );
p_bail( parse );
Expand Down Expand Up @@ -2294,8 +2295,8 @@ void read_token( struct parse* parse, struct token* token ) {
ch = read_ch( parse );
if ( ! isdigit( ch ) ) {
struct pos pos;
t_init_pos( &pos, parse->source->file->id, parse->source->line,
parse->source->column );
t_init_pos( &pos, parse->source->file_entry_id,
parse->source->line, parse->source->column );
p_diag( parse, DIAG_POS_ERR, &pos,
"missing decimal digit after digit separator" );
p_bail( parse );
Expand All @@ -2314,7 +2315,7 @@ void read_token( struct parse* parse, struct token* token ) {
}
else if ( isalpha( ch ) ) {
struct pos pos = { parse->source->line, parse->source->column,
parse->source->file->id };
parse->source->file_entry_id };
p_diag( parse, DIAG_POS_ERR, &pos,
"invalid digit in decimal literal" );
p_bail( parse );
Expand All @@ -2337,14 +2338,14 @@ void read_token( struct parse* parse, struct token* token ) {
}
else if ( isalpha( ch ) ) {
struct pos pos = { parse->source->line, parse->source->column,
parse->source->file->id };
parse->source->file_entry_id };
p_diag( parse, DIAG_POS_ERR, &pos,
"invalid digit in fractional part of fixed-point literal" );
p_bail( parse );
}
else if ( text->value[ text->length - 1 ] == '.' ) {
struct pos pos = { parse->source->line, column,
parse->source->file->id };
parse->source->file_entry_id };
p_diag( parse, DIAG_POS_ERR, &pos,
"no digits found in fractional part of fixed-point literal" );
p_bail( parse );
Expand All @@ -2366,8 +2367,8 @@ void read_token( struct parse* parse, struct token* token ) {
ch = read_ch( parse );
if ( ! isalnum( ch ) ) {
struct pos pos;
t_init_pos( &pos, parse->source->file->id, parse->source->line,
parse->source->column );
t_init_pos( &pos, parse->source->file_entry_id,
parse->source->line, parse->source->column );
p_diag( parse, DIAG_POS_ERR, &pos,
"missing digit after digit separator" );
p_bail( parse );
Expand All @@ -2384,7 +2385,7 @@ void read_token( struct parse* parse, struct token* token ) {
text = temp_text( parse );
while ( true ) {
if ( ! ch ) {
struct pos pos = { line, column, parse->source->file->id };
struct pos pos = { line, column, parse->source->file_entry_id };
p_diag( parse, DIAG_POS_ERR, &pos,
"unterminated string" );
p_bail( parse );
Expand Down Expand Up @@ -2435,7 +2436,7 @@ void read_token( struct parse* parse, struct token* token ) {
// -----------------------------------------------------------------------
while ( true ) {
if ( ! ch ) {
struct pos pos = { line, column, parse->source->file->id };
struct pos pos = { line, column, parse->source->file_entry_id };
p_diag( parse, DIAG_POS_ERR, &pos, "unterminated comment" );
p_bail( parse );
}
Expand Down Expand Up @@ -2568,7 +2569,7 @@ void escape_ch( struct parse* parse, char* ch_out, struct str* text,
if ( ! ch ) {
empty: ;
struct pos pos = { parse->source->line, parse->source->column,
parse->source->file->id };
parse->source->file_entry_id };
p_diag( parse, DIAG_POS_ERR, &pos, "empty escape sequence" );
p_bail( parse );
}
Expand Down Expand Up @@ -2600,7 +2601,7 @@ void escape_ch( struct parse* parse, char* ch_out, struct str* text,
if ( i == 3 ) {
too_many_digits: ;
struct pos pos = { parse->source->line, parse->source->column,
parse->source->file->id };
parse->source->file_entry_id };
p_diag( parse, DIAG_POS_ERR, &pos, "too many digits" );
p_bail( parse );
}
Expand Down Expand Up @@ -2662,7 +2663,7 @@ void escape_ch( struct parse* parse, char* ch_out, struct str* text,
}
else {
struct pos pos = { parse->source->line, slash,
parse->source->file->id };
parse->source->file_entry_id };
p_diag( parse, DIAG_POS_ERR, &pos, "unknown escape sequence" );
p_bail( parse );
}
Expand All @@ -2674,7 +2675,7 @@ void escape_ch( struct parse* parse, char* ch_out, struct str* text,
// Code needs to be a valid character.
if ( code > 127 ) {
struct pos pos = { parse->source->line, slash,
parse->source->file->id };
parse->source->file_entry_id };
p_diag( parse, DIAG_POS_ERR, &pos, "invalid character `\\%s`", buffer );
p_bail( parse );
}
Expand Down

0 comments on commit e1700a0

Please sign in to comment.