diff options
Diffstat (limited to 'libcpp/macro.cc')
| -rw-r--r-- | libcpp/macro.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libcpp/macro.cc b/libcpp/macro.cc index a1a134a..f437da4 100644 --- a/libcpp/macro.cc +++ b/libcpp/macro.cc @@ -3431,7 +3431,7 @@ _cpp_unsave_parameters (cpp_reader *pfile, unsigned n) */ static bool -parse_params (cpp_reader *pfile, unsigned *n_ptr, bool *varadic_ptr) +parse_params (cpp_reader *pfile, unsigned *n_ptr, bool *variadic_ptr) { unsigned nparms = 0; bool ok = false; @@ -3462,7 +3462,7 @@ parse_params (cpp_reader *pfile, unsigned *n_ptr, bool *varadic_ptr) }; unsigned ix = prev_ident; const unsigned char *as_text = NULL; - if (*varadic_ptr) + if (*variadic_ptr) ix = 4; else if (token->type == CPP_EOF) ix += 2; @@ -3473,7 +3473,7 @@ parse_params (cpp_reader *pfile, unsigned *n_ptr, bool *varadic_ptr) goto out; case CPP_NAME: - if (prev_ident || *varadic_ptr) + if (prev_ident || *variadic_ptr) goto bad; prev_ident = true; @@ -3484,7 +3484,7 @@ parse_params (cpp_reader *pfile, unsigned *n_ptr, bool *varadic_ptr) break; case CPP_CLOSE_PAREN: - if (prev_ident || !nparms || *varadic_ptr) + if (prev_ident || !nparms || *variadic_ptr) { ok = true; goto out; @@ -3492,15 +3492,15 @@ parse_params (cpp_reader *pfile, unsigned *n_ptr, bool *varadic_ptr) /* FALLTHRU */ case CPP_COMMA: - if (!prev_ident || *varadic_ptr) + if (!prev_ident || *variadic_ptr) goto bad; prev_ident = false; break; case CPP_ELLIPSIS: - if (*varadic_ptr) + if (*variadic_ptr) goto bad; - *varadic_ptr = true; + *variadic_ptr = true; if (!prev_ident) { /* An ISO bare ellipsis. */ @@ -3577,7 +3577,7 @@ create_iso_definition (cpp_reader *pfile) unsigned int num_extra_tokens = 0; unsigned nparms = 0; cpp_hashnode **params = NULL; - bool varadic = false; + bool variadic = false; bool ok = false; cpp_macro *macro = NULL; @@ -3594,7 +3594,7 @@ create_iso_definition (cpp_reader *pfile) else if (token->type == CPP_OPEN_PAREN) { /* An open-paren, get a parameter list. */ - if (!parse_params (pfile, &nparms, &varadic)) + if (!parse_params (pfile, &nparms, &variadic)) goto out; params = (cpp_hashnode **)_cpp_commit_buff @@ -3645,7 +3645,7 @@ create_iso_definition (cpp_reader *pfile) if (!token) { - macro->variadic = varadic; + macro->variadic = variadic; macro->paramc = nparms; macro->parm.params = params; macro->fun_like = true; |