diff --git a/sourcepawn/compiler/sc.h b/sourcepawn/compiler/sc.h index a6ed6ec1..29ad5c4b 100644 --- a/sourcepawn/compiler/sc.h +++ b/sourcepawn/compiler/sc.h @@ -487,7 +487,6 @@ enum TokenKind { tpDEFINE, tpELSE, /* #else */ tpELSEIF, /* #elseif */ - tpEMIT, tpENDIF, tpENDINPUT, tpENDSCRPT, diff --git a/sourcepawn/compiler/sc2.cpp b/sourcepawn/compiler/sc2.cpp index df0cdeea..b2856877 100644 --- a/sourcepawn/compiler/sc2.cpp +++ b/sourcepawn/compiler/sc2.cpp @@ -1036,10 +1036,6 @@ static int command(void) } /* if */ if (!cp_set(name)) error(FATAL_ERROR_NO_CODEPAGE); - } else if (strcmp(str,"compress")==0) { - cell val; - preproc_expr(&val,NULL); - sc_compress=(int)val; /* switch code packing on/off */ } else if (strcmp(str,"ctrlchar")==0) { while (*lptr<=' ' && *lptr!='\0') lptr++; @@ -1059,70 +1055,6 @@ static int command(void) lptr=(unsigned char*)strchr((char*)lptr,'\0'); /* skip to end (ignore "extra characters on line") */ } else if (strcmp(str,"dynamic")==0) { preproc_expr(&pc_stksize,NULL); - } else if (!strcmp(str,"library") - ||!strcmp(str,"reqclass") - ||!strcmp(str,"loadlib") - ||!strcmp(str,"explib") - ||!strcmp(str,"expclass") - ||!strcmp(str,"defclasslib")) { - char name[sNAMEMAX+1],sname[sNAMEMAX+1]; - const char *prefix=""; - sname[0]='\0'; - sname[1]='\0'; - if (!strcmp(str,"library")) - prefix="??li_"; - else if (!strcmp(str,"reqclass")) - prefix="??rc_"; - else if (!strcmp(str,"loadlib")) - prefix="??f_"; - else if (!strcmp(str,"explib")) - prefix="??el_"; - else if (!strcmp(str,"expclass")) - prefix="??ec_"; - else if (!strcmp(str,"defclasslib")) - prefix="??d_"; - while (*lptr<=' ' && *lptr!='\0') - lptr++; - if (*lptr=='"') { - lptr=getstring((unsigned char*)name,sizeof name,lptr); - } else { - int i; - for (i=0; iident!=iFUNCTN && sym->ident!=iREFFUNC && (sym->usage & uDEFINE)==0)) { - error(17,str); /* undefined symbol */ - } else { - outval(sym->addr,FALSE); - /* mark symbol as "used", unknown whether for read or write */ - markusage(sym,uREAD | uWRITTEN); - code_idx+=opargs(1); - } /* if */ - break; - default: { - char s2[20]; - extern const char *sc_tokens[];/* forward declaration */ - if (tok<256) - sprintf(s2,"%c",(char)tok); - else - strcpy(s2,sc_tokens[tok-tFIRST]); - error(1,sc_tokens[tSYMBOL-tFIRST],s2); - break; - } /* case */ - } /* switch */ - } /* if */ - stgwrite("\n"); - check_empty(lptr); - break; - } /* case */ -#endif #if !defined NO_DEFINE case tpDEFINE: { ret=CMD_DEFINE; @@ -2047,7 +1923,7 @@ const char *sc_tokens[] = { "volatile", "while", "with", - "#assert", "#define", "#else", "#elseif", "#emit", "#endif", "#endinput", + "#assert", "#define", "#else", "#elseif", "#endif", "#endinput", "#endscript", "#error", "#file", "#if", "#include", "#line", "#pragma", "#tryinclude", "#undef", ";", ";", "-integer value-", "-rational value-", "-identifier-",