From 5c02124f1e11b3e57fcea3d941ae883946ea03de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= <hugo@lysator.liu.se>
Date: Thu, 21 Jul 2022 18:06:17 +0200
Subject: Add pre-compiled "headers", ensuring everything compiles again.

---
 Makefile                           |  41 +++------
 module/c/old/cpp.scm               |  11 ++-
 module/c/old/generated/glob.scm    |  22 +++++
 module/c/old/generated/termios.scm | 182 +++++++++++++++++++++++++++++++++++++
 4 files changed, 226 insertions(+), 30 deletions(-)
 create mode 100644 module/c/old/generated/glob.scm
 create mode 100644 module/c/old/generated/termios.scm

diff --git a/Makefile b/Makefile
index 96c0ea58..b1f51b28 100644
--- a/Makefile
+++ b/Makefile
@@ -14,44 +14,30 @@ GUILE_VERSION=$(shell $(GUILE) -c '(display (version))')
 GUILE_SITE_DIR=$(shell $(GUILE) -c "(display (%site-dir))")
 GUILE_CCACHE_DIR=$(shell $(GUILE) -c "(display (%site-ccache-dir))")
 
-not_scm_files = \
-	c/operators \
-	c/preprocessor \
-	c/cpp \
-	c/parse \
-	c/lex \
-	c/eval \
-	c/eval/environment \
-	zzz_sentinel
-
-
 scm_files = \
-	c/cpp-environment \
-	c/cpp-environment/object-like-macro \
-	c/cpp-environment/internal-macro \
-	c/cpp-environment/function-like-macro \
-	c/cpp \
-	c/eval2 \
-	c/lex2 \
-	c/line-fold \
-	c/preprocessor2 \
-	c/trigraph \
-	hnh/util \
-	hnh/util/object \
-	hnh/util/path
-
-# scm_files = \
 	base64 \
+	c/ast \
 	c/compiler \
 	c/cpp-environment \
 	c/cpp-environment/function-like-macro \
 	c/cpp-environment/internal-macro \
 	c/cpp-environment/object-like-macro \
+	c/cpp-types \
+	c/cpp-util \
+	c/eval-basic \
 	c/eval2 \
+	c/flatten-begin \
 	c/lex2 \
 	c/line-fold \
+	c/old/cpp \
+	c/old/lex \
+	c/old/operators \
+	c/old/parse \
+	c/parse2 \
 	c/preprocessor2 \
+	c/to-token \
 	c/trigraph \
+	c/unlex \
 	calp \
 	calp/benchmark/parse \
 	calp/config-base \
@@ -104,7 +90,9 @@ scm_files = \
 	hnh/util/options \
 	hnh/util/path \
 	hnh/util/tree \
+	hnh/util/type \
 	hnh/util/uuid \
+	hnh/util/values \
 	srfi/srfi-41/util \
 	srfi/srfi-64/test-error \
 	srfi/srfi-64/util \
@@ -159,6 +147,7 @@ scm_files = \
 	web/uri-query \
 	xdg/basedir
 
+
 SCM_FILES = $(scm_files:%=module/%.scm)
 
 GO_FILES = $(SCM_FILES:module/%.scm=obj-$(GUILE_VERSION)/%.go)
