refac

zeroflag · Dec 15, 2017 · 9e3ca57 · 9e3ca57
1 parent 134bdd1
commit 9e3ca57
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 35 deletions.
diff --git a/arch/esp8266/forth/examples/example-dht22-data-logger.forth b/arch/esp8266/forth/examples/example-dht22-data-logger.forth
@@ -4,13 +4,7 @@ variable: server
 
 : measure ( -- temperature humidity | throws:EGAVEUP )
     10 0 do
-        ['] dht-measure catch ?dup 0<> 
-        if
-            ex-type cr
-            5000 ms
-        else
-            unloop exit
-        then
+        ['] dht-measure catch ?dup if ex-type cr 5000 ms else unloop exit then
     loop
     EGAVEUP throw ;
 
@@ -19,7 +13,7 @@ variable: server
 : dispose ( -- ) server @ netcon-dispose ;
 : send ( -- ) server @ data 4 netcon-write-buf ;
 : log ( temperature humidity -- ) data! connect ['] send catch dispose throw ;
-: log-measurement ( -- ) { measure log } catch ?dup 0<> if ex-type cr then ;
+: log-measurement ( -- ) { measure log } catch ?dup if ex-type cr then ;
 : main ( -- ) log-measurement 50 ms 120000000 deep-sleep ;
 
 ' boot is: main

diff --git a/arch/esp8266/forth/examples/example-stock-price.forth b/arch/esp8266/forth/examples/example-stock-price.forth
@@ -131,9 +131,7 @@ variable: idx
     begin
         last-refresh @ 0= expired? or if            
             ms@ last-refresh !            
-            { show } catch ?dup 0<> if 
-                error-draw 
-            then            
+            { show } catch ?dup if error-draw then            
         then
         pause
     again ;

diff --git a/arch/esp8266/forth/tasks.forth b/arch/esp8266/forth/tasks.forth
@@ -28,11 +28,8 @@ INTERPRETER init-variable: var-current-task
 : current-task ( -- task ) var-current-task @ ;
 : current-task! ( task -- ) var-current-task ! ;
 
-: alloc-data-stack ( -- a )
-    var-task-stack-size @ allot here ;
-
-: alloc-return-stack ( -- a )
-    var-task-rstack-size @ allot here ;
+: alloc-data-stack ( -- a ) var-task-stack-size @ allot here ;
+: alloc-return-stack ( -- a ) var-task-rstack-size @ allot here ;
 
 : task: ( user-space-size "name" ) ( -- task )
     create:
@@ -48,12 +45,7 @@ INTERPRETER init-variable: var-current-task
         dup .rp @ over .r0 !                 \ init r0 = top of rstack address
         last-task! ;                         \ last-task = this
 
-: task-choose-next ( -- )    
-    current-task
-    begin        
-        .next @ dup
-        .status @ PAUSED =
-    until ;
+: task-choose-next ( -- ) current-task begin .next @ dup .status @ PAUSED = until ;
 
 : task-save-context ( sp ip rp -- ) \ XXX temporal coupling
     current-task .rp !
@@ -72,8 +64,7 @@ INTERPRETER init-variable: var-current-task
 
 : task-user-space ( task -- a ) Task + ;
 
-: user-space ( -- a )
-    current-task task-user-space ;
+: user-space ( -- a ) current-task task-user-space ;
 
 defer: pause
 
@@ -100,8 +91,7 @@ defer: pause
     SKIPPED swap .status ! 
     task-choose-next task-run ;
 
-: deactivate ( -- )
-    current-task stop ;
+: deactivate ( -- ) current-task stop ;
 
 : task-find ( task -- link )
     lastword

diff --git a/arch/esp8266/forth/turnkey.forth b/arch/esp8266/forth/turnkey.forth
@@ -6,11 +6,7 @@ defer: boot
 
 : dst ( -- n ) 16r51000 SIZE + ;
 : heap-size ( -- n ) usedmem align ;
-: check ( code -- | ETURNKEY )
-    ?dup 0<> if
-        print: 'SPI FLASH ERROR: ' . cr
-        ETURNKEY throw
-    then ;
+: check ( code -- | ETURNKEY ) ?dup if print: 'SPI FLASH ERROR: ' . cr ETURNKEY throw then ;
 
 : n, ( addr n -- addr+strlen ) over >r >str r> dup strlen + ;
 : s, ( str-dst str-src -- str-dst+strlen ) tuck strlen 2dup + { cmove } dip ;

diff --git a/generic/forth/punit.forth b/generic/forth/punit.forth
@@ -70,11 +70,9 @@ marker: -punit
     test-reset
     lastword
     begin
-        dup 0<>
+        dup
     while
-        dup test? if
-            dup test-run
-        then
+        dup test? if dup test-run then
         @
     repeat
     drop