X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?a=blobdiff_plain;f=src%2Fscheme.4th;h=77103885d041bf90ddb2ae027365e95065d2b248;hb=bc2450b4b29d6bb8ba5422fb9eb7a75d1b6b5a57;hp=f8dd0899d0e02aac9094648a03be84f1f10ee6f6;hpb=a39894e12a9e84a17411e3bdd5d49fae3369e0d4;p=scheme.forth.jl.git

diff --git a/src/scheme.4th b/src/scheme.4th
index f8dd089..7710388 100644
--- a/src/scheme.4th
+++ b/src/scheme.4th
@@ -4,6 +4,7 @@ scheme definitions
 include term-colours.4th
 include defer-is.4th
 include catch-throw.4th
+include integer.4th
 include float.4th
 
 include debugging.4th
@@ -24,7 +25,8 @@ variable nexttype
     does> @ ;
 
 make-type fixnum-type
-make-type realnum-type
+make-type flonum-type
+make-type ratnum-type
 make-type boolean-type
 make-type character-type
 make-type string-type
@@ -34,7 +36,7 @@ make-type pair-type
 make-type symbol-type
 make-type primitive-proc-type
 make-type compound-proc-type
-make-type fileport-type
+make-type port-type
 : istype? ( obj type -- obj bool )
     over = ;
 
@@ -179,7 +181,7 @@ variable nextfree
     drop ;
 
 : fid>fileport ( fid -- fileport )
-    fileport-type ;
+    port-type ;
 
 : open-input-file ( addr n -- fileport )
     r/o open-file drop fid>fileport
@@ -190,7 +192,7 @@ variable nextfree
 ;
 
 objvar console-i/o-port
-0 fileport-type console-i/o-port obj!
+0 port-type console-i/o-port obj!
 
 objvar current-input-port
 console-i/o-port obj@ current-input-port obj!
@@ -304,6 +306,9 @@ create-symbol lambda            lambda-symbol
 create-symbol λ                 λ-symbol
 create-symbol begin             begin-symbol
 
