X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=ftepp.c;h=8f452754d74b85b3f2787cfba12ee6ddbba112b6;hp=c574f03bb99d518191a243a8155e60f41a9e7c76;hb=4c1c1bc0519b666c92ce7bcab4c02c292d7cbfe7;hpb=e8133893a0bd4e1cc469864b3d6f621ed5f3186f diff --git a/ftepp.c b/ftepp.c index c574f03..8f45275 100644 --- a/ftepp.c +++ b/ftepp.c @@ -837,7 +837,7 @@ static bool ftepp_macro_expand(ftepp_t *ftepp, ppmacro *macro, macroparam *param macro_params_find(macro, macro->output[o+1]->value, &pi)) { ++o; - + ftepp_stringify(ftepp, ¶ms[pi]); break; } @@ -849,10 +849,11 @@ static bool ftepp_macro_expand(ftepp_t *ftepp, ppmacro *macro, macroparam *param break; default: buffer = out->value; - if (vec_size(macro->output) > o + 1 && macro->output[o+1]->token == '#') + #define buffer_stripable(X) ((X) == ' ' || (X) == '\t') + if (vec_size(macro->output) > o + 1 && macro->output[o+1]->token == '#' && buffer_stripable(*buffer)) buffer++; if (strip) { - while (util_isspace(*buffer)) buffer++; + while (buffer_stripable(*buffer)) buffer++; strip = false; } ftepp_out(ftepp, buffer, false);