X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?a=blobdiff_plain;f=src%2Flib.4th;h=e258ea7229a5a4259d4bd62f5612c8f78200c206;hb=87b17b0ee12c90f028186761fbb2bd5f6b4008eb;hp=28aa451a1ac43daf689b2f405f40a56c9ac9a231;hpb=68255a6a4e53c795c746157d0e870b49248907c5;p=forth.jl.git diff --git a/src/lib.4th b/src/lib.4th index 28aa451..e258ea7 100644 --- a/src/lib.4th +++ b/src/lib.4th @@ -1,3 +1,9 @@ +: \ IMMEDIATE + #TIB @ >IN ! +; \ We can now comment! + +\ BASIC DEFINITIONS ---------------------------------------------------------------------- + : / /MOD SWAP DROP ; : MOD /MOD DROP ; : */ -ROT * SWAP / ; @@ -8,32 +14,37 @@ : FALSE 0 ; : NOT 0= ; -: CELLS ; \ Allow for slightly more portable code +\ Translate a number of cells into memory units +\ (in our case 1 cell = 1 memory unit) +: CELLS ; + +\ Since the smallest unit of memory in our system is 64 bits and since strings +\ are stored as arrays of 64 bit integers, the character store/fetch words are +\ just aliases of the standard store/fetch words. +: C! ! ; +: C@ @ ; +: C, , ; -: DEPTH PSP@ PSP0 @ - ; +: DEPTH PSP@ PSP0 - ; : '\n' 10 ; : BL 32 ; : LITERAL IMMEDIATE ['] LIT , , ; -: ':' [ CHAR : ] LITERAL ; -: ';' [ CHAR ; ] LITERAL ; -: '(' [ CHAR ( ] LITERAL ; -: ')' [ CHAR ) ] LITERAL ; -: '<' [ CHAR < ] LITERAL ; -: '>' [ CHAR > ] LITERAL ; -: '"' [ CHAR " ] LITERAL ; -: 'A' [ CHAR A ] LITERAL ; -: '0' [ CHAR 0 ] LITERAL ; -: '-' [ CHAR - ] LITERAL ; -: '.' [ CHAR . ] LITERAL ; +: ' BL WORD FIND >CFA ; + +: CHAR BL WORD 1+ @ ; +: [CHAR] IMMEDIATE + CHAR + ['] LIT , , +; : CR '\n' emit ; : 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 @@ -45,9 +56,6 @@ , \ compile it ; -: DEBUGON TRUE DEBUG ! ; -: DEBUGOFF FALSE DEBUG ! ; - \ CONTROL STRUCTURES ---------------------------------------------------------------------- : IF IMMEDIATE @@ -140,6 +148,7 @@ ; : +LOOP IMMEDIATE + ['] DUP , \ Store copy of increment ['] R> , ['] SWAP , ['] R> , ['] SWAP , ['] R> , ['] SWAP , ['] + , ['] 2DUP , ['] - , @@ -206,12 +215,16 @@ : ( IMMEDIATE 1 \ allowed nested parens by keeping track of depth BEGIN - KEY \ read next character - DUP '(' = IF \ open paren? + >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 ELSE - ')' = IF \ close paren? + [CHAR] ) = IF \ close paren? 1- \ depth decreases THEN THEN @@ -283,10 +296,10 @@ ( print the remainder ) DUP 10 < IF - '0' ( decimal digits 0..9 ) + [CHAR] 0 ( decimal digits 0..9 ) ELSE 10 - ( hex and beyond digits A..Z ) - 'A' + [CHAR] A THEN + EMIT @@ -339,7 +352,7 @@ SWAP ( u flag ) IF ( was it negative? print the - character ) - '-' EMIT + [CHAR] - EMIT THEN U. @@ -348,8 +361,8 @@ : . 0 .R SPACE ; : .S ( -- ) - '<' EMIT DEPTH U. '>' EMIT SPACE - PSP0 @ 1+ + [CHAR] < EMIT DEPTH U. [CHAR] > EMIT SPACE + PSP0 1+ BEGIN DUP PSP@ 2 - <= WHILE @@ -383,11 +396,6 @@ ( STRINGS ---------------------------------------------------------------------- ) -( Since the smallest unit of memory in our system is 64 bits and since strings - are stored as arrays of 64 bit integers, the character store/fetch words are - just aliases of the standard store/fetch words. ) -: C! ! ; -: C@ @ ; ( Block copy, however, is important and novel: ) : CMOVE ( src dest length -- ) @@ -419,10 +427,15 @@ ['] 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 - KEY ( get next character of the string ) - DUP '"' <> + >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 @@ -433,10 +446,15 @@ SWAP ! ( and back-fill the length location ) ELSE ( immediate mode ) HERE @ ( get the start address of the temporary space ) - KEY DROP + BEGIN - KEY - DUP '"' <> + >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 ) @@ -449,52 +467,54 @@ ; : ." IMMEDIATE ( -- ) - STATE @ IF ( compiling? ) - [COMPILE] S" ( read the string, and compile LITSTRING, etc. ) - ['] TELL , ( compile the final TELL ) - ELSE - ( In immediate mode, just read characters and print them until we get - to the ending double quote. ) - KEY DROP - BEGIN - KEY - DUP '"' = IF - DROP ( drop the double quote character ) - EXIT ( return from this function ) - THEN - EMIT - AGAIN - THEN + [COMPILE] S" ( read the string, and compile LITSTRING, etc. ) + ['] TYPE , ( compile the final TYPE ) ; +: .( + BEGIN + >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 ) + THEN + EMIT + 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 - 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 ) ['] EXIT , ( append the codeword EXIT ) ; -: ALLOT ( n -- addr ) - HERE @ SWAP ( here n ) +: ALLOT ( n -- ) HERE +! ( adds n to HERE, after this the old value of HERE is still on the stack ) ; : VARIABLE + BL WORD HEADER + DOVAR , 1 CELLS ALLOT ( allocate 1 cell of memory, push the pointer to this memory ) - WORD HEADER ( make the dictionary entry (the name follows VARIABLE) ) - DOCOL , ( append DOCOL (the codeword field of this word) ) - ['] LIT , ( append the codeword LIT ) - , ( append the pointer to the new memory ) - ['] EXIT , ( append the codeword EXIT ) ; - : 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 ) @@ -502,9 +522,9 @@ ; : 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 ) - >DFA ( get a pointer to the first data field (the 'LIT') ) + >PFA ( get a pointer to the first data field (the 'LIT') ) 1+ ( increment to point at the value ) STATE @ IF ( compiling? ) ['] LIT , ( compile LIT ) @@ -517,9 +537,9 @@ ( 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 ) - >DFA ( get a pointer to the first data field (the 'LIT') ) + >PFA ( get a pointer to the first data field (the 'LIT') ) 1+ ( increment to point at the value ) STATE @ IF ( compiling? ) ['] LIT , ( compile LIT ) @@ -530,6 +550,17 @@ THEN ; +( Fill u ints, starting at a, with the value b ) +: FILL ( a u b -- ) + -ROT OVER + SWAP ?DO + DUP I ! + LOOP + DROP +; + +: ERASE ( a u -- ) + 0 FILL +; ( PRINTING THE DICTIONARY ------------------------------------------------------ ) @@ -584,7 +615,7 @@ ( 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 ) ; @@ -613,7 +644,14 @@ ; : 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). ) @@ -634,7 +672,7 @@ DUP >CFA @ CASE DOCOL OF \ Colon definition - ':' EMIT SPACE DUP ID. SPACE + [CHAR] : EMIT SPACE DUP ID. SPACE DUP ?IMMEDIATE IF ." IMMEDIATE " THEN CR ENDOF DOVAR OF @@ -654,12 +692,12 @@ ENDCASE ( begin the definition with : NAME [IMMEDIATE] ) - ( ':' EMIT SPACE DUP ID. SPACE + ( [CHAR] : EMIT SPACE DUP ID. SPACE DUP ?IMMEDIATE IF ." IMMEDIATE " THEN CR 4 ) 4 SPACES - >DFA ( get the data address, ie. points after DOCOL | end-of-word start-of-data ) + >PFA ( 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 ) @@ -673,11 +711,11 @@ . ( and print it ) ENDOF ['] LITSTRING OF ( is it LITSTRING ? ) - [ CHAR S ] LITERAL EMIT '"' EMIT SPACE ( print S" ) + [CHAR] S EMIT [CHAR] " EMIT SPACE ( print S" ) 1+ DUP @ ( get the length word ) SWAP 1+ SWAP ( end start+1 length ) - 2DUP TELL ( print the string ) - '"' EMIT SPACE ( finish the string with a final quote ) + 2DUP TYPE ( 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 ) ENDOF @@ -718,7 +756,7 @@ 1+ ( end start+1 ) REPEAT - ';' EMIT CR + [CHAR] ; EMIT CR 2DROP ( restore stack ) ;