diff options
Diffstat (limited to 'rsc/source')
| -rw-r--r-- | rsc/source/parser/rscinit.cxx | 4 | ||||
| -rw-r--r-- | rsc/source/res/rscclass.cxx | 2 | ||||
| -rw-r--r-- | rsc/source/res/rscflag.cxx | 4 | ||||
| -rw-r--r-- | rsc/source/res/rscmgr.cxx | 2 | ||||
| -rw-r--r-- | rsc/source/res/rscrange.cxx | 4 | ||||
| -rw-r--r-- | rsc/source/rscpp/cpp.h | 20 | ||||
| -rw-r--r-- | rsc/source/rscpp/cpp1.c | 46 | ||||
| -rw-r--r-- | rsc/source/rscpp/cpp2.c | 50 | ||||
| -rw-r--r-- | rsc/source/rscpp/cpp3.c | 32 | ||||
| -rw-r--r-- | rsc/source/rscpp/cpp4.c | 34 | ||||
| -rw-r--r-- | rsc/source/rscpp/cpp5.c | 10 | ||||
| -rw-r--r-- | rsc/source/rscpp/cpp6.c | 72 | ||||
| -rw-r--r-- | rsc/source/rscpp/cppdef.h | 50 |
13 files changed, 165 insertions, 165 deletions
diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx index 88eeed419175..a65756502968 100644 --- a/rsc/source/parser/rscinit.cxx +++ b/rsc/source/parser/rscinit.cxx @@ -207,8 +207,8 @@ void RscTypCont::Init() aNmTb.Put( "writeifset", WRITEIFSET, (long)0 ); /* Werte fuer Aufzaehlungstypen */ - aNmTb.Put( "sal_True", BOOLEAN, (long)sal_True ); - aNmTb.Put( "sal_False", BOOLEAN, (long)sal_False ); + aNmTb.Put( "TRUE", BOOLEAN, (long)sal_True ); + aNmTb.Put( "FALSE", BOOLEAN, (long)sal_False ); /* Vordefinierte HilfeId's */ aNmTb.Put( "HELP_INDEX", NUMBER, OOO_HELP_INDEX ); diff --git a/rsc/source/res/rscclass.cxx b/rsc/source/res/rscclass.cxx index 4c3380af8c39..3df83a72c7be 100644 --- a/rsc/source/res/rscclass.cxx +++ b/rsc/source/res/rscclass.cxx @@ -1067,7 +1067,7 @@ void RscClass::WriteRcCtor( FILE * fOutput, RscTypCont * pTC ) fprintf( fOutput, "\tsal_uInt32\tnObjMask;\n" ); fprintf( fOutput, "\tsal_uInt32\tnOffset = 0;\n" ); fprintf( fOutput, "\tBYTE *\tpResData;\n\n" ); - fprintf( fOutput, "\tpResData = (sal_uInt8 *)GetClassRes();\n\n" ); + fprintf( fOutput, "\tpResData = (tBYTE *)GetClassRes();\n\n" ); fprintf( fOutput, "\tnObjMask = *(sal_uInt32*)pResData;\n" ); fprintf( fOutput, "\tnOffset += 4;\n\n" ); diff --git a/rsc/source/res/rscflag.cxx b/rsc/source/res/rscflag.cxx index a1844c5a057c..48c583a3ff8e 100644 --- a/rsc/source/res/rscflag.cxx +++ b/rsc/source/res/rscflag.cxx @@ -445,9 +445,9 @@ void RscClient::WriteSrc( const RSCINST & rInst, FILE * fOutput, RscTypCont *, sal_uInt32, const char * ) { if( pRefClass->IsSet( rInst, nConstId ) ) - fprintf( fOutput, "sal_True" ); + fprintf( fOutput, "TRUE" ); else - fprintf( fOutput, "sal_False" ); + fprintf( fOutput, "FALSE" ); } /************************************************************************* diff --git a/rsc/source/res/rscmgr.cxx b/rsc/source/res/rscmgr.cxx index da8f19b68685..69a989c1683b 100644 --- a/rsc/source/res/rscmgr.cxx +++ b/rsc/source/res/rscmgr.cxx @@ -453,7 +453,7 @@ ERRTYPE RscMgr::WriteHxxHeader( const RSCINST & rInst, FILE * fOutput, if( aError.IsOk() ) { fprintf( fOutput, "public:\n " ); - fprintf( fOutput, "%s%s bFreeRes = sal_True )", + fprintf( fOutput, "%s%s bFreeRes = TRUE )", MakeName( pTC, rInst.pClass, rId.GetName() ).GetBuffer(), (rInst.pClass->aCallParType).GetBuffer() ); diff --git a/rsc/source/res/rscrange.cxx b/rsc/source/res/rscrange.cxx index 69fcb1b73d6a..78fa86b6fa48 100644 --- a/rsc/source/res/rscrange.cxx +++ b/rsc/source/res/rscrange.cxx @@ -774,9 +774,9 @@ void RscBool::WriteSrc( const RSCINST & rInst, FILE * fOutput, GetNumber( rInst, &l ); if( l ) - fprintf( fOutput, "sal_True" ); + fprintf( fOutput, "TRUE" ); else - fprintf( fOutput, "sal_False" ); + fprintf( fOutput, "FALSE" ); } //======================================================================= diff --git a/rsc/source/rscpp/cpp.h b/rsc/source/rscpp/cpp.h index 3c8102d1b614..11327d4fb9d1 100644 --- a/rsc/source/rscpp/cpp.h +++ b/rsc/source/rscpp/cpp.h @@ -26,9 +26,9 @@ ************************************************************************/ -#ifndef sal_True -#define sal_True 1 -#define sal_False 0 +#ifndef TRUE +#define TRUE 1 +#define FALSE 0 #endif /* in cpp1.c: file-pointer auf stdout oder file */ @@ -150,9 +150,9 @@ extern FILE *pDefOut; /* ER */ /* * These bits are set in ifstack[] */ -#define WAS_COMPILING 1 /* sal_True if compile set at entry */ -#define ELSE_SEEN 2 /* sal_True when #else processed */ -#define TRUE_SEEN 4 /* sal_True when #if sal_True processed */ +#define WAS_COMPILING 1 /* TRUE if compile set at entry */ +#define ELSE_SEEN 2 /* TRUE when #else processed */ +#define TRUE_SEEN 4 /* TRUE when #if TRUE processed */ /* * Define bits for the basic types and their adjectives @@ -256,8 +256,8 @@ extern int line; /* Current line number */ extern int wrongline; /* Force #line to cc pass 1 */ extern char type[]; /* Character classifier */ extern char token[IDMAX + 1]; /* Current input token */ -extern int instring; /* sal_True if scanning string */ -extern int inmacro; /* sal_True if scanning #define */ +extern int instring; /* TRUE if scanning string */ +extern int inmacro; /* TRUE if scanning #define */ extern int errors; /* Error counter */ extern int recursion; /* Macro depth counter */ extern char ifstack[BLK_NEST]; /* #if information */ @@ -277,8 +277,8 @@ extern char *workp; /* Free space in work */ #if OSL_DEBUG_LEVEL > 1 extern int debug; /* Debug level */ /* ER dump & evaluate #define's */ -extern int bDumpDefs; /* sal_True if #define's dump req. */ -extern int bIsInEval; /* sal_True if #define dumping now */ +extern int bDumpDefs; /* TRUE if #define's dump req. */ +extern int bIsInEval; /* TRUE if #define dumping now */ #ifdef EVALDEFS extern char EvalBuf[NEVALBUF + 1]; /* evaluation buffer */ extern int nEvalOff; /* offset to free buffer pos */ diff --git a/rsc/source/rscpp/cpp1.c b/rsc/source/rscpp/cpp1.c index ace0206c7d9b..1eb7561a2db0 100644 --- a/rsc/source/rscpp/cpp1.c +++ b/rsc/source/rscpp/cpp1.c @@ -66,10 +66,10 @@ char token[IDMAX + 1]; /* Current input token */ int errors; /* cpp error counter */ FILEINFO *infile = NULL; /* Current input file */ #if OSL_DEBUG_LEVEL > 1 -int debug; /* sal_True if debugging now */ -int bDumpDefs; /* sal_True if #define's dump req. */ +int debug; /* TRUE if debugging now */ +int bDumpDefs; /* TRUE if #define's dump req. */ #ifdef EVALDEFS -int bIsInEval; /* sal_True if #define eval now */ +int bIsInEval; /* TRUE if #define eval now */ char EvalBuf[NEVALBUF + 1]; /* evaluation buffer */ int nEvalOff = 0; /* offset to free buffer pos */ #endif @@ -85,10 +85,10 @@ int nEvalOff = 0; /* offset to free buffer pos */ * currently: it is a hook for an eventual invocation flag.) */ int recursion; /* Infinite recursion counter */ -int rec_recover = sal_True; /* Unwind recursive macros */ +int rec_recover = TRUE; /* Unwind recursive macros */ /* - * instring is set sal_True when a string is scanned. It modifies the + * instring is set TRUE when a string is scanned. It modifies the * behavior of the "get next character" routine, causing all characters * to be passed to the caller (except <DEF_MAGIC>). Note especially that * comments and \<newline> are not removed from the source. (This @@ -103,8 +103,8 @@ int rec_recover = sal_True; /* Unwind recursive macros */ * instring and inmarcor are parameters to the get() routine which * were made global for speed. */ -int instring = sal_False; /* sal_True if scanning string */ -int inmacro = sal_False; /* sal_True if #defining a macro */ +int instring = FALSE; /* TRUE if scanning string */ +int inmacro = FALSE; /* TRUE if #defining a macro */ /* * work[] and workp are used to store one piece of text in a temporay @@ -119,7 +119,7 @@ char work[NWORK + 1]; /* Work buffer */ char *workp; /* Work buffer pointer */ /* - * keepcomments is set sal_True by the -C option. If sal_True, comments + * keepcomments is set TRUE by the -C option. If TRUE, comments * are written directly to the output stream. This is needed if * the output from cpp is to be passed to lint (which uses commands * embedded in comments). cflag contains the permanent state of the @@ -133,21 +133,21 @@ char *workp; /* Work buffer pointer */ * __FILE__, and __DATE__. If nflag > 1, absolutely no symbols * are predefined. */ -int keepcomments = sal_False; /* Write out comments flag */ -int cflag = sal_False; /* -C option (keep comments) */ -int eflag = sal_False; /* -E option (never fail) */ +int keepcomments = FALSE; /* Write out comments flag */ +int cflag = FALSE; /* -C option (keep comments) */ +int eflag = FALSE; /* -E option (never fail) */ int nflag = 0; /* -N option (no predefines) */ /* * ifstack[] holds information about nested #if's. It is always * accessed via *ifptr. The information is as follows: * WAS_COMPILING state of compiling flag at outer level. - * ELSE_SEEN set sal_True when #else seen to prevent 2nd #else. - * TRUE_SEEN set sal_True when #if or #elif succeeds - * ifstack[0] holds the compiling flag. It is sal_True if compilation - * is currently enabled. Note that this must be initialized sal_True. + * ELSE_SEEN set TRUE when #else seen to prevent 2nd #else. + * TRUE_SEEN set TRUE when #if or #elif succeeds + * ifstack[0] holds the compiling flag. It is TRUE if compilation + * is currently enabled. Note that this must be initialized TRUE. */ -char ifstack[BLK_NEST] = { sal_True }; /* #if information */ +char ifstack[BLK_NEST] = { TRUE }; /* #if information */ char *ifptr = ifstack; /* -> current ifstack[] */ /* @@ -211,7 +211,7 @@ void InitCpp1() workp = NULL; for( i = 0; i < BLK_NEST; i++ ) - ifstack[ i ] = sal_True; + ifstack[ i ] = TRUE; ifptr = ifstack; pCppOut = stdout; @@ -227,9 +227,9 @@ void InitCpp1() nEvalOff = 0; #endif #endif - rec_recover = sal_True; + rec_recover = TRUE; infile = NULL; - instring = inmacro = keepcomments = cflag = eflag = sal_False; + instring = inmacro = keepcomments = cflag = eflag = FALSE; nflag = 0; incend = incdir; sharpfilename = NULL; @@ -426,7 +426,7 @@ void cppmain() } /* * This loop is started "from the top" at the beginning of each line - * wrongline is set sal_True in many places if it is necessary to write + * wrongline is set TRUE in many places if it is necessary to write * a #line record. (But we don't write them when expanding macros.) * * The counter variable has two different uses: at @@ -446,7 +446,7 @@ void cppmain() if (c == '\n') /* If line's all blank, */ ++counter; /* Do nothing now */ else if (c == '#') { /* Is 1st non-space '#' */ - keepcomments = sal_False; /* Don't pass comments */ + keepcomments = FALSE; /* Don't pass comments */ counter = control(counter); /* Yes, do a #command */ keepcomments = (cflag && compiling); } @@ -542,7 +542,7 @@ void cppmain() end_line: if (c == '\n') { /* Compiling at EOL? */ PUTCHAR('\n'); /* Output newline, if */ if (infile->fp == NULL) /* Expanding a macro, */ - wrongline = sal_True; /* Output # line later */ + wrongline = TRUE; /* Output # line later */ } } /* Continue until EOF */ #ifdef EVALDEFS @@ -612,5 +612,5 @@ void sharp() } } PUTCHAR('\n'); - wrongline = sal_False; + wrongline = FALSE; } diff --git a/rsc/source/rscpp/cpp2.c b/rsc/source/rscpp/cpp2.c index c421308654e5..68d1d2dc72ba 100644 --- a/rsc/source/rscpp/cpp2.c +++ b/rsc/source/rscpp/cpp2.c @@ -189,7 +189,7 @@ dump_line: skipnl(); /* Ignore rest of line */ free(infile->progname); /* if it's allocated. */ infile->progname = savestring(tp); } - wrongline = sal_True; /* Force output later */ + wrongline = TRUE; /* Force output later */ break; case L_include: @@ -212,9 +212,9 @@ dump_line: skipnl(); /* Ignore rest of line */ *ifptr |= ELSE_SEEN; if ((*ifptr & WAS_COMPILING) != 0) { if (compiling || (*ifptr & TRUE_SEEN) != 0) - compiling = sal_False; + compiling = FALSE; else { - compiling = sal_True; + compiling = TRUE; } } break; @@ -227,7 +227,7 @@ else_seen_err: cerror("#%s may not follow #else", token); goto dump_line; } if ((*ifptr & (WAS_COMPILING | TRUE_SEEN)) != WAS_COMPILING) { - compiling = sal_False; /* Done compiling stuff */ + compiling = FALSE; /* Done compiling stuff */ goto dump_line; /* Skip this clause */ } doif(L_if); @@ -248,7 +248,7 @@ nest_err: cerror("#%s must be in an #if", token); goto dump_line; } if (!compiling && (*ifptr & WAS_COMPILING) != 0) - wrongline = sal_True; + wrongline = TRUE; compiling = ((*ifptr & WAS_COMPILING) != 0); --ifptr; break; @@ -323,7 +323,7 @@ void doif(int hash) * Process an #if, #ifdef, or #ifndef. The latter two are straightforward, * while #if needs a subroutine of its own to evaluate the expression. * - * doif() is called only if compiling is sal_True. If false, compilation + * doif() is called only if compiling is TRUE. If false, compilation * is always supressed, so we don't need to evaluate anything. This * supresses unnecessary warnings. */ @@ -337,7 +337,7 @@ void doif(int hash) } if (hash == L_if) { unget(); - found = (eval() != 0); /* Evaluate expr, != 0 is sal_True */ + found = (eval() != 0); /* Evaluate expr, != 0 is TRUE */ hash = L_ifdef; /* #if is now like #ifdef */ } else { @@ -346,11 +346,11 @@ void doif(int hash) found = (lookid(c) != NULL); /* Look for it in symbol table */ } if (found == (hash == L_ifdef)) { - compiling = sal_True; + compiling = TRUE; *ifptr |= TRUE_SEEN; } else { - compiling = sal_False; + compiling = FALSE; } return; @@ -391,7 +391,7 @@ void doinclude() if (delim == '<') delim = '>'; workp = work; - instring = sal_True; /* Accept all characters */ + instring = TRUE; /* Accept all characters */ #ifdef CONTROL_COMMENTS_NOT_ALLOWED while ((c = get()) != '\n' && c != EOF_CHAR) save(c); /* Put it away. */ @@ -408,7 +408,7 @@ void doinclude() save(c); #endif *workp = EOS; /* Terminate filename */ - instring = sal_False; + instring = FALSE; #if HOST == SYS_VMS /* * Assume the default .h filetype. @@ -439,7 +439,7 @@ openinclude(char* filename, int searchlocal) * doinclude() above, but was written as a separate subroutine for * programmer convenience. It searches the list of directories * and actually opens the file, linking it into the list of - * active files. Returns sal_True if the file was opened, sal_False + * active files. Returns TRUE if the file was opened, FALSE * if openinclude() fails. No error message is printed. */ { @@ -475,7 +475,7 @@ openinclude(char* filename, int searchlocal) } #endif if (openfile(tmpname)) - return (sal_True); + return (TRUE); } /* * Look in any directories specified by -I command line @@ -502,10 +502,10 @@ openinclude(char* filename, int searchlocal) sprintf(tmpname, "%s%s", *incptr, filename); #endif if (openfile(tmpname)) - return (sal_True); + return (TRUE); } } - return (sal_False); + return (FALSE); } FILE_LOCAL int @@ -513,26 +513,26 @@ hasdirectory(char* source, char* result) /* * If a device or directory is found in the source filename string, the * node/device/directory part of the string is copied to result and - * hasdirectory returns sal_True. Else, nothing is copied and it returns sal_False. + * hasdirectory returns TRUE. Else, nothing is copied and it returns FALSE. */ { #if HOST == SYS_UNIX register char *tp; if ((tp = strrchr(source, '/')) == NULL) - return (sal_False); + return (FALSE); else { strncpy(result, source, tp - source + 1); result[tp - source + 1] = EOS; - return (sal_True); + return (TRUE); } #else #if HOST == SYS_VMS if (vmsparse(source, NULLST, result) && result[0] != EOS) - return (sal_True); + return (TRUE); else { - return (sal_False); + return (FALSE); } #else /* @@ -542,11 +542,11 @@ hasdirectory(char* source, char* result) if ((tp = strrchr(source, ']')) == NULL && (tp = strrchr(source, ':')) == NULL) - return (sal_False); + return (FALSE); else { strncpy(result, source, tp - source + 1); result[tp - source + 1] = EOS; - return (sal_True); + return (TRUE); } #endif #endif @@ -569,7 +569,7 @@ char *result; /* Size is at least NAM$C_MAXRSS + 1 */ /* * Parse the source string, applying the default (properly, using * the system parse routine), storing it in result. - * sal_True if it parsed, sal_False on error. + * TRUE if it parsed, FALSE on error. * * If defstring is NULL, there are no defaults and result gets * (just) the node::[directory] part of the string (possibly "") @@ -617,9 +617,9 @@ char *result; /* Size is at least NAM$C_MAXRSS + 1 */ rp[nam.nam$b_ver] = EOS; } } - return (sal_True); + return (TRUE); } - return (sal_False); + return (FALSE); } #endif diff --git a/rsc/source/rscpp/cpp3.c b/rsc/source/rscpp/cpp3.c index 02a59efa8ea4..e9c03cdd4874 100644 --- a/rsc/source/rscpp/cpp3.c +++ b/rsc/source/rscpp/cpp3.c @@ -69,14 +69,14 @@ openfile(char* filename) if ( debug || !bDumpDefs ) perror(filename); #endif - return (sal_False); + return (FALSE); } #if OSL_DEBUG_LEVEL > 1 if (debug) fprintf(stderr, "Reading from \"%s\"\n", filename); #endif addfile(fp, filename); - return (sal_True); + return (TRUE); } void addfile(FILE* fp, char* filename) @@ -96,7 +96,7 @@ void addfile(FILE* fp, char* filename) file->fp = fp; /* Better remember FILE * */ file->buffer[0] = EOS; /* Initialize for first read */ line = 1; /* Working on line 1 now */ - wrongline = sal_True; /* Force out initial #line */ + wrongline = TRUE; /* Force out initial #line */ } void setincdirs() @@ -128,9 +128,9 @@ void setincdirs() #endif #if HOST == SYS_RSX - extern int $$rsts; /* sal_True on RSTS/E */ - extern int $$pos; /* sal_True on PRO-350 P/OS */ - extern int $$vms; /* sal_True on VMS compat. */ + extern int $$rsts; /* TRUE on RSTS/E */ + extern int $$pos; /* TRUE on PRO-350 P/OS */ + extern int $$vms; /* TRUE on VMS compat. */ if ($$pos) { /* P/OS? */ *incend++ = "SY:[ZZDECUSC]"; /* C #includes */ @@ -230,7 +230,7 @@ dooptions(int argc, char** argv) char *arg; SIZES *sizp; /* For -S */ int size; /* For -S */ - int isdatum; /* sal_False for -S* */ + int isdatum; /* FALSE for -S* */ int endtest; /* For -S */ for (i = j = 1; i < argc; i++) { @@ -246,8 +246,8 @@ dooptions(int argc, char** argv) c = toupper(c); switch (c) { /* Command character */ case 'C': /* Keep comments */ - cflag = sal_True; - keepcomments = sal_True; + cflag = TRUE; + keepcomments = TRUE; break; case 'D': /* Define symbol */ @@ -266,13 +266,13 @@ dooptions(int argc, char** argv) /* * Now, save the word and its definition. */ - dp = defendel(argv[i] + 2, sal_False); + dp = defendel(argv[i] + 2, FALSE); dp->repl = savestring(ap); dp->nargs = DEF_NOARGS; break; case 'E': /* Ignore non-fatal */ - eflag = sal_True; /* errors. */ + eflag = TRUE; /* errors. */ break; case 'I': /* Include directory */ @@ -317,7 +317,7 @@ dooptions(int argc, char** argv) #if HOST != SYS_UNIX /* zap_uc(ap);*/ #endif - if (defendel(ap, sal_True) == NULL) + if (defendel(ap, TRUE) == NULL) cwarn("\"%s\" wasn't defined", ap); break; @@ -386,7 +386,7 @@ readoptions(char* filename, char*** pfargv) if ( debug || !bDumpDefs ) perror(filename); #endif - return (sal_False); + return (FALSE); } do { @@ -480,7 +480,7 @@ void initdefines() if (nflag == 0) { for (pp = preset; *pp != NULL; pp++) { if (*pp[0] != EOS) { - dp = defendel(*pp, sal_False); + dp = defendel(*pp, FALSE); dp->repl = savestring("1"); dp->nargs = DEF_NOARGS; } @@ -494,14 +494,14 @@ void initdefines() */ if (nflag < 2) { for (pp = magic, i = DEF_NOARGS; *pp != NULL; pp++) { - dp = defendel(*pp, sal_False); + dp = defendel(*pp, FALSE); dp->nargs = --i; } #if OK_DATE /* * Define __DATE__ as today's date. */ - dp = defendel("__DATE__", sal_False); + dp = defendel("__DATE__", FALSE); dp->repl = tp = getmem(27); dp->nargs = DEF_NOARGS; time( (time_t*)&tvec); diff --git a/rsc/source/rscpp/cpp4.c b/rsc/source/rscpp/cpp4.c index 612d6873241d..b8f90ab4f7ed 100644 --- a/rsc/source/rscpp/cpp4.c +++ b/rsc/source/rscpp/cpp4.c @@ -91,16 +91,16 @@ void dodefine() { register int c; register DEFBUF *dp; /* -> new definition */ - int isredefine; /* sal_True if redefined */ + int isredefine; /* TRUE if redefined */ char *old = 0; /* Remember redefined */ if (type[(c = skipws())] != LET) goto bad_define; - isredefine = sal_False; /* Set if redefining */ + isredefine = FALSE; /* Set if redefining */ if ((dp = lookid(c)) == NULL) /* If not known now */ - dp = defendel(token, sal_False); /* Save the name */ + dp = defendel(token, FALSE); /* Save the name */ else { /* It's known: */ - isredefine = sal_True; /* Remember this fact */ + isredefine = TRUE; /* Remember this fact */ old = dp->repl; /* Remember replacement */ dp->repl = NULL; /* No replacement now */ } @@ -132,7 +132,7 @@ void dodefine() if (type[c] == SPA) /* At whitespace? */ c = skipws(); /* Not any more. */ workp = work; /* Replacement put here */ - inmacro = sal_True; /* Keep \<newline> now */ + inmacro = TRUE; /* Keep \<newline> now */ while (c != EOF_CHAR && c != '\n') { /* Compile macro body */ #if OK_CONCAT #if COMMENT_INVISIBLE @@ -184,7 +184,7 @@ void dodefine() case BSH: /* Backslash */ save('\\'); if ((c = get()) == '\n') - wrongline = sal_True; + wrongline = TRUE; save(c); break; @@ -204,7 +204,7 @@ void dodefine() } c = get(); } - inmacro = sal_False; /* Stop newline hack */ + inmacro = FALSE; /* Stop newline hack */ unget(); /* For control check */ if (workp > work && workp[-1] == ' ') /* Drop trailing blank */ workp--; @@ -234,7 +234,7 @@ void dodefine() bad_define: cerror("#define syntax error", NULLST); - inmacro = sal_False; /* Stop <newline> hack */ + inmacro = FALSE; /* Stop <newline> hack */ } void checkparm(int c, DEFBUF* dp) @@ -285,7 +285,7 @@ register DEFBUF *dp; * ANSI Standard C language. */ save(delim); - instring = sal_True; + instring = TRUE; while ((c = get()) != delim && c != '\n' && c != EOF_CHAR) { @@ -297,7 +297,7 @@ register DEFBUF *dp; save(get()); } } - instring = sal_False; + instring = FALSE; if (c != delim) cerror("Unterminated string in macro body", NULLST); save(c); @@ -349,7 +349,7 @@ void doundef() cerror("Illegal #undef argument", NULLST); else { scanid(c); /* Get name to token[] */ - if (defendel(token, sal_True) == NULL) { + if (defendel(token, TRUE) == NULL) { #ifdef STRICT_UNDEF cwarn("Symbol \"%s\" not defined in #undef", token); #endif @@ -459,7 +459,7 @@ void expand(DEFBUF* tokenp) if (tokenp->nargs < 0) cfatal("Bug: Illegal __ macro \"%s\"", tokenp->name); while ((c = skipws()) == '\n') /* Look for (, skipping */ - wrongline = sal_True; /* spaces and newlines */ + wrongline = TRUE; /* spaces and newlines */ if (c != '(') { /* * If the programmer writes @@ -491,7 +491,7 @@ void expand(DEFBUF* tokenp) FILE_LOCAL int expcollect() /* - * Collect the actual parameters for this macro. sal_True if ok. + * Collect the actual parameters for this macro. TRUE if ok. */ { register int c; @@ -499,7 +499,7 @@ expcollect() for (;;) { paren = 0; /* Collect next arg. */ while ((c = skipws()) == '\n') /* Skip over whitespace */ - wrongline = sal_True; /* and newlines. */ + wrongline = TRUE; /* and newlines. */ if (c == ')') { /* At end of all args? */ /* * Note that there is a guard byte in parm[] @@ -514,7 +514,7 @@ expcollect() for (;; c = cget()) { /* Collect arg's bytes */ if (c == EOF_CHAR) { cerror("end of file within macro argument", NULLST); - return (sal_False); /* Sorry. */ + return (FALSE); /* Sorry. */ } else if (c == '\\') { /* Quote next character */ charput(c); /* Save the \ for later */ @@ -537,7 +537,7 @@ expcollect() else if (c == ',' && paren == 0) /* Comma delimits args */ break; else if (c == '\n') /* Newline inside arg? */ - wrongline = sal_True; /* We'll need a #line */ + wrongline = TRUE; /* We'll need a #line */ charput(c); /* Store this one */ } /* Collect an argument */ charput(EOS); /* Terminate argument */ @@ -546,7 +546,7 @@ expcollect() fprintf( pCppOut, "parm[%d] = \"%s\"\n", nargs, parlist[nargs - 1]); #endif } /* Collect all args. */ - return (sal_True); /* Normal return */ + return (TRUE); /* Normal return */ } FILE_LOCAL diff --git a/rsc/source/rscpp/cpp5.c b/rsc/source/rscpp/cpp5.c index 7472a462fb15..70f05543c465 100644 --- a/rsc/source/rscpp/cpp5.c +++ b/rsc/source/rscpp/cpp5.c @@ -91,7 +91,7 @@ static char opdope[OP_MAX] = { typedef struct optab { char op; /* Operator */ char prec; /* Its precedence */ - char skip; /* Short-circuit: sal_True to skip */ + char skip; /* Short-circuit: TRUE to skip */ } OPTAB; static int evalue; /* Current value from evallex() */ @@ -222,7 +222,7 @@ eval() * evaleval Evaluate the current operator, given the values on * the value stack. Returns a pointer to the (new) * value stack. - * For compatiblity with older cpp's, this return returns 1 (sal_True) + * For compatiblity with older cpp's, this return returns 1 (TRUE) * if a syntax error is detected. */ { @@ -609,7 +609,7 @@ nogood: unget(); FILE_LOCAL int bittest(int value) /* - * sal_True if value is zero or exactly one bit is set in value. + * TRUE if value is zero or exactly one bit is set in value. */ { #if (4096 & ~(-4096)) == 0 @@ -674,7 +674,7 @@ evalchar(int skip) register int value; register int count; - instring = sal_True; + instring = TRUE; if ((c = cget()) == '\\') { switch ((c = cget())) { case 'a': /* New in Standard */ @@ -766,7 +766,7 @@ evalchar(int skip) value += c; #endif } - instring = sal_False; + instring = FALSE; return (value); } diff --git a/rsc/source/rscpp/cpp6.c b/rsc/source/rscpp/cpp6.c index 209ee4217067..fd2a2a9a0dd7 100644 --- a/rsc/source/rscpp/cpp6.c +++ b/rsc/source/rscpp/cpp6.c @@ -44,8 +44,8 @@ * never expanded. * macroid() reads the next token (C identifier) into token[]. * If it is a #defined macro, it is expanded, and - * macroid() returns sal_True, otherwise, sal_False. - * catenate() Does the dirty work of token concatenation, sal_True if it did. + * macroid() returns TRUE, otherwise, FALSE. + * catenate() Does the dirty work of token concatenation, TRUE if it did. * scanstring() Reads a string from the input stream, calling * a user-supplied function for each character. * This function may be output() to write the @@ -273,9 +273,9 @@ catenate() /* * A token was just read (via macroid). * If the next character is TOK_SEP, concatenate the next token - * return sal_True -- which should recall macroid after refreshing + * return TRUE -- which should recall macroid after refreshing * macroid's argument. If it is not TOK_SEP, unget() the character - * and return sal_False. + * and return FALSE. */ { register int c; @@ -284,7 +284,7 @@ catenate() #if OK_CONCAT if (get() != TOK_SEP) { /* Token concatenation */ unget(); - return (sal_False); + return (FALSE); } else { token1 = savestring(token); /* Save first token */ @@ -327,10 +327,10 @@ catenate() */ free(token1); /* Free up memory */ ungetstring(work); /* Unget the new thing, */ - return (sal_True); + return (TRUE); } #else - return (sal_False); /* Not supported */ + return (FALSE); /* Not supported */ #endif } @@ -345,12 +345,12 @@ void (*outfun)() /* BP */ /* * Scan off a string. Warning if terminated by newline or EOF. * outfun() outputs the character -- to a buffer if in a macro. - * sal_True if ok, sal_False if error. + * TRUE if ok, FALSE if error. */ { register int c; - instring = sal_True; /* Don't strip comments */ + instring = TRUE; /* Don't strip comments */ (*outfun)(delim); while ((c = get()) != delim && c != '\n' @@ -361,15 +361,15 @@ void (*outfun)() /* BP */ if (c == '\\') (*outfun)(get()); } - instring = sal_False; + instring = FALSE; if (c == delim) { (*outfun)(c); - return (sal_True); + return (TRUE); } else { cerror("Unterminated string", NULLST); unget(); - return (sal_False); + return (FALSE); } } @@ -389,13 +389,13 @@ register void (*outfun)() /* BP */ int expseen; /* 'e' seen in floater */ int signseen; /* '+' or '-' seen */ int octal89; /* For bad octal test */ - int dotflag; /* sal_True if '.' was seen */ + int dotflag; /* TRUE if '.' was seen */ - expseen = sal_False; /* No exponent seen yet */ - signseen = sal_True; /* No +/- allowed yet */ - octal89 = sal_False; /* No bad octal yet */ + expseen = FALSE; /* No exponent seen yet */ + signseen = TRUE; /* No +/- allowed yet */ + octal89 = FALSE; /* No bad octal yet */ radix = 10; /* Assume decimal */ - if ((dotflag = (c == '.')) != sal_False) { /* . something? */ + if ((dotflag = (c == '.')) != FALSE) { /* . something? */ (*outfun)('.'); /* Always out the dot */ if (type[(c = get())] != DIG) { /* If not a float numb, */ unget(); /* Rescan strange char */ @@ -420,25 +420,25 @@ register void (*outfun)() /* BP */ if (radix != 16 && (c == 'e' || c == 'E')) { if (expseen) /* Already saw 'E'? */ break; /* Exit loop, bad nbr. */ - expseen = sal_True; /* Set exponent seen */ - signseen = sal_False; /* We can read '+' now */ + expseen = TRUE; /* Set exponent seen */ + signseen = FALSE; /* We can read '+' now */ radix = 10; /* Decimal exponent */ } else if (radix != 16 && c == '.') { if (dotflag) /* Saw dot already? */ break; /* Exit loop, two dots */ - dotflag = sal_True; /* Remember the dot */ + dotflag = TRUE; /* Remember the dot */ radix = 10; /* Decimal fraction */ } else if (c == '+' || c == '-') { /* 1.0e+10 */ if (signseen) /* Sign in wrong place? */ break; /* Exit loop, not nbr. */ - /* signseen = sal_True; */ /* Remember we saw it */ + /* signseen = TRUE; */ /* Remember we saw it */ } else { /* Check the digit */ switch (c) { case '8': case '9': /* Sometimes wrong */ - octal89 = sal_True; /* Do check later */ + octal89 = TRUE; /* Do check later */ case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': break; /* Always ok */ @@ -452,7 +452,7 @@ register void (*outfun)() /* BP */ } /* End of switch */ } /* End general case */ (*outfun)(c); /* Accept the character */ - signseen = sal_True; /* Don't read sign now */ + signseen = TRUE; /* Don't read sign now */ c = get(); /* Read another char */ } /* End of scan loop */ /* @@ -481,14 +481,14 @@ done: if (dotflag || expseen) { /* Floating point? */ case 'L': if (dotflag) goto nomore; - dotflag = sal_True; + dotflag = TRUE; break; case 'u': case 'U': if (expseen) goto nomore; - expseen = sal_True; + expseen = TRUE; break; default: @@ -607,10 +607,10 @@ lookid(int c) DEFBUF * defendel(char* name, int delete) /* - * Enter this name in the lookup table (delete = sal_False) - * or delete this name (delete = sal_True). - * Returns a pointer to the define block (delete = sal_False) - * Returns NULL if the symbol wasn't defined (delete = sal_True). + * Enter this name in the lookup table (delete = FALSE) + * or delete this name (delete = TRUE). + * Returns a pointer to the define block (delete = FALSE) + * Returns NULL if the symbol wasn't defined (delete = TRUE). */ { register DEFBUF *dp; @@ -839,7 +839,7 @@ newline: * is skipping over blank lines and will do a * #line at its convenience. */ - wrongline = sal_True; /* Need a #line now */ + wrongline = TRUE; /* Need a #line now */ } } } @@ -880,11 +880,11 @@ newline: if (instring) /* Strings just return */ return (c); /* the character. */ else if (c == '/') { /* Comment? */ - instring = sal_True; /* So get() won't loop */ + instring = TRUE; /* So get() won't loop */ /*MM c++ comments */ /*MM*/ c = get(); /*MM*/ if ((c != '*') && (c != '/')) { /* Next byte '*'? */ - instring = sal_False; /* Nope, no comment */ + instring = FALSE; /* Nope, no comment */ unget(); /* Push the char. back */ return ('/'); /* Return the slash */ } @@ -917,7 +917,7 @@ newline: case '*': if ((c = get()) != '/') /* If comment doesn't */ goto test; /* end, look at next */ - instring = sal_False; /* End of comment, */ + instring = FALSE; /* End of comment, */ if (keepcomments) { /* Put out the comment */ cput(c); /* terminator, too */ } @@ -950,7 +950,7 @@ newline: case '\n': /* we'll need a #line */ if (!keepcomments) - wrongline = sal_True; /* later... */ + wrongline = TRUE; /* later... */ default: /* Anything else is */ break; /* Just a character */ } /* End switch */ @@ -965,7 +965,7 @@ newline: if( EOF_CHAR == c ) return (EOF_CHAR); else if( '\n' == c ){ - instring = sal_False; /* End of comment, */ + instring = FALSE; /* End of comment, */ return( c ); } } @@ -973,7 +973,7 @@ newline: } /* End if in comment */ else if (!inmacro && c == '\\') { /* If backslash, peek */ if ((c = get()) == '\n') { /* for a <nl>. If so, */ - wrongline = sal_True; + wrongline = TRUE; goto newline; } else { /* Backslash anything */ diff --git a/rsc/source/rscpp/cppdef.h b/rsc/source/rscpp/cppdef.h index 196dfbe65cf9..cdbf07766c8f 100644 --- a/rsc/source/rscpp/cppdef.h +++ b/rsc/source/rscpp/cppdef.h @@ -26,12 +26,12 @@ ************************************************************************/ /* - * This redundant definition of sal_True and sal_False works around + * This redundant definition of TRUE and FALSE works around * a limitation of Decus C. */ -#ifndef sal_True -#define sal_True 1 -#define sal_False 0 +#ifndef TRUE +#define TRUE 1 +#define FALSE 0 #endif /* @@ -96,16 +96,16 @@ * to be marked "static" even though they are referenced * by "extern" statements elsewhere. * - * OK_DOLLAR Should be set sal_True if $ is a valid alphabetic character + * OK_DOLLAR Should be set TRUE if $ is a valid alphabetic character * in identifiers (default), or zero if $ is invalid. - * Default is sal_True. + * Default is TRUE. * - * OK_CONCAT Should be set sal_True if # may be used to concatenate + * OK_CONCAT Should be set TRUE if # may be used to concatenate * tokens in macros (per the Ansi Draft Standard) or - * sal_False for old-style # processing (needed if cpp is + * FALSE for old-style # processing (needed if cpp is * to process assembler source code). * - * OK_DATE Predefines the compilation date if set sal_True. + * OK_DATE Predefines the compilation date if set TRUE. * Not permitted by the Nov. 12, 1984 Draft Standard. * * S_CHAR etc. Define the sizeof the basic TARGET machine word types. @@ -192,14 +192,14 @@ */ #ifndef OLD_PREPROCESSOR -#define OLD_PREPROCESSOR sal_False +#define OLD_PREPROCESSOR FALSE #endif #if OLD_PREPROCESSOR -#define OK_DOLLAR sal_False -#define OK_CONCAT sal_True -#define COMMENT_INVISIBLE sal_True -#define STRING_FORMAL sal_True +#define OK_DOLLAR FALSE +#define OK_CONCAT TRUE +#define COMMENT_INVISIBLE TRUE +#define STRING_FORMAL TRUE #define IDMAX 63 /* actually, seems to be unlimited */ #endif @@ -219,14 +219,14 @@ #endif /* - * BIG_ENDIAN is set sal_True on machines (such as the IBM 360 series) + * BIG_ENDIAN is set TRUE on machines (such as the IBM 360 series) * where 'ab' stores 'a' in the high-bits and 'b' in the low-bits. - * It is set sal_False on machines (such as the PDP-11 and Vax-11) + * It is set FALSE on machines (such as the PDP-11 and Vax-11) * where 'ab' stores 'a' in the low-bits and 'b' in the high-bits. * (Or is it the other way around?) -- Warning: BIG_ENDIAN code is untested. */ #ifndef BIG_ENDIAN -#define BIG_ENDIAN sal_False +#define BIG_ENDIAN FALSE #endif /* @@ -236,7 +236,7 @@ * expansions. This was removed from the Draft Ansi Standard. */ #ifndef COMMENT_INVISIBLE -#define COMMENT_INVISIBLE sal_False +#define COMMENT_INVISIBLE FALSE #endif /* @@ -245,27 +245,27 @@ * Standard and a limited recognition capability added. */ #ifndef STRING_FORMAL -#define STRING_FORMAL sal_False +#define STRING_FORMAL FALSE #endif /* * OK_DOLLAR enables use of $ as a valid "letter" in identifiers. * This is a permitted extension to the Ansi Standard and is required - * for e.g., VMS, RSX-11M, etc. It should be set sal_False if cpp is + * for e.g., VMS, RSX-11M, etc. It should be set FALSE if cpp is * used to preprocess assembler source on Unix systems. OLD_PREPROCESSOR - * sets OK_DOLLAR sal_False for that reason. + * sets OK_DOLLAR FALSE for that reason. */ #ifndef OK_DOLLAR -#define OK_DOLLAR sal_True +#define OK_DOLLAR TRUE #endif /* * OK_CONCAT enables (one possible implementation of) token concatenation. * If cpp is used to preprocess Unix assembler source, this should be - * set sal_False as the concatenation character, #, is used by the assembler. + * set FALSE as the concatenation character, #, is used by the assembler. */ #ifndef OK_CONCAT -#define OK_CONCAT sal_True +#define OK_CONCAT TRUE #endif /* @@ -274,7 +274,7 @@ * by the Draft Ansi Standard. */ #ifndef OK_DATE -#define OK_DATE sal_True +#define OK_DATE TRUE #endif /* |