X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=sys.f;h=d222320fcfe931fcf5e54db18749ae045ba4fbc0;hb=35d467b9ab869cc9a4f1068b112d5f22ca483afd;hp=df2d231a8266511b8dcfe5cc251f1be28bd4055f;hpb=03fd7979b12ff7cc5d074bb83c9d4e3fcdf616c3;p=rrq%2Fjonasforth.git

diff --git a/sys.f b/sys.f
index df2d231..d222320 100644
--- a/sys.f
+++ b/sys.f
@@ -10,10 +10,6 @@ EXIT [
   EXIT
 [ IMMEDIATE
 
-: / /MOD DROP ;
-: MOD /MOD SWAP DROP ;
-: NEG 0 SWAP - ;
-
 : IF IMMEDIATE
   ' 0BRANCH ,
   HERE @
@@ -26,3 +22,83 @@ EXIT [
   SWAP !
 ;
 
+: ELSE IMMEDIATE
+  ' BRANCH ,
+  HERE @
+  0 ,
+  SWAP DUP HERE @ SWAP - SWAP !
+;
+
+: BEGIN IMMEDIATE
+  HERE @
+;
+
+: AGAIN IMMEDIATE
+  ' BRANCH ,
+  HERE @ - , ;
+
+: ( IMMEDIATE
+  BEGIN
+    READ-WORD
+    1 = IF
+      C@ 41 = IF
+        EXIT
+      THEN
+    ELSE
+      DROP
+    THEN
+  AGAIN ;
+
+: UNTIL IMMEDIATE
+  ' 0BRANCH ,
+  HERE @ - ,
+;
+
+( Compile a literal value into the current word. )
+: LIT, IMMEDIATE ( x -- )
+  ' LIT , , ;
+
+: / /MOD DROP ;
+: MOD /MOD SWAP DROP ;
+: NEG 0 SWAP - ;
+
+: FIB ( n -- Fn )
+  0 1                            ( n a b )
+  0                              ( n a b i )
+  BEGIN
+    ROT                          ( n i a b )
+    DUP ROT +                    ( n i b a+b )
+    ROT ROT                      ( n b a+b i )
+
+    1 +                          ( n b a+b i+1 )
+  DUP 4 PICK = UNTIL
+  DROP SWAP DROP SWAP DROP ;     ( a+b )
+
+: C,
+  HERE @ C!
+  HERE @ 1 +
+  HERE ! ;
+
+: OVER ( a b -- a b a ) SWAP DUP ROT ;
+
+( Compile the given string into the current word directly. )
+: STORE-STRING ( str len -- )
+  BEGIN
+    OVER C@ C,
+    SWAP 1 + SWAP
+  1 - DUP 0 = UNTIL
+  DROP DROP ;
+
+S" HELLO-ADDR" CREATE
+S" Hello!" DUP ROT
+STORE-STRING
+: HELLO
+  ' HELLO-ADDR LIT, TELL NEWLINE ;
+
+HELLO
+
+S" 10 FIB = " TELL
+10 FIB .U
+S"  (Expected: 59)" TELL NEWLINE
+
+TERMINATE