X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?p=forth.jl.git;a=blobdiff_plain;f=src%2Flib.4th;h=2312aeb1727ca682657c07e0d484dfb5eb7c7386;hp=81b1e6fc8403a7b1977526033846ac314f2ec611;hb=b593ff258f6b62e7bd7c00b566d8f4f812b0f95a;hpb=dfc28eefbcea7eb34cf9c1e0df010322b291c40a diff --git a/src/lib.4th b/src/lib.4th index 81b1e6f..2312aeb 100644 --- a/src/lib.4th +++ b/src/lib.4th @@ -25,7 +25,7 @@ : C@ @ ; : C, , ; -: DEPTH PSP@ PSP0 @ - ; +: DEPTH PSP@ PSP0 - ; : '\n' 10 ; : BL 32 ; @@ -60,54 +60,54 @@ : 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 - 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 - 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 - HERE @ SWAP - + HERE SWAP - SWAP ! ; : BEGIN IMMEDIATE - HERE @ \ save location on the stack + HERE \ save location on the stack ; : 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 - HERE @ - \ calculate the offset back + HERE - \ calculate the offset back , \ 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) - HERE @ - , \ and compile it after BRANCH + HERE - , \ and compile it after BRANCH DUP - HERE @ SWAP - \ calculate the offset2 + HERE SWAP - \ calculate the offset2 SWAP ! \ and back-fill it in the original location ; @@ -119,15 +119,15 @@ : 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 , - ['] LIT , HERE @ 0 , ['] >R , - HERE @ + ['] LIT , HERE 0 , ['] >R , + HERE ; : I RSP@ 3 - @ ; @@ -137,7 +137,7 @@ : ?LEAVE IMMEDIATE ['] 0BRANCH , 13 , ['] R> , ['] RDROP , ['] RDROP , - ['] LIT , HERE @ 7 + , ['] DUP , ['] -ROT , ['] - , ['] SWAP , ['] ! , + ['] LIT , HERE 7 + , ['] DUP , ['] -ROT , ['] - , ['] SWAP , ['] ! , ['] BRANCH , 0 , ; @@ -162,13 +162,13 @@ [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 - HERE @ SWAP ! + HERE SWAP ! [COMPILE] ELSE ['] 2DROP , \ Clean up if loop was entirely skipped (?DO) @@ -362,7 +362,7 @@ : .S ( -- ) [CHAR] < EMIT DEPTH U. [CHAR] > EMIT SPACE - PSP0 @ 1+ + PSP0 1+ BEGIN DUP PSP@ 2 - <= WHILE @@ -418,40 +418,50 @@ ( C, appends a byte to the current compiled word. ) : C, - HERE @ C! - 1 HERE +! + HERE C! + 1 H +! ; : 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 ) - KEY DROP + 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 ) - 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 ) - HERE @ ( get the start address of the temporary space ) - KEY DROP + HERE ( get the start address of the temporary space ) + 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 ) - HERE @ - ( calculate the length ) - HERE @ ( push the start address ) + HERE - ( calculate the length ) + HERE ( push the start address ) SWAP ( addr len ) THEN ; @@ -462,9 +472,13 @@ ; : .( - KEY DROP 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 ) @@ -482,15 +496,12 @@ ( CONSTANTS AND VARIABLES ------------------------------------------------------ ) : 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 ) + CREATE , +DOES> @ ; : ALLOT ( n -- ) - HERE +! ( 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 @@ -498,20 +509,15 @@ 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 ) - ['] LIT , ( append the codeword LIT ) - , ( append the initial value ) - ['] EXIT , ( append the codeword EXIT ) + CREATE , +DOES> @ ; : TO IMMEDIATE ( n -- ) BL WORD ( get the name of the value ) FIND ( look it up in the dictionary ) >PFA ( get a pointer to the first data field (the 'LIT') ) - 1+ ( increment to point at the value ) STATE @ IF ( compiling? ) ['] LIT , ( compile LIT ) , ( compile the address of the value ) @@ -526,7 +532,6 @@ BL WORD ( get the name of the value ) FIND ( look it up in the dictionary ) >PFA ( get a pointer to the first data field (the 'LIT') ) - 1+ ( increment to point at the value ) STATE @ IF ( compiling? ) ['] LIT , ( compile LIT ) , ( compile the address of the value ) @@ -603,7 +608,7 @@ : FORGET 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 ) + H ! ( and store H with the dictionary address ) ; ( DUMP ------------------------------------------------------------------------ ) @@ -630,18 +635,18 @@ ; : SEE - BL WORD 2DUP FIND ( find the dictionary entry to decompile ) + BL WORD DUP FIND ( find the dictionary entry to decompile ) ?DUP 0= IF - ." Word '" TYPE ." ' not found in dictionary." + ." Word '" COUNT TYPE ." ' not found in dictionary." EXIT THEN - -ROT 2DROP + 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). ) - 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 ) @@ -751,4 +756,4 @@ ( MEMORY ------------------------------------------------------------------ ) : UNUSED ( -- cells ) - MEMSIZE HERE @ - ; + MEMSIZE HERE - ;