diff --git a/module/c/old/cpp.scm b/module/c/old/cpp.scm
index 1623bd11..743fe330 100644
--- a/module/c/old/cpp.scm
+++ b/module/c/old/cpp.scm
@@ -144,8 +144,11 @@
 
 (define-macro (include# header-file . args)
 
-  (define define-form (if (null? args) 'define (car args)))
+  ;; (define define-form (if (null? args) 'define (car args)))
 
-  `(begin
-     ,@(map (lambda (pair) `(,define-form ,(car pair) ,(cdr pair)))
-            (include% header-file))))
+  ;; `(begin
+  ;;    ,@(map (lambda (pair) `(,define-form ,(car pair) ,(cdr pair)))
+  ;;           (include% header-file)))
+
+  (define path ((@ (hnh util path) path-append) "c/old/generated" (basename header-file ".h")))
+  `(load-from-path ,path))
diff --git a/module/c/old/generated/glob.scm b/module/c/old/generated/glob.scm
new file mode 100644
index 00000000..e9b8e602
--- /dev/null
+++ b/module/c/old/generated/glob.scm
@@ -0,0 +1,22 @@
+(define-public _POSIX_VDISABLE #f)
+(define-public GLOB_MAGCHAR (<< 1 8))
+(define-public GLOB_ABORTED 2)
+(define-public GLOB_NOSYS 4)
+(define-public GLOB_NOCHECK (<< 1 4))
+(define-public GLOB_BRACE (<< 1 10))
+(define-public linux 1)
+(define-public GLOB_ERR (<< 1 0))
+(define-public GLOB_NOMATCH 3)
+(define-public GLOB_TILDE_CHECK (<< 1 14))
+(define-public unix 1)
+(define-public GLOB_ALTDIRFUNC (<< 1 9))
+(define-public GLOB_TILDE (<< 1 12))
+(define-public GLOB_MARK (<< 1 1))
+(define-public GLOB_NOSPACE 1)
+(define-public GLOB_DOOFFS (<< 1 3))
+(define-public GLOB_ONLYDIR (<< 1 13))
+(define-public GLOB_NOSORT (<< 1 2))
+(define-public GLOB_PERIOD (<< 1 7))
+(define-public GLOB_NOMAGIC (<< 1 11))
+(define-public GLOB_APPEND (<< 1 5))
+(define-public GLOB_NOESCAPE (<< 1 6))
diff --git a/module/c/old/generated/termios.scm b/module/c/old/generated/termios.scm
new file mode 100644
index 00000000..e879766b
--- /dev/null
+++ b/module/c/old/generated/termios.scm
@@ -0,0 +1,182 @@
+(define-public _POSIX_VDISABLE #f)
+(define-public BS1 8192)
+(define-public BS0 0)
+(define-public ECHOKE 2048)
+(define-public VINTR 0)
+(define-public B300 7)
+(define-public VSTART 8)
+(define-public CSTOPB 64)
+(define-public TIOCSER_TEMT 1)
+(define-public CBAUDEX 4096)
+(define-public B2000000 4107)
+(define-public B1500000 4106)
+(define-public CTIME 0)
+(define-public B4000000 4111)
+(define-public B3500000 4110)
+(define-public B75 2)
+(define-public TOSTOP 256)
+(define-public B921600 4103)
+(define-public B50 1)
+(define-public NLDLY 256)
+(define-public B1152000 4105)
+(define-public ICRNL 256)
+(define-public CRDLY 1536)
+(define-public B0 0)
+(define-public VEOL2 16)
+(define-public (CCEQ val c)
+  (and (= c val) ((negate =) val _POSIX_VDISABLE)))
+(define-public B600 8)
+(define-public TCIOFF 2)
+(define-public HUPCL 1024)
+(define-public B4800 12)
+(define-public BRKINT 2)
+(define-public NCCS 32)
+(define-public EXTPROC 65536)
+(define-public CRTSCTS 2147483648)
+(define-public IXON 1024)
+(define-public VQUIT 1)
+(define-public linux 1)
+(define-public B1800 10)
+(define-public IGNBRK 1)
+(define-public B57600 4097)
+(define-public B200 6)
+(define-public ECHOPRT 1024)
+(define-public OFILL 64)
+(define-public VREPRINT 12)
+(define-public TCSANOW 0)
+(define-public ONLCR 4)
+(define-public TCIFLUSH 0)
+(define-public CBAUD 4111)
+(define-public IXANY 2048)
+(define-public TCSAFLUSH 2)
+(define-public OFDEL 128)
+(define-public TCOFLUSH 1)
+(define-public B38400 15)
+(define-public B19200 14)
+(define-public NL1 256)
+(define-public CSIZE 48)
+(define-public NL0 0)
+(define-public TCION 3)
+(define-public TCOOFF 0)
+(define-public unix 1)
+(define-public PARMRK 8)
+(define-public OLCUC 2)
+(define-public ISIG 1)
+(define-public CMIN 1)
+(define-public ECHOK 32)
+(define-public ECHO 8)
+(define-public B115200 4098)
+(define-public IXOFF 4096)
+(define-public (CTRL x) (logand x 31))
+(define-public CDISCARD (CTRL 111))
+(define-public CDSUSP (CTRL 121))
+(define-public CSUSP (CTRL 122))
+(define-public CWERASE (CTRL 119))
+(define-public CLNEXT (CTRL 118))
+(define-public CKILL (CTRL 117))
+(define-public CFLUSH CDISCARD)
+(define-public ONOCR 16)
+(define-public CSTATUS 0)
+(define-public VT1 16384)
+(define-public VT0 0)
+(define-public NOFLSH 128)
+(define-public VTDLY 16384)
+(define-public IGNPAR 4)
+(define-public IMAXBEL 8192)
+(define-public TABDLY 6144)
+(define-public VLNEXT 15)
+(define-public B150 5)
+(define-public B134 4)
+(define-public OCRNL 8)
+(define-public B1000000 4104)
+(define-public CIBAUD 269418496)
+(define-public ECHOE 16)
+(define-public CERASE 127)
+(define-public B110 3)
+(define-public B3000000 4109)
+(define-public TCSADRAIN 1)
+(define-public VSUSP 10)
+(define-public BSDLY 8192)
+(define-public B500000 4101)
+(define-public PARODD 512)
+(define-public ONLRET 32)
+(define-public CEOL 0)
+(define-public CBRK CEOL)
+(define-public CEOF (CTRL 100))
+(define-public CEOT CEOF)
+(define-public CINTR (CTRL 99))
+(define-public VMIN 6)
+(define-public EXTB B38400)
+(define-public EXTA B19200)
+(define-public FFDLY 32768)
+(define-public CLOCAL 2048)
+(define-public ISTRIP 32)
+(define-public TAB3 6144)
+(define-public TAB2 4096)
+(define-public TAB1 2048)
+(define-public TAB0 0)
+(define-public IEXTEN 32768)
+(define-public B460800 4100)
+(define-public CS8 48)
+(define-public CS7 32)
+(define-public CS6 16)
+(define-public CS5 0)
+(define-public VKILL 3)
+(define-public CR3 1536)
+(define-public CR2 1024)
+(define-public CR1 512)
+(define-public CR0 0)
+(define-public OPOST 1)
+(define-public B576000 4102)
+(define-public VERASE 2)
+(define-public B2400 11)
+(define-public TCOON 1)
+(define-public CMSPAR 1073741824)
+(define-public B230400 4099)
+(define-public CREPRINT (CTRL 114))
+(define-public INPCK 16)
+(define-public CSTOP (CTRL 115))
+(define-public VDISCARD 13)
+(define-public VTIME 5)
+(define-public IUCLC 512)
+(define-public VSTOP 9)
+(define-public VEOL 11)
+(define-public VEOF 4)
+(define-public ICANON 2)
+(define-public IGNCR 128)
+(define-public VWERASE 14)
+(define-public XTABS 6144)
+(define-public TTYDEF_OFLAG (logior OPOST ONLCR XTABS))
+(define-public ECHOCTL 512)
+(define-public TTYDEF_LFLAG
+  (logior
+   ECHO
+   ICANON
+   ISIG
+   IEXTEN
+   ECHOE
+   ECHOKE
+   ECHOCTL))
+(define-public XCASE 4)
+(define-public IUTF8 16384)
+(define-public CSTART (CTRL 113))
+(define-public CQUIT 28)
+(define-public INLCR 64)
+(define-public TCIOFLUSH 2)
+(define-public B2500000 4108)
+(define-public TTYDEF_IFLAG
+  (logior BRKINT ISTRIP ICRNL IMAXBEL IXON IXANY))
+(define-public B1200 9)
+(define-public PARENB 256)
+(define-public CREAD 128)
+(define-public TTYDEF_CFLAG
+  (logior CREAD CS7 PARENB HUPCL))
+(define-public FF1 32768)
+(define-public FF0 0)
+(define-public PENDIN 16384)
+(define-public FLUSHO 4096)
+(define-public CRPRNT CREPRINT)
+(define-public VSWTC 7)
+(define-public B9600 13)
+(define-public TTYDEF_SPEED B9600)
+(define-public ECHONL 64)
-- 
cgit v1.2.3