From 48f690f08983703fe75c3af71dffb8867b6dcf30 Mon Sep 17 00:00:00 2001 From: Landon Curt Noll Date: Fri, 24 Mar 2023 21:10:40 -0700 Subject: [PATCH] fix Makefile and README.md for 2015/muth --- 2015/muth/Makefile | 294 ++++++++++++++++++++++++++++---------------- 2015/muth/README.md | 47 ++++--- 2 files changed, 213 insertions(+), 128 deletions(-) diff --git a/2015/muth/Makefile b/2015/muth/Makefile index e048f8dc0..d44ccecc7 100644 --- a/2015/muth/Makefile +++ b/2015/muth/Makefile @@ -1,37 +1,52 @@ #!/usr/bin/env make # -# 2015 makefile +# IOCCC 2015 winning entry - muth + +################################################################################ # -# 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 -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 -CUT=cut + +####################### +# common tool locations +####################### +# +include ../../var.mk # Set X11_LIBDIR to the directory where the X11 library resides # @@ -45,51 +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-keyword-macro -Wno-unused-macros +CSILENCE= -Wno-keyword-macro -# 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=c11 -CSTD= -std=c1x +CSTD= -std=gnu11 -# 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= -DX="$(X)" -DV="$(V)" -# 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 "${MACHINE}" -include "${TAPE}" +#CINCLUDE= -I ${X11_INCDIR} -I ${X11_INCDIR}/X11 +#CINCLUDE= `${SDL2_CONFIG} --cflags` -# 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 @@ -102,59 +117,95 @@ CINCLUDE= -include "${MACHINE}" -include "${TAPE}" #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= -L ${X11_LIBDIR} +#LIBS= -lm +#LIBS= -L ${X11_LIBDIR} -lX11 +#LIBS= `${SDL2_CONFIG} --libs` -# 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-poison-system-directories -Wno-unused-macros +# +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 +ENTRY= muth +PROG= prog +# +OBJ= ${PROG}.o +CSRC= ${PROG}.o DATA= +TARGET= ${PROG} +# ALT_OBJ= -ALT_ENTRY= -TARGET= ${ENTRY} +ALT_TARGET= -MACHINE = machine_beaver_4_2.h -TAPE = tape_empty.h +# entry specific variables +# +MACHINE= machine_beaver_4_2.h +TAPE= tape_empty.h + +MACHINE_SET= machine_beaver_4_2.h machine_champ_2_4.h machine_chaos_5_2.h \ + machine_cmplx_5_2.h machine_count_5_2.h machine_gcd.h machine_great_3_2.h \ + machine_ioccc.h machine_nop.h machine_ru_2_4.h machine_times2.h + +TAPE_SET= tape_15_50.h tape_77_55.h tape_empty.h tape_five.h ################# # build the entry ################# # -all: ${TARGET} ${DATA} +all: data ${TARGET} ${MACHINE_SET} ${TAPE_SET} @${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 the entry +# +.PHONY: run +run: ${PROG} + ./${PROG} | ${TR} -d '~' + [ -z "${V}" ] || [ "${V}" -lt 1 ] || { echo "total:" $$(./${PROG} | ${TR} -dc '~' | wc -c) "steps"; } + [ -z "${V}" ] || [ "${V}" -lt 2 ] || { ./${PROG} | ${GREP} '^~' | ${CUT} -f2 | ${SORT} | ${UNIQ} -c; } + # alternative executable # -alt: ${ALT_ENTRY} +alt: data ${ALT_TARGET} @${TRUE} # data files @@ -162,41 +213,51 @@ alt: ${ALT_ENTRY} data: ${DATA} @${TRUE} -# test the entry +# both all and alt # -.PHONY: run -run: ${ENTRY} - @ ./${ENTRY} | ${TR} -d '~' - @ [ -z "${V}" ] || [ "${V}" -lt 1 ] || { echo "total:" $$(./${ENTRY} | ${TR} -dc '~' | wc -c) "steps"; } - @ [ -z "${V}" ] || [ "${V}" -lt 2 ] || { ./${ENTRY} | ${GREP} '^~' | ${CUT} -f2 | ${SORT} | ${UNIQ} -c; } +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} - -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 ################## @@ -215,54 +276,69 @@ 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/muth/README.md b/2015/muth/README.md index e49ff39c1..1e8aa643d 100644 --- a/2015/muth/README.md +++ b/2015/muth/README.md @@ -1,33 +1,43 @@ # Most Complete Use of CPP -Dominik Muth + Dominik Muth + +# To build: -## Judges' comments: -### To use: +```sh +make +``` - make -B [MACHINE=your_machine.h] [TAPE=your_tape.h] [X=[0|1|2|3|4|5|6|7|8|9]] [V=[0|1|2]] run +### To run: + +```sh +make -B [MACHINE=your_machine.h] [TAPE=your_tape.h] [X=[0|1|2|3|4|5|6|7|8|9]] [V=[0|1|2]] run +``` ### Try: - make -B V=2 run +```sh +make -B V=2 run - strings prog | grep '(,)' +strings prog | grep '(,)' - make -B MACHINE=machine_times2.h TAPE=tape_five.h V=1 run +make -B MACHINE=machine_times2.h TAPE=tape_five.h V=1 run - make -B MACHINE=machine_chaos_5_2.h X=5 run +make -B MACHINE=machine_chaos_5_2.h X=5 run +``` -### Selected Judges Remarks: +## Judges' comments: This is something we were fearing all along: that the C preprocessor is Turing-complete even without conditionals and recursive file inclusion as some kind of a [rewriting system](https://en.wikipedia.org/wiki/Rewriting). Now we have the proof! ## Author's comments: + ### Preprocessor Turing Engine -#### Features +### Features - Turing machine runs in preprocessor - universal (unlimited configurable states, symbols, and tape) @@ -42,19 +52,19 @@ even without conditionals and recursive file inclusion as some kind of a - make target `run` runs `./prog` and filters a little statistics out of the verbose output - `X` (defaults to 3) sets the maximum number of steps: *M*(`X`) ~ 8`X` -#### Limitations +### Limitations If the machine does not halt after *M*(`X`) steps, you will see unexpanded macros in the output. -#### Compiler warnings +### Compiler warnings If `V=1` or `V=2` is used, you may see "`warning: string length is greater than the length '4095' ISO C99 compilers are required to support`". -#### Programming +### Programming Implementing your own Turing machine is easy. Take a look at the supplied header files for examples. -##### Tape Symbols +#### Tape Symbols Every symbol used (except "`_`") must be explicitly declared using @@ -64,7 +74,7 @@ Example: #define sym_1(sym, _1) sym -##### Tape +#### Tape The initial content of the tape must be defined in the tape header using a triple like: @@ -76,7 +86,7 @@ The initial content of the tape must be defined in the tape header using a tripl The empty pairs "`(,)`" represent the continuations of the tape, filled with underscore symbols ("`_`"). They are expanded on demand. -##### State Machine +#### State Machine All transitions are defined in the machine header using the syntax @@ -97,11 +107,10 @@ To halt the machine, use the keyword "`break`" as in #define A_1 (2, break) --------------------------------------------------------------------------------- -