Debugging GC issue.

[scheme.forth.jl.git] / src / scheme.4th

diff --git a/src/scheme.4th b/src/scheme.4th
index 7b1da05..d6dccd1 100644 (file)
--- a/src/scheme.4th
+++ b/src/scheme.4th
@@ -1273,6 +1273,11 @@ parse-idx-stack parse-idx-sp !
         exit
     then
 
+    nextchar [char] ) = if
+        inc-parse-idx
+        except-message: ." unmatched closing parenthesis." recoverable-exception throw
+    then
+
     \ Anything else is parsed as a symbol
     readsymbol charlist>symbol
 
@@ -1286,7 +1291,7 @@ parse-idx-stack parse-idx-sp !
 
 \ }}}
 
-\ ---- Eval ---- {{{
+\ ---- Syntax ---- {{{
 
 : self-evaluating? ( obj -- obj bool )
     boolean-type istype? if true exit then
@@ -1449,7 +1454,7 @@ parse-idx-stack parse-idx-sp !
 
 \ }}}
 
-\ ---- Analyze ----
+\ ---- Analyze ---- {{{
 
 : evaluate-eproc ( eproc env --- res )
 
@@ -1636,15 +1641,7 @@ parse-idx-stack parse-idx-sp !
     then
 ;
 
-: application-executor ( operator-proc arg-procs env -- res )
-    2rot 2over ( aprocs env fproc env )
-    evaluate-eproc ( aprocs env proc )
-
-    -2rot 2swap ( proc env aprocs )
-    evaluate-operand-eprocs ( proc vals )
-
-    2swap ( vals proc )
-    
+: apply ( vals proc )
     dup case
         primitive-proc-type of
             drop execute
@@ -1668,6 +1665,18 @@ parse-idx-stack parse-idx-sp !
     endcase
 ;
 
+: application-executor ( operator-proc arg-procs env -- res )
+    2rot 2over ( aprocs env fproc env )
+    evaluate-eproc ( aprocs env proc )
+
+    -2rot 2swap ( proc env aprocs )
+    evaluate-operand-eprocs ( proc vals )
+
+    2swap ( vals proc )
+
+    ['] apply goto
+;
+
 : analyze-application ( exp -- eproc )
     2dup operator analyze
     2swap operands operand-eproc-list
@@ -1700,6 +1709,7 @@ parse-idx-stack parse-idx-sp !
 
 ; is analyze
 
+\ }}}
 
 \ ---- Macro Expansion ---- {{{
 
@@ -2008,7 +2018,9 @@ variable gc-stack-depth
 ;
 
 :noname
-    \ ." GC! "
+    ." GC! "
+
+    trace
 
     gc-unmark
 
@@ -2026,7 +2038,7 @@ variable gc-stack-depth
 
     gc-sweep
 
-    \ ." (" gc-count-marked . ." pairs marked as used.)" cr
+    ." (" gc-count-marked . ." pairs marked as used.)" cr
 ; is collect-garbage
 
 \ }}}
@@ -2041,8 +2053,14 @@ variable gc-stack-depth
     ok-symbol ( port res )
 
     begin
+        \ DEBUG
+        bold fg blue ." READ from " 2over drop . ." ==> " reset-term
+
         2over read-port ( port res obj )
 
+        \ DEBUG
+        2dup print cr
+
         2dup EOF character-type objeq? if
             2drop 2swap close-port
             exit
@@ -2091,7 +2109,7 @@ variable gc-stack-depth
     enable-gc
 
     \ Display welcome message
-    welcome-symbol nil cons global-env obj@ eval 2drop
+    \ welcome-symbol nil cons global-env obj@ eval 2drop
 
     begin
         ['] repl-body catch