Do not use '#endif/#else xxx'; it is not allowed for ANSI C

This commit is contained in:
ceriel
1991-12-17 15:28:58 +00:00
parent 8daa5b2260
commit d33da47a2a
67 changed files with 306 additions and 298 deletions

View File

@@ -52,9 +52,9 @@ checkarg(arg, typset)
}
return 1;
}
#else not CHECKING
#else /* not CHECKING */
#define checkarg(arg, x) 1
#endif CHECKING
#endif /* CHECKING */
/* EM_doinstr: An EM instruction
*/
@@ -72,7 +72,7 @@ EM_doinstr(p)
return;
}
}
#endif CHECKING
#endif /* CHECKING */
switch(parametertype) {
case PAR_NO:
break;
@@ -389,7 +389,7 @@ EM_mkcalls(line)
EM_error = "Message not ended";
return 0;
}
#endif CHECKING
#endif /* CHECKING */
EM_error = 0;
switch(line->em_type) {
default:

View File

@@ -92,9 +92,9 @@ static int wsize, psize; /* word size and pointer size */
#ifdef CHECKING
static char *argrange = "Argument range error";
#define check(expr) (expr || EM_error || (EM_error = argrange))
#else not CHECKING
#else /* not CHECKING */
#define check(x) /* nothing */
#endif CHECKING
#endif /* CHECKING */
/* Error handling
*/
@@ -117,9 +117,9 @@ xfatal(s)
}
#include "readk.c"
#else not COMPACT
#else /* not COMPACT */
#include "reade.c"
#endif COMPACT
#endif /* COMPACT */
/* EM_open: Open input file, get magic word if COMPACT.
*/
@@ -147,9 +147,9 @@ EM_open(filename)
EM_error = "Illegal magic word";
return 0;
}
#else not COMPACT
#else /* not COMPACT */
inithash(); /* initialize hashtable */
#endif COMPACT
#endif /* COMPACT */
EM_initialized = 1;
return 1;
@@ -228,7 +228,7 @@ EM_getinstr(p)
p->em_type = EM_FATAL;
return 0;
}
#endif CHECKING
#endif /* CHECKING */
if (!state) { /* All clear, get a new line */
gethead(p);
@@ -247,14 +247,14 @@ EM_getinstr(p)
}
#ifndef COMPACT
if (j == PAR_B) i = ptyp(sp_ilb2);
#endif COMPACT
#endif /* COMPACT */
if (j != PAR_NO) getarg(i, &(p->em_arg));
#ifndef COMPACT
if (j == PAR_B) {
p->em_cst = p->em_ilb;
p->em_argtype = cst_ptyp;
}
#endif COMPACT
#endif /* COMPACT */
/* range checking
*/
#ifdef CHECKING
@@ -304,10 +304,10 @@ EM_getinstr(p)
check(p->em_cst >= 0 && p->em_cst <= 2);
break;
}
#endif CHECKING
#endif /* CHECKING */
#ifndef COMPACT
checkeol();
#endif COMPACT
#endif /* COMPACT */
}
break;
case EM_PSEU:
@@ -334,7 +334,7 @@ EM_getinstr(p)
if (! EM_error)
EM_error="Third argument of hol/bss not 0/1";
}
#endif CHECKING
#endif /* CHECKING */
break;
case ps_exa:
case ps_ina:
@@ -378,7 +378,7 @@ EM_getinstr(p)
if (p->em_opcode != ps_con && p->em_opcode != ps_rom) {
checkeol();
}
#endif COMPACT
#endif /* COMPACT */
break;
case EM_STARTMES:
startmes(p);

View File

@@ -48,7 +48,7 @@ getarg(typset, ap)
register int i = getbyte();
#ifdef CHECKING
int argtyp;
#endif CHECKING
#endif /* CHECKING */
ap->ema_argtype = 0;
switch(i) {
@@ -75,7 +75,7 @@ getarg(typset, ap)
EM_error = "Illegal data label";
break;
}
#endif CHECKING
#endif /* CHECKING */
break;
case sp_ilb1: /* Instruction label encoded in one byte */
@@ -91,7 +91,7 @@ getarg(typset, ap)
EM_error = "Illegal instruction label";
break;
}
#endif CHECKING
#endif /* CHECKING */
break;
case sp_cst2: /* A cst encoded in two bytes */
@@ -180,11 +180,11 @@ getarg(typset, ap)
if (argtyp == sp_cend) {
ap->ema_argtype = 0;
}
#else not CHECKING
#else /* not CHECKING */
if (i == sp_cend) {
ap->ema_argtype = 0;
}
#endif CHECKING
#endif /* CHECKING */
}
#ifdef CHECKING
@@ -209,7 +209,7 @@ checkident(s)
}
return 1;
}
#endif CHECKING
#endif /* CHECKING */
/* getstring: read a string from the input
*/
@@ -231,7 +231,7 @@ getstring(isident)
s->length = 0;
return s;
}
#endif CHECKING
#endif /* CHECKING */
if (n > s->maxlen) {
if (! s->maxlen) {
@@ -253,7 +253,7 @@ getstring(isident)
EM_error = "Illegal identifier";
}
}
#endif CHECKING
#endif /* CHECKING */
return s;
}
@@ -305,7 +305,7 @@ gethead(p)
if (p->em_ilb > 32767 && !EM_error) {
EM_error = "Illegal instruction label definition";
}
#endif CHECKING
#endif /* CHECKING */
break;
case sp_dlb1: /* Numeric data label */
@@ -322,7 +322,7 @@ gethead(p)
if (p->em_dlb > 32767 && !EM_error) {
EM_error = "Illegal data label definition";
}
#endif CHECKING
#endif /* CHECKING */
break;
case sp_dnam: /* Non-numeric data label */