* interp/buildom.boot (createEnum): Fix quoting.

	* interp/compat.boot (system): Likewise.
	* interp/astr.boot (ncEltQ): Fix declaration.
	* interp/compiler.boot (compMapCond'): Likewise.
	(compMapCond): Likewise.
	(compMapCondFun): Remove declaration.

6 files changed, 26 insertions, 18 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index f26b5fb8..892ccde2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2009-01-04  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
+	* interp/buildom.boot (createEnum): Fix quoting.
+	* interp/compat.boot (system): Likewise.
+	* interp/astr.boot (ncEltQ): Fix declaration.
+	* interp/compiler.boot (compMapCond'): Likewise.
+	(compMapCond): Likewise.
+	(compMapCondFun): Remove declaration.
+
 2009-01-03  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
 	* lisp/core.lisp.in (|%algebraSystemIsComplete|): New.
diff --git a/src/interp/astr.boot b/src/interp/astr.boot
index b506c23a..3ccabe7d 100644
--- a/src/interp/astr.boot
+++ b/src/interp/astr.boot
@@ -1,6 +1,6 @@
 -- Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
 -- All rights reserved.
--- Copyright (C) 2007, Gabriel Dos Reis.
+-- Copyright (C) 2007-2009, Gabriel Dos Reis.
 -- All rights reserved.
 --
 -- Redistribution and use in source and binary forms, with or without
@@ -36,7 +36,7 @@ namespace BOOT
 module astr where
   ncTag: %Thing -> %Symbol
   ncAlist: %Thing -> %List
-  ncEltQ: %List -> %Thing
+  ncEltQ: (%List,%Thing) -> %Thing
   ncPutQ: (%List,%Thing,%Thing) -> %Thing
 
 --% Attributed Structures (astr)
diff --git a/src/interp/buildom.boot b/src/interp/buildom.boot
index c1bf3d0a..11a86a37 100644
--- a/src/interp/buildom.boot
+++ b/src/interp/buildom.boot
@@ -279,7 +279,7 @@ createEnum(sym, dom) ==
   val := -1
   for v in args for i in 0.. repeat
      sym=v => return(val:=i)
-  val<0 => userError ["Cannot coerce",sym,"to",["Enumeration",:args]]
+  val<0 => userError ['"Cannot coerce",sym,'"to",["Enumeration",:args]]
   val
 
 --% INSTANTIATORS
diff --git a/src/interp/compat.boot b/src/interp/compat.boot
index f6e4f08b..bdda2846 100644
--- a/src/interp/compat.boot
+++ b/src/interp/compat.boot
@@ -1,6 +1,6 @@
 -- Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd.
 -- All rights reserved.
--- Copyright (C) 2007-2008, Gabriel Dos Reis.
+-- Copyright (C) 2007-2009, Gabriel Dos Reis.
 -- All rights reserved.
 --
 -- Redistribution and use in source and binary forms, with or without
@@ -53,7 +53,7 @@ system() ==
   -- VM version of system command
   string := getSystemCommandLine()
   if string = '"" then string := '"sh"
-  sayMessage ["   Return Code = ", runCommand string]
+  sayMessage ['"   Return Code = ", runCommand string]
   terminateSystemCommand()
 
 editFile file ==
diff --git a/src/interp/compiler.boot b/src/interp/compiler.boot
index bc56663c..b49a420c 100644
--- a/src/interp/compiler.boot
+++ b/src/interp/compiler.boot
@@ -80,9 +80,6 @@ getFormModemaps: (%Form,%Env) -> %List
 transImplementation: (%Form,%Modemap,%Thing) -> %Code
 reshapeArgumentList: (%Form,%Signature) -> %Form
 applyMapping: (%Form,%Mode,%Env,%List) -> %Maybe %Triple
-compMapCond: (%Symbol,%Mode,%Env,%List) -> %Code
-compMapCond': (%List,%Symbol,%Mode,%Env) -> %Code
-compMapCondFun: (%Thing,%Symbol,%Mode,%Env) -> %Code
 
 
 ++ A list of routines for diagnostic reports.  These functions, in an
@@ -444,8 +441,8 @@ hasUniqueCaseView(x,m,e) ==
 
 convertOrCroak(T,m) ==
   u:= convert(T,m) => u
-  userError ["CANNOT CONVERT: ",T.expr,"%l"," OF MODE: ",T.mode,"%l",
-    " TO MODE: ",m,"%l"]
+  userError ['"CANNOT CONVERT: ",T.expr,"%l",'" OF MODE: ",T.mode,"%l",
+    '" TO MODE: ",m,"%l"]
 
 convert(T,m) ==
   coerce(T,resolve(T.mode,m) or return nil)
@@ -1704,10 +1701,7 @@ compApplyModemap(form,modemap,$e) ==
   -- 2. Select viable modemap implementation.
   compViableModemap(op,lt,modemap)
 
-compMapCond(dc,[cexpr,fnexpr]) ==
-  compMapCond'(cexpr,dc) => fnexpr
-  stackMessage('"not known that %1pb has %2pb",[dc,cexpr])
-
+compMapCond': (%Form,%Mode) -> %Boolean
 compMapCond'(cexpr,dc) ==
   cexpr=true => true
   cexpr is ["AND",:l] => and/[compMapCond'(u,dc) for u in l]
@@ -1724,6 +1718,11 @@ compMapCond'(cexpr,dc) ==
   stackMessage('"not known that %1pb has %2pb",[dc,cexpr])
   false
 
+compMapCond: (%Mode,%List) -> %Code
+compMapCond(dc,[cexpr,fnexpr]) ==
+  compMapCond'(cexpr,dc) => fnexpr
+  stackMessage('"not known that %1pb has %2pb",[dc,cexpr])
+
 
 --%
 
@@ -1889,7 +1888,7 @@ compReduce1(form is ["REDUCE",op,.,collectForm],m,e,$formalArgList) ==
   [collectOp,:itl,body]:= collectForm
   if STRINGP op then op:= INTERN op
   ^MEMQ(collectOp,'(COLLECT COLLECTV COLLECTVEC)) =>
-        systemError ["illegal reduction form:",form]
+        systemError ['"illegal reduction form:",form]
   $sideEffectsList: local := nil
   $until: local := nil
   $initList: local := nil
diff --git a/src/interp/g-cndata.boot b/src/interp/g-cndata.boot
index 58783619..b822d73a 100644
--- a/src/interp/g-cndata.boot
+++ b/src/interp/g-cndata.boot
@@ -126,8 +126,8 @@ installConstructor(cname,type) ==
  
 constructorNameConflict(name,kind) ==
   userError
-    ["The name",:bright name,"conflicts with the name of an existing rule",
-      "%l","please choose another ",kind]
+    ['"The name",:bright name,'"conflicts with the name of an existing rule",
+      "%l",'"please choose another ",kind]
 
 constructorAbbreviationErrorCheck(c,a,typ,errmess) ==
   siz := SIZE (s := PNAME a)
@@ -210,7 +210,7 @@ unabbrevSpecialForms(op,arglist,modeIfTrue) ==
 unabbrevRecordComponent(a,modeIfTrue) ==
   a is ["Declare",b,T] or a is [":",b,T] =>
     [":",b,unabbrev1(T,modeIfTrue)]
-  userError "wrong format for Record type"
+  userError '"wrong format for Record type"
  
 unabbrevUnionComponent(a,modeIfTrue) ==
   a is ["Declare",b,T] or a is [":",b,T] =>