From 950e3c765e30648de34cfc4f65fffdce06f0727f Mon Sep 17 00:00:00 2001
From: Joel Martin <github@martintribe.org>
Date: Tue, 1 Apr 2014 21:50:24 -0500
Subject: PS: add stepA_more.

Sync other steps. In particular, self reference in function definition
and putting readline into _readline function.
---
 ps/step6_file.ps | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(limited to 'ps/step6_file.ps')

diff --git a/ps/step6_file.ps b/ps/step6_file.ps
index 2172942..b90bac5 100644
--- a/ps/step6_file.ps
+++ b/ps/step6_file.ps
@@ -2,6 +2,8 @@
 (reader.ps) run
 
 % read
+/_readline { print flush (%stdin) (r) file 99 string readline } def
+
 /READ {
     /str exch def
     str read_str
@@ -84,18 +86,21 @@ end } def
                 /params null % close over parameters
                 /ast null    % close over ast
                 /env null    % close over environment
+                /data { __self__ fload EVAL }
             >>
             dup length dict copy % make an actual copy/new instance
             dup /params a1 put  % insert closed over a1 into position 2
             dup /ast a2 put  % insert closed over a2 into position 3
             dup /env env put % insert closed over env into position 4
+            dup   dup /data get   exch 0 exch put % insert self reference
         }{
             /el ast env eval_ast def
-            el _first _mal_function? { % if user defined function
-                el _rest el _first fload % stack: ast new_env
+            el _rest el _first % stack: ast function
+            dup _mal_function? { % if user defined function
+                fload % stack: ast new_env
                 /loop? true def
             }{ %else (regular procedure/function)
-                el _rest el _first exec % apply function to args
+                exec % apply function to args
             } ifelse
         } ifelse } ifelse } ifelse } ifelse } ifelse
     } ifelse
@@ -128,8 +133,6 @@ types_ns { _ref } forall
 (\(def! not \(fn* \(a\) \(if a false true\)\)\)) RE pop
 (\(def! load-file \(fn* \(f\) \(eval \(read-string \(str "\(do " \(slurp f\) "\)"\)\)\)\)\)) RE pop
 
-/stdin (%stdin) (r) file def 
-
 userdict /ARGUMENTS known { %if command line arguments
     ARGUMENTS length 0 gt { %if more than 0 arguments
         ARGUMENTS {
@@ -139,14 +142,9 @@ userdict /ARGUMENTS known { %if command line arguments
     } if
 } if
 { % loop
-    (user> ) print flush
-
-    stdin 99 string readline
-
+    (user> ) _readline
     not { exit } if  % exit if EOF
 
-    %(\ngot line: ) print dup print (\n) print flush
-
     { %try
         REP print (\n) print
     } stopped {
@@ -155,6 +153,7 @@ userdict /ARGUMENTS known { %if command line arguments
         $error /newerror false put
         $error /errorinfo null put
         clear
+        cleardictstack
     } if
 } bind loop
 
-- 
cgit v1.2.3