From 30a034500322fc2bbcab63e14c2474b3eedb343a Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Mon, 4 Aug 2008 17:39:16 +0000
Subject: 	* interp/cparse.boot ($npPParg): Remove. 	($npPCff):
 Likewise. 	(npPPff, npPCff): Take an argument. 	(npPPf): Likewise. 
 (npPPg, npPCg): Likewise. 	(npPP, npPC): Pass around a suspension of the
 argument.

---
 src/interp/cparse.boot | 34 +++++++++++++---------------------
 1 file changed, 13 insertions(+), 21 deletions(-)

(limited to 'src/interp/cparse.boot')

diff --git a/src/interp/cparse.boot b/src/interp/cparse.boot
index d21743eb..3782faf5 100644
--- a/src/interp/cparse.boot
+++ b/src/interp/cparse.boot
@@ -198,39 +198,31 @@ npList(f,str1,g)== -- always produces a list, g is applied to it
     else npPush FUNCALL(g, [])
 
 
-++ rewrite flets, using global scoping
-$npPParg := nil
+npPPff f ==
+  FUNCALL f and npPush [npPop1()]
 
-npPPff() ==
-  FUNCALL $npPParg and npPush [npPop1()]
+npPPf f ==
+  npSemiListing function LAMBDA(nil, npPPff f)
 
-npPPf() ==
-  npSemiListing function npPPff
-
-npPPg() ==
-  npListAndRecover function npPPf
+npPPg f ==
+  npListAndRecover function LAMBDA(nil, npPPf f)
     and npPush pfAppend npPop1()
 
 npPP(f) ==
-  $npPParg := f
-  npParened function npPPf
-    or npPileBracketed function npPPg and
+  npParened function LAMBDA(nil, npPPf f)
+    or npPileBracketed function LAMBDA(nil, npPPg f) and
       npPush pfEnSequence npPop1()
         or FUNCALL f
 
-++ rewrite flets, using global scoping
-$npPCff := nil
-
-npPCff() ==
-  FUNCALL $npPCff and npPush [npPop1()]
+npPCff f ==
+  FUNCALL f and npPush [npPop1()]
 
-npPCg() ==
-  npListAndRecover function npPCff
+npPCg f ==
+  npListAndRecover function LAMBDA(nil,npPCff f)
     and npPush pfAppend npPop1()
 
 npPC(f) ==
-  $npPCff := f
-  npPileBracketed function npPCg and
+  npPileBracketed function LAMBDA(nil, npPCg f) and
     npPush pfEnSequence npPop1()
       or FUNCALL f
 
-- 
cgit v1.2.3