diff options
Diffstat (limited to 'rsc/source/rscpp')
| -rw-r--r-- | rsc/source/rscpp/cpp.h | 3 | ||||
| -rw-r--r-- | rsc/source/rscpp/cpp1.c | 31 | ||||
| -rw-r--r-- | rsc/source/rscpp/cpp2.c | 12 | ||||
| -rw-r--r-- | rsc/source/rscpp/cpp3.c | 42 | ||||
| -rw-r--r-- | rsc/source/rscpp/cpp4.c | 19 | ||||
| -rw-r--r-- | rsc/source/rscpp/cpp5.c | 17 | ||||
| -rw-r--r-- | rsc/source/rscpp/cpp6.c | 32 | ||||
| -rw-r--r-- | rsc/source/rscpp/cppdef.h | 11 | ||||
| -rw-r--r-- | rsc/source/rscpp/cppmain.c | 6 | ||||
| -rw-r--r-- | rsc/source/rscpp/makefile.mk | 2 |
10 files changed, 67 insertions, 108 deletions
diff --git a/rsc/source/rscpp/cpp.h b/rsc/source/rscpp/cpp.h index 11327d4fb9d1..8ec451ab9d3d 100644 --- a/rsc/source/rscpp/cpp.h +++ b/rsc/source/rscpp/cpp.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -413,3 +414,5 @@ void ciwarn( char *format, int n); void dumpdef( char *why ); void dumpadef( char *why, DEFBUF *dp ); #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/rscpp/cpp1.c b/rsc/source/rscpp/cpp1.c index 1eb7561a2db0..378adaa17c5e 100644 --- a/rsc/source/rscpp/cpp1.c +++ b/rsc/source/rscpp/cpp1.c @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,7 +39,7 @@ FILE *pDefOut = NULL; /* ER evtl. #define's dump */ #endif #ifdef B200 -/* BP, 25.07.91, einzige Moeglichkeit unter BC Stack und Heap festzusetzen */ +/* einzige Moeglichkeit unter BC Stack und Heap festzusetzen */ extern unsigned _stklen = 24000; extern unsigned _heaplen = 30000; #endif @@ -188,7 +189,7 @@ char *magic[] = { /* Note: order is important */ "__FILE__", NULL /* Must be last */ }; - + static char *sharpfilename = NULL; int nRunde = 0; @@ -196,7 +197,6 @@ int nRunde = 0; void InitCpp1() { int i; - /* BP */ /* in der LIB-Version muessen alle Variablen initialisiert werden */ line = wrongline = errors = recursion = 0; @@ -233,7 +233,6 @@ void InitCpp1() nflag = 0; incend = incdir; sharpfilename = NULL; - /* BP */ } int MAIN(int argc, char** argv) @@ -286,8 +285,6 @@ nRunde++; if ((i = creat(useargv[3], 0, "rat=cr", "rfm=var")) == -1 || dup2(i, fileno(stdout)) == -1) { #else -/* alt if (freopen(useargv[3], "w", stdout) == NULL) { */ - pDefOut = fopen( useargv[3], "w" ); if( pDefOut == NULL ) { #endif @@ -297,7 +294,6 @@ nRunde++; } } /* Continue by opening output */ } -/* OSL_DEBUG_LEVEL > 1 */ #endif case 3: /* @@ -311,8 +307,6 @@ nRunde++; if ((i = creat(useargv[2], 0, "rat=cr", "rfm=var")) == -1 || dup2(i, fileno(stdout)) == -1) { #else -/* alt if (freopen(useargv[2], "w", stdout) == NULL) { */ - pCppOut = fopen( useargv[2], "w" ); if( pCppOut == NULL ) { #endif @@ -326,7 +320,6 @@ nRunde++; * Open input file, "-" means use stdin. */ if (!streq(useargv[1], "-")) { -/* alt: if (freopen(useargv[1], "r", stdin) == NULL) { */ pCppIn = fopen( useargv[1], "r" ); if( pCppIn == NULL) { perror(useargv[1]); @@ -348,16 +341,6 @@ nRunde++; default: exit(IO_ERROR); /* Can't happen */ } -/* if ( pfargv ) - { - for ( j=0;j++;j < PARALIMIT ) - { - if (pfargv[j]!=0) - free(pfargv[j]); - } - free(pfargv); - } -*/ setincdirs(); /* Setup -I include directories */ addfile( pCppIn, work); /* "open" main input file */ @@ -398,7 +381,7 @@ nRunde++; #endif } - + FILE_LOCAL void cppmain() /* @@ -550,7 +533,7 @@ end_line: if (c == '\n') { /* Compiling at EOL? */ EvalBuf[nEvalOff++] = '\0'; #endif } - + void output(int c) /* * Output one character to stdout -- output() is passed as an @@ -562,7 +545,6 @@ void output(int c) #else if (c != TOK_SEP) #endif -/* alt: PUTCHAR(c); */ PUTCHAR(c); } @@ -579,7 +561,6 @@ int c; #else if (c != TOK_SEP) #endif -/* alt: PUTCHAR(c); */ { PUTCHAR(c); if ( bIsInEval && nEvalOff < NEVALBUF ) @@ -614,3 +595,5 @@ void sharp() PUTCHAR('\n'); wrongline = FALSE; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/rscpp/cpp2.c b/rsc/source/rscpp/cpp2.c index 68d1d2dc72ba..c9046c73724c 100644 --- a/rsc/source/rscpp/cpp2.c +++ b/rsc/source/rscpp/cpp2.c @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -316,7 +317,7 @@ nest_err: cerror("#%s must be in an #if", token); } return (counter + 1); } - + FILE_LOCAL void doif(int hash) /* @@ -361,7 +362,7 @@ badif: cerror("#if, #ifdef, or #ifndef without an argument", NULLST); #endif return; } - + FILE_LOCAL void doinclude() /* @@ -431,7 +432,7 @@ void doinclude() incerr: cerror("#include syntax error", NULLST); return; } - + FILE_LOCAL int openinclude(char* filename, int searchlocal) /* @@ -507,7 +508,7 @@ openinclude(char* filename, int searchlocal) } return (FALSE); } - + FILE_LOCAL int hasdirectory(char* source, char* result) /* @@ -551,7 +552,7 @@ hasdirectory(char* source, char* result) #endif #endif } - + #if HOST == SYS_VMS /* @@ -623,3 +624,4 @@ char *result; /* Size is at least NAM$C_MAXRSS + 1 */ } #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/rscpp/cpp3.c b/rsc/source/rscpp/cpp3.c index e9c03cdd4874..92887b1c675f 100644 --- a/rsc/source/rscpp/cpp3.c +++ b/rsc/source/rscpp/cpp3.c @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -24,10 +25,6 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#if defined(_MSC_VER) && (_MSC_VER > 1310) -#define _USE_32BIT_TIME_T -#endif - #include <stdio.h> #ifdef UNX #include <stdlib.h> @@ -89,16 +86,14 @@ void addfile(FILE* fp, char* filename) */ { register FILEINFO *file; -/* #ifndef _NO_PROTO */ - extern FILEINFO *getfile( int bufsize, char *filename ); /* BP */ -/* #endif */ + extern FILEINFO *getfile( int bufsize, char *filename ); file = getfile(NBUFF, filename); file->fp = fp; /* Better remember FILE * */ file->buffer[0] = EOS; /* Initialize for first read */ line = 1; /* Working on line 1 now */ wrongline = TRUE; /* Force out initial #line */ } - + void setincdirs() /* * Append system-specific directories to the include directory list. @@ -162,7 +157,7 @@ void setincdirs() #if HOST == SYS_UNKNOWN /* - * BP: 25.07.91, Kontext: GenMake + * Kontext: GenMake * Unter DOS wird nun auch die Environment-Variable INCLUDE ausgewetet. * Es kommt erschwerend hinzu, dass alle Eintraege, die mit ';' getrennt * sind, mit in die Liste aufenommen werden muessen. @@ -173,7 +168,7 @@ void setincdirs() * verwendete knallte es in strcpy() ! */ -#if !defined( ZTC ) && !defined( WNT ) && !defined(BLC) && ! defined UNX && ! defined OS2 +#if !defined( WNT ) && ! defined UNX extern char *getenv( char *pStr ); /* BP */ #endif char *pIncGetEnv = NULL; /* Pointer auf INCLUDE */ @@ -187,7 +182,7 @@ void setincdirs() } -/* BP: 11.09.91, Kontext: Erweiterung des INCLUDE-Services +/* Kontext: Erweiterung des INCLUDE-Services * Bislang konnte der cpp keine Include-Angaben in der Kommandozeile * vertragen, bei denen die directries mit ';' getrennt wurden. * Dies ist auch verstaendlich, da dieses cpp fuer UNIX-Systeme @@ -213,9 +208,6 @@ int AddInclude( char* pIncStr ) return( 1 ); } - - - int dooptions(int argc, char** argv) /* @@ -251,9 +243,6 @@ dooptions(int argc, char** argv) break; case 'D': /* Define symbol */ -#if HOST != SYS_UNIX -/* zap_uc(ap); */ /* Force define to U.C. */ -#endif /* * If the option is just "-Dfoo", make it -Dfoo=1 */ @@ -314,9 +303,6 @@ dooptions(int argc, char** argv) break; case 'U': /* Undefine symbol */ -#if HOST != SYS_UNIX -/* zap_uc(ap);*/ -#endif if (defendel(ap, TRUE) == NULL) cwarn("\"%s\" wasn't defined", ap); break; @@ -366,7 +352,7 @@ dooptions(int argc, char** argv) } return (j); /* Return new argc */ } - + int readoptions(char* filename, char*** pfargv) { @@ -429,8 +415,6 @@ readoptions(char* filename, char*** pfargv) return (back); } - - #if HOST != SYS_UNIX FILE_LOCAL void zap_uc(char* ap) @@ -466,9 +450,9 @@ void initdefines() register char *tp; register DEFBUF *dp; int i; - long tvec; + time_t tvec; -#if !defined( ZTC ) && !defined( WNT ) && !defined(BLC) && !defined(G3) +#if !defined( WNT ) && !defined(G3) extern char *ctime(); #endif @@ -504,14 +488,14 @@ void initdefines() dp = defendel("__DATE__", FALSE); dp->repl = tp = getmem(27); dp->nargs = DEF_NOARGS; - time( (time_t*)&tvec); + time( &tvec); *tp++ = '"'; - strcpy(tp, ctime((const time_t*)&tvec)); + strcpy(tp, ctime(&tvec)); tp[24] = '"'; /* Overwrite newline */ #endif } } - + #if HOST == SYS_VMS /* * getredirection() is intended to aid in porting C programs @@ -599,3 +583,5 @@ char **argv; return (j); /* Return new argc */ } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/rscpp/cpp4.c b/rsc/source/rscpp/cpp4.c index 04d715f35351..3f5e03a0b5b7 100644 --- a/rsc/source/rscpp/cpp4.c +++ b/rsc/source/rscpp/cpp4.c @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -236,7 +237,7 @@ bad_define: cerror("#define syntax error", NULLST); inmacro = FALSE; /* Stop <newline> hack */ } - + void checkparm(int c, DEFBUF* dp) /* * Replace this param if it's defined. Note that the macro name is a @@ -264,7 +265,7 @@ void checkparm(int c, DEFBUF* dp) for (cp = token; *cp != EOS;) /* And save */ save(*cp++); /* The token itself */ } - + #if STRING_FORMAL void stparmscan(delim, dp) int delim; @@ -336,7 +337,7 @@ void stparmscan(int delim) workp[-1] = wp[-1]; /* Nope, reset end quote. */ } #endif - + void doundef() /* * Remove the symbol from the defined list. @@ -384,7 +385,7 @@ void charput(int c) *parmp++ = (char)c; } } - + /* * M a c r o E x p a n s i o n */ @@ -404,9 +405,7 @@ void expand(DEFBUF* tokenp) { register int c; register FILEINFO *file; -#ifndef ZTC /* BP */ extern FILEINFO *getfile(); -#endif #if OSL_DEBUG_LEVEL > 1 if (debug) @@ -487,7 +486,7 @@ void expand(DEFBUF* tokenp) expstuff(tokenp); /* Do actual parameters */ } /* nargs switch */ } - + FILE_LOCAL int expcollect() /* @@ -548,7 +547,7 @@ expcollect() } /* Collect all args. */ return (TRUE); /* Normal return */ } - + FILE_LOCAL void expstuff(DEFBUF* tokenp) /* @@ -562,9 +561,7 @@ void expstuff(DEFBUF* tokenp) char *defend; /* -> output buff end */ int string_magic; /* String formal hack */ FILEINFO *file; /* Funny #include */ -#ifndef ZTC /* BP */ extern FILEINFO *getfile(); -#endif file = getfile(NBUFF, tokenp->name); inp = tokenp->repl; /* -> macro replacement */ @@ -633,3 +630,5 @@ void dumpparm(char* why) } } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/rscpp/cpp5.c b/rsc/source/rscpp/cpp5.c index 70f05543c465..4eb3183b5a86 100644 --- a/rsc/source/rscpp/cpp5.c +++ b/rsc/source/rscpp/cpp5.c @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -113,7 +114,7 @@ register int op; #define isbinary(op) (op >= FIRST_BINOP && op <= LAST_BINOP) #define isunary(op) (op >= FIRST_UNOP && op <= LAST_UNOP) #endif - + /* * The following definitions are used to specify basic variable sizes. */ @@ -157,7 +158,7 @@ register int op; #ifndef S_PFPTR #define S_PFPTR (sizeof (int (*)())) #endif - + typedef struct types { short type; /* This is the bit if */ char *name; /* this is the token word */ @@ -202,7 +203,6 @@ SIZES size_table[] = { { T_FPTR, 0, S_PFPTR }, /* int (*()) */ { 0, 0, 0 }, /* End of table */ }; - void InitCpp5() { @@ -235,9 +235,7 @@ eval() int skip; /* For short-circuit testing */ int value[NEXP]; /* Value stack */ OPTAB opstack[NEXP]; /* Operand stack */ -#ifndef ZTC /* BP */ extern int *evaleval(); /* Does actual evaluation */ -#endif valp = value; opp = opstack; opp->op = OP_END; /* Mark bottom of stack */ @@ -380,7 +378,7 @@ again: ; } /* op1 switch end */ } /* Stack unwind loop */ } - + FILE_LOCAL int evallex(int skip) /* @@ -663,7 +661,7 @@ evalnum(int c) unget(); return (value); } - + FILE_LOCAL int evalchar(int skip) /* @@ -769,7 +767,7 @@ evalchar(int skip) instring = FALSE; return (value); } - + FILE_LOCAL int * evaleval(int* valp, int op, int skip) /* @@ -907,7 +905,7 @@ evaleval(int* valp, int op, int skip) *valp++ = v1; return (valp); } - + #ifdef DEBUG_EVAL dumpstack(opstack, opp, value, valp) OPTAB opstack[NEXP]; /* Operand stack */ @@ -927,3 +925,4 @@ register int *valp; /* -> value vector */ } #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/rscpp/cpp6.c b/rsc/source/rscpp/cpp6.c index fd2a2a9a0dd7..cb628ba4c04d 100644 --- a/rsc/source/rscpp/cpp6.c +++ b/rsc/source/rscpp/cpp6.c @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -81,7 +82,7 @@ * cierror & ciwarn take a format and a single int (char) argument. * cfatal takes a format and a single string argument. */ - + /* * This table must be rewritten for a non-Ascii machine. * @@ -168,7 +169,6 @@ OP_LPA,OP_RPA,OP_MUL,OP_ADD, 000,OP_SUB, DOT,OP_DIV, /* 28 ()*+,-./ */ #endif - /* * C P P S y m b o l T a b l e s */ @@ -226,7 +226,7 @@ skipws() #endif return (c); } - + void scanid(int c) /* * Get the next token (an id) into the token buffer. @@ -267,7 +267,7 @@ macroid(int c) } return (c); } - + int catenate() /* @@ -333,7 +333,7 @@ catenate() return (FALSE); /* Not supported */ #endif } - + int scanstring(int delim, #ifndef _NO_PROTO @@ -372,7 +372,7 @@ void (*outfun)() /* BP */ return (FALSE); } } - + void scannumber(int c, #ifndef _NO_PROTO register void (*outfun)( int ) /* BP */ /* Output/store func */ @@ -466,7 +466,7 @@ register void (*outfun)() /* BP */ done: if (dotflag || expseen) { /* Floating point? */ if (c == 'l' || c == 'L') { (*outfun)(c); - c = get(); /* Ungotten later */ + get(); /* Ungotten later */ } } else { /* Else it's an integer */ @@ -502,7 +502,7 @@ nomore: unget(); /* Not part of a number */ if (octal89 && radix == 8) cwarn("Illegal digit in octal number", NULLST); } - + void save(int c) { if (workp >= &work[NWORK]) { @@ -563,7 +563,6 @@ getmem(int size) cfatal("Out of memory", NULLST); return (result); } - DEFBUF * lookid(int c) @@ -603,7 +602,7 @@ lookid(int c) } return ((temp == 0) ? dp : NULL); } - + DEFBUF * defendel(char* name, int delete) /* @@ -771,7 +770,7 @@ void dumpadef(char *why, register DEFBUF *dp) pCppOut = pRememberOut; } #endif - + /* * G E T */ @@ -792,11 +791,7 @@ get_from_file: if ((file = infile) == NULL) return (EOF_CHAR); newline: -#if 0 - fprintf( pCppOut, "get(%s), recursion %d, line %d, bptr = %d, buffer \"%s\"\n", - file->filename, recursion, line, - file->bptr - file->buffer, file->buffer); -#endif + /* * Read a character from the current input line or macro. * At EOS, either finish the current macro (freeing temp. @@ -1033,9 +1028,7 @@ void ungetstring(char* text) */ { register FILEINFO *file; -#ifndef ZTC /* BP */ extern FILEINFO *getfile(); -#endif file = getfile(strlen(text) + 1, ""); strcpy(file->buffer, text); } @@ -1058,7 +1051,7 @@ cget() #endif return (c); } - + /* * Error messages and other hacks. The first byte of severity * is 'S' for string arguments and 'I' for int arguments. This @@ -1146,3 +1139,4 @@ void ciwarn(char* format, int narg) domsg("IWarning", format, &narg); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/rscpp/cppdef.h b/rsc/source/rscpp/cppdef.h index cdbf07766c8f..2490f1df7d7b 100644 --- a/rsc/source/rscpp/cppdef.h +++ b/rsc/source/rscpp/cppdef.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -184,7 +185,7 @@ #ifndef LINE_PREFIX #define LINE_PREFIX "" #endif - + /* * OLD_PREPROCESSOR forces the definition of OK_DOLLAR, OK_CONCAT, * COMMENT_INVISIBLE, and STRING_FORMAL to values appropriate for @@ -303,12 +304,7 @@ #else #define PAR_MAC (31 + 1) #endif -/* ER 13.06.95 19:33 - da Makros im file->buffer expandiert werden, muss NBUFF mindestens NWORK sein -#define NWORK 4096 -#define NBUFF 4096 - */ -/* ER 13.06.95 20:05 NWORK wg. grooossen Makros in *.src erhoeht, +/* NWORK wg. grooossen Makros in *.src erhoeht, da wir bald 10 Sprachen haben werden gleich ordentlich reingehauen.. */ #define NWORK 128000 #define NBUFF NWORK @@ -344,3 +340,4 @@ #endif #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/rscpp/cppmain.c b/rsc/source/rscpp/cppmain.c index 3060a6d6be9a..144576e2846b 100644 --- a/rsc/source/rscpp/cppmain.c +++ b/rsc/source/rscpp/cppmain.c @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -36,10 +37,7 @@ int main( argc, argv ) int argc; char *argv[]; { -#ifdef TSTCPP - ( start_cpp( argc, argv ) ); - puts("erster teil ist fertig" ); -#endif return( start_cpp( argc, argv ) ); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/rscpp/makefile.mk b/rsc/source/rscpp/makefile.mk index ca62bb37792c..2cec0885ffad 100644 --- a/rsc/source/rscpp/makefile.mk +++ b/rsc/source/rscpp/makefile.mk @@ -61,10 +61,8 @@ OBJFILES= \ LIBSALCPPRT=$(0) APP1TARGET= $(TARGET) APP1LIBS=$(LB)$/$(TARGET).lib -.IF "$(GUI)" != "OS2" APP1STACK=32768 .ENDIF -.ENDIF .IF "$(GUI)"=="UNX" CDEFS+=-Dunix |