--- gforth/tasker.fs	1997/05/21 20:39:42	1.4
+++ gforth/tasker.fs	2001/06/12 09:29:10	1.9
@@ -1,6 +1,6 @@
 \ Multitasker                                          19aug94py
 
-\ Copyright (C) 1995-1997 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -16,7 +16,7 @@
 
 \ You should have received a copy of the GNU General Public License
 \ along with this program; if not, write to the Free Software
-\ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+\ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
 
 Create sleepers  sleepers A, sleepers A, 0 ,
 
@@ -41,22 +41,21 @@ Create sleepers  sleepers A, sleepers A,
   lp! fp! rp! prev-task @ sleep ;
 
 \ USER' computes the task offset
-: user' ( 'user' -- n )
-    ' >body @ postpone literal ; immediate
-interpretation:
-    ' >body @ ;
+:noname    ' >body @ ;
+:noname    ' >body @ postpone literal ; 
+interpret/compile: user' ( 'user' -- n )
 
 \ NEWTASK creates a new, sleeping task
 : NewTask ( n -- Task )  dup 2* 2* udp @ + dup
   allocate throw  + >r
   r@ over - udp @ - next-task over udp @ move
-  r> over user' r0 + ! dup >r
-  dup r@ user' l0   + ! over -
-  dup r@ user' f0   + ! over -
-  dup r@ user' s0   + ! over -
+  r> over user' rp0 + ! dup >r
+  dup r@ user' lp0   + ! over -
+  dup r@ user' fp0   + ! over -
+  dup r@ user' sp0   + ! over -
   dup r@ user' normal-dp + dup >r !
-   r> r@ user' dpp  + ! + $10 +
-      r@ user' >tib + !
+   r> r@ user' dpp  + ! 2drop
+    0 r@ user' current-input + !
   r> dup 2dup 2! dup sleep ;
 
 : kill-task
@@ -65,11 +64,11 @@ interpretation:
 
 : (pass) ( x1 .. xn n task -- )  rdrop
   [ ' kill-task >body ] ALiteral r>
-  rot >r r@ user' r0 + @ 2 cells - dup >r 2!
+  rot >r r@ user' rp0 + @ 2 cells - dup >r 2!
   r>              swap 1+
-  r@ user' f0 + @ swap 1+
-  r@ user' l0 + @ swap 1+
-  cells r@ user' s0 + @ tuck swap - dup r@ user' save-task + !
+  r@ user' fp0 + @ swap 1+
+  r@ user' lp0 + @ swap 1+
+  cells r@ user' sp0 + @ tuck swap - dup r@ user' save-task + !
   ?DO  I !  cell  +LOOP  r> wake ;
 
 : activate ( task -- )  0 swap (pass) ;