diff --git a/sourcepawn/compiler/sc1.c b/sourcepawn/compiler/sc1.c index c74a4a81..679012fd 100644 --- a/sourcepawn/compiler/sc1.c +++ b/sourcepawn/compiler/sc1.c @@ -209,12 +209,12 @@ int pc_compile(int argc, char *argv[]) /* allocate memory for fixed tables */ inpfname=(char*)malloc(_MAX_PATH); if (inpfname==NULL) - error(103); /* insufficient memory */ + error(123); /* insufficient memory */ litq=(cell*)malloc(litmax*sizeof(cell)); if (litq==NULL) - error(103); /* insufficient memory */ + error(123); /* insufficient memory */ if (!phopt_init()) - error(103); /* insufficient memory */ + error(123); /* insufficient memory */ setopt(argc,argv,outfname,errfname,incfname,reportname,codepage); strcpy(binfname,outfname); @@ -239,7 +239,7 @@ int pc_compile(int argc, char *argv[]) lcl_tabsize=sc_tabsize; #if !defined NO_CODEPAGE if (!cp_set(codepage)) /* set codepage */ - error(108); /* codepage mapping file not found */ + error(128); /* codepage mapping file not found */ #endif /* optionally create a temporary input file that is a collection of all * input files @@ -256,7 +256,7 @@ int pc_compile(int argc, char *argv[]) tname=tempnam(NULL,"pawn"); #elif defined(MACOS) && !defined(__MACH__) /* tempnam is not supported for the Macintosh CFM build. */ - error(104,get_sourcefile(1)); + error(124,get_sourcefile(1)); tname=NULL; sname=NULL; #else @@ -270,7 +270,7 @@ int pc_compile(int argc, char *argv[]) pc_closesrc(ftmp); remove(tname); strcpy(inpfname,sname); /* avoid invalid filename */ - error(100,sname); + error(120,sname); } /* if */ pc_writesrc(ftmp,(unsigned char*)"#file \""); pc_writesrc(ftmp,(unsigned char*)sname); @@ -289,18 +289,18 @@ int pc_compile(int argc, char *argv[]) } /* if */ inpf_org=(FILE*)pc_opensrc(inpfname); if (inpf_org==NULL) - error(100,inpfname); + error(120,inpfname); freading=TRUE; outf=(FILE*)pc_openasm(outfname); /* first write to assembler file (may be temporary) */ if (outf==NULL) - error(101,outfname); + error(121,outfname); /* immediately open the binary file, for other programs to check */ if (sc_asmfile || sc_listing) { binf=NULL; } else { binf=(FILE*)pc_openbin(binfname); if (binf==NULL) - error(101,binfname); + error(121,binfname); } /* if */ setconstants(); /* set predefined constants and tagnames */ for (i=0; iname); } needtoken('='); cur_litidx = litidx; @@ -1840,26 +1839,22 @@ static void declstructvar(char *firstname,int fpublic, pstruct_t *pstruct) { if (arg->ident == iREFERENCE && sym->ident != iVARIABLE) { - /* :TODO: Change to "symbol \"%s\" does not have a matching type */ - error(20, str); + error(97, str); } else if (arg->ident == iARRAY) { if (sym->ident != iARRAY) { - /* :TODO: Change to "symbol \"%s\" does not have a matching type */ - error(20, str); + error(97, str); } else { /* :TODO: We should check dimension sizes here... */ } } else if (arg->ident == iREFARRAY) { if (sym->ident != iARRAY) { - /* :TODO: Change to "symbol \"%s\" does not have a matching type */ - error(20, str); + error(97, str); } /* :TODO: Check dimension sizes! */ } else { - /* :TODO: Change to "symbol \"%s\" does not have a matching type */ - error(20, str); + error(97, str); } if (sym->tag != arg->tag) { @@ -1977,7 +1972,7 @@ static void declglb(char *firstname,int firsttag,int fpublic,int fstatic,int fst size=needsub(&idxtag[numdim],&enumroot); /* get size; size==0 for "var[]" */ #if INT_MAX < LONG_MAX if (size > INT_MAX) - error(105); /* overflow, exceeding capacity */ + error(125); /* overflow, exceeding capacity */ #endif #if 0 /* We don't actually care */ if (ispublic) @@ -2276,7 +2271,7 @@ static int declloc(int fstatic) idxtag[numdim] = dim_sym ? dim_sym->tag : 0; #if INT_MAX < LONG_MAX if (dim[numdim] > INT_MAX) - error(105); /* overflow, exceeding capacity */ + error(125); /* overflow, exceeding capacity */ #endif } else { error(29); /* invalid expression, assumed 0 */ @@ -2898,8 +2893,7 @@ static void declstruct(void) if (pstructs_find(str) != NULL) { - /* :TODO: change to "struct requires unique struct name" */ - error(58); + error(98); } pstruct = pstructs_add(str); @@ -2971,8 +2965,7 @@ static void declstruct(void) } if (pstructs_addarg(pstruct, &arg) == NULL) { - /* :TODO: change to "struct member name appears more than once" */ - error(58); + error(99, arg.name, pstruct->name); } } while (matchtoken(',')); needtoken('}'); @@ -3246,7 +3239,7 @@ static void decl_enum(int vclass) enumsym->usage |= uENUMROOT; /* start a new list for the element names */ if ((enumroot=(constvalue*)malloc(sizeof(constvalue)))==NULL) - error(103); /* insufficient memory (fatal error) */ + error(123); /* insufficient memory (fatal error) */ memset(enumroot,0,sizeof(constvalue)); } else { enumsym=NULL; @@ -3396,7 +3389,7 @@ static void attachstatelist(symbol *sym, int state_id) constvalue *stateptr; if (sym->states==NULL) { if ((sym->states=(constvalue*)malloc(sizeof(constvalue)))==NULL) - error(103); /* insufficient memory (fatal error) */ + error(123); /* insufficient memory (fatal error) */ memset(sym->states,0,sizeof(constvalue)); } /* if */ /* see whether the id already exists (add new state only if it does not @@ -3573,8 +3566,8 @@ static int operatoradjust(int opertok,symbol *sym,char *opername,int resulttag) if (arg->ident!=iREFARRAY) error(73,arg->name);/* must be an array argument */ } else { - if (arg->ident!=iVARIABLE) - error(66,arg->name);/* must be non-reference argument */ + //if (arg->ident!=iVARIABLE) + //error(66,arg->name);/* must be non-reference argument */ } /* if */ if (arg->hasdefault) error(59,arg->name); /* arguments of an operator may not have a default value */ @@ -3778,7 +3771,7 @@ static void funcstub(int fnative) error(9); /* invalid array size */ #if INT_MAX < LONG_MAX if (size > INT_MAX) - error(105); /* overflow, exceeding capacity */ + error(125); /* overflow, exceeding capacity */ #endif dim[numdim++]=(int)size; } /* while */ @@ -3839,6 +3832,10 @@ static void funcstub(int fnative) */ if (fnative) { if (opertok!=0) { + if (matchtoken('[')) + { + printf("Hrm!\n"); + } needtoken('='); lexpush(); /* push back, for matchtoken() to retrieve again */ } /* if */ @@ -4231,7 +4228,7 @@ static int declargs(symbol *sym,int chkshadow) /* redimension the argument list, add the entry */ sym->dim.arglist=(arginfo*)realloc(sym->dim.arglist,(argcnt+2)*sizeof(arginfo)); if (sym->dim.arglist==0) - error(103); /* insufficient memory */ + error(123); /* insufficient memory */ memset(&sym->dim.arglist[argcnt+1],0,sizeof(arginfo)); /* keep the list terminated */ sym->dim.arglist[argcnt]=arg; } else { @@ -4260,7 +4257,7 @@ static int declargs(symbol *sym,int chkshadow) /* redimension the argument list, add the entry iVARARGS */ sym->dim.arglist=(arginfo*)realloc(sym->dim.arglist,(argcnt+2)*sizeof(arginfo)); if (sym->dim.arglist==0) - error(103); /* insufficient memory */ + error(123); /* insufficient memory */ memset(&sym->dim.arglist[argcnt+1],0,sizeof(arginfo)); /* keep the list terminated */ sym->dim.arglist[argcnt].ident=iVARARGS; sym->dim.arglist[argcnt].hasdefault=FALSE; @@ -4269,7 +4266,7 @@ static int declargs(symbol *sym,int chkshadow) sym->dim.arglist[argcnt].numtags=numtags; sym->dim.arglist[argcnt].tags=(int*)malloc(numtags*sizeof tags[0]); if (sym->dim.arglist[argcnt].tags==NULL) - error(103); /* insufficient memory */ + error(123); /* insufficient memory */ memcpy(sym->dim.arglist[argcnt].tags,tags,numtags*sizeof tags[0]); } else { if (argcnt>oldargcnt || sym->dim.arglist[argcnt].ident!=iVARARGS) @@ -4364,7 +4361,7 @@ static void doarg(char *name,int ident,int offset,int tags[],int numtags, size=needsub(&arg->idxtag[arg->numdim],&enumroot);/* may be zero here, it is a pointer anyway */ #if INT_MAX < LONG_MAX if (size > INT_MAX) - error(105); /* overflow, exceeding capacity */ + error(125); /* overflow, exceeding capacity */ #endif arg->dim[arg->numdim]=(int)size; arg->numdim+=1; @@ -4420,7 +4417,7 @@ static void doarg(char *name,int ident,int offset,int tags[],int numtags, cell val; tokeninfo(&val,&name); if ((arg->defvalue.size.symname=duplicatestring(name)) == NULL) - error(103); /* insufficient memory */ + error(123); /* insufficient memory */ arg->defvalue.size.level=0; if (size_tag_token==uSIZEOF || size_tag_token==uCOUNTOF) { while (matchtoken('[')) { @@ -4446,7 +4443,7 @@ static void doarg(char *name,int ident,int offset,int tags[],int numtags, arg->numtags=numtags; arg->tags=(int*)malloc(numtags*sizeof tags[0]); if (arg->tags==NULL) - error(103); /* insufficient memory */ + error(123); /* insufficient memory */ memcpy(arg->tags,tags,numtags*sizeof tags[0]); argsym=findloc(name); if (argsym!=NULL) { @@ -5189,7 +5186,7 @@ static constvalue *insert_constval(constvalue *prev,constvalue *next,const char constvalue *cur; if ((cur=(constvalue*)malloc(sizeof(constvalue)))==NULL) - error(103); /* insufficient memory (fatal error) */ + error(123); /* insufficient memory (fatal error) */ memset(cur,0,sizeof(constvalue)); if (name!=NULL) { assert(strlen(name)=(wq+wqTABSZ-wqSIZE)) - error(102,"loop table"); /* loop table overflow (too many active loops)*/ + error(122,"loop table"); /* loop table overflow (too many active loops)*/ k=0; while (kstktop); newstack=(stkitem*)malloc(newsize*sizeof(stkitem)); if (newstack==NULL) - error(102,"parser stack"); /* stack overflow (recursive include?) */ + error(122,"parser stack"); /* stack overflow (recursive include?) */ /* swap the stacks */ memcpy(newstack,stack,stkidx*sizeof(stkitem)); if (stack!=NULL) @@ -157,7 +157,7 @@ static char *extensions[] = { ".inc", ".p", ".pawn" }; PUSHSTK_I(fline); inpfname=duplicatestring(name);/* set name of include file */ if (inpfname==NULL) - error(103); /* insufficient memory */ + error(123); /* insufficient memory */ inpf=fp; /* set input file pointer to include file */ fnumber++; fline=0; /* set current line number to 0 */ @@ -280,7 +280,7 @@ static void doinclude(int silent) if (result) add_constant(symname,1,sGLOBAL,0); else if (!silent) - error(100,name); /* cannot read from ... (fatal error) */ + error(120,name); /* cannot read from ... (fatal error) */ } /* if */ } @@ -915,7 +915,7 @@ static int command(void) ret=CMD_IF; assert(iflevel>=0); if (iflevel>=sCOMP_STACK) - error(102,"Conditional compilation stack"); /* table overflow */ + error(122,"Conditional compilation stack"); /* table overflow */ iflevel++; if (SKIPPING) break; /* break out of switch */ @@ -1004,7 +1004,7 @@ static int command(void) free(inpfname); inpfname=duplicatestring(pathname); if (inpfname==NULL) - error(103); /* insufficient memory */ + error(123); /* insufficient memory */ fline=0; } /* if */ } /* if */ @@ -1024,7 +1024,7 @@ static int command(void) /* nothing */; /* save start of expression */ preproc_expr(&val,NULL); /* get constant expression (or 0 on error) */ if (!val) - error(110,str); /* assertion failed */ + error(130,str); /* assertion failed */ check_empty(lptr); } /* if */ break; @@ -1048,7 +1048,7 @@ static int command(void) name[i]='\0'; } /* if */ if (!cp_set(name)) - error(108); /* codepage mapping file not found */ + error(128); /* codepage mapping file not found */ } else if (strcmp(str,"compress")==0) { cell val; preproc_expr(&val,NULL); @@ -1314,7 +1314,7 @@ static int command(void) /* store matched pattern */ pattern=(char*)malloc(count+1); if (pattern==NULL) - error(103); /* insufficient memory */ + error(123); /* insufficient memory */ lptr=start; count=0; while (lptr!=end) { @@ -1348,7 +1348,7 @@ static int command(void) /* store matched substitution */ substitution=(char*)malloc(count+1); /* +1 for '\0' */ if (substitution==NULL) - error(103); /* insufficient memory */ + error(123); /* insufficient memory */ lptr=start; count=0; while (lptr!=end) { @@ -1399,7 +1399,7 @@ static int command(void) while (*lptr<=' ' && *lptr!='\0') lptr++; if (!SKIPPING) - error(111,lptr); /* user error */ + error(131,lptr); /* user error */ break; default: error(31); /* unknown compiler directive */ @@ -1563,7 +1563,7 @@ static int substpattern(unsigned char *line,size_t buffersize,char *pattern,char len=(int)(e-s); args[arg]=(unsigned char*)malloc(len+1); if (args[arg]==NULL) - error(103); /* insufficient memory */ + error(123); /* insufficient memory */ strlcpy((char*)args[arg],(char*)s,len+1); /* character behind the pattern was matched too */ if (*e==*p) { @@ -2220,7 +2220,7 @@ static void chk_grow_litq(void) litmax+=sDEF_LITMAX; p=(cell *)realloc(litq,litmax*sizeof(cell)); if (p==NULL) - error(102,"literal table"); /* literal table overflow (fatal error) */ + error(122,"literal table"); /* literal table overflow (fatal error) */ litq=p; } /* if */ } @@ -2408,7 +2408,7 @@ static symbol *add_symbol(symbol *root,symbol *entry,int sort) root=root->next; if ((newsym=(symbol *)malloc(sizeof(symbol)))==NULL) { - error(103); + error(123); return NULL; } /* if */ memcpy(newsym,entry,sizeof(symbol)); @@ -2767,7 +2767,7 @@ SC_FUNC symbol *addsym(const char *name,cell addr,int ident,int vclass,int tag,i /* create an empty referrer list */ if ((refer=(symbol**)malloc(sizeof(symbol*)))==NULL) { - error(103); /* insufficient memory */ + error(123); /* insufficient memory */ return NULL; } /* if */ *refer=NULL; diff --git a/sourcepawn/compiler/sc3.c b/sourcepawn/compiler/sc3.c index 9a64175d..c50a8c8e 100644 --- a/sourcepawn/compiler/sc3.c +++ b/sourcepawn/compiler/sc3.c @@ -1987,7 +1987,7 @@ restart: */ sym=fetchfunc(lastsymbol,0); if (sym==NULL) - error(103); /* insufficient memory */ + error(123); /* insufficient memory */ markusage(sym,uREAD); } else { return error(12); /* invalid function call */ @@ -2137,7 +2137,7 @@ static int primary(value *lval) assert(sc_status==statFIRST); sym=fetchfunc(st,0); if (sym==NULL) - error(103); /* insufficient memory */ + error(123); /* insufficient memory */ } /* if */ assert(sym!=NULL); assert(sym->ident==iFUNCTN || sym->ident==iREFFUNC); diff --git a/sourcepawn/compiler/sc5.c b/sourcepawn/compiler/sc5.c index 82d411c1..4bbc3f62 100644 --- a/sourcepawn/compiler/sc5.c +++ b/sourcepawn/compiler/sc5.c @@ -92,13 +92,13 @@ static short lastfile; return 0; } /* if */ - if (number<100){ + if (number<120){ msg=errmsg[number-1]; pre=prefix[0]; errflag=TRUE; /* set errflag (skip rest of erroneous expression) */ errnum++; } else if (number<200){ - msg=fatalmsg[number-100]; + msg=fatalmsg[number-120]; pre=prefix[1]; errnum++; /* a fatal error also counts as an error */ } else { @@ -138,7 +138,7 @@ static short lastfile; } /* if */ va_end(argptr); - if (number>=100 && number<200 || errnum>25){ + if (number>=120 && number<200 || errnum>25){ if (strlen(errfname)==0) { va_start(argptr,number); pc_error(0,"\nCompilation aborted.",NULL,0,0,argptr); @@ -160,7 +160,7 @@ static short lastfile; if (number<200) errorcount++; if (errorcount>=3) - error(107); /* too many error/warning messages on one line */ + error(127); /* too many error/warning messages on one line */ return 0; } diff --git a/sourcepawn/compiler/sc5.scp b/sourcepawn/compiler/sc5.scp index c6759275..d243ff50 100644 --- a/sourcepawn/compiler/sc5.scp +++ b/sourcepawn/compiler/sc5.scp @@ -26,14 +26,14 @@ SC_FUNC int strexpand(char *dest, unsigned char *source, int maxlen, unsigned ch #define SCPACK_TABLE errstr_table /*-*SCPACK start of pair table, do not change or remove this line */ unsigned char errstr_table[][2] = { - {101,32}, {111,110}, {116,32}, {105,110}, {97,114}, {116,105}, {100,32}, {115,32}, {101,114}, {101,110}, {133,129}, {97,108}, {37,115}, {34,140}, {141,34}, {117,110}, - {114,101}, {110,111}, {115,105}, {97,116}, {121,32}, {97,110}, {111,114}, {109,98}, {32,142}, {100,101}, {115,116}, {41,10}, {109,137}, {101,134}, {138,32}, {98,108}, - {145,130}, {111,108}, {114,97}, {143,99}, {118,139}, {102,163}, {115,121}, {166,151}, {167,161}, {117,115}, {97,32}, {115,146}, {97,159}, {132,162}, {103,32}, {136,32}, - {150,32}, {103,117}, {105,134}, {177,156}, {164,178}, {132,179}, {111,102}, {101,120}, {165,158}, {131,180}, {99,104}, {116,104}, {105,135}, {153,102}, {101,100}, {118,132}, - {168,152}, {182,32}, {105,172}, {191,194}, {101,135}, {173,148}, {109,97}, {116,111}, {99,129}, {115,10}, {112,144}, {116,97}, {181,130}, {98,128}, {154,147}, {44,32}, - {40,192}, {132,97}, {169,130}, {189,131}, {152,10}, {101,10}, {208,155}, {109,210}, {195,128}, {34,32}, {129,32}, {139,32}, {104,97}, {105,99}, {146,122}, {109,147}, - {110,32}, {100,105}, {101,108}, {117,108}, {99,111}, {108,111}, {111,112}, {116,136}, {200,154}, {58,212}, {102,105}, {97,115}, {108,128}, {230,136}, {232,149}, {149,32}, - {202,171}, {131,174}, {203,174}, {215,205}, {119,105}, {109,112}, {183,240}, {110,117}, {118,128}, {165,138}, {247,151}, {198,148}, {102,150}, {111,32}, {131,32} + {101,32}, {111,110}, {116,32}, {105,110}, {97,114}, {116,105}, {100,32}, {115,32}, {101,114}, {37,115}, {101,110}, {133,129}, {34,137}, {140,34}, {97,108}, {117,110}, + {114,101}, {110,111}, {97,116}, {115,105}, {121,32}, {97,110}, {111,114}, {109,98}, {115,116}, {32,141}, {100,101}, {41,10}, {109,138}, {101,134}, {145,130}, {139,32}, + {98,108}, {111,108}, {114,97}, {143,99}, {118,142}, {102,163}, {115,121}, {166,151}, {167,161}, {97,32}, {117,115}, {103,32}, {115,147}, {132,162}, {97,160}, {136,32}, + {150,32}, {103,117}, {105,134}, {177,156}, {164,178}, {132,179}, {111,102}, {99,104}, {116,104}, {101,120}, {165,159}, {131,180}, {105,135}, {168,153}, {154,102}, {101,100}, + {118,132}, {101,135}, {182,32}, {105,174}, {192,195}, {173,148}, {109,97}, {116,111}, {99,129}, {101,10}, {115,10}, {112,144}, {116,97}, {181,130}, {98,128}, {152,146}, + {44,32}, {40,189}, {132,97}, {170,130}, {190,131}, {153,10}, {209,155}, {109,211}, {104,97}, {196,128}, {109,146}, {34,32}, {129,32}, {142,32}, {105,99}, {117,108}, + {99,111}, {147,122}, {110,32}, {100,105}, {101,108}, {108,111}, {111,112}, {116,136}, {200,152}, {131,32}, {149,32}, {131,171}, {58,213}, {109,101}, {102,105}, {97,115}, + {108,128}, {118,128}, {230,136}, {232,149}, {204,171}, {203,172}, {218,183}, {215,206}, {119,105}, {100,111}, {109,112}, {110,117}, {185,245}, {165,139}, {251,151} }; /*-*SCPACK end of pair table, do not change or remove this line */ @@ -133,139 +133,147 @@ static char *errmsg[] = { /*092*/ "number of arguments does not match definition\n", /*093*/ "expected tag name identifier\n", /*094*/ "function enumeration requires unique tag\n", -/*095*/ "cannot have required parameters after optional parameters\n" +/*095*/ "cannot have required parameters after optional parameters\n", +/*096*/ "could not find member \"%s\" in struct \"%s\"\n", +/*097*/ "symbol \"%s\" does not have a matching type\n", +/*098*/ "struct requires unique struct name\n", +/*099*/ "member \"%s\" appears more than once in struct \"%s\"\n" #else - "\267pect\235\307k\211:\230\317bu\202fo\217\206\216\012", - "\201l\224\252s\203g\354\316e\234\202(\260\366\201) c\357f\241\345w ea\272 \042c\353e\042\012", - "\231cl\321\236\301\252\345c\333\330\327appe\204 \376\252\344\365o\217\206\237ock\012", - "\371\230 \274\240i\365le\234t\276\012", - "\270\373\240\334\370\265t\311", - "\363a\253gn\235\307 \357\255y\012", - "\355\223\260c\225\240\315\220\323\276\012", - "\363\252\356\202\366\201; \353sum\235z\210o\012", - "\271\305\336\200(nega\205ve\317z\210\375\260ou\202\301bo\217ds\233", - "\271\270\260\231cl\321\212\012", - "\271out\222d\200\371\311", - "\271\270c\213l\317\240\252\264add\220s\311", - "\221 \211tr\224po\203\202(\221 pu\237\335 \371s\233", - "\271\316e\234t; \240\376s\364t\272\012", - "\042\275a\343t\331c\353\200\363\273\200l\353\202c\353\200\376s\364t\272 \316e\234t\012", - "m\343\205p\354\275a\343t\207\376\042s\364t\272\042\012", - "\217\323\235\300\012", - "\203i\205\213iza\236d\223\252\267ce\276\207\231cl\204\235\336\325", - "\240\252lab\342\351", - "\271\250 nam\200\216\012", - "\250 \213\220ad\224\323\276\351", - "\363l\244u\200(n\201-\356t\233", - "\305a\253gn\234\202\363\222\365\354a\253gn\234t\012", - "\042b\220ak\331\260\042\310t\203ue\331\274ou\202\301\310t\267t\012", - "\270head\361\341ff\210\207from pro\307typ\325", - "\221 \337\272\361\042#if...\042\012", - "\271\272\321ct\257\356t\012", - "\271subscrip\202(\240\357\305\260\307\375m\225\224subscripts)\351", - "\271\366\201\317\353sum\235z\210o\012", - "\344\365o\217\206\316e\234\202\240c\345s\235a\202\273\200\211\206\301\352\354(\232\204t\235a\202l\203\200%d\233", - "\217k\221w\340\341\220c\205v\325", - "\305\203\231x ou\202\301bo\217d\207(\330\216\233", - "\305\363\203\231x\235(\330\216\233", - "\314do\304\240\334\370\252\275a\343\202\244u\200(\314%d\233", - "\314typ\200mis\337\272 (\314%d\233", - "e\365t\224\316e\234t\012", - "\271\232r\361(po\253\237\224n\201-\347m\203\223\235\232r\203g\233", - "\267t\242 \272\321c\347\207\332l\203\325", - "\356\202\250 \334\207\221 \336\325", - "dupl\335\223\200\042c\353e\331lab\342 (\244u\200%d\233", - "\271\342lip\222s\317\305\336\200\274\240k\221wn\012", - "\271\344\227\203a\236\301cl\353\207speci\352\210\311", - "\272\321ct\257\356\202\267ce\276\207r\225g\200f\260pack\235\232r\203g\012", - "po\222\212\333p\321me\347\207\327\312c\276\200\213l nam\235p\321me\347\311", - "\307\375m\225\224\270\265t\311", - "\217k\221w\340\305\336\200(\330\216\233", - "\305\336\304d\375\240\337\272\317\260\231\232\203a\236\305\274\307\375sm\213l\012", - "\305(\207d\375\240\337\272\012", - "\271l\203\200\310t\203ua\212\012", - "\271r\225g\325", - "\271subscript\317\251\200\042[ ]\331\355\223\226\207\332\306j\260\341\234\222\201\311", - "m\343\205-\341\234\222\201\333\255y\207\363f\343l\224\203i\205\213iz\276\012", - "\267ce\276\361\306ximum \372\257\301\341\234\222\201\311", - "\217\337\272\235c\345s\361b\242c\200(\042}\042\233", - "\232\204\202\301\270bod\224\364\273ou\202\270head\210\012", - "\255ys\317\345c\333\303\304\225\206\270\265t\207c\225\240\315pu\237\335 (\330\216\233", - "\217f\203ish\235\366\332be\374\200\344\365il\257\341\220c\205v\325", - "dupl\335\223\200\265t; sam\200\314\274p\353s\235tw\335\325", - "\270\314\373\240\334\370\252\275a\343\202\244u\200(\330\216\233", - "m\343\205p\354\042#\342se\331\341\220c\205v\304betwe\211 \042#if ... #\211\341f\042\012", - "\042#\342seif\331\341\220c\205\370f\241\345w\207\357\042#\342se\331\341\220c\205v\325", - "\372\257\301\355\225d\207do\304\240\352\202\273\200\355\223\226\012", - "\270\220s\343\202\362\301\355\223\226\230 \363\216\012", - "c\225\240\272\225g\200\312\323\235\355\223\226\311", - "\270\314\373\201l\224\334\370\252s\203g\354\362(\314%d\233", - "\270\314\373\240\315\252\220f\210\211c\200\314\260\357\305(\314\216\233", - "\330c\225\240\315bo\273 \252\220f\210\211c\200\225\206\357\305(\330\216\233", - "\271\242\212\333\372\257\312ci\222\332\376#p\242g\306\012", - "\242\212\333\372\257\374\306\202\213\220ad\224\323\276\012", - "\242\212\333\372\257supp\226\202wa\207\240\211\254\276\012", - "\251\210-\323\235\355\223\260\363\231cl\204\235be\374\200\251\200(\371\230\233", - "\042\336e\266\331\355\223\260\274\271\332\042\371\331\250\311", - "\270\314\363\357\305(\314\216\233", - "#\323\200p\223\347\340\327\232\204\202\364\273 \357\213p\334be\205c \272\321c\347\012", - "\203pu\202l\203\200\307\375l\201\256(aft\257subs\205tu\212s\233", - "\246n\313x \210r\260\376\273\200\366\201\317\260\271\270c\213l\012", - "m\213\374m\235UTF-8 \211\344d\203g\317\260c\226rupt\235\352le: \214\012", - "\270\251\304bo\273 \042\220turn\331\225\206\042\220tur\340<\244ue>\042\012", - "\203\310\222\232\211\202\220tur\340typ\304(\305& n\201-\255y\233", - "\217k\221w\340\250\317\260\240\252\356\202\250 \326", - "c\225\240\313k\200\252\362a\207\252\275a\343\202\244u\200f\260\357\203\231x\235\305p\321met\257\326", - "\251\210-\323\235\355\223\226\207\225\206na\205\370\371\207\373\240\334\370\316e\311", - "\252\270\260\330\373\201l\224b\342\201\256\307 \252s\203g\354au\307\337\332\326", - "\316\200\310fl\335t: \201\200\301\273\200\316\304\274\213\220ad\224a\253gn\235\307 a\221\273\257i\365le\234\313\236\326", - "\221 \316\304\204\200\323\235f\260\300\012", - "\217k\221w\340au\307\337\201\324", - "\217k\221w\340\316\200\216 f\260au\307\337\201\324", - "pu\237\335 \303\304\225\206\345c\333\303\304\373\240\334\370\316\304\326", - "\316\200\303\304\373\240\315\203i\205\213iz\235\326", - "pu\237\335 \371\207\373\240\220tur\340\255y\207\326", - "a\227i\261ou\207\356t; \362ov\210rid\200\274\220qui\220\206\326", - "\372\257\301\265t\207do\304\240\337\272 \323i\212\012", - "\267pect\235\362nam\200id\211\205\352\210\012", - "\270\211um\210a\236\220qui\220\207\217iqu\200\313g\012", - "c\225\240\334\370\220qui\220\206p\321me\347\207aft\257\346\212\333p\321me\347\311" + "\271pect\235\307k\212:\231\320bu\202fo\217\206\215\012", + "\201l\224\251s\203g\360\317e\234\202(\260\374\201) c\352f\241\345w ea\267 \042c\357e\042\012", + "\232cl\322\237\302\251\345c\335\331\327appe\204 \351\251\340\372o\217\206\240ock\012", + "\375\231 \274\236i\372le\234t\277\012", + "\272\306\224\236\330\361\265t\312", + "\367a\254gn\235\307 \352\255y\012", + "\362\222\260c\225\236\316\220\324\277\012", + "\367\251\363\202\374\201; \357sum\235z\210o\012", + "\273\305\341\200(nega\205ve\320z\210o \260ou\202\302bo\217ds\233", + "\273\272\260\232cl\322\213\012", + "\273out\223d\200\375\312", + "\273\272c\216l\320\236\251\264add\220s\312", + "\221 \212tr\224po\203\202(\221 pu\240\336 \375s\233", + "\273\317e\234t; \236\351s\370t\267\012", + "\042\276a\337t\333c\357\200\367\270\200l\357\202c\357\200\351s\370t\267 \317e\234t\012", + "m\337\205p\360\276a\337t\207\351\042s\370t\267\042\012", + "\217\324\235\275\012", + "\203i\205\216iza\237d\222\251\271ce\277\207\232cl\204\235\341\311", + "\236\251lab\344\354", + "\273\250 nam\200\215\012", + "\250 \216\220ad\224\324\277\354", + "\367l\244u\200(n\201-\363t\233", + "\305a\254gn\234\202\367\223\372\360a\254gn\234t\012", + "\042b\220ak\333\260\042\310t\203ue\333\274ou\202\302\310t\271t\012", + "\272head\353\343ff\210\207from pro\307typ\311", + "\221 \366\353\042#if...\042\012", + "\273\267\322ct\257\363t\012", + "\273subscrip\202(\236\352\305\260\307o m\225\224subscripts)\354", + "\273\374\201\320\357sum\235z\210o\012", + "\340\372o\217\206\317e\234\202\236c\345s\235a\202\270\200\212\206\302\356\360(\230\204t\235a\202l\203\200%d\233", + "\217k\221w\342\343\220c\205v\311", + "\305\203\232x ou\202\302bo\217d\207(\331\215\233", + "\305\367\203\232x\235(\331\215\233", + "\315\371\301\236\330\361\251\276a\337\202\244u\200(\315%d\233", + "\315typ\200mis\366 (\315%d\233", + "e\372t\224\317e\234t\012", + "\273\230r\353(po\254\240\224n\201-\347m\203\222\235\230r\203g\233", + "\271t\242 \267\322c\347\207\334l\203\311", + "\363\202\250 \330\207\221 \341\311", + "dupl\336\222\200\042c\357e\333lab\344 (\244u\200%d\233", + "\273\344lip\223s\320\305\341\200\274\236k\221wn\012", + "\273\340\227\203a\237\302cl\357\207speci\356\210\312", + "\267\322ct\257\363\202\271ce\277\207r\225g\200f\260pack\235\230r\203g\012", + "po\223\213\335p\322\355\347\207\327\313c\277\200\216l nam\235p\322\355\347\312", + "\307o m\225\224\272\265t\312", + "\217k\221w\342\305\341\200(\331\215\233", + "\305\341\301\371 \236\366\320\260\232\230\203a\237\305\274\307o sm\216l\012", + "\305(\207\371 \236\366\012", + "\273l\203\200\310t\203ua\213\012", + "\273r\225g\311", + "\273subscript\320\252\200\042[ ]\333\362\222\226\207\334\306j\260\343\234\223\201\312", + "m\337\205-\343\234\223\201\335\255y\207\367f\337l\224\203i\205\216iz\277\012", + "\271ce\277\353\306ximum \376\257\302\343\234\223\201\312", + "\217\366\235c\345s\353b\242c\200(\042}\042\233", + "\230\204\202\302\272bod\224\370\270ou\202\272head\210\012", + "\255ys\320\345c\335\304\301\225\206\272\265t\207c\225\236\316pu\240\336 (\331\215\233", + "\217f\203ish\235\374\334bef\226\200\340\372il\257\343\220c\205v\311", + "dupl\336\222\200\265t; sam\200\315\274p\357s\235tw\336\311", + "\272\315\306\224\236\330\361\251\276a\337\202\244u\200(\331\215\233", + "m\337\205p\360\042#\344se\333\343\220c\205v\301betwe\212 \042#if ... #\212\343f\042\012", + "\042#\344seif\333\343\220c\205\361f\241\345w\207\352\042#\344se\333\343\220c\205v\311", + "\376\257\302\362\225d\207\371\301\236\356\202\270\200\362\222\226\012", + "\272\220s\337\202\364\302\362\222\226\231 \367\215\012", + "c\225\236\267\225g\200\313\324\235\362\222\226\312", + "\272\315\306\224\201l\224\330\361\251s\203g\360\364(\315%d\233", + "\272\315\306\224\236\316\251\220f\210\212c\200\315\260\352\305(\315\215\233", + "\331c\225\236\316bo\270 \251\220f\210\212c\200\225\206\352\305(\331\215\233", + "\273\242\213\335\376\257\313ci\223\334\351#p\242g\306\012", + "\242\213\335\376\257f\226\306\202\216\220ad\224\324\277\012", + "\242\213\335\376\257supp\226\202wa\207\236\212\256\277\012", + "\252\210-\324\235\362\222\260\367\232cl\204\235bef\226\200\252\200(\375\231\233", + "\042\341e\266\333\362\222\260\274\273\334\042\375\333\250\312", + "\272\315\367\352\305(\315\215\233", + "#\324\200p\222\347\342\327\230\204\202\370\270 \352\216p\330be\205c \267\322c\347\012", + "\203pu\202l\203\200\307o l\201\253(aft\257subs\205tu\213s\233", + "\246n\314x \210r\260\351\270\200\374\201\320\260\273\272c\216l\012", + "m\216f\226m\235UTF-8 \212\340d\203g\320\260c\226rupt\235\356le: \211\012", + "\272\252\301bo\270 \042\220turn\333\225\206\042\220tur\342<\244ue>\042\012", + "\203\310\223\230\212\202\220tur\342typ\301(\305& n\201-\255y\233", + "\217k\221w\342\250\320\260\236\251\363\202\250 \326", + "c\225\236\314k\200\251\364a\207\251\276a\337\202\244u\200f\260\352\203\232x\235\305p\322\355t\257\326", + "\252\210-\324\235\362\222\226\207\225\206na\205\361\375\207\306\224\236\330\361\317e\312", + "\251\272\260\331\306\224\201l\224b\344\201\253\307 \251s\203g\360au\307\332\334\326", + "\317\200\310fl\336t: \201\200\302\270\200\317\301\274\216\220ad\224a\254gn\235\307 a\221\270\257i\372le\234\314\237\326", + "\221 \317\301\204\200\324\235f\260\275\012", + "\217k\221w\342au\307\332\201\325", + "\217k\221w\342\317\200\215 f\260au\307\332\201\325", + "pu\240\336 \304\301\225\206\345c\335\304\301\306\224\236\330\361\317\301\326", + "\317\200\304\301\306\224\236\316\203i\205\216iz\235\326", + "pu\240\336 \375\207\306\224\236\220tur\342\255y\207\326", + "a\227i\261ou\207\363t; \364ov\210rid\200\274\220qui\220\206\326", + "\376\257\302\265t\207\371\301\236\366 \324i\213\012", + "\271pect\235\364nam\200id\212\205\356\210\012", + "\272\212um\210a\237\220qui\220\207\217iqu\200\314g\012", + "c\225\236\330\361\220qui\220\206p\322\355\347\207aft\257\346\213\335p\322\355\347\312", + "\340\337\206\236f\203\206\355\227\210\231 \351\230ruc\202\215\012", + "\275 \371\301\236\330\361\251\366\353typ\311", + "\230ruc\202\220qui\220\207\217iqu\200\230ruc\202nam\311", + "\355\227\210\231 appe\204\207m\226\200\270\352\201c\200\351\230ruc\202\215\012" #endif }; static char *fatalmsg[] = { #ifdef SCPACK -/*100*/ "cannot read from file: \"%s\"\n", -/*101*/ "cannot write to file: \"%s\"\n", -/*102*/ "table overflow: \"%s\"\n", +/*120*/ "cannot read from file: \"%s\"\n", +/*121*/ "cannot write to file: \"%s\"\n", +/*122*/ "table overflow: \"%s\"\n", /* table can be: loop table * literal table * staging buffer * option table (response file) * peephole optimizer table */ -/*103*/ "insufficient memory\n", -/*104*/ "invalid assembler instruction \"%s\"\n", -/*105*/ "numeric overflow, exceeding capacity\n", -/*106*/ "compiled script exceeds the maximum memory size (%ld bytes)\n", -/*107*/ "too many error messages on one line\n", -/*108*/ "codepage mapping file not found\n", -/*109*/ "invalid path: \"%s\"\n", -/*110*/ "assertion failed: %s\n", -/*111*/ "user error: %s\n", +/*123*/ "insufficient memory\n", +/*124*/ "invalid assembler instruction \"%s\"\n", +/*125*/ "numeric overflow, exceeding capacity\n", +/*126*/ "compiled script exceeds the maximum memory size (%ld bytes)\n", +/*127*/ "too many error messages on one line\n", +/*128*/ "codepage mapping file not found\n", +/*129*/ "invalid path: \"%s\"\n", +/*130*/ "assertion failed: %s\n", +/*131*/ "user error: %s\n", #else - "c\225\240\220a\206from \352le\351", - "c\225\240writ\200\307 \352le\351", - "t\254\200ov\210f\345w\351", - "\203suff\335i\211\202mem\226y\012", - "\271\353se\227l\257\203\232ruc\212\324", - "\367m\210\335 ov\210f\345w\317\267ce\276\361capacity\012", - "\344\365il\235scrip\202\267ce\276\207\273\200\306ximum mem\226\224\336\200(%l\206bytes\233", - "\307\375m\225\224\210r\260messag\304\332\201\200l\203\325", - "\344\231pag\200\306pp\361\352\354\240fo\217d\012", - "\271p\223h\351", - "\353s\210\236fail\276: \214\012", - "\251\257\210r\226: \214\012" + "c\225\236\220a\206from \356le\354", + "c\225\236writ\200\307 \356le\354", + "t\256\200ov\210f\345w\354", + "\203suff\336i\212\202\355m\226y\012", + "\273\357se\227l\257\203\230ruc\213\325", + "\373m\210\336 ov\210f\345w\320\271ce\277\353capacity\012", + "\340\372il\235scrip\202\271ce\277\207\270\200\306ximum \355m\226\224\341\200(%l\206bytes\233", + "\307o m\225\224\210r\260\355ssag\301\334\201\200l\203\311", + "\340\232pag\200\306pp\353\356\360\236fo\217d\012", + "\273p\222h\354", + "\357s\210\237fail\277: \211\012", + "\252\257\210r\226: \211\012" #endif }; @@ -309,42 +317,42 @@ static char *warnmsg[] = { /*235*/ "public function lacks forward declaration (symbol \"%s\")\n", /*236*/ "unknown parameter in substitution (incorrect #define pattern)\n" #else - "\300 \274tr\243\223\235\307 %\206\272\321c\347\311", - "\220\323i\236\301\356t/\306cr\375\326", - "\372\257\301\265t\207do\304\240\337\272 \323i\212\012", - "\250 \274nev\257\251\276\351", - "\250 \274a\253gn\235\252\244u\200\273a\202\274nev\257\251\276\351", - "\220d\217d\225\202\344\231: \356\202\366\332\274z\210o\012", - "\220d\217d\225\202te\232: \356\202\366\332\274n\201-z\210o\012", - "\217k\221w\340#p\242g\306\012", - "\270\364\273 \362\220s\343\202\251\235be\374\200\323i\212\317\374c\361\220p\204s\325", - "\371\230 sho\343\206\220tur\340\252\244u\325", - "po\253\237\200\251\200\301\250 be\374\200\203i\205\213iza\212\351", - "po\253\237\224\217\203t\211\231\206a\253gn\234t\012", - "po\253\237\224\217\203t\211\231\206bit\364s\200\355a\212\012", - "\362mis\337\272\012", - "po\253\237\224\252\042\350\331\305\314wa\207\203t\211\231d\351", - "\366\332\334\207\221 effect\012", - "ne\232\235\344m\234t\012", - "\345os\200\203d\211\313\212\012", - "\241\206\232y\354pro\307typ\304\251\235\364\273 \346\212\333sem\335\241umn\311", - "\345c\333\330\216 s\334dow\207\252\330a\202\252\312c\276\361lev\342\012", - "\366\332\364\273 \362ov\210rid\200\327appe\204 betwe\211 p\204\211\273ese\311", - "lab\342 nam\200\216 s\334dow\207\362nam\325", - "\372\257\301\341git\207\267ce\276\207\242\212\333\372\257\312ci\222\201\012", - "\220d\217d\225\202\042\336e\266\042: \314\336\200\274\213way\2071 \326", - "\203\231\347m\203\223\200\305\336\200\376\042\336e\266\331\366\332\326", - "\217\220a\272\254\200\344\231\012", - "\252\330\274a\253gn\235\307 its\342f \326", - "m\226\200\203i\205\213iz\210\207\273\357\211um \352\342d\311", - "l\211g\273 \301\203i\205\213iz\257\267ce\276\207\336\200\301\273\200\211um \352\342d\012", - "\203\231x \362mis\337\272 \326", - "\221 i\365le\234\313\236f\260\316\200\216 \376\371\230\317\221 f\213l-back\012", - "\316\200specif\335a\236\332\374w\204\206\231cl\321\236\274ig\221\220d\012", - "outpu\202\352\354\274writt\211\317bu\202\364\273 \344\365ac\202\211\344d\361\341s\254\276\012", - "\316\200\330\216 s\334dow\207\252g\345b\333\303\325", - "\270\274\231\312c\223\235\320) \214\012", - "pu\237\335 \270lack\207\374w\204\206\231cl\321\236\326", - "\217k\221w\340p\321met\257\376subs\205tu\236(\203c\226\220c\202#\323\200p\223\347n\233" + "\275 \274tr\243\222\235\307 %\206\267\322c\347\312", + "\220\324i\237\302\363t/\306cro \326", + "\376\257\302\265t\207\371\301\236\366 \324i\213\012", + "\250 \274nev\257\252\277\354", + "\250 \274a\254gn\235\251\244u\200\270a\202\274nev\257\252\277\354", + "\220d\217d\225\202\340\232: \363\202\374\334\274z\210o\012", + "\220d\217d\225\202te\230: \363\202\374\334\274n\201-z\210o\012", + "\217k\221w\342#p\242g\306\012", + "\272\370\270 \364\220s\337\202\252\235bef\226\200\324i\213\320f\226c\353\220p\204s\311", + "\375\231 sho\337\206\220tur\342\251\244u\311", + "po\254\240\200\252\200\302\250 bef\226\200\203i\205\216iza\213\354", + "po\254\240\224\217\203t\212\232\206a\254gn\234t\012", + "po\254\240\224\217\203t\212\232\206bit\370s\200\362a\213\012", + "\364mis\366\012", + "po\254\240\224\251\042\350\333\305\315wa\207\203t\212\232d\354", + "\374\334\330\207\221 effect\012", + "ne\230\235\340m\234t\012", + "\345os\200\203d\212\314\213\012", + "\241\206\230y\360pro\307typ\301\252\235\370\270 \346\213\335sem\336\241umn\312", + "\345c\335\331\215 s\330\371w\207\251\331a\202\251\313c\277\353lev\344\012", + "\374\334\370\270 \364ov\210rid\200\327appe\204 betwe\212 p\204\212\270ese\312", + "lab\344 nam\200\215 s\330\371w\207\364nam\311", + "\376\257\302\343git\207\271ce\277\207\242\213\335\376\257\313ci\223\201\012", + "\220d\217d\225\202\042\341e\266\042: \315\341\200\274\216way\2071 \326", + "\203\232\347m\203\222\200\305\341\200\351\042\341e\266\333\374\334\326", + "\217\220a\267\256\200\340\232\012", + "\251\331\274a\254gn\235\307 its\344f \326", + "m\226\200\203i\205\216iz\210\207\270\352\212um \356\344d\312", + "l\212g\270 \302\203i\205\216iz\257\271ce\277\207\341\200\302\270\200\212um \356\344d\012", + "\203\232x \364mis\366 \326", + "\221 i\372le\234\314\237f\260\317\200\215 \351\375\231\320\221 f\216l-back\012", + "\317\200specif\336a\237\334f\226w\204\206\232cl\322\237\274ig\221\220d\012", + "outpu\202\356\360\274writt\212\320bu\202\370\270 \340\372ac\202\212\340d\353\343s\256\277\012", + "\317\200\331\215 s\330\371w\207\251g\345b\335\304\311", + "\272\274\232\313c\222\235\321) \211\012", + "pu\240\336 \272lack\207f\226w\204\206\232cl\322\237\326", + "\217k\221w\342p\322\355t\257\351subs\205tu\237(\203c\226\220c\202#\324\200p\222\347n\233" #endif };