The Lambda Lab
/
projects
/
forth.jl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CREATE/DOES> working. Closes #2.
[forth.jl.git]
/
src
/
lib.4th
diff --git
a/src/lib.4th
b/src/lib.4th
index
c9df3d9
..
647b499
100644
(file)
--- a/
src/lib.4th
+++ b/
src/lib.4th
@@
-1,6
+1,5
@@
: \ IMMEDIATE
: \ IMMEDIATE
- KEY
- 10 = 0BRANCH [ -5 , ]
+ #TIB @ >IN !
; \ We can now comment!
\ BASIC DEFINITIONS ----------------------------------------------------------------------
; \ We can now comment!
\ BASIC DEFINITIONS ----------------------------------------------------------------------
@@
-26,18
+25,16
@@
: C@ @ ;
: C, , ;
: C@ @ ;
: C, , ;
-: DEPTH PSP@ PSP0
@
- ;
+: DEPTH PSP@ PSP0 - ;
: '\n' 10 ;
: BL 32 ;
: LITERAL IMMEDIATE ['] LIT , , ;
: '\n' 10 ;
: BL 32 ;
: LITERAL IMMEDIATE ['] LIT , , ;
-: CHAR
- BL WORD
- DROP @
-;
+: ' BL WORD FIND >CFA ;
+: CHAR BL WORD 1+ @ ;
: [CHAR] IMMEDIATE
CHAR
['] LIT , ,
: [CHAR] IMMEDIATE
CHAR
['] LIT , ,
@@
-59,61
+56,58
@@
, \ compile it
;
, \ compile it
;
-: DEBUGON TRUE DEBUG ! ;
-: DEBUGOFF FALSE DEBUG ! ;
-
\ CONTROL STRUCTURES ----------------------------------------------------------------------
: IF IMMEDIATE
['] 0BRANCH , \ compile 0BRANCH
\ CONTROL STRUCTURES ----------------------------------------------------------------------
: IF IMMEDIATE
['] 0BRANCH , \ compile 0BRANCH
- HERE
@
\ save location of the offset on the stack
+ HERE \ save location of the offset on the stack
0 , \ compile a dummy offset
;
: THEN IMMEDIATE
DUP
0 , \ compile a dummy offset
;
: THEN IMMEDIATE
DUP
- HERE
@
SWAP - \ calculate the offset from the address saved on the stack
+ HERE SWAP - \ calculate the offset from the address saved on the stack
SWAP ! \ store the offset in the back-filled location
;
: ELSE IMMEDIATE
['] BRANCH , \ definite branch to just over the false-part
SWAP ! \ store the offset in the back-filled location
;
: ELSE IMMEDIATE
['] BRANCH , \ definite branch to just over the false-part
- HERE
@
\ save location of the offset on the stack
+ HERE \ save location of the offset on the stack
0 , \ compile a dummy offset
SWAP \ now back-fill the original (IF) offset
DUP \ same as for THEN word above
0 , \ compile a dummy offset
SWAP \ now back-fill the original (IF) offset
DUP \ same as for THEN word above
- HERE
@
SWAP -
+ HERE SWAP -
SWAP !
;
: BEGIN IMMEDIATE
SWAP !
;
: BEGIN IMMEDIATE
- HERE
@
\ save location on the stack
+ HERE \ save location on the stack
;
: UNTIL IMMEDIATE
['] 0BRANCH , \ compile 0BRANCH
;
: UNTIL IMMEDIATE
['] 0BRANCH , \ compile 0BRANCH
- HERE
@
- \ calculate the offset from the address saved on the stack
+ HERE - \ calculate the offset from the address saved on the stack
, \ compile the offset here
;
: AGAIN IMMEDIATE
['] BRANCH , \ compile BRANCH
, \ compile the offset here
;
: AGAIN IMMEDIATE
['] BRANCH , \ compile BRANCH
- HERE
@
- \ calculate the offset back
+ HERE - \ calculate the offset back
, \ compile the offset here
;
: WHILE IMMEDIATE
['] 0BRANCH , \ compile 0BRANCH
, \ compile the offset here
;
: WHILE IMMEDIATE
['] 0BRANCH , \ compile 0BRANCH
- HERE
@
\ save location of the offset2 on the stack
+ HERE \ save location of the offset2 on the stack
0 , \ compile a dummy offset2
;
: REPEAT IMMEDIATE
['] BRANCH , \ compile BRANCH
SWAP \ get the original offset (from BEGIN)
0 , \ compile a dummy offset2
;
: REPEAT IMMEDIATE
['] BRANCH , \ compile BRANCH
SWAP \ get the original offset (from BEGIN)
- HERE
@
- , \ and compile it after BRANCH
+ HERE - , \ and compile it after BRANCH
DUP
DUP
- HERE
@
SWAP - \ calculate the offset2
+ HERE SWAP - \ calculate the offset2
SWAP ! \ and back-fill it in the original location
;
SWAP ! \ and back-fill it in the original location
;
@@
-125,15
+119,15
@@
: DO IMMEDIATE
['] LIT , -1 , [COMPILE] IF
['] >R , ['] >R ,
: DO IMMEDIATE
['] LIT , -1 , [COMPILE] IF
['] >R , ['] >R ,
- ['] LIT , HERE
@
0 , ['] >R ,
- HERE
@
+ ['] LIT , HERE 0 , ['] >R ,
+ HERE
;
: ?DO IMMEDIATE
['] 2DUP , ['] - , [COMPILE] IF
['] >R , ['] >R ,
;
: ?DO IMMEDIATE
['] 2DUP , ['] - , [COMPILE] IF
['] >R , ['] >R ,
- ['] LIT , HERE
@
0 , ['] >R ,
- HERE
@
+ ['] LIT , HERE 0 , ['] >R ,
+ HERE
;
: I RSP@ 3 - @ ;
;
: I RSP@ 3 - @ ;
@@
-143,7
+137,7
@@
: ?LEAVE IMMEDIATE
['] 0BRANCH , 13 ,
['] R> , ['] RDROP , ['] RDROP ,
: ?LEAVE IMMEDIATE
['] 0BRANCH , 13 ,
['] R> , ['] RDROP , ['] RDROP ,
- ['] LIT , HERE
@
7 + , ['] DUP , ['] -ROT , ['] - , ['] SWAP , ['] ! ,
+ ['] LIT , HERE 7 + , ['] DUP , ['] -ROT , ['] - , ['] SWAP , ['] ! ,
['] BRANCH ,
0 ,
;
['] BRANCH ,
0 ,
;
@@
-154,6
+148,7
@@
;
: +LOOP IMMEDIATE
;
: +LOOP IMMEDIATE
+
['] DUP , \ Store copy of increment
['] R> , ['] SWAP , ['] R> , ['] SWAP , ['] R> , ['] SWAP , ['] + , ['] 2DUP , ['] - ,
['] DUP , \ Store copy of increment
['] R> , ['] SWAP , ['] R> , ['] SWAP , ['] R> , ['] SWAP , ['] + , ['] 2DUP , ['] - ,
@@
-167,13
+162,13
@@
[COMPILE] THEN
\ Branch back to begining of loop kernel
[COMPILE] THEN
\ Branch back to begining of loop kernel
- ['] 0BRANCH , HERE
@
- ,
+ ['] 0BRANCH , HERE - ,
\ Clean up
['] RDROP , ['] RDROP , ['] RDROP ,
\ Record address of loop end for any LEAVEs to use
\ Clean up
['] RDROP , ['] RDROP , ['] RDROP ,
\ Record address of loop end for any LEAVEs to use
- HERE
@
SWAP !
+ HERE SWAP !
[COMPILE] ELSE
['] 2DROP , \ Clean up if loop was entirely skipped (?DO)
[COMPILE] ELSE
['] 2DROP , \ Clean up if loop was entirely skipped (?DO)
@@
-220,11
+215,11
@@
: ( IMMEDIATE
1 \ allowed nested parens by keeping track of depth
BEGIN
: ( IMMEDIATE
1 \ allowed nested parens by keeping track of depth
BEGIN
- >IN
#TIB
>= IF \ End of TIB?
+ >IN
@ #TIB @
>= IF \ End of TIB?
QUERY \ Get next line
THEN
QUERY \ Get next line
THEN
-
>IN
@ 1 >IN +!
+
TIB >IN @ +
@ 1 >IN +!
DUP [CHAR] ( = IF \ open paren?
DROP \ drop the open paren
1+ \ depth increases
DUP [CHAR] ( = IF \ open paren?
DROP \ drop the open paren
1+ \ depth increases
@@
-367,7
+362,7
@@
: .S ( -- )
[CHAR] < EMIT DEPTH U. [CHAR] > EMIT SPACE
: .S ( -- )
[CHAR] < EMIT DEPTH U. [CHAR] > EMIT SPACE
- PSP0
@
1+
+ PSP0 1+
BEGIN
DUP PSP@ 2 - <=
WHILE
BEGIN
DUP PSP@ 2 - <=
WHILE
@@
-423,40
+418,50
@@
( C, appends a byte to the current compiled word. )
: C,
( C, appends a byte to the current compiled word. )
: C,
- HERE
@
C!
- 1 H
ERE
+!
+ HERE C!
+ 1 H +!
;
: S" IMMEDIATE ( -- addr len )
STATE @ IF ( compiling? )
['] LITSTRING , ( compile LITSTRING )
;
: S" IMMEDIATE ( -- addr len )
STATE @ IF ( compiling? )
['] LITSTRING , ( compile LITSTRING )
- HERE
@
( save the address of the length word on the stack )
+ HERE ( save the address of the length word on the stack )
0 , ( dummy length - we don't know what it is yet )
0 , ( dummy length - we don't know what it is yet )
- KEY DROP
+
BEGIN
BEGIN
- KEY ( get next character of the string )
+ >IN @ #TIB @ >= IF \ End of TIB?
+ QUERY \ Get next line
+ THEN
+
+ TIB >IN @ + @ 1 >IN +! \ Get char from TIB
+
DUP [CHAR] " <>
WHILE
C, ( copy character )
REPEAT
DROP ( drop the double quote character at the end )
DUP ( get the saved address of the length word )
DUP [CHAR] " <>
WHILE
C, ( copy character )
REPEAT
DROP ( drop the double quote character at the end )
DUP ( get the saved address of the length word )
- HERE
@
SWAP - ( calculate the length )
+ HERE SWAP - ( calculate the length )
1- ( subtract 1 (because we measured from the start of the length word) )
SWAP ! ( and back-fill the length location )
ELSE ( immediate mode )
1- ( subtract 1 (because we measured from the start of the length word) )
SWAP ! ( and back-fill the length location )
ELSE ( immediate mode )
- HERE
@
( get the start address of the temporary space )
- KEY DROP
+ HERE ( get the start address of the temporary space )
+
BEGIN
BEGIN
- KEY
+ >IN @ #TIB @ >= IF \ End of TIB?
+ QUERY \ Get next line
+ THEN
+
+ TIB >IN @ + @ 1 >IN +! \ Get char from TIB
+
DUP [CHAR] " <>
WHILE
OVER C! ( save next character )
1+ ( increment address )
REPEAT
DROP ( drop the final " character )
DUP [CHAR] " <>
WHILE
OVER C! ( save next character )
1+ ( increment address )
REPEAT
DROP ( drop the final " character )
- HERE
@
- ( calculate the length )
- HERE
@
( push the start address )
+ HERE - ( calculate the length )
+ HERE ( push the start address )
SWAP ( addr len )
THEN
;
SWAP ( addr len )
THEN
;
@@
-467,9
+472,13
@@
;
: .(
;
: .(
- KEY DROP
BEGIN
BEGIN
- KEY
+ >IN @ #TIB @ >= IF \ End of TIB?
+ QUERY \ Get next line
+ THEN
+
+ TIB >IN @ + @ 1 >IN +! \ Get char from TIB
+
DUP [CHAR] ) = IF
DROP ( drop the double quote character )
EXIT ( return from this function )
DUP [CHAR] ) = IF
DROP ( drop the double quote character )
EXIT ( return from this function )
@@
-495,15
+504,15
@@
;
: ALLOT ( n -- )
;
: ALLOT ( n -- )
- H
ERE +! ( adds n to HERE, after this the old value of HERE
is still on the stack )
+ H
+! ( adds n to H, after this the old value of H
is still on the stack )
;
: VARIABLE
;
: VARIABLE
- CREATE
+ BL WORD HEADER
+ DOVAR ,
1 CELLS ALLOT ( allocate 1 cell of memory, push the pointer to this memory )
;
1 CELLS ALLOT ( allocate 1 cell of memory, push the pointer to this memory )
;
-
: VALUE ( n -- )
BL WORD HEADER ( make the dictionary entry (the name follows VALUE) )
DOCOL , ( append DOCOL )
: VALUE ( n -- )
BL WORD HEADER ( make the dictionary entry (the name follows VALUE) )
DOCOL , ( append DOCOL )
@@
-608,7
+617,7
@@
: FORGET
BL WORD FIND ( find the word, gets the dictionary entry address )
DUP @ LATEST ! ( set LATEST to point to the previous word )
: FORGET
BL WORD FIND ( find the word, gets the dictionary entry address )
DUP @ LATEST ! ( set LATEST to point to the previous word )
- H
ERE ! ( and store HERE
with the dictionary address )
+ H
! ( and store H
with the dictionary address )
;
( DUMP ------------------------------------------------------------------------ )
;
( DUMP ------------------------------------------------------------------------ )
@@
-635,18
+644,18
@@
;
: SEE
;
: SEE
- BL WORD
2
DUP FIND ( find the dictionary entry to decompile )
+ BL WORD DUP FIND ( find the dictionary entry to decompile )
?DUP 0= IF
?DUP 0= IF
- ." Word '" TYPE ." ' not found in dictionary."
+ ." Word '"
COUNT
TYPE ." ' not found in dictionary."
EXIT
THEN
EXIT
THEN
-
-ROT 2
DROP
+
SWAP
DROP
( Now we search again, looking for the next word in the dictionary. This gives us
the length of the word that we will be decompiling. (Well, mostly it does). )
( Now we search again, looking for the next word in the dictionary. This gives us
the length of the word that we will be decompiling. (Well, mostly it does). )
- HERE
@
( address of the end of the last compiled word )
+ HERE ( address of the end of the last compiled word )
LATEST @ ( word last curr )
BEGIN
2 PICK ( word last curr word )
LATEST @ ( word last curr )
BEGIN
2 PICK ( word last curr word )
@@
-756,4
+765,4
@@
( MEMORY ------------------------------------------------------------------ )
: UNUSED ( -- cells )
( MEMORY ------------------------------------------------------------------ )
: UNUSED ( -- cells )
- MEMSIZE HERE
@
- ;
+ MEMSIZE HERE - ;