Fixing out web boot order.

Makefile

@@ -199,15 +199,17 @@ COMMON_PHASE1e = common/comments.fs \
                  common/structures.fs
 
 COMMON_PHASE2 = common/tasks.fs common/utils.fs common/locals.fs \
-                common/filetools.fs common/including.fs \
+                common/streams.fs
-                common/streams.fs common/blocks.fs
+
+COMMON_FILETOOLS = common/filetools.fs common/including.fs \
+                   common/blocks.fs
 
 COMMON_DESKTOP = common/ansi.fs common/desktop.fs \
                  common/graphics.fs common/graphics_utils.fs common/heart.fs
 
 POSIX_BOOT =  $(COMMON_PHASE1) \
               posix/posix.fs posix/allocation.fs posix/termios.fs \
-              $(COMMON_PHASE2) $(COMMON_DESKTOP) \
+              $(COMMON_PHASE2) $(COMMON_FILETOOLS) $(COMMON_DESKTOP) \
               posix/x11.fs \
               posix/graphics.fs \
               posix/sockets.fs posix/telnetd.fs posix/httpd.fs posix/web_interface.fs \
@@ -224,7 +226,7 @@ WINDOWS_BOOT = $(COMMON_PHASE1) \
                windows/windows_gdi.fs \
                windows/windows_messages.fs \
                windows/allocation.fs \
-               $(COMMON_PHASE2) $(COMMON_DESKTOP) \
+               $(COMMON_PHASE2) $(COMMON_FILETOOLS) $(COMMON_DESKTOP) \
                windows/graphics.fs \
                posix/autoboot.fs \
                common/fini.fs
@@ -233,7 +235,7 @@ $(GEN)/windows_boot.h: tools/source_to_string.js $(WINDOWS_BOOT) | $(GEN)
 
 ESP32_BOOT = $(COMMON_PHASE1) \
              esp32/allocation.fs \
-             $(COMMON_PHASE2) \
+             $(COMMON_PHASE2) $(COMMON_FILETOOLS) \
              esp32/bindings.fs esp32/platform.fs \
              posix/httpd.fs posix/web_interface.fs esp32/web_interface.fs \
              esp32/registers.fs esp32/timers.fs \
@@ -262,7 +264,7 @@ $(GEN)/web_sys.js: $(GEN)/dump_web_opcodes | $(GEN)
 
 WEB_BOOT =  $(COMMON_PHASE1e) \
             $(COMMON_PHASE2) \
-            common/fini.fs
+            web/fini.fs
 $(GEN)/web_boot.js: tools/source_to_string.js $(WEB_BOOT) | $(GEN)
 	$< -web boot $(VERSION) $(REVISION) $(WEB_BOOT) >$@
 

common/forth_namespace_tests.fs

@@ -432,7 +432,7 @@ e: check-args
   out: argc 
 ;e
 
-e: check-highlevel
+e: check-imports
   out: needs 
   out: required 
   out: included? 
@@ -467,11 +467,14 @@ e: check-desktop
   check-ansi
 ;e
 
-e: check-phase2
+e: check-filetools
   check-blocks
-  out: streams 
+  check-imports
-  check-highlevel
   check-snapshots
+;e
+
+e: check-phase2
+  out: streams 
   check-locals
   check-utils
   out: ms 
@@ -497,6 +500,7 @@ e: test-windows-forth-namespace
   ' forth list-from
   out: FORTH 
   check-desktop
+  check-filetools
   check-phase2
   check-allocation
   out: default-key? 
@@ -543,6 +547,7 @@ e: test-posix-forth-namespace
   out: sockets 
   out: x11 
   check-desktop
+  check-filetools
   check-phase2
   out: form 
   out: termios 
@@ -651,6 +656,7 @@ e: test-esp32-forth-namespace
   out: WiFi 
   out: Wire 
   out: ESP 
+  check-filetools
   check-phase2
   check-allocation
   check-phase1

web/fini.fs

@@ -0,0 +1,23 @@
+\ Copyright 2022 Bradley D. Nelson
+\
+\ Licensed under the Apache License, Version 2.0 (the "License");
+\ you may not use this file except in compliance with the License.
+\ You may obtain a copy of the License at
+\
+\     http://www.apache.org/licenses/LICENSE-2.0
+\
+\ Unless required by applicable law or agreed to in writing, software
+\ distributed under the License is distributed on an "AS IS" BASIS,
+\ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+\ See the License for the specific language governing permissions and
+\ limitations under the License.
+
+internals definitions
+( TODO: Figure out why this has to happen so late. )
+transfer internals-builtins
+forth definitions internals
+( Bring a forth to the top of the vocabulary. )
+: ok   ." uEforth" raw-ok ;
+transfer forth
+forth
+ok

web/web.template.js

@@ -463,9 +463,9 @@ function VM(stdlib, foreign, heap) {
     }
   }
 
-  function memmove(src, dst, n) {
+  function memmove(dst, src, n) {
-    src = src | 0;
     dst = dst | 0;
+    src = src | 0;
     n = n | 0;
     if ((src | 0) < (dst | 0)) {
       src = (src + n - 1) | 0;