diff --git a/src/c/dpp.c b/src/c/dpp.c index 82c45bd7f..87d4f7216 100644 --- a/src/c/dpp.c +++ b/src/c/dpp.c @@ -644,7 +644,7 @@ put_declaration(void) fprintf(out, "\tKEYS[%d]=K%s;\n", i, keyword[i].k_key); } put_lineno(); - fprintf(out, "\tparse_key(narg-%d, ARGS, %d, KEYS, KEY_VARS, %s, %d);\n", + fprintf(out, "\tva_parse_key(narg-%d, ARGS, %d, KEYS, KEY_VARS, %s, %d);\n", nreq+nopt, nkey, rest_flag ? rest_var : "OBJNULL", allow_other_keys_flag); for (i = 0; i < nkey; i++) { put_lineno(); diff --git a/src/c/string.d b/src/c/string.d index ce682da45..bb4aafe18 100644 --- a/src/c/string.d +++ b/src/c/string.d @@ -322,7 +322,7 @@ string_cmp(int narg, int sign, int boundary, va_list ARGS) KEYS[1]=@':end1'; KEYS[2]=@':start2'; KEYS[3]=@':end2'; - parse_key(narg-2, ARGS, 4, KEYS, KEY_VARS, OBJNULL, 0); + va_parse_key(narg-2, ARGS, 4, KEYS, KEY_VARS, OBJNULL, 0); string1 = coerce_to_string_designator(string1); string2 = coerce_to_string_designator(string2); @@ -407,7 +407,7 @@ string_compare(int narg, int sign, int boundary, va_list ARGS) KEYS[1]=@':end1'; KEYS[2]=@':start2'; KEYS[3]=@':end2'; - parse_key(narg-2, ARGS, 4, KEYS, KEY_VARS, OBJNULL, 0); + va_parse_key(narg-2, ARGS, 4, KEYS, KEY_VARS, OBJNULL, 0); string1 = coerce_to_string_designator(string1); string2 = coerce_to_string_designator(string2); @@ -565,7 +565,7 @@ string_case(int narg, int (*casefun)(), va_list ARGS) if (narg < 1) FEtoo_few_arguments(&narg); KEYS[0]=@':start'; KEYS[1]=@':end'; - parse_key(narg-1, ARGS, 2, KEYS, KEY_VARS, OBJNULL, 0); + va_parse_key(narg-1, ARGS, 2, KEYS, KEY_VARS, OBJNULL, 0); strng = coerce_to_string_designator(strng); conv = copy_simple_string(strng); @@ -639,7 +639,7 @@ nstring_case(int narg, int (*casefun)(), va_list ARGS) if (narg < 1) FEtoo_few_arguments(&narg); KEYS[0]=@':start'; KEYS[1]=@':end'; - parse_key(narg-1, ARGS, 2, KEYS, KEY_VARS, OBJNULL, 0); + va_parse_key(narg-1, ARGS, 2, KEYS, KEY_VARS, OBJNULL, 0); assert_type_string(strng); if (startp == Cnil) start = MAKE_FIXNUM(0);