Unify vocab test slightly.

ueforth/Makefile

@@ -173,7 +173,7 @@ WINDOWS_BOOT = common/boot.fs common/conditionals.fs common/vocabulary.fs \
                windows/windows.fs windows/windows_highlevel.fs common/highlevel.fs \
                common/tasks.fs common/utils.fs common/locals.fs common/desktop.fs \
                common/filetools.fs common/streams.fs \
-               common/blocks.fs common/locals.fs \
+               common/blocks.fs \
                posix/autoboot.fs \
                common/fini.fs
 $(GEN)/windows_boot.h: common/source_to_string.js $(WINDOWS_BOOT) | $(GEN)

ueforth/common/forth_namespace_tests.fs

@@ -15,6 +15,38 @@
 also internals
 : list-from ( xt ) begin dup >name-length while dup see. cr >link repeat drop ;
 
+e: check-locals
+  out: +to 
+  out: to 
+  out: ; 
+  out: { 
+  out: (local) 
+;e
+
+e: check-highlevel-floats
+  out: f.s 
+  out: f. 
+  out: #fs 
+  out: set-precision 
+  out: precision 
+  out: fsqrt 
+  out: pi 
+  out: fvariable 
+  out: fconstant 
+  out: fliteral 
+  out: afliteral 
+  out: sf, 
+  out: sfloat+ 
+  out: sfloats 
+  out: sfloat 
+  out: f>= 
+  out: f<= 
+  out: f<> 
+  out: f> 
+  out: f< 
+  out: f= 
+;e
+
 DEFINED? windows [IF]
 
 e: test-forth-namespace
@@ -31,11 +63,6 @@ e: test-forth-namespace
 e: test-forth-namespace
   ' forth list-from
   out: FORTH 
-  out: +to 
-  out: to 
-  out: ; 
-  out: { 
-  out: (local) 
   out: editor 
   out: list 
   out: copy 
@@ -63,11 +90,7 @@ e: test-forth-namespace
   out: dump-file 
   out: argv 
   out: argc 
-  out: +to 
-  out: to 
-  out: ; 
-  out: { 
-  out: (local) 
+  check-locals
   out: words 
   out: vlist 
   out: order 
@@ -114,27 +137,7 @@ e: test-forth-namespace
   out: default-key 
   out: default-type 
   out: windows 
-  out: f.s 
-  out: f. 
-  out: #fs 
-  out: set-precision 
-  out: precision 
-  out: fsqrt 
-  out: pi 
-  out: fvariable 
-  out: fconstant 
-  out: fliteral 
-  out: afliteral 
-  out: sf, 
-  out: sfloat+ 
-  out: sfloats 
-  out: sfloat 
-  out: f>= 
-  out: f<= 
-  out: f<> 
-  out: f> 
-  out: f< 
-  out: f= 
+  check-highlevel-floats
   out: page 
   out: at-xy 
   out: normal 
@@ -420,11 +423,7 @@ e: test-forth-namespace
   out: xlib 
   out: argv 
   out: argc 
-  out: +to 
-  out: to 
-  out: ; 
-  out: { 
-  out: (local) 
+  check-locals
   out: reset 
   out: revive 
   out: startup: 
@@ -478,27 +477,7 @@ e: test-forth-namespace
   out: default-key 
   out: default-type 
   out: posix 
-  out: f.s 
-  out: f. 
-  out: #fs 
-  out: set-precision 
-  out: precision 
-  out: fsqrt 
-  out: pi 
-  out: fvariable 
-  out: fconstant 
-  out: fliteral 
-  out: afliteral 
-  out: sf, 
-  out: sfloat+ 
-  out: sfloats 
-  out: sfloat 
-  out: f>= 
-  out: f<= 
-  out: f<> 
-  out: f> 
-  out: f< 
-  out: f= 
+  check-highlevel-floats
   out: page 
   out: at-xy 
   out: normal 

ueforth/common/testing.fs

@@ -42,8 +42,8 @@ variable expect-used   variable result-used
 : expected ( -- a n ) expect-buffer expect-used @ ;
 : resulted ( -- a n ) result-buffer result-used @ ;
 : out:cr   nl expect-emit ;
-: out: ( "line" -- ) nl parse expect-type nl expect-emit ;
 : out:\ ( "line" -- ) nl parse expect-type ;
+: out: ( "line" -- ) out:\ out:cr ;
 variable confirm-old-type
 : confirm{   ['] type >body @ confirm-old-type ! ['] result-type is type ;
 : }confirm   confirm-old-type @ is type ;

ueforth/common/vocabulary_tests.fs

@@ -134,7 +134,7 @@ variable see-tally
   ['] tally-type is type
   see-all
   ['] default-type is type
-  see-tally @ 36000 >assert
+  see-tally @ 35000 >assert
 ;
 
 (