From a69745412584ad360c0d93307759f44045bb59d5 Mon Sep 17 00:00:00 2001
From: David Kinder <david.kinder@david.kinder>
Date: Mon, 6 Jun 2022 10:35:24 +0100
Subject: [PATCH] Fix compiler warnings on Windows for new JSON code

---
 foundation-module/Chapter 4/Characters.w |  4 ++++
 foundation-module/Chapter 4/JSON.w       | 13 ++++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/foundation-module/Chapter 4/Characters.w b/foundation-module/Chapter 4/Characters.w
index 82f23c3..de8c65e 100644
--- a/foundation-module/Chapter 4/Characters.w	
+++ b/foundation-module/Chapter 4/Characters.w	
@@ -26,6 +26,10 @@ int Characters::islower(wchar_t c) {
 int Characters::isalnum(wchar_t c) {
 	return isalnum((int) c);
 }
+int Characters::iscntrl(wchar_t c) {
+	int i = c;
+	return ((i >= 0) && (i < 32));
+}
 int Characters::vowel(wchar_t c) {
 	if ((c == 'a') || (c == 'e') || (c == 'i') || (c == 'o') || (c == 'u')) return TRUE;
 	return FALSE;
diff --git a/foundation-module/Chapter 4/JSON.w b/foundation-module/Chapter 4/JSON.w
index 4dc272a..60aeb30 100755
--- a/foundation-module/Chapter 4/JSON.w	
+++ b/foundation-module/Chapter 4/JSON.w	
@@ -258,7 +258,8 @@ the JSON standard), and the special cases |true|, |false| and |null|.
 
 =
 JSON_value *JSON::decode_range(text_stream *T, int from, int to, text_file_position *tfp) {
-	int first_nws = -1, last_nws = -1, first_c = 0, last_c = 0;
+	int first_nws = -1, last_nws = -1;
+	wchar_t first_c = 0, last_c = 0;
 	@<Find the first and last non-whitespace character@>;
 	switch (first_c) {
 		case '[':
@@ -456,7 +457,7 @@ JSON_value *JSON::decode_string(text_stream *T, int from, int to, text_file_posi
 		if (c == '\\') {
 			i++;
 			c = Str::get_at(T, i);
-			if ((c >= 0) && (c < 32)) return JSON::decode_error(I"unescaped control character", tfp);
+			if (Characters::iscntrl(c)) return JSON::decode_error(I"unescaped control character", tfp);
 			switch (c) {
 				case 'b': c = 8; break;
 				case 't': c = 9; break;
@@ -571,7 +572,7 @@ void JSON::encode_string(OUTPUT_STREAM, text_stream *T) {
 			case 12: WRITE("\\f"); break;
 			case 13: WRITE("\\r"); break;
 			default:
-				if ((c >= 0) && (c < 32)) WRITE("\\u%04x", c);
+				if (Characters::iscntrl(c)) WRITE("\\u%04x", (int)c);
 				else PUT(c);
 				break;
 		}
@@ -991,7 +992,8 @@ JSON requirement.
 =
 JSON_requirement *JSON::decode_req_range(text_stream *T, int from, int to,
 	dictionary *known_names) {
-	int first_nws = -1, last_nws = -1, first_c = 0, last_c = 0;
+	int first_nws = -1, last_nws = -1;
+	wchar_t first_c = 0, last_c = 0;
 	@<Find the first and last non-whitespace character in requirement@>;
 	if (first_c == '(') {
 		if (last_c != ')')
@@ -1035,7 +1037,8 @@ for what it's worth, we opt for the value.
 =
 JSON_single_requirement *JSON::decode_sreq_range(text_stream *T, int from, int to,
 	dictionary *known_names) {
-	int first_nws = -1, last_nws = -1, first_c = 0, last_c = 0;
+	int first_nws = -1, last_nws = -1;
+	wchar_t first_c = 0, last_c = 0;
 	@<Find the first and last non-whitespace character in requirement@>;
 	if (first_nws < 0) return JSON::error_sr(I"whitespace where requirement expected");
 	switch (first_c) {