Hide more.

ueforth/Makefile

@@ -128,8 +128,9 @@ WINDOWS_BOOT = common/boot.fs common/vocabulary.fs common/hide_calls.fs common/a
 $(GEN)/windows_boot.h: common/source_to_string.js $(WINDOWS_BOOT) | $(GEN)
 	echo "ok" | cat $(WINDOWS_BOOT) - | $< boot >$@
 
-ARDUINO_BOOT = common/boot.fs common/vocabulary.fs arduino/arduino.fs arduino/hide_io.fs \
+ARDUINO_BOOT = common/boot.fs common/vocabulary.fs arduino/hide_io.fs \
-               arduino/arduino_highlevel.fs common/highlevel.fs common/filetools.fs \
+               arduino/arduino.fs arduino/arduino_highlevel.fs \
+               common/highlevel.fs common/filetools.fs \
                common/tasks.fs common/streams.fs arduino/arduino_server.fs \
                arduino/esp_camera.fs common/blocks.fs common/utils.fs \
                arduino/autoboot.fs

ueforth/arduino/arduino_server.fs

@@ -98,16 +98,25 @@ window.onload = function() {
 </script>
 | s>z constant index-html
 
-variable webserver
-20000 constant out-size
-
 streams
 : >stream >stream ;
 : stream> stream> ;
 : stream>ch stream>ch ;
 : stream stream ;
+WebServer
+: WebServer.setContentLength WebServer.setContentLength ;
+: WebServer.arg WebServer.arg ;
+: WebServer.hasArg WebServer.hasArg ;
+: WebServer.send WebServer.send ;
+: WebServer.on WebServer.on ;
+: WebServer.new WebServer.new ;
+: WebServer.begin WebServer.begin ;
+: WebServer.handleClient WebServer.handleClient ;
 web-interface
 
+variable webserver
+20000 constant out-size
+
 200 stream input-stream
 out-size dup stream output-stream
 

ueforth/arduino/hide_io.fs

@@ -1,11 +1,25 @@
 ( Migrate various words to separate vocabularies )
 vocabulary Wire   Wire definitions
-transfer Wire.begin   transfer Wire.setClock   transfer Wire.getClock
+transfer{
-transfer Wire.setTimeout   transfer Wire.getTimeout
+  Wire.begin Wire.setClock Wire.getClock
-transfer Wire.lastError   transfer Wire.getErrorText
+  Wire.setTimeout Wire.getTimeout
-transfer Wire.beginTransmission   transfer Wire.endTransmission
+  Wire.lastError Wire.getErrorText
-transfer Wire.requestFrom   transfer Wire.writeTransmission
+  Wire.beginTransmission Wire.endTransmission
-transfer Wire.readTransmission   transfer Wire.write
+  Wire.requestFrom Wire.writeTransmission
-transfer Wire.available   transfer Wire.read
+  Wire.readTransmission Wire.write
-transfer Wire.peek   transfer Wire.busy   transfer Wire.flush
+  Wire.available Wire.read
+  Wire.peek Wire.busy Wire.flush
+}transfer
+forth definitions
+
+vocabulary WebServer   WebServer definitions
+transfer{
+  WebServer.arg WebServer.argi WebServer.argName
+  WebServer.new WebServer.delete
+  WebServer.begin WebServer.stop
+  WebServer.on WebServer.hasArg
+  WebServer.sendHeader WebServer.send WebServer.sendContent
+  WebServer.method WebServer.handleClient
+  WebServer.args WebServer.setContentLength
+}transfer
 forth definitions

ueforth/common/boot.fs

@@ -195,7 +195,7 @@ variable hld
 75 value line-width
 : onlines ( n xt -- n xt )
    swap dup line-width > if drop 0 cr then over >name nip + 1+ swap ;
-: words   0 context @ @ begin onlines dup see. >link dup 0= until 2drop cr ;
+: words   0 context @ @ begin dup while onlines dup see. >link repeat 2drop cr ;
 
 ( Examine Memory )
 : dump ( a n -- )

ueforth/common/hide_calls.fs

@@ -1,5 +1,5 @@
 internals definitions
-transfer call0 transfer call1 transfer call2 transfer call3 transfer call4
+transfer{
-transfer call5 transfer call6 transfer call7 transfer call8 transfer call9
+  call0 call1 call2 call3 call4 call5 call6 call7 call8 call9 call10
-transfer call10
+}transfer
 forth definitions

ueforth/common/vocabulary.fs

@@ -4,25 +4,29 @@
 : definitions   context @ current ! ;
 : >name-length ( xt -- n ) dup 0= if exit then >name nip ;
 : vlist   0 context @ @ begin dup >name-length while onlines dup see. >link repeat 2drop cr ;
-: transfer ( "name" ) ' context @ begin 2dup @ <> while @ >link& repeat nip
+
-                      dup @ swap dup @ >link swap ! current @ @ over >link& !
+( Make it easy to transfer words between vocabularies )
-                      current @ ! ;
+: transfer-xt ( xt --  ) context @ begin 2dup @ <> while @ >link& repeat nip
+                         dup @ swap dup @ >link swap ! current @ @ over >link& !   current @ ! ;
+: transfer ( "name" ) ' transfer-xt ;
+: }transfer ;
+: transfer{ begin ' dup ['] }transfer = if drop exit then transfer-xt again ;
 
 ( Hide some words in an internals vocabulary )
 vocabulary internals   internals definitions
-transfer branch   transfer 0branch   transfer donext   transfer dolit
+transfer{
-transfer 'notfound   transfer notfound
+  transfer-xt
-transfer immediate?
+  branch 0branch donext dolit
-transfer input-buffer   transfer ?echo   transfer ?echo-prompt
+  'notfound notfound
-transfer evaluate1   transfer evaluate-buffer
+  immediate? input-buffer ?echo ?echo-prompt
-transfer 'sys   transfer 'heap
+  evaluate1 evaluate-buffer
-transfer aliteral
+  'sys 'heap aliteral
-transfer leaving(   transfer )leaving   transfer leaving   transfer leaving,
+  leaving( )leaving leaving leaving,
-transfer (do)   transfer (?do)   transfer (+loop)
+  (do) (?do) (+loop)
-transfer parse-quote
+  parse-quote digit $@
-transfer digit
+  see. see-loop >name-length exit=
-transfer $@
+  see-one
-transfer see.   transfer see-loop    transfer >name-length   transfer exit=
+  tib-setup input-limit
-transfer see-one
+}transfer
-transfer tib-setup   transfer input-limit
 forth definitions
+

ueforth/site/index.html

@@ -270,6 +270,7 @@ SPIFFS.usedBytes ( -- n )
 </pre>
 
 <h5>WebServer</h5>
+These words are inside the <code>WebServer</code> vocabulary.
 <pre>
 WebServer.new ( port -- ws )   Allocate new webserver object
 WebServer.delete ( ws -- )   Delete webserver object