From 62025c92bdec6048ffa70b361279f4f3277c8d8f Mon Sep 17 00:00:00 2001
From: David Given <dg@cowlark.com>
Date: Thu, 21 Jun 2018 23:06:29 +0200
Subject: [PATCH] The ctype functions are pure.

---
 lang/cem/libcc.ansi/build.lua                  |  6 +++---
 lang/cem/libcc.ansi/ctype/LIST                 | 15 ---------------
 lang/cem/libcc.ansi/ctype/Makefile             | 15 ---------------
 lang/cem/libcc.ansi/{ => pure}/ctype/char.tab  |  0
 lang/cem/libcc.ansi/{ => pure}/ctype/genfiles  |  0
 lang/cem/libcc.ansi/{ => pure}/ctype/tolower.c |  0
 lang/cem/libcc.ansi/{ => pure}/ctype/toupper.c |  0
 7 files changed, 3 insertions(+), 33 deletions(-)
 delete mode 100644 lang/cem/libcc.ansi/ctype/LIST
 delete mode 100644 lang/cem/libcc.ansi/ctype/Makefile
 rename lang/cem/libcc.ansi/{ => pure}/ctype/char.tab (100%)
 rename lang/cem/libcc.ansi/{ => pure}/ctype/genfiles (100%)
 rename lang/cem/libcc.ansi/{ => pure}/ctype/tolower.c (100%)
 rename lang/cem/libcc.ansi/{ => pure}/ctype/toupper.c (100%)

diff --git a/lang/cem/libcc.ansi/build.lua b/lang/cem/libcc.ansi/build.lua
index 47d9bc4b3..c49bdf0e2 100644
--- a/lang/cem/libcc.ansi/build.lua
+++ b/lang/cem/libcc.ansi/build.lua
@@ -2,12 +2,12 @@ include("plat/build.lua")
 
 tabgen {
 	name = "ctype_tab",
-	srcs = { "./ctype/char.tab" }
+	srcs = { "./pure/ctype/char.tab" }
 }
 
 normalrule {
 	name = "ctype_files",
-	ins = { "./ctype/genfiles" },
+	ins = { "./pure/ctype/genfiles" },
 	outleaves = {
 		"isalnum.c",
 		"isalpha.c",
@@ -40,7 +40,7 @@ for _, plat in ipairs(vars.plats) do
 			"./pure/setjmp/*.e",
 			"./pure/math/*.c", -- hypot.c
 			"./pure/math/*.e",
-			"./ctype/*.c",
+			"./pure/ctype/*.c",
 			"./errno/*.c",
 			"./malloc/*.c",
 			"./misc/environ.c", -- don't build everything here as it's all obsolete
diff --git a/lang/cem/libcc.ansi/ctype/LIST b/lang/cem/libcc.ansi/ctype/LIST
deleted file mode 100644
index a8f581760..000000000
--- a/lang/cem/libcc.ansi/ctype/LIST
+++ /dev/null
@@ -1,15 +0,0 @@
-isalnum.c
-isalpha.c
-iscntrl.c
-isdigit.c
-isgraph.c
-islower.c
-isprint.c
-ispunct.c
-isspace.c
-isupper.c
-isxdigit.c
-isascii.c
-toupper.c
-tolower.c
-chartab.c
diff --git a/lang/cem/libcc.ansi/ctype/Makefile b/lang/cem/libcc.ansi/ctype/Makefile
deleted file mode 100644
index 56ef72a02..000000000
--- a/lang/cem/libcc.ansi/ctype/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-clean:
-	rm -f isalnum.o isalpha.o iscntrl.o isdigit.o isgraph.o \
-		islower.o isprint.o ispunct.o isspace.o isupper.o \
-		isxdigit.o isascii.o tolower.o toupper.o chartab.o \
-		isalnum.c isalpha.c iscntrl.c isdigit.c isgraph.c \
-		islower.c isprint.c ispunct.c isspace.c isupper.c \
-		isxdigit.c isascii.c chartab.c \
-		OLIST
-
-chartab.c: char.tab
-	tabgen -fchar.tab > chartab.c
-
-isalnum.c isalpha.c iscntrl.c isdigit.c isgraph.c islower.c isprint.c \
-ispunct.c isspace.c isupper.c isxdigit.c isascii.c: genfiles
-	sh genfiles
diff --git a/lang/cem/libcc.ansi/ctype/char.tab b/lang/cem/libcc.ansi/pure/ctype/char.tab
similarity index 100%
rename from lang/cem/libcc.ansi/ctype/char.tab
rename to lang/cem/libcc.ansi/pure/ctype/char.tab
diff --git a/lang/cem/libcc.ansi/ctype/genfiles b/lang/cem/libcc.ansi/pure/ctype/genfiles
similarity index 100%
rename from lang/cem/libcc.ansi/ctype/genfiles
rename to lang/cem/libcc.ansi/pure/ctype/genfiles
diff --git a/lang/cem/libcc.ansi/ctype/tolower.c b/lang/cem/libcc.ansi/pure/ctype/tolower.c
similarity index 100%
rename from lang/cem/libcc.ansi/ctype/tolower.c
rename to lang/cem/libcc.ansi/pure/ctype/tolower.c
diff --git a/lang/cem/libcc.ansi/ctype/toupper.c b/lang/cem/libcc.ansi/pure/ctype/toupper.c
similarity index 100%
rename from lang/cem/libcc.ansi/ctype/toupper.c
rename to lang/cem/libcc.ansi/pure/ctype/toupper.c