From fabbf02ee4b80241b75826536502c2d683e8462e Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Wed, 14 Nov 2007 01:09:16 +0000
Subject: 	* Makefile.pamphlet (br-search.$(FASLEXT)): New rule. 
 (br-saturn.$(FASLEXT)): Likewise. 	(br-op2.$(FASLEXT)): Likewise. 
 (br-op1.$(FASLEXT)): Likewise. 	(br-con.$(FASLEXT)): Likewise. 
 (br-data.$(FASLEXT)): Likewise. 	(br-util.$(FASLEXT)): Likewise. 
 (<<br-search.clisp>>): Remove. 	(<<br-saturn.clisp>>): Likewise. 
 (<<br-op2.clisp>>): Likewise. 	(<<br-op1.clisp>>): Likewise. 
 (<<br-con.clisp>>): Likewise. 	(<<br-data.clisp>>): Likewise. 
 (<<br-util.clisp>>): Likewise. 	* br-search.boot.pamphlet: Push into
 package "BOOT".  Fix syntax. 	* br-saturn.boot.pamphlet: Likewise. 	*
 br-op2.boot.pamphlet: Likewise. 	* br-op1.boot.pamphlet: Likewise. 
 * br-con.boot.pamphlet: Likewise. 	* br-data.boot.pamphlet: Likewise. 
 * br-util.boot.pamphlet: Likewise.

---
 src/interp/br-search.boot.pamphlet | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'src/interp/br-search.boot.pamphlet')

diff --git a/src/interp/br-search.boot.pamphlet b/src/interp/br-search.boot.pamphlet
index d8e2cbea..22650a14 100644
--- a/src/interp/br-search.boot.pamphlet
+++ b/src/interp/br-search.boot.pamphlet
@@ -50,6 +50,9 @@
 <<*>>=
 <<license>>
 
+import '"bc-util"
+)package "BOOT"
+
 --====================> WAS b-search.boot <================================
 
 --=======================================================================
@@ -112,7 +115,7 @@ grepForAbbrev(s,key) ==
   someLowerCaseChar or not someUpperCaseChar => false
   pattern := DOWNCASE s
   ['Abbreviations ,:[GETDATABASE(x,'CONSTRUCTORFORM)
-    for x in allConstructors() | test]] where test ==
+    for x in allConstructors() | test]] where test() ==
          not $includeUnexposed? and not isExposedConstructor x => false
          a := GETDATABASE(x,'ABBREVIATION)
          match?(pattern,PNAME a) and not HGET($defaultPackageNamesHT,x)
@@ -163,9 +166,9 @@ pmTransFilter s ==
 
 checkPmParse parse ==
   STRINGP parse => parse
-  fn parse => parse where fn(u) ==
+  (fn parse => parse) where fn(u) ==
     u is [op,:args] =>
-      MEMQ(op,'(and or not)) and and/[checkPmParse x for x in args]
+      MEMQ(op,'(and or not)) and "and"/[checkPmParse x for x in args]
     STRINGP u => true
     false
   nil
@@ -329,7 +332,7 @@ conform2OutputForm(form) ==
   null args => form
   cosig := rest GETDATABASE(op,'COSIG)
   atypes := rest CDAR GETDATABASE(op,'CONSTRUCTORMODEMAP)
-  sargl := [fn for x in args for atype in atypes for pred in cosig] where fn ==
+  sargl := [fn for x in args for atype in atypes for pred in cosig] where fn() ==
     pp [x,atype,pred]
     pred => conform2OutputForm x
     typ := sublisFormal(args,atype)
@@ -377,7 +380,7 @@ looksLikeDomainForm x ==
   atom x => k = 1
   k ^= #x => false
   and/[p for key in rest coSig for arg in rest x] where
-    p ==
+    p() ==
       key => looksLikeDomainForm arg
       not IDENTP arg
 
@@ -455,7 +458,7 @@ genSearch1(filter,reg,doc) ==
   htShowPageStar()
 searchDropUnexposedLines alist ==
   [[op,[pred for line in lines | pred],:lines] for [op,.,:lines] in alist] where
-    pred ==
+    pred() ==
       not $exposedOnlyIfTrue or dbExposed?(line,dbKind line) => line
       nil
 
@@ -891,7 +894,7 @@ htButtonOn?(htPage,key) ==
   LASSOC(key,htpInputAreaAlist htPage) is [a,:.] and a = '" t"
 
 mkDetailedGrepPattern(kind,name,nargs,argOrSig) == main where
-  main ==
+  main() ==
     nottick := '"[^`]"
     name := replaceGrepStar name
     firstPart :=
-- 
cgit v1.2.3