diff options
| -rw-r--r-- | src/ChangeLog | 9 | ||||
| -rw-r--r-- | src/interp/cparse.boot | 34 |
2 files changed, 22 insertions, 21 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 5703c54f..a8bd3f83 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,14 @@ 2008-08-04 Gabriel Dos Reis <gdr@cs.tamu.edu> + * 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. + +2008-08-04 Gabriel Dos Reis <gdr@cs.tamu.edu> + * Makefile.pamphlet: Use $(mkdir_p) in lieu of $(mkinstalldirs), during build. Also use 'cp -p' instead of $(INSTALL). * algebra/Makefile.pamphlet: Likewise. 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 |