From 1274ab7bb728752e576c942d8a12e0274fac936b Mon Sep 17 00:00:00 2001
From: Brad Nelson <flagxor@gmail.com>
Date: Sun, 30 Jan 2022 16:15:52 -0800
Subject: [PATCH] Fixing up order.

---
 ueforth/Makefile                              | 20 +++++++++----------
 ueforth/common/{highlevel.fs => including.fs} |  0
 ueforth/esp32/{highlevel.fs => allocation.fs} |  0
 .../{posix_highlevel.fs => allocation.fs}     |  0
 ueforth/posix/{posix_main.c => main.c}        |  0
 .../{windows_highlevel.fs => allocation.fs}   |  0
 .../windows/{windows_interp.h => interp.h}    |  0
 ueforth/windows/{windows_main.c => main.c}    |  2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)
 rename ueforth/common/{highlevel.fs => including.fs} (100%)
 rename ueforth/esp32/{highlevel.fs => allocation.fs} (100%)
 rename ueforth/posix/{posix_highlevel.fs => allocation.fs} (100%)
 rename ueforth/posix/{posix_main.c => main.c} (100%)
 rename ueforth/windows/{windows_highlevel.fs => allocation.fs} (100%)
 rename ueforth/windows/{windows_interp.h => interp.h} (100%)
 rename ueforth/windows/{windows_main.c => main.c} (98%)

diff --git a/ueforth/Makefile b/ueforth/Makefile
index 5d740e0..23378a5 100644
--- a/ueforth/Makefile
+++ b/ueforth/Makefile
@@ -162,11 +162,11 @@ COMMON_PHASE1 = common/boot.fs common/conditionals.fs common/vocabulary.fs \
 COMMON_DESKTOP = common/hide_calls.fs common/ansi.fs common/desktop.fs
 
 COMMON_PHASE2 = common/tasks.fs common/utils.fs common/locals.fs \
-                common/filetools.fs common/highlevel.fs \
+                common/filetools.fs common/including.fs \
                 common/streams.fs common/blocks.fs
 
 POSIX_BOOT =  $(COMMON_PHASE1) \
-              posix/posix.fs posix/posix_highlevel.fs posix/termios.fs \
+              posix/posix.fs posix/allocation.fs posix/termios.fs \
               $(COMMON_PHASE2) $(COMMON_DESKTOP) \
               posix/sockets.fs posix/telnetd.fs posix/httpd.fs posix/web_interface.fs \
               posix/autoboot.fs \
@@ -175,7 +175,7 @@ $(GEN)/posix_boot.h: common/source_to_string.js $(POSIX_BOOT) | $(GEN)
 	$< boot $(VERSION) $(REVISION) $(POSIX_BOOT) >$@
 
 WINDOWS_BOOT = $(COMMON_PHASE1) \
-               windows/windows.fs windows/windows_highlevel.fs \
+               windows/windows.fs windows/allocation.fs \
                $(COMMON_PHASE2) $(COMMON_DESKTOP) \
                posix/autoboot.fs \
                common/fini.fs
@@ -183,9 +183,9 @@ $(GEN)/windows_boot.h: common/source_to_string.js $(WINDOWS_BOOT) | $(GEN)
 	$< -win boot $(VERSION) $(REVISION) $(WINDOWS_BOOT) >$@
 
 ESP32_BOOT = $(COMMON_PHASE1) \
-             esp32/highlevel.fs esp32/bindings.fs \
+             esp32/allocation.fs \
              $(COMMON_PHASE2) \
-             esp32/platform.fs \
+             esp32/platform.fs esp32/bindings.fs \
              posix/httpd.fs posix/web_interface.fs esp32/web_interface.fs \
              esp32/registers.fs esp32/timers.fs \
              esp32/bterm.fs posix/telnetd.fs \
@@ -256,7 +256,7 @@ $(POSIX):
 	mkdir -p $@
 
 $(POSIX)/ueforth: \
-    posix/posix_main.c \
+    posix/main.c \
     common/opcodes.h \
     common/calls.h \
     common/floats.h \
@@ -272,12 +272,12 @@ $(WINDOWS):
 	mkdir -p $@
 
 $(WINDOWS)/uEf32.obj: \
-    windows/windows_main.c \
+    windows/main.c \
     common/opcodes.h \
     common/calls.h \
     common/floats.h \
     common/core.h \
-    windows/windows_interp.h \
+    windows/interp.h \
     $(GEN)/windows_boot.h | $(WINDOWS)
 	$(CL32) /c /Fo$@ $(WIN_CFLAGS) $<
 
@@ -287,12 +287,12 @@ $(WINDOWS)/uEf32.exe: \
 	$(LINK32) /OUT:$@ $(WIN_LFLAGS32) $^
 
 $(WINDOWS)/uEf64.obj: \
-    windows/windows_main.c \
+    windows/main.c \
     common/opcodes.h \
     common/calls.h \
     common/floats.h \
     common/core.h \
-    windows/windows_interp.h \
+    windows/interp.h \
     $(GEN)/windows_boot.h | $(WINDOWS)
 	$(CL64) /c /Fo$@ $(WIN_CFLAGS) $<
 
diff --git a/ueforth/common/highlevel.fs b/ueforth/common/including.fs
similarity index 100%
rename from ueforth/common/highlevel.fs
rename to ueforth/common/including.fs
diff --git a/ueforth/esp32/highlevel.fs b/ueforth/esp32/allocation.fs
similarity index 100%
rename from ueforth/esp32/highlevel.fs
rename to ueforth/esp32/allocation.fs
diff --git a/ueforth/posix/posix_highlevel.fs b/ueforth/posix/allocation.fs
similarity index 100%
rename from ueforth/posix/posix_highlevel.fs
rename to ueforth/posix/allocation.fs
diff --git a/ueforth/posix/posix_main.c b/ueforth/posix/main.c
similarity index 100%
rename from ueforth/posix/posix_main.c
rename to ueforth/posix/main.c
diff --git a/ueforth/windows/windows_highlevel.fs b/ueforth/windows/allocation.fs
similarity index 100%
rename from ueforth/windows/windows_highlevel.fs
rename to ueforth/windows/allocation.fs
diff --git a/ueforth/windows/windows_interp.h b/ueforth/windows/interp.h
similarity index 100%
rename from ueforth/windows/windows_interp.h
rename to ueforth/windows/interp.h
diff --git a/ueforth/windows/windows_main.c b/ueforth/windows/main.c
similarity index 98%
rename from ueforth/windows/windows_main.c
rename to ueforth/windows/main.c
index 3865672..00e7c8b 100644
--- a/ueforth/windows/windows_main.c
+++ b/ueforth/windows/main.c
@@ -44,7 +44,7 @@
   CALLING_OPCODE_LIST \
 
 #include "common/core.h"
-#include "windows/windows_interp.h"
+#include "windows/interp.h"
 
 #include "gen/windows_boot.h"