From 9d21fa4fca1032c805ea210f631aed7080a785b6 Mon Sep 17 00:00:00 2001 From: Arvid Norlander Date: Tue, 18 Nov 2008 14:40:38 -0500 Subject: [PATCH] Clean up trailing whitespaces. --- src/arrgghh.c | 4 ++-- src/dekludge.c | 9 +++------ src/feh2.c | 16 ++++++++-------- src/fiddle.c | 2 +- src/ick_lose.c | 2 +- src/ick_lose.h | 4 ++-- src/numerals.c | 2 +- src/perpet.c | 5 ++--- src/pickwrap.c | 8 ++++---- src/unravel.c | 18 +++++++++--------- src/yuk.c | 6 +++--- src/yuk.h | 2 +- 12 files changed, 37 insertions(+), 41 deletions(-) diff --git a/src/arrgghh.c b/src/arrgghh.c index 834a10e..9716fe6 100644 --- a/src/arrgghh.c +++ b/src/arrgghh.c @@ -1,4 +1,4 @@ -/* +/* * SYNOPSIS: ick_parseargs(argc,argv) * FILE : ick_parseargs.c * AUTHOR : Steve Swales @@ -6,7 +6,7 @@ * PURPOSE: Parse arguments for INTERCAL programs. * LICENSE TERMS - Copyright (C) 1996 Eric S. Raymond + Copyright (C) 1996 Eric S. Raymond This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/dekludge.c b/src/dekludge.c index 385fd1a..59823fa 100644 --- a/src/dekludge.c +++ b/src/dekludge.c @@ -7,7 +7,7 @@ DESCRIPTION This file contains optimizations used by the C-INTERCAL compiler. LICENSE TERMS - Copyright (C) 1996 Eric S. Raymond + Copyright (C) 1996 Eric S. Raymond This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -212,7 +212,7 @@ void optimizef(void) } /* There are some flow idioms that maybe should be optimized. The most common is the NEXTing idiom for if(), which looks like this: - + DO (1) NEXT block 2 escape via NEXTING or COMEFROM @@ -370,7 +370,7 @@ void optimize(node *np) } do { - optflag = optimize_pass1(np); + optflag = optimize_pass1(np); } while(optflag); /* Keep optimizing until no optimizations are found */ if(optdebug && optdebug != 3) explexpr(np,stderr); if(optdebug == 3) prexpr(np,stderr,0); @@ -630,6 +630,3 @@ void checknodeactbits(node *np) break; } } - - - diff --git a/src/feh2.c b/src/feh2.c index 485a922..2790d3b 100644 --- a/src/feh2.c +++ b/src/feh2.c @@ -741,12 +741,12 @@ void explexpr(node* np, FILE* fp) explexpr(np->rval, fp); (void) fprintf(fp, ")"); break; - + case C_NOT: (void) fprintf(fp, "(~ "); explexpr(np->rval, fp); (void) fprintf(fp, ")"); - break; + break; case C_NOTEQUAL: (void) fprintf(fp, "("); @@ -880,8 +880,8 @@ void explexpr(node* np, FILE* fp) (void) fprintf(fp, " BY "); explexpr(np->rval, fp); break; - - default: + + default: ick_lose(IE778, emitlineno, (const char*) NULL); /*@-unreachable@*/ break; /*@=unreachable@*/ } @@ -962,7 +962,7 @@ static void ooprvar(node *np, FILE *fp, int freenode) /* This should never be reached */ ick_lose(IE778, emitlineno, (const char*) NULL); /*@-unreachable@*/ break; /*@=unreachable@*/ - + case SUB: { (void) fprintf(fp, "ick_aref("); @@ -1436,7 +1436,7 @@ void prexpr(node *np, FILE *fp, int freenode) prexpr(np->rval, fp, freenode); (void) fprintf(fp, ")"); break; - + case C_NOT: (void) fprintf(fp, "(~"); tempint=np->rval->width; /* AIS */ @@ -1445,7 +1445,7 @@ void prexpr(node *np, FILE *fp, int freenode) (void) fprintf(fp, " & ick_Max_small)"); else (void) fprintf(fp, " & ick_Max_large)"); - break; + break; /* AIS: I added the rest of the cases */ case C_NOTEQUAL: @@ -1473,7 +1473,7 @@ void prexpr(node *np, FILE *fp, int freenode) prexpr(np->rval, fp, freenode); (void) fprintf(fp, ")"); break; - + case C_LSHIFTBY: (void) fprintf(fp, "("); prexpr(np->lval, fp, freenode); diff --git a/src/fiddle.c b/src/fiddle.c index e1c2d97..1358293 100644 --- a/src/fiddle.c +++ b/src/fiddle.c @@ -4,7 +4,7 @@ * We link these to the compiler, too, in order to do constant folding * LICENSE TERMS - Copyright (C) 1996 Eric S. Raymond + Copyright (C) 1996 Eric S. Raymond This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/ick_lose.c b/src/ick_lose.c index b38158c..c54f7ce 100644 --- a/src/ick_lose.c +++ b/src/ick_lose.c @@ -4,7 +4,7 @@ * ick_lose.c -- report INTERCAL compile- or run-time error * LICENSE TERMS - Copyright (C) 1996 Eric S. Raymond + Copyright (C) 1996 Eric S. Raymond This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/ick_lose.h b/src/ick_lose.h index fb36e51..911c6c6 100644 --- a/src/ick_lose.h +++ b/src/ick_lose.h @@ -1,13 +1,13 @@ /* ick_lose.h --- error message strings */ /* - * Note: these error message texts, with one exception, are direct from + * Note: these error message texts, with one exception, are direct from * the Princeton compiler (INTERCAL-72) sources (transmitted by Don Woods). * The one exception is IE632, which in INTERCAL-72 had the error message * PROGRAM ATTEMPTED TO EXIT WITHOUT ERROR MESSAGE * ESR's "THE NEXT STACK HAS RUPTURED!..." has been retained on the grounds * that it is more obscure and much funnier. For context, find a copy of - * Joe Haldeman's SF short story "A !Tangled Web", ick_first published in + * Joe Haldeman's SF short story "A !Tangled Web", ick_first published in * Analog magazine in September 1981 and later anthologized in the author's * "Infinite Dreams" (Ace 1985). */ diff --git a/src/numerals.c b/src/numerals.c index c5b800d..024228e 100644 --- a/src/numerals.c +++ b/src/numerals.c @@ -19,7 +19,7 @@ * to fulfill the requirement for Ancient Roman localization. * LICENSE TERMS - Copyright (C) 1996 Eric S. Raymond + Copyright (C) 1996 Eric S. Raymond This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/perpet.c b/src/perpet.c index 06e75c8..88c54cc 100644 --- a/src/perpet.c +++ b/src/perpet.c @@ -484,7 +484,7 @@ int main(int argc, char *argv[]) #ifdef SIGBUS (void) signal(SIGBUS, abend); #endif /* SIGBUS */ - + if (!nocompilerbug) { #ifdef USG srand48(time(NULL) + getpid()); @@ -950,7 +950,7 @@ int main(int argc, char *argv[]) /* AIS: Possibly link in the debugger yuk and/or libickmt.a here. */ /* AIS: Added -g support. */ /* AIS: Added argv[0] (now path) to the -I, -L settings. */ - + textlinecount=0; /* AIS: If there are no files, there's no need to free any textlines */ while ((c = myfgetc(ifp)) != EOF) @@ -1860,4 +1860,3 @@ needc99?99:89,tempfn); } /* perpet.c ends here */ - diff --git a/src/pickwrap.c b/src/pickwrap.c index 2133baa..c7258c2 100644 --- a/src/pickwrap.c +++ b/src/pickwrap.c @@ -24,21 +24,21 @@ int ick_main(void) { pickinit(); /* degenerated code */ - ick_restart: + ick_restart: top: switch(ick_skipto) { case 0: $G } - + #ifdef YUK - if(yukloop) goto ick_restart; + if(yukloop) goto ick_restart; #endif ick_lose(IE633, $J, (const char *)0); $H - + return 0; } $Q diff --git a/src/unravel.c b/src/unravel.c index 18854fc..7e3c671 100644 --- a/src/unravel.c +++ b/src/unravel.c @@ -1,6 +1,6 @@ /***************************************************************************** -NAME +NAME unravel.c -- multithreading and backtracking support for C-INTERCAL LICENSE TERMS @@ -124,7 +124,7 @@ static void fluputs(const char* s) * ickthread objects. choicepoint creates a choicepoint or marks a * choicepoint as stale; choiceahead eliminates a choicepoint; * choiceback eliminates a stale choicepoint or returns to a fresh - * choicepoint. + * choicepoint. * *********************************************************************/ @@ -213,7 +213,7 @@ void choiceahead(void) } if(ick_printflow) fluputs("(ahead)"); - + /* This code works by converting topchoice back to a thread and placing it just before the current thread, and then killing it. First, the data from this thread, apart from the choicepoint stack, must be saved. */ @@ -380,12 +380,12 @@ int multicome1(int errlineno, jmp_buf pc) i = tailcount; tvp = ick_tailforget; ick_tailforget = malloc(i * sizeof *ick_tailforget); - if(!ick_tailforget) ick_lose(IE991, errlineno, (const char *) NULL); + if(!ick_tailforget) ick_lose(IE991, errlineno, (const char *) NULL); memcpy(ick_tailforget, tvp, i * sizeof *ick_tailforget); i = hybridcount; tvp = ick_hyforget; ick_hyforget = malloc(i * sizeof *ick_hyforget); - if(!ick_hyforget) ick_lose(IE991, errlineno, (const char *) NULL); + if(!ick_hyforget) ick_lose(IE991, errlineno, (const char *) NULL); memcpy(ick_hyforget, tvp, i * sizeof *ick_hyforget); /* duplicate data stored in arrays */ @@ -490,7 +490,7 @@ int multicome1(int errlineno, jmp_buf pc) isb->save.a->data.hybrid = (ick_type32*)malloc(prod * sizeof(ick_type32)); if(!isb->save.a->data.hybrid) ick_lose(IE991, errlineno, (const char *) NULL); memcpy(isb->save.a->data.hybrid, isb2->save.a->data.hybrid, - prod * sizeof(ick_type32)); + prod * sizeof(ick_type32)); } isb2 = isb->ick_next; } @@ -679,7 +679,7 @@ void killthread(void) /*@-unqualifiedtrans@*/ /* it is only at this point */ free(ick_next); /* Free NEXT stack */ /*@=unqualifiedtrans@*/ - + ickmt_prev->ick_next = ickmt_cur->ick_next; if(ickmt_cur->ick_next == ickmt_cur) { @@ -731,7 +731,7 @@ void nextthread(jmp_buf pc, int errlineno, int flags) /* OK, so I've spaghettified this procedure slightly by using goto instead of if. But I was so deep into figuring out setjmp/longjmp, a goto seemed crystal-clear by comparison. */ - + /* save variables */ ickmt_cur->dsi->varforget[0] = ick_onespots; ickmt_cur->dsi->varforget[1] = ick_twospots; @@ -807,7 +807,7 @@ void nextthread(jmp_buf pc, int errlineno, int flags) /* load choicepoints */ if(!choicing) topchoice = ickmt_cur->choicepoint; - + /* load ick_stashbox */ /*@-onlytrans@*/ /* ditto */ ick_first = ickmt_cur->dsi->sb; diff --git a/src/yuk.c b/src/yuk.c index 08c876e..dc2beda 100644 --- a/src/yuk.c +++ b/src/yuk.c @@ -304,7 +304,7 @@ void yukline(int aboff,int emitlineno) } } } - } + } if(writelines||broken) { /* write line that we're on */ @@ -567,7 +567,7 @@ void yukline(int aboff,int emitlineno) if(yukvars[i].vartype==ick_TAIL) ick_tailforget[yukvars[i].intername]=*buf=='i'; if(yukvars[i].vartype==ick_HYBRID) - ick_hyforget[yukvars[i].intername]=*buf=='i'; + ick_hyforget[yukvars[i].intername]=*buf=='i'; } } } @@ -728,7 +728,7 @@ void yukline(int aboff,int emitlineno) } else (void) puts("Don't know which line you mean."); - break; + break; case 's': singlestep=1; writelines=1; diff --git a/src/yuk.h b/src/yuk.h index f6e5550..998b6d6 100644 --- a/src/yuk.h +++ b/src/yuk.h @@ -44,7 +44,7 @@ extern int yukloop; with decent accuracy under DOS. DJGPP implements timer types 0, 1, and 2, so it will 'work' with the default value of 2, but the results you get will be basically meaningless as the base information can't - be accurately obtained (the resolution is slightly worse than 50ms, + be accurately obtained (the resolution is slightly worse than 50ms, which is far too slow for profiling). */ #ifndef YPTIMERTIME # ifdef HAVE_GETHRTIME -- 2.43.0