From 8be08799622b6b0d67339942439a592262a5ec8c Mon Sep 17 00:00:00 2001 From: Landon Curt Noll Date: Tue, 7 Mar 2023 21:41:39 -0800 Subject: [PATCH] fix alt code use in 2015/howe Make shell scripts executable and use bash. --- 2015/howe/.gitignore | 1 + 2015/howe/Makefile | 296 +++++++++++++++----------- 2015/howe/README.md | 20 +- 2015/howe/avgtime.sh | 2 +- 2015/howe/prog-test.sh | 2 +- 2015/howe/{prog.orig.c => prog.alt.c} | 0 6 files changed, 193 insertions(+), 128 deletions(-) mode change 100644 => 100755 2015/howe/avgtime.sh mode change 100644 => 100755 2015/howe/prog-test.sh rename 2015/howe/{prog.orig.c => prog.alt.c} (100%) diff --git a/2015/howe/.gitignore b/2015/howe/.gitignore index ea1749132..ffb16e793 100644 --- a/2015/howe/.gitignore +++ b/2015/howe/.gitignore @@ -1 +1,2 @@ prog +prog.alt diff --git a/2015/howe/Makefile b/2015/howe/Makefile index f73fb185f..25bf564f0 100644 --- a/2015/howe/Makefile +++ b/2015/howe/Makefile @@ -1,50 +1,52 @@ #!/usr/bin/env make # -# 2015 makefile +# IOCCC 2015 winning entry - howe + +################################################################################ # -# This work by Landon Curt Noll, Simon Cooper, and Leonid A. Broukhis -# is licensed under: +# Regarding individual entries: +# +# IOCCC winning entry code may not work on your system. Even with standards, +# conditions and build environments change, especially when it comes to more +# extreme code such you might find in an IOCCC winner. Moreover, what was +# allowed and liked in one IOCCC contest may no longer be liked/allowed in +# later IOCCC years. +# +# Corrections on winning author and fixing typos in remarks are VERY WELCOME. +# +# GitHub pull requests are welcome: +# +# If you have a patch that might make running an entry work in modern Unix-like +# environments, please create a GitHub pull request for the IOCCC judges to +# consider. +# +# Suggestions and corrections regarding Makefiles, winning author information, +# fixing typos in remarks, and code patches are welcome via opening a GitHub +# issue or better yet, by creating a GitHub pull request for the IOCCC judges +# to consider. To form a GitHub issue or GitHub pull, please visit: +# +# https://github.com/ioccc-src/winner +# +################################################################################ + +# This work by Landon Curt Noll and Leonid A. Broukhis is licensed under: # # Creative Commons Attribution-ShareAlike 3.0 Unported License. # # See: http://creativecommons.org/licenses/by-sa/3.0/ -################ -# tool locations -################ +############################# +# shell used by this Makefile +############################# # +SHELL= bash -# Assume a POSIX compliant shell. +####################### +# common tool locations +####################### # -# On Linux -# /bin/sh = /bin/bash -# -# On NetBSD -# /bin/ksh -# /usr/pkg/bin/bash -# -# On OpenBSD -# /bin/ksh = /bin/pdksh -# -SHELL= /bin/sh - -CP= cp -CPP= cpp -GUNZIP= gunzip -BUNZIP2= bunzip2 -LD= ld -MAKE= make -RM= rm -SED= sed -TAR= tar -TRUE= true -MKDIR= mkdir -MV= mv -TR= tr -GREP= grep -SORT= sort -UNIQ= uniq +include ../../var.mk # Set X11_LIBDIR to the directory where the X11 library resides # @@ -58,50 +60,51 @@ X11_LIBDIR= /opt/X11/lib #X11_INCDIR= /usr/X11/include X11_INCDIR= /opt/X11/include -# Compiler warnings -# -#CWARN= -#CWARN= -Wall -#CWARN= -Wall -Wextra -CWARN= -Wall -Wextra -pedantic ${CSILENCE} -#CWARN= -Wall -Wextra -Weverything -#CWARN= -Wall -Wextra -Weverything -pedantic -#CWARN= -Wall -Wextra -Weverything -pedantic ${CSILENCE} - -# Silence warnings that ${CWARN} would normally complain about +# Common C compiler warnings to silence # #CSILENCE= -CSILENCE= -Wno-sign-compare -Wno-missing-prototypes \ - -Wno-padded -Wno-shadow \ - -Wno-sign-conversion +CSILENCE= -Wno-long-long -Wno-sign-compare -# compiler standard +# Common C compiler warning flags +# +#CWARN= ${CSILENCE} +#CWARN= -Wall ${CSILENCE} +#CWARN= -Wall -Wextra ${CSILENCE} +CWARN= -Wall -Wextra -pedantic ${CSILENCE} + +# Compiler standard # #CSTD= #CSTD= -ansi -CSTD= -std=c99 +CSTD= -std=gnu90 -# compiler bit architecture +# Compiler bit architecture # # Some entries require 32-bitness: # ARCH= -m32 # -# Some entries require 64-bitess: +# Some entries require 64-bitness: # ARCH= -m64 # # By default we assume nothing: # ARCH= -# defines that are needed to compile +# Defines that are needed to compile # CDEFINE= +#CDEFINE= -DIOCCC -# include files that are needed to compile +# Include files that are needed to compile # CINCLUDE= +#CINCLUDE= -include stdlib.h +#CINCLUDE= -include stdio.h +#CINCLUDE= -include stdlib.h -include stdio.h +#CINCLUDE= -I ${X11_INCDIR} +#CINCLUDE= -I ${HOMEBREW_PREFIX}/include/SDL2 -# optimization +# Optimization # # Most compiles will safely use -O2. Some can use only -O1 or -O. # A few compilers have broken optimizers or this entry make break @@ -114,62 +117,81 @@ CINCLUDE= #OPT= -O2 OPT= -O3 -# default flags for ANSI C compilation +# Default flags for ANSI C compilation # -CFLAGS= ${CWARN} ${CSTD} ${ARCH} ${CDEFINE} ${CINCLUDE} ${OPT} +CFLAGS= ${CSTD} ${CWARN} ${ARCH} ${CDEFINE} ${CINCLUDE} ${OPT} # Libraries needed to build # LIBS= +#LIBS= -lm +#LIBS= -L ${X11_LIBDIR} -lX11 +#LIBS= -L ${HOMEBREW_PREFIX}/lib -lSDL -# ANSI compiler -# -# Set CC to the name of your ANSI compiler. -# -# Some entries seem to need gcc. If you have gcc, set -# both CC and MAY_NEED_GCC to gcc. -# -# If you do not have gcc, set CC to the name of your ANSI compiler, and -# set MAY_NEED_GCC to either ${CC} (and hope for the best) or to just : -# to disable such programs. +# C compiler to use # CC= cc #CC=clang -MAY_NEED_GCC= gcc +#CC=gcc + +# Compiler add-ons or replacements for clang only +# +ifeq ($(CC),clang) +# +CSILENCE+= -Wno-missing-prototypes -Wno-missing-variable-declarations -Wno-padded \ + -Wno-poison-system-directories -Wno-shadow -Wno-shorten-64-to-32 \ + -Wno-sign-conversion +# +CWARN+= -Weverything +# +endif + +# Specific add-ons or replacements for gcc only +# +ifeq ($(CC),gcc) +# +#CSILENCE+= +# +#CWARN+= +# +endif ############################## # Special flags for this entry ############################## # -ENTRY= prog -CSRC= ${ENTRY}.c -OBJ= ${ENTRY}.o -DATA= -ALT_OBJ= -ALT_ENTRY= -TARGET= ${ENTRY} +ENTRY= howe +PROG= prog +# +OBJ= ${PROG}.o +DATA= avgtime.sh prog-test.sh +TARGET= ${PROG} +# +ALT_OBJ= ${PROG}.alt.o +ALT_TARGET= ${PROG}.alt ################# # build the entry ################# # -all: ${TARGET} ${DATA} +all: data ${TARGET} @${TRUE} -${ENTRY}: ${CSRC} +.PHONY: all alt data everything clean clobber install \ + love haste waste maker easter_egg sandwich \ + supernova deep_magic magic charon pluto + +${PROG}: ${PROG}.c ${CC} ${CFLAGS} $< -o $@ ${LIBS} -test: makeholes prog-test.sh ${TARGET} - ${SHELL} ./prog-test.sh - -makeholes: makeholes.c +${PROG}.alt: ${PROG}.alt.c ${CC} ${CFLAGS} $< -o $@ ${LIBS} # alternative executable # -alt: ${ALT_ENTRY} +alt: data ${ALT_TARGET} @${TRUE} # data files @@ -177,35 +199,51 @@ alt: ${ALT_ENTRY} data: ${DATA} @${TRUE} +# both all and alt +# +everything: all alt + ############### # utility rules ############### # -everything: all alt - clean: ${RM} -f ${OBJ} ${ALT_OBJ} + @-if [ -f indent.c ]; then \ + echo ${RM} -f indent.c; \ + ${RM} -f indent.c; \ + fi clobber: clean - ${RM} -f ${TARGET} ${ALT_ENTRY} - ${RM} -f *.tmp - ${RM} -f makeholes makeholes.o - -nuke: clobber - @${TRUE} - -dist_clean: nuke - @${TRUE} + ${RM} -f ${TARGET} ${ALT_TARGET} + @-if [ -e sandwich ]; then \ + ${RM} -f sandwich; \ + echo 'ate sandwich'; \ + fi install: - @echo "Surely we are joking Dr. May!" + @echo "Dr. Spock says that is not logical!" @${TRUE} -# backwards compatibility +# you may be able to misunderstand the source by reading indent.c # -build: all - @${TRUE} +indent.c: ${PROG}.c + @if which "${GINDENT}" >/dev/null 2>&1; then \ + echo ${RM} -f $@; \ + ${RM} -f $@; \ + echo "${GINDENT} < $< > $@"; \ + ${GINDENT} < $< > $@; \ + elif which "${INDENT}" >/dev/null 2>&1; then \ + echo ${RM} -f $@; \ + ${RM} -f $@; \ + echo "${INDENT} < $< > $@"; \ + ${INDENT} < $< > $@; \ + else \ + echo "no intent tool found, ident $< yourself, sorry"; \ + echo "exit 1"; \ + exit 1; \ + fi ################## @@ -224,54 +262,70 @@ waste: @echo 'haste' @${TRUE} -make: - @echo 'Attend a maker faire' +maker: + @echo 'Participate in a maker faire' @${TRUE} easter_egg: - @echo you expected to sometimes mis-understand this $${RANDOM} magic - @echo chongo '' "/\\oo/\\" - @echo Readers shall not be disallowed from not failing to be unable to not partly misunderstand this partocular final echo. + @echo "you expected to often misunderstand this $${RANDOM} magic" + @echo "chongo '' /\\oo/\\" + @echo "Eggy" + +sandwich: easter_egg + @if [ `id -u` -eq 0 ]; then \ + echo 'Okay.'; \ + echo "$${RANDOM}`date +%s`$${RANDOM}" > $@; \ + else \ + echo 'What? Make it yourself.'; \ + exit 1; \ + fi # Understand the history of the Homebrew Computer Club # as well as the West Coast Computer Faire and # you might be confused different. :-) # -supernova: nuke +supernova: sandwich @-if [ -r .code_anal ]; then \ - ${RM} -f .code_anal_v5; \ + ${RM} -f .code_anal_v6; \ else \ - echo "planet deniers, like the IAU, are amusing"; \ + echo "planet deniers, like some members of the IAU, are so cute when they try to defend their logic"; \ fi - @echo A $@ helps ${MAKE} the elements that help form planets + @echo "A $@ helps ${MAKE} the elements that help form planets" @${TRUE} -deep_magic: +deep_magic: supernova @-if [ -r .code_anal ]; then \ - ccode_analysis --deep_magic 2ed3582ec5c094a093fea2a6bcb9f19439892873c9cc45ed1ceaafe08b7d52e1b2c7cd524be3b0b2 --FNV1a_hash_512_bit "${ENTRY}"; \ + ccode_analysis --deep_magic 7889066cdbdf09b0408021754586e895be641cc9be29e7eafd3ca65359541f17 \ + --FNV1a_hash_512_bit -v2 "${PROG}" "${PROG}.c"; \ else \ - echo "You are holding it wrong!"; \ + echo "Wrong! Do it again!"; \ + sleep 2; \ + echo "Wrong! Do it again!"; \ + sleep 2; \ + echo "Wrong! Do it again!"; \ fi @${TRUE} magic: deep_magic @-if [ -r .code_anal ]; then \ - ccode_analysis --mode 216091 --level 216193 --FNV1a_hash_512_bit "${ENTRY}"; \ + ccode_analysis --level 20003 --mode 5717175 --FNV1a_hash_512_bit -v2 "${PROG}" "${PROG}.c"; \ else \ - echo "These aren't the primes you're looking for Pauline!"; \ + echo "If you don't eat yer meat, you can't have any pudding!"; \ + echo "How can you have any pudding if you don't eat yer meat?!"; \ fi @${TRUE} # The IOCCC resident astronomer states # -charon: supernova - @echo $@ is a dwarf planet - @echo dwarf is a type of planet - @echo $@ is a planet +charon: magic + @echo "$@ is a dwarf planet" + @echo "dwarf is a type of planet" + @echo "therefore IAU, $@ is a planet" -pluto: supernova +pluto: charon ${MAKE} charon - @echo $@ is a dwarf planet - @echo dwarf is a type of planet - @echo $@ is a planet - @echo get used to having lots of planets becasue supernovae can ${MAKE} a lot of them + @echo "$@ is a dwarf planet" + @echo "dwarf is a type of planet" + @echo "therefore, $@ is a planet" + @echo "having lots of planets is good feature because supernovae can help ${MAKE} a lot of them" + diff --git a/2015/howe/README.md b/2015/howe/README.md index 1bcf28e01..8c61bff1b 100644 --- a/2015/howe/README.md +++ b/2015/howe/README.md @@ -5,11 +5,11 @@ Montreal, Quebec, Canada Twitter: @SirWumpus +## To build: -## Judges' comments: -### To use: + make all - make +### To run ./prog file1 file2 @@ -17,7 +17,7 @@ Twitter: @SirWumpus ### Try: - ./prog prog.orig.c prog.c + ./prog prog.alt.c prog.c make test ./prog -d ABXYEFCD.tmp ACDBECFD.tmp @@ -39,6 +39,16 @@ Twitter: @SirWumpus ./prog war-and-peace.txt nuked.tmp ./avgtime.sh 100 ./prog war-and-peace.txt nuked.tmp +### Alternate code + +An alternate version of this entry, prog.alt.c, is provided. This alternate code does not use a 64 bit FNV hash. + +To compile this alternate version: + + make alt + +Use `prog.alt` as you would `prog` above. + ### Selected Judges Remarks: This is the best use of the FNV that we have seen in the IOCCC so far! @@ -60,7 +70,7 @@ Or should we teach our youth to understand the intricacies of this code? Ying Tong Iddle I Po! We suggest you read the source for yourself, which might be easier than the academic papers it was inspired by. -NOTE: Unlike the original entry source, prog.orig.c, prog.c uses a +NOTE: Unlike the original entry source, prog.alt.c, prog.c uses a 64 bit FNV hash and fixes a function call warning. ## Author's comments: diff --git a/2015/howe/avgtime.sh b/2015/howe/avgtime.sh old mode 100644 new mode 100755 index 26c0e944f..d2a0f63cc --- a/2015/howe/avgtime.sh +++ b/2015/howe/avgtime.sh @@ -1,4 +1,4 @@ -#!/bin/ksh +#!/usr/bin/env bash COUNT=$1; shift CMD="$@" diff --git a/2015/howe/prog-test.sh b/2015/howe/prog-test.sh old mode 100644 new mode 100755 index b366593c6..d5411829e --- a/2015/howe/prog-test.sh +++ b/2015/howe/prog-test.sh @@ -1,4 +1,4 @@ -#!/bin/ksh +#!/usr/bin/env bash # Assume a POSIX compliant shell. PROG="./prog" diff --git a/2015/howe/prog.orig.c b/2015/howe/prog.alt.c similarity index 100% rename from 2015/howe/prog.orig.c rename to 2015/howe/prog.alt.c