From 7bff8e55f06974e6e96abbe7a44c0774860a218a Mon Sep 17 00:00:00 2001
From: Brad Nelson <flagxor@gmail.com>
Date: Sun, 30 Jan 2022 13:30:08 -0800
Subject: [PATCH] Refactor.

---
 ueforth/Makefile                        | 13 +++++++------
 ueforth/common/forth_namespace_tests.fs | 13 ++++++++-----
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/ueforth/Makefile b/ueforth/Makefile
index d83b24d..46ec2a0 100644
--- a/ueforth/Makefile
+++ b/ueforth/Makefile
@@ -161,12 +161,13 @@ COMMON_PREPLATFORM = common/boot.fs common/conditionals.fs common/vocabulary.fs
 
 COMMON_DESKTOP = common/hide_calls.fs common/ansi.fs
 
-COMMON_POSTPLATFORM = common/utils.fs common/locals.fs
+COMMON_POSTPLATFORM = common/utils.fs common/locals.fs \
+                      common/filetools.fs common/highlevel.fs
 
 POSIX_BOOT =  $(COMMON_PREPLATFORM) \
               $(COMMON_DESKTOP) \
               posix/posix.fs posix/posix_highlevel.fs posix/termios.fs \
-              common/tasks.fs $(COMMON_POSTPLATFORM) common/highlevel.fs common/filetools.fs \
+              common/tasks.fs $(COMMON_POSTPLATFORM) \
               common/desktop.fs posix/posix_desktop.fs \
               common/streams.fs common/blocks.fs \
               posix/sockets.fs posix/telnetd.fs posix/httpd.fs posix/web_interface.fs \
@@ -177,9 +178,9 @@ $(GEN)/posix_boot.h: common/source_to_string.js $(POSIX_BOOT) | $(GEN)
 
 WINDOWS_BOOT = $(COMMON_PREPLATFORM) \
                $(COMMON_DESKTOP) \
-               windows/windows.fs windows/windows_highlevel.fs common/highlevel.fs \
+               windows/windows.fs windows/windows_highlevel.fs \
                common/tasks.fs $(COMMON_POSTPLATFORM) common/desktop.fs \
-               common/filetools.fs common/streams.fs \
+               common/streams.fs \
                common/blocks.fs \
                posix/autoboot.fs \
                common/fini.fs
@@ -188,8 +189,8 @@ $(GEN)/windows_boot.h: common/source_to_string.js $(WINDOWS_BOOT) | $(GEN)
 
 ESP32_BOOT = $(COMMON_PREPLATFORM) \
              common/tasks.fs esp32/platform.fs esp32/highlevel.fs \
-             esp32/bindings.fs common/highlevel.fs \
-             common/filetools.fs $(COMMON_POSTPLATFORM) \
+             esp32/bindings.fs \
+             $(COMMON_POSTPLATFORM) \
              common/streams.fs posix/httpd.fs posix/web_interface.fs esp32/web_interface.fs \
              esp32/registers.fs esp32/timers.fs \
              esp32/bterm.fs posix/telnetd.fs \
diff --git a/ueforth/common/forth_namespace_tests.fs b/ueforth/common/forth_namespace_tests.fs
index da59f35..a1607fe 100644
--- a/ueforth/common/forth_namespace_tests.fs
+++ b/ueforth/common/forth_namespace_tests.fs
@@ -370,6 +370,11 @@ e: check-args
   out: argc 
 ;e
 
+e: check-highlevel
+  out: include 
+  out: included 
+;e
+
 DEFINED? windows [IF]
 
 e: test-forth-namespace
@@ -388,13 +393,12 @@ e: test-forth-namespace
   out: FORTH 
   check-blocks
   out: streams 
-  check-snapshots
   check-args
+  check-highlevel
+  check-snapshots
   check-locals
   check-utils
   check-tasks
-  out: include 
-  out: included 
   out: resize 
   out: free 
   out: allocate 
@@ -450,9 +454,8 @@ e: test-forth-namespace
   out: streams 
   out: xlib 
   check-args
+  check-highlevel
   check-snapshots
-  out: include 
-  out: included 
   check-locals
   check-utils
   out: ms