Module: wine Branch: master Commit: 047827b1c9f92c31350bca6179d2b22093e4721c URL: https://source.winehq.org/git/wine.git/?a=commit;h=047827b1c9f92c31350bca617...
Author: Zebediah Figura z.figura12@gmail.com Date: Tue Jul 28 16:32:19 2020 -0500
wpp: Correct the spelling of "ellipsis".
Signed-off-by: Zebediah Figura z.figura12@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
libs/wpp/ppl.l | 2 +- libs/wpp/ppy.y | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/libs/wpp/ppl.l b/libs/wpp/ppl.l index a68124355b..566cf2f73f 100644 --- a/libs/wpp/ppl.l +++ b/libs/wpp/ppl.l @@ -522,7 +522,7 @@ void pp_writestring(const char *format, ...) <pp_macro>{ws}+ ; <pp_macro>{cident} ppy_lval.cptr = pp_xstrdup(ppy_text); return tIDENT; <pp_macro>, return ','; -<pp_macro>"..." return tELIPSIS; +<pp_macro>"..." return tELLIPSIS; <pp_macro>(\\r?)|(\n)|(.)|(..?) ppy_error("Argument identifier expected"); <pp_macro>\\r?\n newline(0);
diff --git a/libs/wpp/ppy.y b/libs/wpp/ppy.y index eb4f15a4b8..a6c0957994 100644 --- a/libs/wpp/ppy.y +++ b/libs/wpp/ppy.y @@ -140,7 +140,7 @@ static int nmacro_args; %token tRCINCLUDE %token tIF tIFDEF tIFNDEF tELSE tELIF tENDIF tDEFINED tNL %token tINCLUDE tLINE tGCCLINE tERROR tWARNING tPRAGMA tPPIDENT -%token tUNDEF tMACROEND tCONCAT tELIPSIS tSTRINGIZE +%token tUNDEF tMACROEND tCONCAT tELLIPSIS tSTRINGIZE %token <cptr> tIDENT tLITERAL tMACRO tDEFINE %token <cptr> tDQSTRING tSQSTRING tIQSTRING %token <uint> tUINT @@ -333,7 +333,7 @@ allmargs: /* Empty */ { $$ = 0; macro_args = NULL; nmacro_args = 0; } ;
emargs : margs { $$ = $1; } - | margs ',' tELIPSIS { $$ = add_new_marg(NULL, arg_list); nmacro_args *= -1; } + | margs ',' tELLIPSIS { $$ = add_new_marg(NULL, arg_list); nmacro_args *= -1; } ;
margs : margs ',' tIDENT { $$ = add_new_marg($3, arg_single); }