wrong arguments moved from warning 202 to error 92
--HG-- branch : dvander extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/branches/dvander%4013
This commit is contained in:
parent
cc6e3f9fab
commit
97312faf3d
@ -1586,16 +1586,16 @@ static int substpattern(unsigned char *line,size_t buffersize,char *pattern,char
|
|||||||
s+=2;
|
s+=2;
|
||||||
} /* if */
|
} /* if */
|
||||||
e++; /* skip %, digit is skipped later */
|
e++; /* skip %, digit is skipped later */
|
||||||
} else if (*e == '"') {
|
} else if (*e == '"') {
|
||||||
p=e;
|
p=e;
|
||||||
if (is_startstring(e)) {
|
if (is_startstring(e)) {
|
||||||
e=skipstring(e);
|
e=skipstring(e);
|
||||||
strins((char*)s,(char *)p,(e-p+1));
|
strins((char*)s,(char *)p,(e-p+1));
|
||||||
s+=(e-p+1);
|
s+=(e-p+1);
|
||||||
} else {
|
} else {
|
||||||
strins((char*)s,(char*)e,1);
|
strins((char*)s,(char*)e,1);
|
||||||
s++;
|
s++;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
strins((char*)s,(char*)e,1);
|
strins((char*)s,(char*)e,1);
|
||||||
s++;
|
s++;
|
||||||
|
@ -1988,7 +1988,7 @@ static int nesting=0;
|
|||||||
if (matchtoken('_')) {
|
if (matchtoken('_')) {
|
||||||
arglist[argpos]=ARG_IGNORED; /* flag argument as "present, but ignored" */
|
arglist[argpos]=ARG_IGNORED; /* flag argument as "present, but ignored" */
|
||||||
if (arg[argidx].ident==0 || arg[argidx].ident==iVARARGS) {
|
if (arg[argidx].ident==0 || arg[argidx].ident==iVARARGS) {
|
||||||
error(202); /* argument count mismatch */
|
error(92); /* argument count mismatch */
|
||||||
} else if (!arg[argidx].hasdefault) {
|
} else if (!arg[argidx].hasdefault) {
|
||||||
error(34,nargs+1); /* argument has no default value */
|
error(34,nargs+1); /* argument has no default value */
|
||||||
} /* if */
|
} /* if */
|
||||||
@ -2007,7 +2007,7 @@ static int nesting=0;
|
|||||||
assert(sc_status==statFIRST || arg[argidx].tags!=NULL);
|
assert(sc_status==statFIRST || arg[argidx].tags!=NULL);
|
||||||
switch (arg[argidx].ident) {
|
switch (arg[argidx].ident) {
|
||||||
case 0:
|
case 0:
|
||||||
error(202); /* argument count mismatch */
|
error(92); /* argument count mismatch */
|
||||||
break;
|
break;
|
||||||
case iVARARGS:
|
case iVARARGS:
|
||||||
/* always pass by reference */
|
/* always pass by reference */
|
||||||
|
@ -129,7 +129,8 @@ static char *errmsg[] = {
|
|||||||
/*088*/ "public variables and local variables may not have states (symbol \"%s\")\n",
|
/*088*/ "public variables and local variables may not have states (symbol \"%s\")\n",
|
||||||
/*089*/ "state variables may not be initialized (symbol \"%s\")\n",
|
/*089*/ "state variables may not be initialized (symbol \"%s\")\n",
|
||||||
/*090*/ "public functions may not return arrays (symbol \"%s\")\n",
|
/*090*/ "public functions may not return arrays (symbol \"%s\")\n",
|
||||||
/*091*/ "ambiguous constant; tag override is required (symbol \"%s\")\n"
|
/*091*/ "ambiguous constant; tag override is required (symbol \"%s\")\n",
|
||||||
|
/*092*/ "number of arguments does not match definition\n"
|
||||||
#else
|
#else
|
||||||
"\271pect\235\306k\212:\227\316bu\202fo\217\206\216\012",
|
"\271pect\235\306k\212:\227\316bu\202fo\217\206\216\012",
|
||||||
"\201l\223\252s\203g\352\315e\234\202(\255\363\201) c\355f\240\344w ea\275 \042c\351e\042\012",
|
"\201l\223\252s\203g\352\315e\234\202(\255\363\201) c\355f\240\344w ea\275 \042c\351e\042\012",
|
||||||
@ -221,7 +222,8 @@ static char *errmsg[] = {
|
|||||||
"pu\236\326 \301\310\226\206\344c\337\301\310\367\242\340\376\315\310\323",
|
"pu\236\326 \301\310\226\206\344c\337\301\310\367\242\340\376\315\310\323",
|
||||||
"\315\200\301\310\367\242\312\203i\205\211iz\235\323",
|
"\315\200\301\310\367\242\312\203i\205\211iz\235\323",
|
||||||
"pu\236\326 \366\207\367\242\221tur\336\256y\207\323",
|
"pu\236\326 \366\207\367\242\221tur\336\256y\207\323",
|
||||||
"a\230i\262ou\207\354t; \373ov\210rid\200\272\221qui\221\206\323"
|
"a\230i\262ou\207\354t; \373ov\210rid\200\272\221qui\221\206\323",
|
||||||
|
"\374\230\264\304\265t\207do\310\242\345\275 \327i\214\012",
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user