Roll back ad04d21fda
As was discussed with Landon this was a mistake even if it helped with
consistency. There was even a brilliant pun that was destroyed with that
commit which I think is worth pointing out:
cp README.md hill
./ant hill
in 1991/ant ... even if it's technically 'anthill'.
I hope that I got all links fixed in years.html and winners.html. As
well I tried to make sure I got all handles fixed in all/summary.txt.
Nevertheless these should be checked. For some handles they were never
updated (at least in the html files - though maybe summary.txt too, not
sure) in the first place so there was nothing to do.
Typo fixes like references to *.hint when it should be README.md. There
probably are others that need to be fixed but haven't been located yet.
This commit is contained in:
1 parent
d4ef163cc4
commit
750255aded
52 files changed
+177
-164
No files matched your search
+1
-1
@@ -1,5 +1,5 @@
|
||||
ant/ant
|
||||
mills/mills
|
||||
cmills/mills
|
||||
dgibson/data.name
|
||||
dgibson/data.name2
|
||||
dgibson/life.d
|
||||
|
||||
+1
-1
@@ -53,7 +53,7 @@ include ../var.mk
|
||||
# IOCCC winners
|
||||
###############
|
||||
#
|
||||
WINNERS= dgibson ejb howe jonth leo lmfjyh mills plummer rince schnitzi vanb
|
||||
WINNERS= cmills dgibson ejb howe jonth leo lmfjyh plummer rince schnitzi vanb
|
||||
|
||||
YEAR= 1993
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
ag
|
||||
ag.txt
|
||||
ant
|
||||
howe
|
||||
ant
|
||||
@@ -1,6 +1,6 @@
|
||||
#!/usr/bin/env make
|
||||
#
|
||||
# IOCCC 1993 winning entry - howe
|
||||
# IOCCC 1993 winning entry - ant
|
||||
|
||||
################################################################################
|
||||
#
|
||||
@@ -160,7 +160,7 @@ endif
|
||||
# Special flags for this entry
|
||||
##############################
|
||||
#
|
||||
ENTRY= howe
|
||||
ENTRY= ant
|
||||
PROG= ${ENTRY}
|
||||
#
|
||||
OBJ= ${PROG}.o
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
### To run
|
||||
|
||||
./howe 'ERE' [file ...]
|
||||
./ant 'ERE' [file ...]
|
||||
|
||||
## Judges' comments
|
||||
|
||||
You may also want to try the author's test suite:
|
||||
make -f howe.test.mk
|
||||
make -f ant.test.mk
|
||||
|
||||
See the author's Posix P1003.2-like documentation file howe.txt
|
||||
See the author's Posix P1003.2-like documentation file ant.txt
|
||||
for more information.
|
||||
|
||||
This program demonstrates that Posix doesn't guarantee readability. :-)
|
||||
File renamed without changes.
@@ -5,28 +5,28 @@
|
||||
#
|
||||
|
||||
SHELL=/bin/sh
|
||||
PRG=./howe
|
||||
PRG=./ant
|
||||
|
||||
all: howe char word anchor literal wild closure option branch sub class
|
||||
all: ant char word anchor literal wild closure option branch sub class
|
||||
|
||||
#
|
||||
# Built the entry
|
||||
#
|
||||
howe: Makefile
|
||||
make -f Makefile howe
|
||||
ant: Makefile
|
||||
make -f Makefile ant
|
||||
|
||||
#
|
||||
# Test simple text patterns without the use of meta characters.
|
||||
#
|
||||
|
||||
empty:
|
||||
$(PRG) '' howe.test.mk
|
||||
$(PRG) '' ant.test.mk
|
||||
|
||||
char:
|
||||
$(PRG) 'q' howe.test.mk
|
||||
$(PRG) 'q' ant.test.mk
|
||||
|
||||
word:
|
||||
$(PRG) 'simple' howe.test.mk
|
||||
$(PRG) 'simple' ant.test.mk
|
||||
|
||||
#
|
||||
# Test meta characters.
|
||||
@@ -35,28 +35,28 @@ word:
|
||||
anchor: anchor1 anchor2 anchor3 anchor4 anchor5
|
||||
|
||||
anchor1:
|
||||
$(PRG) '^anchor1' howe.test.mk
|
||||
$(PRG) '^anchor1' ant.test.mk
|
||||
|
||||
anchor2:
|
||||
$(PRG) 'Grep$$' howe.test.mk
|
||||
$(PRG) 'Grep$$' ant.test.mk
|
||||
|
||||
#
|
||||
# Find all empty lines.
|
||||
#
|
||||
anchor3:
|
||||
$(PRG) '^$$' howe.test.mk
|
||||
$(PRG) '^$$' ant.test.mk
|
||||
|
||||
#
|
||||
# This is valid but will never match.
|
||||
#
|
||||
anchor4:
|
||||
-$(PRG) 'x^a' howe.test.mk
|
||||
-$(PRG) 'x^a' ant.test.mk
|
||||
|
||||
#
|
||||
# This is valid but will never match.
|
||||
#
|
||||
anchor5:
|
||||
-$(PRG) 'mk$$x' howe.test.mk
|
||||
-$(PRG) 'mk$$x' ant.test.mk
|
||||
|
||||
literal: literal1 literal2
|
||||
|
||||
@@ -64,13 +64,13 @@ literal: literal1 literal2
|
||||
# Every line with a dollar-sign.
|
||||
#
|
||||
literal1:
|
||||
$(PRG) '\$$' howe.test.mk
|
||||
$(PRG) '\$$' ant.test.mk
|
||||
|
||||
#
|
||||
# Every line with a backslash.
|
||||
#
|
||||
literal2:
|
||||
$(PRG) '\\' howe.test.mk
|
||||
$(PRG) '\\' ant.test.mk
|
||||
|
||||
#
|
||||
# wild #1#
|
||||
@@ -78,7 +78,7 @@ literal2:
|
||||
# wild #%#
|
||||
#
|
||||
wild:
|
||||
$(PRG) '#.#' howe.test.mk
|
||||
$(PRG) '#.#' ant.test.mk
|
||||
|
||||
#
|
||||
# closure !!
|
||||
@@ -86,7 +86,7 @@ wild:
|
||||
# closure !xxxxxx!
|
||||
#
|
||||
closure:
|
||||
$(PRG) 'closure !x*!' howe.test.mk
|
||||
$(PRG) 'closure !x*!' ant.test.mk
|
||||
|
||||
#
|
||||
# option ++
|
||||
@@ -98,45 +98,45 @@ closure:
|
||||
option: option1 option2
|
||||
|
||||
option1:
|
||||
$(PRG) '+b?+' howe.test.mk
|
||||
$(PRG) '+b?+' ant.test.mk
|
||||
|
||||
option2:
|
||||
$(PRG) '+.?+' howe.test.mk
|
||||
$(PRG) '+.?+' ant.test.mk
|
||||
|
||||
branch: branch1 branch2 branch3 branch4 branch5 branch6
|
||||
|
||||
branch1:
|
||||
$(PRG) 'q|simple' howe.test.mk
|
||||
$(PRG) 'q|simple' ant.test.mk
|
||||
|
||||
#
|
||||
# This pattern should be the same as '(^all)|(Public)|(Grep$)'.
|
||||
#
|
||||
branch2:
|
||||
$(PRG) '^all|Public|Grep$$' howe.test.mk
|
||||
$(PRG) '^all|Public|Grep$$' ant.test.mk
|
||||
|
||||
#
|
||||
# This pattern should generate the same results as branch2.
|
||||
#
|
||||
branch3:
|
||||
$(PRG) 'Grep$$|^all|Public' howe.test.mk
|
||||
$(PRG) 'Grep$$|^all|Public' ant.test.mk
|
||||
|
||||
#
|
||||
# Null expression between start of pattern and vertical-line.
|
||||
#
|
||||
branch4:
|
||||
$(PRG) '|Grep' howe.test.mk
|
||||
$(PRG) '|Grep' ant.test.mk
|
||||
|
||||
#
|
||||
# Null expression between vertical-line and end of pattern.
|
||||
#
|
||||
branch5:
|
||||
$(PRG) 'Grep|' howe.test.mk
|
||||
$(PRG) 'Grep|' ant.test.mk
|
||||
|
||||
#
|
||||
# Null expression between vertical-line and vertical-line.
|
||||
#
|
||||
branch6:
|
||||
$(PRG) 'all||Grep' howe.test.mk
|
||||
$(PRG) 'all||Grep' ant.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()' howe.test.mk
|
||||
$(PRG) 's()u()b()' ant.test.mk
|
||||
|
||||
sub1:
|
||||
$(PRG) '#(1|%)#' howe.test.mk
|
||||
$(PRG) '#(1|%)#' ant.test.mk
|
||||
|
||||
sub2:
|
||||
$(PRG) 'aa((bc)*|g)xx' howe.test.mk
|
||||
$(PRG) 'aa((bc)*|g)xx' ant.test.mk
|
||||
|
||||
#
|
||||
# Null expression between the left-parenthesis and the vertical-line.
|
||||
#
|
||||
sub3:
|
||||
$(PRG) '#(|1)#' howe.test.mk
|
||||
$(PRG) '#(|1)#' ant.test.mk
|
||||
|
||||
#
|
||||
# Null expression between the vertical-line and the right-parenthesis.
|
||||
#
|
||||
sub4:
|
||||
$(PRG) '#(1|)#' howe.test.mk
|
||||
$(PRG) '#(1|)#' ant.test.mk
|
||||
|
||||
#
|
||||
# Null expression between the vertical-line and the right-parenthesis.
|
||||
#
|
||||
sub5:
|
||||
$(PRG) '#(%||1)#' howe.test.mk
|
||||
$(PRG) '#(%||1)#' ant.test.mk
|
||||
|
||||
#
|
||||
# Missing left-parenthesis generates an error.
|
||||
#
|
||||
lparen1:
|
||||
-$(PRG) 'left ( only' howe.test.mk
|
||||
-$(PRG) 'left ( only' ant.test.mk
|
||||
|
||||
lparen2:
|
||||
$(PRG) 'left \( only' howe.test.mk
|
||||
$(PRG) 'left \( only' ant.test.mk
|
||||
|
||||
#
|
||||
# Right-parenthesis without preceding left parenthesis should be a literal.
|
||||
#
|
||||
rparen1:
|
||||
-$(PRG) 'right ) only' howe.test.mk
|
||||
-$(PRG) 'right ) only' ant.test.mk
|
||||
|
||||
rparen2:
|
||||
$(PRG) 'right \) only' howe.test.mk
|
||||
$(PRG) 'right \) only' ant.test.mk
|
||||
|
||||
#
|
||||
# 12345678
|
||||
@@ -215,26 +215,26 @@ rparen2:
|
||||
class: class1 class2 class3 class4 class5 class6 class7 class8
|
||||
|
||||
class1:
|
||||
$(PRG) '=[09]=' howe.test.mk
|
||||
$(PRG) '=[09]=' ant.test.mk
|
||||
|
||||
class2:
|
||||
$(PRG) '=[^09]=' howe.test.mk
|
||||
$(PRG) '=[^09]=' ant.test.mk
|
||||
|
||||
class3:
|
||||
$(PRG) '=[]]=' howe.test.mk
|
||||
$(PRG) '=[]]=' ant.test.mk
|
||||
|
||||
class4:
|
||||
$(PRG) '=[^]]=' howe.test.mk
|
||||
$(PRG) '=[^]]=' ant.test.mk
|
||||
|
||||
class5:
|
||||
$(PRG) '=[0-9]=' howe.test.mk
|
||||
$(PRG) '=[0-9]=' ant.test.mk
|
||||
|
||||
class6:
|
||||
$(PRG) '=[^0-9]=' howe.test.mk
|
||||
$(PRG) '=[^0-9]=' ant.test.mk
|
||||
|
||||
class7:
|
||||
-$(PRG) '=[3-1]=' howe.test.mk
|
||||
-$(PRG) '=[3-1]=' ant.test.mk
|
||||
|
||||
class8:
|
||||
$(PRG) '=[-13]=' howe.test.mk
|
||||
$(PRG) '=[-13]=' ant.test.mk
|
||||
|
||||
@@ -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 howe character except a, c, -; the
|
||||
are equivalent and match ant 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
|
||||
@@ -0,0 +1 @@
|
||||
cmills
|
||||
@@ -1,6 +1,6 @@
|
||||
#!/usr/bin/env make
|
||||
#
|
||||
# IOCCC 1993 winning entry - mills
|
||||
# IOCCC 1993 winning entry - cmills
|
||||
|
||||
################################################################################
|
||||
#
|
||||
@@ -54,7 +54,7 @@ include ../../var.mk
|
||||
#X11_LIBDIR= /usr/X11/lib
|
||||
X11_LIBDIR= /opt/X11/lib
|
||||
|
||||
# Set X11_INCLUDEDIR to the directory where the X11 include files reside
|
||||
# Set X11_INCDIR to the directory where the X11 include files reside
|
||||
#
|
||||
#X11_INCDIR= /usr/X11R6/include
|
||||
#X11_INCDIR= /usr/X11/include
|
||||
@@ -161,7 +161,7 @@ endif
|
||||
# Special flags for this entry
|
||||
##############################
|
||||
#
|
||||
ENTRY= mills
|
||||
ENTRY= cmills
|
||||
PROG= ${ENTRY}
|
||||
#
|
||||
OBJ= ${PROG}.o
|
||||
@@ -10,11 +10,21 @@
|
||||
|
||||
make all
|
||||
|
||||
NOTE: this entry requires `X11/Xlib.h` header file and the X11 library to
|
||||
compile. The Makefile sets the additional paths to `/opt/X11/include` (`-I`
|
||||
flag) and `/opt/X11/lib` (`-L` flag) but you can override it by specifying e.g.:
|
||||
|
||||
make X11_INCDIR=/opt/local/include X11_LIBDIR=/opt/local/lib/ all
|
||||
|
||||
which could compile it under macOS with MacPorts if you have the right packages
|
||||
installed though it still must be run on an X11 server which means that the
|
||||
example is just that: an example which might or might not work when running.
|
||||
|
||||
### To run
|
||||
|
||||
DISPLAY="your_X_server_display"
|
||||
export DISPLAY
|
||||
./mills [speed] # must be run on an X11 server
|
||||
./cmills [speed] # must be run on an X11 server
|
||||
|
||||
where:
|
||||
|
||||
File renamed without changes.
@@ -1 +0,0 @@
|
||||
mills
|
||||
Reference in new issue
Block a user