+\ Symbol to be bound to welcome message procedure by library
+create-symbol welcome           welcome-symbol
+
 \ }}}
 
 \ ---- Environments ---- {{{
@@ -436,8 +441,6 @@ global-env obj!
     bl word
     count
 
-    \ 2dup ." Defining primitive " type ." ..." cr
-
     cstr>charlist
     charlist>symbol
   
@@ -459,6 +462,82 @@ global-env obj!
     then
 ;
 
+: ensure-arg-type-and-count ( tn tn-1 ... t2 t1 args n -- )
+    dup 0= if
+        drop nil objeq? false = if
+            recoverable-exception throw" Too many arguments for primitive procedure."
+        then
+    else
+        -rot nil? if
+            recoverable-exception throw" Too few arguments for primitive procedure."
+        then
+
+        2dup cdr 2swap car ( ... t1 n args' arg1 )
+        2rot 1- swap 2swap rot ( ... args' n-1 arg1 t1 )
+        istype? false = if
+            recoverable-exception throw" Incorrect type for primitive procedure."
+        then
+
+        2drop recurse
+    then
+
+;
+
+: push-args-to-stack ( args -- arg1 arg2 ... argn )
+    begin
+        nil? false =
+    while
+        2dup car 2swap cdr
+    repeat
+
+    2drop
+;
+
+: add-fa-checks ( cfa n -- cfa' )
+    here current @ 1+ dup @ , !
+    0 ,
+    here -rot
+    docol ,
+    ['] 2dup , ['] lit , , ['] ensure-arg-count ,
+    ['] push-args-to-stack ,
+    ['] lit , , ['] execute ,
+    ['] exit ,
+;
+
+: add-fa-type-checks ( cfa t1 t2 ... tn n -- cfa' )
+    here current @ 1+ dup @ , !
+    0 ,
+    here >R
+    docol ,
+    ['] 2dup ,
+    ['] >R , ['] >R ,
+
+    dup ( cfa t1 t2 ... tn n m )
+    
+    begin
+        ?dup 0>
+    while
+        rot ['] lit , , ( cfa t1 t2 ... tn-1 n m )
+        1-
+    repeat
+
+    ['] R> , ['] R> ,
+
+    ['] lit , , ['] ensure-arg-type-and-count ,
+
+    ['] push-args-to-stack ,
+    ['] lit , , ['] execute ,
+    ['] exit ,
+
+    R>
+;
+
+: make-fa-primitive ( cfa n -- )
+    add-fa-checks make-primitive ;
+
+: make-fa-type-primitive ( cfa t1 t2 ... tn n -- )
+    add-fa-type-checks make-primitive ;
+
 : arg-type-error
             bold fg red ." Incorrect argument type." reset-term cr
             abort
@@ -667,7 +746,7 @@ parse-idx-stack parse-idx-sp !
     delim? pop-parse-idx
 ;
 
-: realnum? ( -- bool )
+: flonum? ( -- bool )
     push-parse-idx
 
     minus? plus? or if
@@ -712,6 +791,42 @@ parse-idx-stack parse-idx-sp !
     pop-parse-idx
 ;
 
+: ratnum? ( -- bool )
+    push-parse-idx
+
+    minus? plus? or if
+        inc-parse-idx
+    then
+
+    digit? invert if
+        pop-parse-idx false exit
+    else
+        inc-parse-idx
+    then
+
+    begin digit? while
+        inc-parse-idx
+    repeat
+
+    [char] / nextchar <> if
+        pop-parse-idx false exit
+    else
+        inc-parse-idx
+    then
+
+    digit? invert if
+        pop-parse-idx false exit
+    else
+        inc-parse-idx
+    then
+
+    begin digit? while
+        inc-parse-idx
+    repeat
+
+    delim? pop-parse-idx
+;
+
 : boolean? ( -- bool )
     nextchar [char] # <> if false exit then
 
@@ -779,7 +894,7 @@ parse-idx-stack parse-idx-sp !
 : string? ( -- bool )
     nextchar [char] " = ;
 
-: readfixnum ( -- num-atom )
+: readfixnum ( -- fixnum )
     plus? minus? or if
         minus?
         inc-parse-idx
@@ -799,22 +914,54 @@ parse-idx-stack parse-idx-sp !
     fixnum-type
 ;
 
-: readrealnum ( -- realnum )
+: readflonum ( -- flonum )
+    readfixnum drop
+    dup 0< swap abs i->f
 
-    \ Remember that at this point we're guaranteed to
-    \ have a parsable real on this line.
+    [char] . nextchar = if
+        inc-parse-idx
 
-    parse-str parse-idx @ +
+        10.0 ( f exp )
 
-    begin delim? false = while
+        begin digit? while
+            nextchar [char] 0 - i->f ( f exp d )
+            over f/ rot f+ ( exp f' )
+            swap 10.0 f* ( f' exp' )
             inc-parse-idx
-    repeat
+        repeat
 
-    parse-str parse-idx @ + over -
+        drop
+    then
+
+    [char] e nextchar = [char] E nextchar = or if
+        inc-parse-idx
+        10.0
+        readfixnum drop i->f
+        f^ f*
+    then
 
-    float-parse
+    swap if
+        -1.0 f*
+    then
 
-    realnum-type
+    flonum-type
+;
+
+: make-rational ( fixnum fixnum -- ratnum|fixnum )
+    drop swap drop
+    simplify
+
+    dup 1 = if
+        drop fixnum-type
+    else
+        fixnum-type swap fixnum-type
+        cons drop ratnum-type
+    then
+;
+
+: readratnum ( -- ratnum )
+    readfixnum inc-parse-idx readfixnum
+    make-rational
 ;
 
 : readbool ( -- bool-obj )
@@ -845,35 +992,51 @@ parse-idx-stack parse-idx-sp !
 ;
 
 : readstring ( -- charlist )
-    nextchar [char] " = if
-        inc-parse-idx
 
-        delim? false = if
-            bold fg red
-            ." No delimiter following right double quote. Aborting." cr
-            reset-term abort
+    nil nil
+
+    begin
+        nextchar [char] " <>
+    while
+        nextchar [char] \ = if
+            inc-parse-idx
+            nextchar case
+                [char] n of '\n' endof
+                [char] " of [char] " endof
+                [char] \
+            endcase
+        else
+            nextchar
         then
+        inc-parse-idx character-type
+        nil cons
 
-        dec-parse-idx
+        ( firstchar prevchar thischar )
 
-        0 nil-type exit
-    then
+        2swap nil? if
+            2drop 2swap 2drop 2dup  ( thischar thischar )
+        else
+            ( firstchar thischar prevchar )
+            2over 2swap  set-cdr! ( firstchar thischar )
+        then
+    repeat
 
-    nextchar [char] \ = if
-        inc-parse-idx
-        nextchar case
-            [char] n of '\n' endof
-            [char] " of [char] " endof
-            [char] \
-        endcase
-    else
-        nextchar
+    \ Discard previous character
+    2drop
+
+    inc-parse-idx
+    delim? false = if
+        bold fg red
+        ." No delimiter following right double quote. Aborting." cr
+        reset-term abort
     then
-    inc-parse-idx character-type
 
-    recurse
+    dec-parse-idx
 
-    cons
+    nil? if
+        nil cons
+    then
+    drop string-type
 ;
 
 : readsymbol ( -- charlist )
@@ -938,8 +1101,13 @@ parse-idx-stack parse-idx-sp !
         exit
     then
 
-    realnum? if
-        readrealnum
+    flonum? if
+        readflonum
+        exit
+    then
+
+    ratnum? if
+        readratnum
         exit
     then
 
@@ -957,7 +1125,6 @@ parse-idx-stack parse-idx-sp !
         inc-parse-idx
 
         readstring
-        drop string-type
 
         nextchar [char] " <> if
             bold red ." Missing closing double-quote." reset-term cr
@@ -1032,7 +1199,8 @@ parse-idx-stack parse-idx-sp !
 : self-evaluating? ( obj -- obj bool )
     boolean-type istype? if true exit then
     fixnum-type istype? if true exit then
-    realnum-type istype? if true exit then
+    flonum-type istype? if true exit then
+    ratnum-type istype? if true exit then
     character-type istype? if true exit then
     string-type istype? if true exit then
     nil-type istype? if true exit then
@@ -1522,11 +1690,16 @@ hide env
 
 \ ---- Print ---- {{{
 
-: printfixnum ( fixnumobj -- ) drop 0 .R ;
+: printfixnum ( fixnum -- ) drop 0 .R ;
 
-: printrealnum ( realnumobj -- ) drop float-print ;
+: printflonum ( flonum -- ) drop f. ;
 
-: printbool ( numobj -- )
+: printratnum ( ratnum -- )
+    drop pair-type 2dup
+    car print ." /" cdr print
+;
+
+: printbool ( bool -- )
     drop if
         ." #t"
     else
@@ -1596,7 +1769,8 @@ hide env
 
 :noname ( obj -- )
     fixnum-type istype? if printfixnum exit then
-    realnum-type istype? if printrealnum exit then
+    flonum-type istype? if printflonum exit then
+    ratnum-type istype? if printratnum exit then
     boolean-type istype? if printbool exit then
     character-type istype? if printchar exit then
     string-type istype? if printstring exit then
@@ -1606,6 +1780,7 @@ hide env
     primitive-proc-type istype? if printprim exit then
     compound-proc-type istype? if printcomp exit then
     none-type istype? if printnone exit then
+    port-type istype? if printport exit then
 
     recoverable-exception throw" Tried to print object with unknown type."
 ; is print
@@ -1718,24 +1893,6 @@ variable gc-stack-depth
 
 \ ---- Loading files ---- {{{
 
-: charlist>cstr ( charlist addr -- n )
-
-    dup 2swap ( origaddr addr charlist )
-
-    begin 
-        nil? false =
-    while
-        2dup cdr 2swap car 
-        drop ( origaddr addr charlist char )
-        -rot 2swap ( origaddr charlist addr char )
-        over !
-        1+ -rot ( origaddr nextaddr charlist )
-    repeat
-
-    2drop ( origaddr finaladdr ) 
-    swap -
-;
-
 : load ( addr n -- finalResult )
     open-input-file
 
@@ -1789,13 +1946,14 @@ variable gc-stack-depth
 ;
 
 : repl
-    cr ." Welcome to scheme.forth.jl!" cr
-       ." Use Ctrl-D to exit." cr
 
     empty-parse-str
 
     enable-gc
 
+    \ Display welcome message
+    welcome-symbol nil cons global-env obj@ eval 2drop
+
     begin
         ['] repl-body catch
         case