diff --git a/1990/.gitignore b/1990/.gitignore index 7f047df8e..a47722c25 100644 --- a/1990/.gitignore +++ b/1990/.gitignore @@ -1,5 +1,5 @@ baruch/baruch -cmills/cmills +mills/mills dds/dds dg/dg jaw/atob @@ -10,9 +10,9 @@ scjones/scjones stig/o stig/o.c tbr/tbr -theorem/fibonacci -theorem/fibonacci.c -theorem/sorter -theorem/sorter.c -theorem/theorem +mariano/fibonacci +mariano/fibonacci.c +mariano/sorter +mariano/sorter.c +mariano/mariano westley/westley diff --git a/1990/Makefile b/1990/Makefile index 16ad51ce1..65db600bc 100644 --- a/1990/Makefile +++ b/1990/Makefile @@ -53,7 +53,7 @@ include ../var.mk # IOCCC winners ############### # -WINNERS= baruch cmills dds dg jaw pjr scjones stig tbr theorem westley +WINNERS= baruch dds dg jaw mariano mills pjr scjones stig tbr westley YEAR= 1990 diff --git a/1990/cmills/.gitignore b/1990/cmills/.gitignore deleted file mode 100644 index 931adc228..000000000 --- a/1990/cmills/.gitignore +++ /dev/null @@ -1 +0,0 @@ -cmills diff --git a/1990/theorem/.gitignore b/1990/mariano/.gitignore similarity index 82% rename from 1990/theorem/.gitignore rename to 1990/mariano/.gitignore index e523870b9..47cb1bda8 100644 --- a/1990/theorem/.gitignore +++ b/1990/mariano/.gitignore @@ -1,5 +1,5 @@ fibonacci fibonacci.c +mariano sorter sorter.c -theorem diff --git a/1990/theorem/Makefile b/1990/mariano/Makefile similarity index 98% rename from 1990/theorem/Makefile rename to 1990/mariano/Makefile index 235e17082..59fae18eb 100644 --- a/1990/theorem/Makefile +++ b/1990/mariano/Makefile @@ -1,6 +1,6 @@ #!/usr/bin/env make # -# IOCCC 1990 winning entry - theorem +# IOCCC 1990 winning entry - mariano ################################################################################ # @@ -165,7 +165,7 @@ endif # Special flags for this entry ############################## # -ENTRY= theorem +ENTRY= mariano PROG= ${ENTRY} # OBJ= ${PROG}.o @@ -191,13 +191,13 @@ ${PROG}: ${PROG}.c ${CC} ${CFLAGS} $< -o $@ ${LIBS} sorter.c: ${PROG} ${PROG}.c - -./theorem -r 0 0 0 0 < theorem.c > sorter.c + -./mariano -r 0 0 0 0 < mariano.c > sorter.c sorter: sorter.c ${CC} ${CFLAGS} sorter.c -o $@ fibonacci.c: sorter ${PROG}.c - -./sorter 0 0 0 0 < theorem.c > fibonacci.c + -./sorter 0 0 0 0 < mariano.c > fibonacci.c fibonacci: fibonacci.c ${CC} ${CFLAGS} fibonacci.c -o $@ diff --git a/1990/theorem/README.md b/1990/mariano/README.md similarity index 89% rename from 1990/theorem/README.md rename to 1990/mariano/README.md index 9d8d83dee..d904a90e3 100644 --- a/1990/theorem/README.md +++ b/1990/mariano/README.md @@ -19,7 +19,7 @@ systems with this entry. ## To run: - ./theorem expression x1 x2 h y1 + ./mariano expression x1 x2 h y1 where: @@ -32,7 +32,7 @@ where: ## Try: - ./theorem y 0 1 0.1 1 + ./mariano y 0 1 0.1 1 @@ -41,7 +41,7 @@ where: The program's source implements four functions, all from the same source file! -When you compile theorem.c as is and run with 5 args, it numerically +When you compile mariano.c as is and run with 5 args, it numerically solves the equation y'=f(x,y), with a step size of h, over the interval x=[x1,x2], with the initial condition of y(x1)=y1. @@ -56,14 +56,14 @@ left to right. (i.e., parenthesis aren't supported). Try running the program with the following args: - ./theorem y 0 1 0.1 1 - ./theorem 1/x 1 2 0.1 0 - ./theorem 'x^2/y+x' 0 1 0.1 6 + ./mariano y 0 1 0.1 1 + ./mariano 1/x 1 2 0.1 0 + ./mariano 'x^2/y+x' 0 1 0.1 6 But wait, there is more! You also get, free of charge, a reversing filter! Try: - ./theorem -r 0 0 0 0 < theorem.c > sorter.c + ./mariano -r 0 0 0 0 < mariano.c > sorter.c Still not impressed? The author throws in for free, a sort program! Try: @@ -75,12 +75,12 @@ This program is safe for home use as well. The author has included a safety feature in case you misplace the original program source: - ./sorter -r 0 0 0 0 < sorter.c > theorem_bkp.c + ./sorter -r 0 0 0 0 < sorter.c > mariano_bkp.c And finally, as a special offer to users of this entry, the author provides a Fibonacci sequence generator! Try: - ./sorter 0 0 0 0 < theorem.c > fibonacci.c + ./sorter 0 0 0 0 < mariano.c > fibonacci.c cc fibonacci.c -o fibonacci ./fibonacci 1 1 ./fibonacci 2 1 diff --git a/1990/theorem/theorem.c b/1990/mariano/mariano.c similarity index 94% rename from 1990/theorem/theorem.c rename to 1990/mariano/mariano.c index 857646e48..7512d69fe 100644 --- a/1990/theorem/theorem.c +++ b/1990/mariano/mariano.c @@ -21,7 +21,7 @@ if(R=='/')*g/=u; if(R=='^')P(g,*g,u); C w(g,R,u)float*g,u;char R; -/**/{int b,f;A=atoi(*++a);b=atoi(*++a);while((f=A+b)<15000){printf("%d\n",f);A=b;b=f;}} +/**/{int b,f;A=atoi(++a);b=atoi(++a);while((f=A+b)<15000){printf("%d\n",f);A=b;b=f;}} main(A,a)int A;char*a[]; o o if(!strcmp(*++a,"-r"))S(); diff --git a/1990/mills/.gitignore b/1990/mills/.gitignore new file mode 100644 index 000000000..435314278 --- /dev/null +++ b/1990/mills/.gitignore @@ -0,0 +1 @@ +mills diff --git a/1990/cmills/Makefile b/1990/mills/Makefile similarity index 99% rename from 1990/cmills/Makefile rename to 1990/mills/Makefile index 0d3166dea..37b584635 100644 --- a/1990/cmills/Makefile +++ b/1990/mills/Makefile @@ -1,6 +1,6 @@ #!/usr/bin/env make # -# IOCCC 1990 winning entry - cmills +# IOCCC 1990 winning entry - mills ################################################################################ # @@ -163,7 +163,7 @@ endif # Special flags for this entry ############################## # -ENTRY= cmills +ENTRY= mills PROG= ${ENTRY} # OBJ= ${PROG}.o diff --git a/1990/cmills/README.md b/1990/mills/README.md similarity index 96% rename from 1990/cmills/README.md rename to 1990/mills/README.md index 97f2a0201..a0284f0b2 100644 --- a/1990/cmills/README.md +++ b/1990/mills/README.md @@ -12,14 +12,14 @@ ### To run - ./cmills [starting_cash] + ./mills [starting_cash] NOTE: we used a patch from Yusuke Endoh to get this to work in modern systems (it resulted in a bus error otherwise). Thank you Yusuke for your assistance! ### Try: - ./cmills 5000 + ./mills 5000 NOTE: this program uses `gets()` so you will likely get a warning under modern @@ -29,7 +29,7 @@ systems. Compile notes: - cc -DM=500 -DN=52 -DX="srand((int)time(0L))" -DV=void -o cmills cmills.c + cc -DM=500 -DN=52 -DX="srand((int)time(0L))" -DV=void -o mills mills.c -DM= -DN=<52 * number of decks used> diff --git a/1990/cmills/cmills.c b/1990/mills/mills.c similarity index 100% rename from 1990/cmills/cmills.c rename to 1990/mills/mills.c diff --git a/1991/Makefile b/1991/Makefile index e70318e7b..68e9abd8a 100644 --- a/1991/Makefile +++ b/1991/Makefile @@ -53,7 +53,7 @@ include ../var.mk # IOCCC winners ############### # -WINNERS= ant brnstnd buzzard cdupont davidguy dds fine rince westley +WINNERS= brnstnd buzzard cdupont davidguy dds fine howe rince westley YEAR= 1991 diff --git a/1991/ant/.gitignore b/1991/howe/.gitignore similarity index 100% rename from 1991/ant/.gitignore rename to 1991/howe/.gitignore diff --git a/1991/ant/Makefile b/1991/howe/Makefile similarity index 99% rename from 1991/ant/Makefile rename to 1991/howe/Makefile index 4eab4caa8..fc119e5fd 100644 --- a/1991/ant/Makefile +++ b/1991/howe/Makefile @@ -1,6 +1,6 @@ #!/usr/bin/env make # -# IOCCC 1991 winning entry - ant +# IOCCC 1991 winning entry - howe ################################################################################ # @@ -163,7 +163,7 @@ endif # Special flags for this entry ############################## # -ENTRY= ant +ENTRY= howe PROG= ${ENTRY} # OBJ= ${PROG}.o diff --git a/1991/ant/README.md b/1991/howe/README.md similarity index 99% rename from 1991/ant/README.md rename to 1991/howe/README.md index f01cd6f6b..543775bc2 100644 --- a/1991/ant/README.md +++ b/1991/howe/README.md @@ -12,8 +12,8 @@ ### To run - cp ant.hint hill - ./ant hill + cp howe.hint hill + ./howe hill ## Judges' comments diff --git a/1991/ant/ant.c b/1991/howe/howe.c similarity index 100% rename from 1991/ant/ant.c rename to 1991/howe/howe.c diff --git a/1992/Makefile b/1992/Makefile index e5b366a23..e9d1cd1e8 100644 --- a/1992/Makefile +++ b/1992/Makefile @@ -53,8 +53,8 @@ include ../var.mk # IOCCC winners ############### # -WINNERS= adrian albert ant buzzard1 buzzard2 gson imc kivinen lush marangon \ - nathan vern westley +WINNERS= albert buzzard1 buzzard2 gson howe imc kivinen lush marangon \ + mariano nathan vern westley YEAR= 1992 diff --git a/1992/ant/.gitignore b/1992/howe/.gitignore similarity index 68% rename from 1992/ant/.gitignore rename to 1992/howe/.gitignore index 67f925559..dcf1cb0d7 100644 --- a/1992/ant/.gitignore +++ b/1992/howe/.gitignore @@ -1,3 +1,3 @@ am am.safe -ant +howe diff --git a/1992/ant/Makefile b/1992/howe/Makefile similarity index 99% rename from 1992/ant/Makefile rename to 1992/howe/Makefile index 4b681d5e0..8ddafabc3 100644 --- a/1992/ant/Makefile +++ b/1992/howe/Makefile @@ -1,6 +1,6 @@ #!/usr/bin/env make # -# IOCCC 1992 winning entry - ant +# IOCCC 1992 winning entry - howe ################################################################################ # @@ -162,7 +162,7 @@ endif # Special flags for this entry ############################## # -ENTRY= ant +ENTRY= howe PROG= ${ENTRY} # OBJ= ${PROG}.o diff --git a/1992/ant/README.md b/1992/howe/README.md similarity index 95% rename from 1992/ant/README.md rename to 1992/howe/README.md index 51291de9f..02bd41690 100644 --- a/1992/ant/README.md +++ b/1992/howe/README.md @@ -13,7 +13,7 @@ ### To run - ./am ant.test.mk + ./am howe.test.mk ## Judges' comments @@ -33,7 +33,7 @@ ## Author's comments - See the file ant.README. + See the file howe.README. Copyright (c) 1992, Landon Curt Noll & Larry Bassel. All Rights Reserved. Permission for personal, educational or non-profit use is diff --git a/1992/ant/ant.README b/1992/howe/howe.README similarity index 99% rename from 1992/ant/ant.README rename to 1992/howe/howe.README index b982a3975..c69dc9118 100644 --- a/1992/ant/ant.README +++ b/1992/howe/howe.README @@ -261,9 +261,9 @@ REFERENCES FILES -ant.c Obfuscated source -ant.README Manual for AM -ant.test.mk Test makefile +howe.c Obfuscated source +howe.README Manual for AM +howe.test.mk Test makefile BUGS diff --git a/1992/ant/ant.c b/1992/howe/howe.c similarity index 100% rename from 1992/ant/ant.c rename to 1992/howe/howe.c diff --git a/1992/ant/ant.test.mk b/1992/howe/howe.test.mk similarity index 100% rename from 1992/ant/ant.test.mk rename to 1992/howe/howe.test.mk diff --git a/1992/adrian/.gitignore b/1992/mariano/.gitignore similarity index 92% rename from 1992/adrian/.gitignore rename to 1992/mariano/.gitignore index 4450cfb5f..53400c544 100644 --- a/1992/adrian/.gitignore +++ b/1992/mariano/.gitignore @@ -5,8 +5,8 @@ adecho.c adgrep adhead adhead.c -adrian adsleep adsleep.c adwc adwc.c +mariano diff --git a/1992/adrian/Makefile b/1992/mariano/Makefile similarity index 93% rename from 1992/adrian/Makefile rename to 1992/mariano/Makefile index c772dc322..c9fcea042 100644 --- a/1992/adrian/Makefile +++ b/1992/mariano/Makefile @@ -1,6 +1,6 @@ #!/usr/bin/env make # -# IOCCC 1992 winning entry - adrian +# IOCCC 1992 winning entry - mariano ################################################################################ # @@ -166,7 +166,7 @@ endif # Special flags for this entry ############################## # -ENTRY= adrian +ENTRY= mariano PROG= ${ENTRY} # OBJ= ${PROG}.o @@ -191,20 +191,20 @@ all: data ${TARGET} ${PROG}: ${PROG}.c ${CC} ${CFLAGS} $< -o $@ ${LIBS} ${RM} -f ad.temp adwc.c adbasename.c adecho.c adhead.c adsleep.c - ${SED} '1s/\..*\./. wc ./' adrian.c > ad.temp - -./adrian ad.temp adwc.c + ${SED} '1s/\..*\./. wc ./' mariano.c > ad.temp + -./mariano ad.temp adwc.c ${CC} ${CFLAGS} -o adwc adwc.c - ${SED} '1s/\..*\./. basename ./' adrian.c > ad.temp - -./adrian ad.temp adbasename.c + ${SED} '1s/\..*\./. basename ./' mariano.c > ad.temp + -./mariano ad.temp adbasename.c ${CC} ${CFLAGS} -o adbasename adbasename.c - ${SED} '1s/\..*\./. echo| ./' adrian.c > ad.temp - -./adrian ad.temp adecho.c + ${SED} '1s/\..*\./. echo| ./' mariano.c > ad.temp + -./mariano ad.temp adecho.c ${CC} ${CFLAGS} -o adecho adecho.c - ${SED} '1s/\..*\./. head; ./' adrian.c > ad.temp - -./adrian ad.temp adhead.c + ${SED} '1s/\..*\./. head; ./' mariano.c > ad.temp + -./mariano ad.temp adhead.c ${CC} ${CFLAGS} -o adhead adhead.c - ${SED} '1s/\..*\./. sleep ./' adrian.c > ad.temp - -./adrian ad.temp adsleep.c + ${SED} '1s/\..*\./. sleep ./' mariano.c > ad.temp + -./mariano ad.temp adsleep.c ${CC} ${CFLAGS} -o adsleep adsleep.c ${RM} -f ad.temp @@ -241,7 +241,7 @@ clean: clobber: clean ${RM} -f ${TARGET} ${ALT_TARGET} ${RM} -f adbasename adbasename.c adecho adecho.c adgrep adhead - ${RM} -f adhead.c adrian adsleep adsleep.c adwc adwc.c + ${RM} -f adhead.c mariano adsleep adsleep.c adwc adwc.c @-if [ -e sandwich ]; then \ ${RM} -f sandwich; \ echo 'ate sandwich'; \ diff --git a/1992/adrian/README.md b/1992/mariano/README.md similarity index 97% rename from 1992/adrian/README.md rename to 1992/mariano/README.md index e57b2691a..1508d7c95 100644 --- a/1992/adrian/README.md +++ b/1992/mariano/README.md @@ -12,7 +12,7 @@ ### To run - ./adrian adrian.grep.try < adrian.hint + ./mariano mariano.grep.try < mariano.hint For the slow minded, try: @@ -130,7 +130,7 @@ If no filename is specified on the command line, then "adgrep.c" is used as the specification for the automaton. (This file has been renamed - to adrian.c by the judges.) In this case, the program will search for + to mariano.c by the judges.) In this case, the program will search for matches to the regular expression: ^.[^|C][^w[Q]*(Q|[w[]c).*|^.[C|]$ @@ -208,7 +208,7 @@ machine.) The four programs which read from stdin require lines shorter than 999 characters. - The other info files are adrian.grep.[1-6] which contain the six + The other info files are mariano.grep.[1-6] which contain the six examples that appear above, and from, which is used to emulate the unix from command. For reasons of clarity, the name "from" should probably not be changed if possible. I wouldn't want to be accused of diff --git a/1992/adrian/adrian.c b/1992/mariano/mariano.c similarity index 100% rename from 1992/adrian/adrian.c rename to 1992/mariano/mariano.c diff --git a/1992/adrian/adrian.grep.1 b/1992/mariano/mariano.grep.1 similarity index 100% rename from 1992/adrian/adrian.grep.1 rename to 1992/mariano/mariano.grep.1 diff --git a/1992/adrian/adrian.grep.2 b/1992/mariano/mariano.grep.2 similarity index 100% rename from 1992/adrian/adrian.grep.2 rename to 1992/mariano/mariano.grep.2 diff --git a/1992/adrian/adrian.grep.3 b/1992/mariano/mariano.grep.3 similarity index 100% rename from 1992/adrian/adrian.grep.3 rename to 1992/mariano/mariano.grep.3 diff --git a/1992/adrian/adrian.grep.4 b/1992/mariano/mariano.grep.4 similarity index 100% rename from 1992/adrian/adrian.grep.4 rename to 1992/mariano/mariano.grep.4 diff --git a/1992/adrian/adrian.grep.5 b/1992/mariano/mariano.grep.5 similarity index 100% rename from 1992/adrian/adrian.grep.5 rename to 1992/mariano/mariano.grep.5 diff --git a/1992/adrian/adrian.grep.from b/1992/mariano/mariano.grep.from similarity index 100% rename from 1992/adrian/adrian.grep.from rename to 1992/mariano/mariano.grep.from diff --git a/1992/adrian/adrian.grep.try b/1992/mariano/mariano.grep.try similarity index 100% rename from 1992/adrian/adrian.grep.try rename to 1992/mariano/mariano.grep.try diff --git a/1993/.gitignore b/1993/.gitignore index 719efe2c0..e22307309 100644 --- a/1993/.gitignore +++ b/1993/.gitignore @@ -1,5 +1,5 @@ ant/ant -cmills/cmills +mills/mills dgibson/data.name dgibson/data.name2 dgibson/life.d diff --git a/1993/Makefile b/1993/Makefile index fe24fe219..12af97e4c 100644 --- a/1993/Makefile +++ b/1993/Makefile @@ -53,7 +53,7 @@ include ../var.mk # IOCCC winners ############### # -WINNERS= ant cmills dgibson ejb jonth leo lmfjyh plummer rince schnitzi vanb +WINNERS= dgibson ejb howe jonth leo lmfjyh mills plummer rince schnitzi vanb YEAR= 1993 diff --git a/1993/cmills/.gitignore b/1993/cmills/.gitignore deleted file mode 100644 index 931adc228..000000000 --- a/1993/cmills/.gitignore +++ /dev/null @@ -1 +0,0 @@ -cmills diff --git a/1993/ant/.gitignore b/1993/howe/.gitignore similarity index 73% rename from 1993/ant/.gitignore rename to 1993/howe/.gitignore index 5eb79a4c1..2b4e1f31a 100644 --- a/1993/ant/.gitignore +++ b/1993/howe/.gitignore @@ -1,3 +1,4 @@ ag ag.txt ant +howe diff --git a/1993/ant/Makefile b/1993/howe/Makefile similarity index 99% rename from 1993/ant/Makefile rename to 1993/howe/Makefile index 69fdbf54f..25ca65cd5 100644 --- a/1993/ant/Makefile +++ b/1993/howe/Makefile @@ -1,6 +1,6 @@ #!/usr/bin/env make # -# IOCCC 1993 winning entry - ant +# IOCCC 1993 winning entry - howe ################################################################################ # @@ -160,7 +160,7 @@ endif # Special flags for this entry ############################## # -ENTRY= ant +ENTRY= howe PROG= ${ENTRY} # OBJ= ${PROG}.o diff --git a/1993/ant/README.md b/1993/howe/README.md similarity index 91% rename from 1993/ant/README.md rename to 1993/howe/README.md index d5159ef73..90f765a0e 100644 --- a/1993/ant/README.md +++ b/1993/howe/README.md @@ -12,14 +12,14 @@ ### To run - ./ant 'ERE' [file ...] + ./howe 'ERE' [file ...] ## Judges' comments You may also want to try the author's test suite: - make -f ant.test.mk + make -f howe.test.mk - See the author's Posix P1003.2-like documentation file ant.txt + See the author's Posix P1003.2-like documentation file howe.txt for more information. This program demonstrates that Posix doesn't guarantee readability. :-) diff --git a/1993/ant/ant.c b/1993/howe/howe.c similarity index 100% rename from 1993/ant/ant.c rename to 1993/howe/howe.c diff --git a/1993/ant/ant.test.mk b/1993/howe/howe.test.mk similarity index 62% rename from 1993/ant/ant.test.mk rename to 1993/howe/howe.test.mk index afb54deae..e253c6ce7 100644 --- a/1993/ant/ant.test.mk +++ b/1993/howe/howe.test.mk @@ -5,28 +5,28 @@ # SHELL=/bin/sh -PRG=./ant +PRG=./howe -all: ant char word anchor literal wild closure option branch sub class +all: howe char word anchor literal wild closure option branch sub class # # Built the entry # -ant: Makefile - make -f Makefile ant +howe: Makefile + make -f Makefile howe # # Test simple text patterns without the use of meta characters. # empty: - $(PRG) '' ant.test.mk + $(PRG) '' howe.test.mk char: - $(PRG) 'q' ant.test.mk + $(PRG) 'q' howe.test.mk word: - $(PRG) 'simple' ant.test.mk + $(PRG) 'simple' howe.test.mk # # Test meta characters. @@ -35,28 +35,28 @@ word: anchor: anchor1 anchor2 anchor3 anchor4 anchor5 anchor1: - $(PRG) '^anchor1' ant.test.mk + $(PRG) '^anchor1' howe.test.mk anchor2: - $(PRG) 'Grep$$' ant.test.mk + $(PRG) 'Grep$$' howe.test.mk # # Find all empty lines. # anchor3: - $(PRG) '^$$' ant.test.mk + $(PRG) '^$$' howe.test.mk # # This is valid but will never match. # anchor4: - -$(PRG) 'x^a' ant.test.mk + -$(PRG) 'x^a' howe.test.mk # # This is valid but will never match. # anchor5: - -$(PRG) 'mk$$x' ant.test.mk + -$(PRG) 'mk$$x' howe.test.mk literal: literal1 literal2 @@ -64,13 +64,13 @@ literal: literal1 literal2 # Every line with a dollar-sign. # literal1: - $(PRG) '\$$' ant.test.mk + $(PRG) '\$$' howe.test.mk # # Every line with a backslash. # literal2: - $(PRG) '\\' ant.test.mk + $(PRG) '\\' howe.test.mk # # wild #1# @@ -78,7 +78,7 @@ literal2: # wild #%# # wild: - $(PRG) '#.#' ant.test.mk + $(PRG) '#.#' howe.test.mk # # closure !! @@ -86,7 +86,7 @@ wild: # closure !xxxxxx! # closure: - $(PRG) 'closure !x*!' ant.test.mk + $(PRG) 'closure !x*!' howe.test.mk # # option ++ @@ -98,45 +98,45 @@ closure: option: option1 option2 option1: - $(PRG) '+b?+' ant.test.mk + $(PRG) '+b?+' howe.test.mk option2: - $(PRG) '+.?+' ant.test.mk + $(PRG) '+.?+' howe.test.mk branch: branch1 branch2 branch3 branch4 branch5 branch6 branch1: - $(PRG) 'q|simple' ant.test.mk + $(PRG) 'q|simple' howe.test.mk # # This pattern should be the same as '(^all)|(Public)|(Grep$)'. # branch2: - $(PRG) '^all|Public|Grep$$' ant.test.mk + $(PRG) '^all|Public|Grep$$' howe.test.mk # # This pattern should generate the same results as branch2. # branch3: - $(PRG) 'Grep$$|^all|Public' ant.test.mk + $(PRG) 'Grep$$|^all|Public' howe.test.mk # # Null expression between start of pattern and vertical-line. # branch4: - $(PRG) '|Grep' ant.test.mk + $(PRG) '|Grep' howe.test.mk # # Null expression between vertical-line and end of pattern. # branch5: - $(PRG) 'Grep|' ant.test.mk + $(PRG) 'Grep|' howe.test.mk # # Null expression between vertical-line and vertical-line. # branch6: - $(PRG) 'all||Grep' ant.test.mk + $(PRG) 'all||Grep' howe.test.mk # # sub aabcbcbcxx @@ -151,49 +151,49 @@ sub: sub0 sub1 sub2 sub3 sub4 sub5 lparen1 lparen2 rparen1 rparen2 # Null sub-expressions. # sub0: - $(PRG) 's()u()b()' ant.test.mk + $(PRG) 's()u()b()' howe.test.mk sub1: - $(PRG) '#(1|%)#' ant.test.mk + $(PRG) '#(1|%)#' howe.test.mk sub2: - $(PRG) 'aa((bc)*|g)xx' ant.test.mk + $(PRG) 'aa((bc)*|g)xx' howe.test.mk # # Null expression between the left-parenthesis and the vertical-line. # sub3: - $(PRG) '#(|1)#' ant.test.mk + $(PRG) '#(|1)#' howe.test.mk # # Null expression between the vertical-line and the right-parenthesis. # sub4: - $(PRG) '#(1|)#' ant.test.mk + $(PRG) '#(1|)#' howe.test.mk # # Null expression between the vertical-line and the right-parenthesis. # sub5: - $(PRG) '#(%||1)#' ant.test.mk + $(PRG) '#(%||1)#' howe.test.mk # # Missing left-parenthesis generates an error. # lparen1: - -$(PRG) 'left ( only' ant.test.mk + -$(PRG) 'left ( only' howe.test.mk lparen2: - $(PRG) 'left \( only' ant.test.mk + $(PRG) 'left \( only' howe.test.mk # # Right-parenthesis without preceding left parenthesis should be a literal. # rparen1: - -$(PRG) 'right ) only' ant.test.mk + -$(PRG) 'right ) only' howe.test.mk rparen2: - $(PRG) 'right \) only' ant.test.mk + $(PRG) 'right \) only' howe.test.mk # # 12345678 @@ -215,26 +215,26 @@ rparen2: class: class1 class2 class3 class4 class5 class6 class7 class8 class1: - $(PRG) '=[09]=' ant.test.mk + $(PRG) '=[09]=' howe.test.mk class2: - $(PRG) '=[^09]=' ant.test.mk + $(PRG) '=[^09]=' howe.test.mk class3: - $(PRG) '=[]]=' ant.test.mk + $(PRG) '=[]]=' howe.test.mk class4: - $(PRG) '=[^]]=' ant.test.mk + $(PRG) '=[^]]=' howe.test.mk class5: - $(PRG) '=[0-9]=' ant.test.mk + $(PRG) '=[0-9]=' howe.test.mk class6: - $(PRG) '=[^0-9]=' ant.test.mk + $(PRG) '=[^0-9]=' howe.test.mk class7: - -$(PRG) '=[3-1]=' ant.test.mk + -$(PRG) '=[3-1]=' howe.test.mk class8: - $(PRG) '=[-13]=' ant.test.mk + $(PRG) '=[-13]=' howe.test.mk diff --git a/1993/ant/ant.txt b/1993/howe/howe.txt similarity index 93% rename from 1993/ant/ant.txt rename to 1993/howe/howe.txt index c29317475..8aed2cc35 100644 --- a/1993/ant/ant.txt +++ b/1993/howe/howe.txt @@ -31,7 +31,7 @@ None. 4. OPERANDS pattern Specify one pattern to be used during the search for - input. See Extended Regular Exprssions below on what + input. See Extended Regular Expressions below on what constitutes a valid pattern. file A pathname of a file to be searched for the pattern. @@ -39,12 +39,12 @@ file A pathname of a file to be searched for the pattern. is dash (-), the standard input shall be used. -5. EXTERNINAL INFLUENCES +5. EXTERNAL INFLUENCES 5.1. STANDARD INPUT The standard input shall be used only if no file operands are -specifed. See Input Files. +specified. See Input Files. 5.2. INPUT FILES @@ -99,7 +99,7 @@ without parentheses would have matched. 7.1.1.1. ERE ORDINARY CHARACTERS -An oridinary character is an ERE that matches itself. An ordinary +An ordinary character is an ERE that matches itself. An ordinary character is any character in the supported character set, except for the ERE special characters listed in 7.1.1.2. The interpretation of an ordinary character preceded by a backslash (\) is the ordinary @@ -129,7 +129,7 @@ which they have their special meaning are: except when used in a bracket expression. Results are undefined if this character appears first in an ERE, or immediately - following a vertial-line, circumflex, or + following a vertical-line, circumflex, or left-parenthesis. | The vertical-line is special except when used @@ -162,7 +162,7 @@ set of characters represented by the bracket expression. The following rules and definitions apply to bracket expressions: 1) A bracket expression is either a matching list expression - or a nonmatching list expression. It consists of one or more + or a non-matching list expression. It consists of one or more characters and/or range expressions. The right-bracket (]) shall lose its special meaning and represent itself in a bracket expression if it occurs first in the list [after an @@ -176,7 +176,7 @@ The following rules and definitions apply to bracket expressions: character of the list shall not be the circumflex. For example, [abc] is an ERE that matches any of a, b, or c. - 3) A nonmatching list expression begins with a circumflex (^), + 3) A non-matching list expression begins with a circumflex (^), and specifies a list that shall match any character except for the expressions represented in the list after the leading circumflex. For example, [^abc] is an ERE that matches any @@ -191,7 +191,7 @@ The following rules and definitions apply to bracket expressions: In the following, all examples assume the collation sequence specified for the POSIX Locale (a.k.a ASCII Character Set), - unless another collation sequence is sepecifically defined + unless another collation sequence is specifically defined by the hardware. The starting range point and the ending range point shall be a @@ -208,7 +208,7 @@ The following rules and definitions apply to bracket expressions: an ending range point in a range expression. As examples, the expressions [-ac] and [ac-] are equivalent and match any of the characters a, c, or -; the expressions [^-ac] and [^ac-] - are equivalent and match ant character except a, c, -; the + are equivalent and match howe character except a, c, -; the expression [%--] matches any of the characters between % and - inclusive; the expression [--@] matches any of the characters between - and @ inclusive; and the expression @@ -228,10 +228,10 @@ characters from EREs matching a single character: example, both the ERE cd and the ERE (cd) are matched by the third and forth character of the string abcdefabcdef. - 2) When an ERE matching a single character, or a concatention of + 2) When an ERE matching a single character, or a concatenation of EREs enclosed in parentheses is followed by the special character asterisk (*), together with that asterisk it shall - match what zero or more consecutive occurences of the ERE + match what zero or more consecutive occurrences of the ERE would match. For example, the ERE b*c matches the first character in the string cabbbcde, and the ERE b*cd matches the third through seventh characters in the string @@ -241,7 +241,7 @@ characters from EREs matching a single character: 3) When an ERE matching a single character or an ERE enclosed in parentheses is followed by the special character question-mark (?), together with that question mark it shall match what zero - or one consecutive occurences of the ERE would match. For + or one consecutive occurrences of the ERE would match. For example, the ERE b?c matches the second character in the string acabbbcde. @@ -333,7 +333,7 @@ and that ARRAY be set to 256. For Watcom C the command line would be The value ARRAY represents the size of the compiled pattern array and the size of the array used to record matched states. The default -value choosen should handle most patterns. ARRAY can be overridden on +value chosen should handle most patterns. ARRAY can be overridden on the command line with -DARRAY=nn, where 255 < nn < INT_MAX. @@ -366,7 +366,7 @@ The expression (a*)* compiles but loops forever. There is no check for trailing backslash (\) in the pattern. There is no check for unbalanced brackets. Omitting a closing bracket -will generate a "Patern too long" error, which is not the real error. +will generate a "Pattern too long" error, which is not the real error. 13. NOTICES diff --git a/1993/mills/.gitignore b/1993/mills/.gitignore new file mode 100644 index 000000000..435314278 --- /dev/null +++ b/1993/mills/.gitignore @@ -0,0 +1 @@ +mills diff --git a/1993/cmills/Makefile b/1993/mills/Makefile similarity index 99% rename from 1993/cmills/Makefile rename to 1993/mills/Makefile index 61709b3dc..769bc91f8 100644 --- a/1993/cmills/Makefile +++ b/1993/mills/Makefile @@ -1,6 +1,6 @@ #!/usr/bin/env make # -# IOCCC 1993 winning entry - cmills +# IOCCC 1993 winning entry - mills ################################################################################ # @@ -161,7 +161,7 @@ endif # Special flags for this entry ############################## # -ENTRY= cmills +ENTRY= mills PROG= ${ENTRY} # OBJ= ${PROG}.o diff --git a/1993/cmills/README.md b/1993/mills/README.md similarity index 97% rename from 1993/cmills/README.md rename to 1993/mills/README.md index 65f114ac9..f21eec1ea 100644 --- a/1993/cmills/README.md +++ b/1993/mills/README.md @@ -14,7 +14,7 @@ DISPLAY="your_X_server_display" export DISPLAY - ./cmills [speed] # must be run on an X11 server + ./mills [speed] # must be run on an X11 server where: diff --git a/1993/cmills/cmills.c b/1993/mills/mills.c similarity index 100% rename from 1993/cmills/cmills.c rename to 1993/mills/mills.c diff --git a/2018/burton2/discrepancies b/2018/burton2/discrepancies index 7ad219ddf..17fe27304 100644 --- a/2018/burton2/discrepancies +++ b/2018/burton2/discrepancies @@ -8,8 +8,8 @@ cl -45 cw -55 cc -617 ci -463 ts -85 kw -26 ks -69 src/obc/1990/theorem/theorem. iocccsize fails at "z;/*/", eating everything until the following "/**/main(" looks to be due to mis-identification of a comment closing block as opening block cl 0 cw -2 cc 0 ci 0 ts 0 kw 0 ks 0 src/obc/1991/westley/westley.c -cl 0 cw -3 cc 0 ci 0 ts 0 kw 0 ks 0 src/obc/1992/adrian/adrian.c -cl 0 cw -3 cc 0 ci 0 ts 0 kw 0 ks 0 src/obc/1992/adrian/adrian.orig.c +cl 0 cw -3 cc 0 ci 0 ts 0 kw 0 ks 0 src/obc/1992/gmariano/gmariano.c +cl 0 cw -3 cc 0 ci 0 ts 0 kw 0 ks 0 src/obc/1992/gmariano/gmariano.orig.c cl 0 cw -1 cc 0 ci 0 ts 0 kw 0 ks 0 src/obc/1994/shapiro/shapiro.c cl 0 cw -2 cc 0 ci 0 ts 0 kw 0 ks 0 src/obc/1996/gandalf/gandalf.c cl 0 cw -1 cc 0 ci 0 ts 0 kw 0 ks 0 src/obc/1996/schweikh1/schweikh1.c diff --git a/all/summary.txt b/all/summary.txt index 19697f67d..68f6e2ec5 100644 --- a/all/summary.txt +++ b/all/summary.txt @@ -52,48 +52,48 @@ 1989 westley reversible, rot13able program that reverses and/or rot13s. 1990 baruch short prog to solve N-queens problem -1990 cmills squished blackjack game +1990 mills squished blackjack game 1990 dds basic interpreter, heavily compressed 1990 dg rot13 done with strange cpp macros 1990 jaw compress & atob standins +1990 mariano numerically solves the equation y'=f(x,y) 1990 pjr the quick brown fox... cppd, structs of functions 1990 scjones trigraph-abusing self-reproducing program 1990 stig nested-comment tester (all on command line) 1990 tbr simple compressed shell, silly layout -1990 theorem numerically solves the equation y'=f(x,y) 1990 westley poetic exchange between lovers, prints "luvs me, luvs not" -1991 ant compressed vi-like editor 1991 brnstnd sorta stack language 1991 buzzard walk thru a maze from a first person point of view 1991 cdupont prints a message without vowels 1991 davidguy plays life on a root window, doesn't need Xlib or include files 1991 dds basic compiler, heavily compressed 1991 fine rot13s lines of input +1991 howe compressed vi-like editor 1991 rince game with sprites, boulders, dimonds, and keys 1991 westley plays tic-tac-toe, compile output for next move, prints board -1992 adrian grep-like utility using a state machine transition language 1992 albert factors multi-precision numbers with factors < MAX_LONG -1992 ant make utility 1992 buzzard.1 print factorial, gcd or prime test using a Babbage-like engine 1992 buzzard.2 forth-like stack machine 1992 gson anagram generator +1992 howe make utility 1992 imc Mandelbrot/Julia drawer 1992 kivinen X11 space invaders, dropout and knockout games 1992 lush prints "Hello, World" using error messages 1992 marangon game to balance a grid of digits to all 5's +1992 mariano grep-like utility using a state machine transition language 1992 nathan obfuscation by (trivial) encryption (source not exported) 1992 vern plays chess 1992 westley print ASCII world map and mark a location by lat/long -1993 ant egrep utility with Posix-like documentation -1993 cmills X11 program that shatters and bounces windows 1993 dgibson plays the game of like using cpp 1993 ejb tower of Hanoi and patience pizzle +1993 howe egrep utility with Posix-like documentation 1993 jonth game of Tetris 1993 leo game of mastermind (cows & bulls) 1993 lmfjyh source is the filename, prints value of __FILE__ +1993 mills X11 program that shatters and bounces windows 1993 plummer prints numbers up to a given value 1993 rince game state machine language, comes with a number of games 1993 schnitzi answers questions about English text in a file diff --git a/faq.html b/faq.html index 941135f6f..efcee4c23 100644 --- a/faq.html +++ b/faq.html @@ -448,7 +448,7 @@ Now, Microsoft makes AT&T look mild and kind in comparison. :-( (IMHO) ). BTW: See the story about the '' Bill +HREF="/1993/mills/mills.hint">Bill Gates'' award. :-) diff --git a/winners.html b/winners.html index bafe89e17..a4d470b72 100644 --- a/winners.html +++ b/winners.html @@ -823,7 +823,7 @@ Contest
  • Adrian Mariano -- http://cam.cornell.edu/adrian/
  • Eric Marshall @@ -848,8 +848,8 @@ Contest
  • Christopher Mills - -

    cmills - X11 program that shatters and bounces windows

    + +

    mills - X11 program that shatters and bounces windows

    dgibson - plays the game of like using cpp

    @@ -2768,20 +2768,20 @@ Contest
  • mkentry.c
  • 1992.tar.bz2 - all of the data for 1992 (72.0 KiB) - -

    adrian - grep-like utility using a state machine transition language

    + +

    mariano - grep-like utility using a state machine transition language

    albert - factors multi-precision numbers with factors < MAX_LONG

    @@ -3007,13 +3007,13 @@ Contest
  • baruch.c
  • README.md - -

    cmills - squished blackjack game

    + +

    mills - squished blackjack game

    dds - basic interpreter, heavily compressed