projects
/
rrq
/
jonasforth.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move some Forth words to separate 'bootstrap.asm' file
[rrq/jonasforth.git]
/
sys.f
diff --git
a/sys.f
b/sys.f
index 604d87aa75e71f116f1177d048e18c4028a5b4b6..6b13ff9775b5b0ad93c26ada9e83e00c504b8feb 100644
(file)
--- a/
sys.f
+++ b/
sys.f
@@
-10,10
+10,6
@@
EXIT [
EXIT
[ IMMEDIATE
EXIT
[ IMMEDIATE
-: / /MOD DROP ;
-: MOD /MOD SWAP DROP ;
-: NEG 0 SWAP - ;
-
: IF IMMEDIATE
' 0BRANCH ,
HERE @
: IF IMMEDIATE
' 0BRANCH ,
HERE @
@@
-37,48
+33,55
@@
EXIT [
HERE @
;
HERE @
;
+: AGAIN IMMEDIATE
+ ' BRANCH ,
+ HERE @ - , ;
+
+: ( IMMEDIATE
+ BEGIN
+ READ-WORD
+ 1 = IF
+ C@ 41 = IF
+ EXIT
+ THEN
+ ELSE
+ DROP
+ THEN
+ AGAIN ;
+
: UNTIL IMMEDIATE
' 0BRANCH ,
HERE @ - ,
;
: UNTIL IMMEDIATE
' 0BRANCH ,
HERE @ - ,
;
-: FIB
- 0 1
- 0
- BEGIN
- ROT
- DUP ROT +
- ROT ROT
+( Compile a literal value into the current word. )
+: LIT, IMMEDIATE ( x -- )
+ ' LIT , , ;
- 1 +
- DUP 4 PICK = UNTIL
- DROP SWAP DROP SWAP DROP
-;
+: / /MOD DROP ;
+: MOD /MOD SWAP DROP ;
+: NEG 0 SWAP - ;
: C,
HERE @ C!
HERE @ 1 +
HERE ! ;
: C,
HERE @ C!
HERE @ 1 +
HERE ! ;
-: OVER
- SWAP DUP ROT ;
+: OVER ( a b -- a b a ) SWAP DUP ROT ;
-: STORE-STRING
+( 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 ;
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
+: NEWLINE 10 EMIT ;
+: SPACE 32 EMIT ;
-S" 10 FIB = " TELL
-10 FIB .U
-S" (Expected: 59)" TELL NEWLINE
+( Read a number from standard input. )
+: READ-NUMBER READ-WORD PARSE-NUMBER ;
+( vim: syntax=forth
+)