X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?a=blobdiff_plain;f=scheme.4th;h=d6b362158a612082750f44e0a725c56837b8ccf7;hb=61f902750c854d52bc37a5903e07b7e84f7081c4;hp=12c07d2a72cbaa02dfe6f04cf54e0ef229e80420;hpb=8db1ca2b987bbea36b7f1f9a1ab1baafb49fef9e;p=scheme.forth.jl.git diff --git a/scheme.4th b/scheme.4th index 12c07d2..d6b3621 100644 --- a/scheme.4th +++ b/scheme.4th @@ -180,7 +180,7 @@ console-i/o-port obj@ current-input-port obj! objvar symbol-table : duplicate-charlist ( charlist -- copy ) - 2dup nil objeq? false = if + nil? false = if 2dup car 2swap cdr recurse cons then ; @@ -239,7 +239,7 @@ objvar symbol-table ; -: cstr>charlist ( addr n -- symbol-obj ) +: cstr>charlist ( addr n -- charlist ) dup 0= if 2drop nil else @@ -256,13 +256,7 @@ objvar symbol-table count cstr>charlist - drop symbol-type - - 2dup - - symbol-table obj@ - cons - symbol-table obj! + charlist>symbol create swap , , does> dup @ swap 1+ @ @@ -336,7 +330,7 @@ objvar vals : get-vars-vals ( var env -- vars? vals? bool ) begin - 2dup nil objeq? false = + nil? false = while 2over 2over first-frame get-vars-vals-frame if @@ -402,6 +396,54 @@ objvar global-env nil nil nil extend-env global-env obj! +\ }}} + +\ ---- Primitives ---- {{{ + +: make-primitive ( cfa -- ) + bl word + count + + \ 2dup ." Defining primitive " type ." ..." cr + + cstr>charlist + charlist>symbol + + rot primitive-proc-type ( var prim ) + global-env obj@ define-var +; + +: arg-count-error + bold fg red ." Incorrect argument count." reset-term cr + abort +; + +: ensure-arg-count ( args n -- ) + dup 0= if + drop nil objeq? false = if + arg-count-error + then + else + -rot nil? if + arg-count-error + then + + cdr rot 1- recurse + then +; + +: arg-type-error + bold fg red ." Incorrect argument type." reset-term cr + abort +; + +: ensure-arg-type ( arg type -- arg ) + istype? false = if + arg-type-error + then +; + + \ }}} \ ---- Macros ---- {{{ @@ -422,7 +464,11 @@ objvar macro-table car cdr exit then + + cdr repeat + + 2swap 2drop ; : make-macro ( name_symbol params body env -- ) @@ -442,6 +488,8 @@ objvar macro-table set-cdr! exit then + + cdr repeat 2drop @@ -1065,7 +1113,7 @@ hide env : if-alternative ( ifobj -- alt|false ) cdr cdr cdr - 2dup nil objeq? if + nil? if 2drop false else car @@ -1105,14 +1153,14 @@ hide env 2swap ( env explist ) \ Abort on empty list - 2dup nil objeq? if + nil? if 2drop none 2swap exit then begin 2dup cdr ( env explist nextexplist ) - 2dup nil objeq? false = + nil? false = while -2rot car 2over ( nextexplist env exp env ) eval @@ -1182,10 +1230,10 @@ hide env 2swap ; -: apply ( proc argvals ) +: apply ( proc argvals -- result ) 2swap dup case primitive-proc-type of - drop execute + drop execute endof compound-proc-type of @@ -1204,11 +1252,24 @@ hide env R> drop ['] eval goto-deferred \ Tail call optimization endof - bold fg red ." Object not applicable. Aboring." reset-term cr + bold fg red ." Object not applicable. Aborting." reset-term cr abort endcase ; +: macro-expand ( proc expbody -- result ) + 2swap + 2dup procedure-body ( expbody proc procbody ) + -2rot 2dup procedure-params ( procbody expbody proc argnames ) + -2rot procedure-env ( procbody argnames expbody procenv ) + + -2rot 2swap + flatten-proc-args + 2swap 2rot + + extend-env eval-sequence eval +; + :noname ( obj env -- result ) 2swap @@ -1274,29 +1335,34 @@ hide env application? if 2over 2over ( env exp env exp ) - operator 2dup ( env exp env opname opname ) + operator ( env exp env opname ) + + 2dup lookup-macro nil? false = if + \ Macro function evaluation - lookup-macro 2dup nil objeq? if - \ Regular function application + ( env exp env opname mproc ) + 2swap 2drop -2rot 2drop cdr ( env mproc body ) + + 2dup print cr + macro-expand + 2dup print cr + + 2swap + ['] eval goto-deferred + else + \ Regular function application 2drop ( env exp env opname ) 2swap eval ( env exp proc ) + -2rot ( proc env exp ) operands 2swap ( proc operands env ) list-of-vals ( proc argvals ) apply - else - \ Macro function evaluation - - ( env exp env opname mproc ) - 2swap 2drop -2rot 2drop ( env mproc exp ) - apply 2swap ( expanded-exp env ) - - ['] eval goto-deferred + exit then - exit then bold fg red ." Error evaluating expression - unrecognized type. Aborting." reset-term cr @@ -1499,61 +1565,6 @@ variable gc-stack-depth \ }}} -\ ---- Primitives ---- {{{ - -: make-primitive ( cfa -- ) - bl word - count - - \ 2dup ." Defining primitive " type ." ..." cr - - cstr>charlist - drop symbol-type - - 2dup - - symbol-table obj@ - cons - symbol-table obj! - - rot primitive-proc-type ( var prim ) - global-env obj@ define-var -; - -: arg-count-error - bold fg red ." Incorrect argument count." reset-term cr - abort -; - -: ensure-arg-count ( args n -- ) - dup 0= if - drop nil objeq? false = if - arg-count-error - then - else - -rot 2dup nil objeq? if - arg-count-error - then - - cdr rot 1- recurse - then -; - -: arg-type-error - bold fg red ." Incorrect argument type." reset-term cr - abort -; - -: ensure-arg-type ( arg type -- arg ) - istype? false = if - arg-type-error - then -; - -include scheme-primitives.4th - -\ }}} - \ ---- Loading files ---- {{{ : charlist>cstr ( charlist addr -- n ) @@ -1561,7 +1572,7 @@ include scheme-primitives.4th dup 2swap ( origaddr addr charlist ) begin - 2dup nil objeq? false = + nil? false = while 2dup cdr 2swap car drop ( origaddr addr charlist char ) @@ -1595,15 +1606,14 @@ include scheme-primitives.4th again ; -:noname ( args -- finalResult ) - 2dup 1 ensure-arg-count - car string-type ensure-arg-type +\ }}} + +\ ---- Standard Library ---- {{{ - drop pair-type - pad charlist>cstr - pad swap load -; make-primitive load + include scheme-primitives.4th + s" scheme-library.scm" load 2drop + \ }}} \ ---- REPL ----