dawids/lang-bootstrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

macro replacement in #line directives

Browse source
This commit is contained in:
pommicket 2022-01-10 12:29:11 -05:00
parent f706d3903a
commit f192249c65
2 changed files with 40 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

6
05/main.c
View file

@ -3,4 +3,10 @@
f(2 f(2
3) 3)
#define STRINGIFY(x) #x
#define MY_FILE STRINGIFY(some_file.c)
#define LINE_NUMBER 1982
#line LINE_NUMBER MY_FILE
#pragma #pragma

63
05/preprocess.b
View file

@ -531,14 +531,19 @@ function translation_phase_4
fputs(2, .str_directive_error) fputs(2, .str_directive_error)
exit(1) exit(1)
:pp_directive_line :pp_directive_line
; @NONSTANDARD: we don't do macro replacements in #line directives global 1000 dat_directive_line_text
local temp_out
temp_out = &dat_directive_line_text
macro_replacement_to_terminator(filename, &line_number, &in, &temp_out, 10)
temp_out = &dat_directive_line_text
; at this stage, we just turn #line directives into a nicer format: ; at this stage, we just turn #line directives into a nicer format:
; {$line_number filename} e.g. {$77 main.c} ; {$line_number filename} e.g. {$77 main.c}
local new_line_number local new_line_number
pptoken_skip(&in) pptoken_skip(&temp_out)
pptoken_skip_spaces(&in) pptoken_skip_spaces(&temp_out)
new_line_number = stoi(in) new_line_number = stoi(temp_out)
new_line_number -= 1 ; #line directive applies to the following line new_line_number -= 1 ; #line directive applies to the following line
*1out = '$ *1out = '$
out += 1 out += 1
@ -547,14 +552,14 @@ function translation_phase_4
out = strcpy(out, p) out = strcpy(out, p)
*1out = 32 *1out = 32
out += 1 out += 1
pptoken_skip(&in) pptoken_skip(&temp_out)
pptoken_skip_spaces(&in) pptoken_skip_spaces(&temp_out)
if *1in == 10 goto ppdirective_line_no_filename if *1temp_out == 10 goto ppdirective_line_no_filename
if *1in != '" goto bad_line_directive if *1temp_out != '" goto bad_line_directive
; copy filename ; copy filename
in += 1 temp_out += 1
filename = out filename = out
out = memccpy(out, in, '") out = memccpy(out, temp_out, '")
*1out = 0 *1out = 0
out += 1 out += 1
goto ppdirective_line_cont goto ppdirective_line_cont
@ -562,7 +567,6 @@ function translation_phase_4
out = strcpy(out, filename) out = strcpy(out, filename)
out += 1 out += 1
:ppdirective_line_cont :ppdirective_line_cont
pptoken_skip_to_newline(&in)
line_number = new_line_number line_number = new_line_number
goto process_pptoken goto process_pptoken
:pp_directive_undef :pp_directive_undef
@ -769,24 +773,25 @@ function look_up_function_macro
argument name argument name
return look_up_macro(function_macros, name) return look_up_macro(function_macros, name)
; replace macros at *p_in until terminator is reached ; replace macros at *p_in until terminator character is reached
;function macro_replacement_to_terminator function macro_replacement_to_terminator
; argument filename argument filename
; argument p_line_number argument p_line_number
; argument p_in argument p_in
; argument p_out argument p_out
; argument terminator argument terminator
; local in local in
; local out local out
; in = *8p_in in = *8p_in
; out = *8p_out out = *8p_out
; :macro_replacement_to_terminator_loop :macro_replacement_to_terminator_loop
; if *1in == terminator goto macro_replacement_to_terminator_loop_end if *1in == terminator goto macro_replacement_to_terminator_loop_end
; macro_replacement(filename, p_line_number, &in, &out) macro_replacement(filename, p_line_number, &in, &out)
; :macro_replacement_to_terminator_loop_end goto macro_replacement_to_terminator_loop
; *8p_in = in :macro_replacement_to_terminator_loop_end
; *8p_out = out *8p_in = in
; return *8p_out = out
return
; @NONSTANDARD: ; @NONSTANDARD:
; Macro replacement isn't handled properly in the following ways: ; Macro replacement isn't handled properly in the following ways: