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

handle fmacros with no parameters

Browse source
This commit is contained in:
pommicket 2022-02-07 16:01:35 -05:00
parent ef1100ad08
commit cfe52e2cfe
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
05/preprocess.b
View file

@ -660,6 +660,10 @@ function translation_phase_4
pptoken_skip(&in) ; skip opening parenthesis pptoken_skip(&in) ; skip opening parenthesis
pptoken_skip_spaces(&in) pptoken_skip_spaces(&in)
param_name = param_names param_name = param_names
; macros with no arguments are legal for some reason
if *1in == ') goto macro_params_loop_end
:macro_params_loop :macro_params_loop
c = *1in c = *1in
if c == 10 goto phase4_missing_closing_bracket if c == 10 goto phase4_missing_closing_bracket
@ -1229,7 +1233,6 @@ function macro_replacement
pptoken_skip(&in) ; skip macro name pptoken_skip(&in) ; skip macro name
pptoken_skip_spaces(&in) pptoken_skip_spaces(&in)
pptoken_skip(&in) ; skip opening bracket pptoken_skip(&in) ; skip opening bracket
if *1in == ') goto empty_fmacro_invocation
local arguments local arguments
local fmacro_out local fmacro_out
@ -1240,6 +1243,7 @@ function macro_replacement
; store the arguments (separated by 255-characters) ; store the arguments (separated by 255-characters)
p = arguments p = arguments
if *1in == ') goto fmacro_no_args
:fmacro_arg_loop :fmacro_arg_loop
b = fmacro_arg_end(filename, p_line_number, in) b = fmacro_arg_end(filename, p_line_number, in)
b -= in b -= in
@ -1253,6 +1257,9 @@ function macro_replacement
if c == ') goto fmacro_arg_loop_end if c == ') goto fmacro_arg_loop_end
pptoken_skip_spaces(&in) pptoken_skip_spaces(&in)
goto fmacro_arg_loop goto fmacro_arg_loop
:fmacro_no_args
in += 2 ; skip )
; (fallthrough)
:fmacro_arg_loop_end :fmacro_arg_loop_end
*1p = 255 ; use an additional 255-character to mark the end (note: macro arguments may not be empty) *1p = 255 ; use an additional 255-character to mark the end (note: macro arguments may not be empty)
@ -1370,12 +1377,6 @@ function macro_replacement
*1old_banned_fmacros_end = 255 *1old_banned_fmacros_end = 255
return return
:empty_fmacro_invocation
compile_error(filename, *8p_line_number, .str_empty_fmacro_invocation)
:str_empty_fmacro_invocation
string No arguments provided to function-like macro.
byte 0
:handle___FILE__ :handle___FILE__
pptoken_skip(&in) pptoken_skip(&in)
*1out = '" *1out = '"