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
RSP0 and PSP0 now constants. Closes #4.
[forth.jl.git]
/
src
/
lib.4th
diff --git
a/src/lib.4th
b/src/lib.4th
index
955cadf
..
e258ea7
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,13
+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 , , ;
+: ' BL WORD FIND >CFA ;
+
+: CHAR BL WORD 1+ @ ;
: [CHAR] IMMEDIATE
CHAR
['] LIT , ,
: [CHAR] IMMEDIATE
CHAR
['] LIT , ,
@@
-42,7
+44,7
@@
: SPACE BL emit ;
: [COMPILE] IMMEDIATE
: SPACE BL emit ;
: [COMPILE] IMMEDIATE
-
WORD
\ get the next word
+
BL WORD
\ get the next word
FIND \ find it in the dictionary
>CFA \ get its codeword
, \ and compile that
FIND \ find it in the dictionary
>CFA \ get its codeword
, \ and compile that
@@
-54,9
+56,6
@@
, \ compile it
;
, \ compile it
;
-: DEBUGON TRUE DEBUG ! ;
-: DEBUGOFF FALSE DEBUG ! ;
-
\ CONTROL STRUCTURES ----------------------------------------------------------------------
: IF IMMEDIATE
\ CONTROL STRUCTURES ----------------------------------------------------------------------
: IF IMMEDIATE
@@
-149,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 , ['] - ,
@@
-215,7
+215,11
@@
: ( IMMEDIATE
1 \ allowed nested parens by keeping track of depth
BEGIN
: ( IMMEDIATE
1 \ allowed nested parens by keeping track of depth
BEGIN
- KEY \ read next character
+ >IN @ #TIB @ >= IF \ End of TIB?
+ QUERY \ Get next line
+ THEN
+
+ 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
@@
-358,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,9
+427,14
@@
['] LITSTRING , ( compile LITSTRING )
HERE @ ( save the address of the length word on the stack )
0 , ( dummy length - we don't know what it is yet )
['] LITSTRING , ( compile LITSTRING )
HERE @ ( save the address of the length word on the stack )
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 )
DUP [CHAR] " <>
WHILE
C, ( copy character )
@@
-437,9
+446,14
@@
SWAP ! ( and back-fill the length location )
ELSE ( immediate mode )
HERE @ ( get the start address of the temporary space )
SWAP ! ( and back-fill the length location )
ELSE ( immediate mode )
HERE @ ( get the start address of the temporary space )
- 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] " <>
WHILE
OVER C! ( save next character )
DUP [CHAR] " <>
WHILE
OVER C! ( save next character )
@@
-454,13
+468,17
@@
: ." IMMEDIATE ( -- )
[COMPILE] S" ( read the string, and compile LITSTRING, etc. )
: ." IMMEDIATE ( -- )
[COMPILE] S" ( read the string, and compile LITSTRING, etc. )
- ['] T
ELL , ( compile the final TELL
)
+ ['] T
YPE , ( compile the final TYPE
)
;
: .(
;
: .(
- 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 )
@@
-469,11
+487,16
@@
AGAIN
;
AGAIN
;
+( Converts address of counted string into address of
+ start of string and length of string. )
+: COUNT ( addr1 -- addr2 n )
+ DUP 1+ SWAP @ ;
+
( CONSTANTS AND VARIABLES ------------------------------------------------------ )
: CONSTANT
( CONSTANTS AND VARIABLES ------------------------------------------------------ )
: CONSTANT
-
WORD HEADER
( make dictionary entry (the name follows CONSTANT) )
+
BL WORD HEADER
( make dictionary entry (the name follows CONSTANT) )
DOCOL , ( append DOCOL (the codeword field of this word) )
['] LIT , ( append the codeword LIT )
, ( append the value on the top of the stack )
DOCOL , ( append DOCOL (the codeword field of this word) )
['] LIT , ( append the codeword LIT )
, ( append the value on the top of the stack )
@@
-485,13
+508,13
@@
;
: 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 -- )
: VALUE ( n -- )
-
WORD HEADER
( make the dictionary entry (the name follows VALUE) )
+
BL WORD HEADER
( make the dictionary entry (the name follows VALUE) )
DOCOL , ( append DOCOL )
['] LIT , ( append the codeword LIT )
, ( append the initial value )
DOCOL , ( append DOCOL )
['] LIT , ( append the codeword LIT )
, ( append the initial value )
@@
-499,9
+522,9
@@
;
: TO IMMEDIATE ( n -- )
;
: TO IMMEDIATE ( n -- )
-
WORD
( get the name of the value )
+
BL WORD
( get the name of the value )
FIND ( look it up in the dictionary )
FIND ( look it up in the dictionary )
- >
D
FA ( get a pointer to the first data field (the 'LIT') )
+ >
P
FA ( get a pointer to the first data field (the 'LIT') )
1+ ( increment to point at the value )
STATE @ IF ( compiling? )
['] LIT , ( compile LIT )
1+ ( increment to point at the value )
STATE @ IF ( compiling? )
['] LIT , ( compile LIT )
@@
-514,9
+537,9
@@
( x +TO VAL adds x to VAL )
: +TO IMMEDIATE
( x +TO VAL adds x to VAL )
: +TO IMMEDIATE
-
WORD
( get the name of the value )
+
BL WORD
( get the name of the value )
FIND ( look it up in the dictionary )
FIND ( look it up in the dictionary )
- >
D
FA ( get a pointer to the first data field (the 'LIT') )
+ >
P
FA ( get a pointer to the first data field (the 'LIT') )
1+ ( increment to point at the value )
STATE @ IF ( compiling? )
['] LIT , ( compile LIT )
1+ ( increment to point at the value )
STATE @ IF ( compiling? )
['] LIT , ( compile LIT )
@@
-592,7
+615,7
@@
( FORGET ---------------------------------------------------------------------- )
: FORGET
( FORGET ---------------------------------------------------------------------- )
: FORGET
-
WORD FIND
( find the word, gets the dictionary entry address )
+
BL WORD FIND
( find the word, gets the dictionary entry address )
DUP @ LATEST ! ( set LATEST to point to the previous word )
HERE ! ( and store HERE with the dictionary address )
;
DUP @ LATEST ! ( set LATEST to point to the previous word )
HERE ! ( and store HERE with the dictionary address )
;
@@
-621,7
+644,14
@@
;
: SEE
;
: SEE
- WORD FIND ( find the dictionary entry to decompile )
+ BL WORD DUP FIND ( find the dictionary entry to decompile )
+
+ ?DUP 0= IF
+ ." Word '" COUNT TYPE ." ' not found in dictionary."
+ EXIT
+ THEN
+
+ 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). )
@@
-667,7
+697,7
@@
4 SPACES
4 SPACES
- >
D
FA ( get the data address, ie. points after DOCOL | end-of-word start-of-data )
+ >
P
FA ( get the data address, ie. points after DOCOL | end-of-word start-of-data )
( now we start decompiling until we hit the end of the word )
BEGIN ( end start )
( now we start decompiling until we hit the end of the word )
BEGIN ( end start )
@@
-684,7
+714,7
@@
[CHAR] S EMIT [CHAR] " EMIT SPACE ( print S"<space> )
1+ DUP @ ( get the length word )
SWAP 1+ SWAP ( end start+1 length )
[CHAR] S EMIT [CHAR] " EMIT SPACE ( print S"<space> )
1+ DUP @ ( get the length word )
SWAP 1+ SWAP ( end start+1 length )
- 2DUP T
ELL
( print the string )
+ 2DUP T
YPE
( print the string )
[CHAR] " EMIT SPACE ( finish the string with a final quote )
+ ( end start+1+len, aligned )
1- ( because we're about to add 4 below )
[CHAR] " EMIT SPACE ( finish the string with a final quote )
+ ( end start+1+len, aligned )
1- ( because we're about to add 4 below )