* boot/tokens.boot: freshLine, functionSymbol?, and symbolGlobal?

	are now builin.
	* boot/ast.boot: Tidy.
	* interp/c-util.boot: Likewise.
	* interp/br-saturn.boot: Likewise.
	* interp/i-syscmd.boot: Likewise.
	* interp/i-output.boot: Likewise.
	* interp/clam.boot: Likewise.
	* interp/trace.boot: Likewise.
	* interp/sys-utility.boot: Likewise.
	* interp/sys-driver.boot: Likewise.
	* interp/lisplib.boot: Likewise.
	* interp/lisp-backend.boot: Likewise.

10 files changed, 13 insertions, 13 deletions

diff --git a/src/interp/br-saturn.boot b/src/interp/br-saturn.boot
index d320facc..060a5289 100644
--- a/src/interp/br-saturn.boot
+++ b/src/interp/br-saturn.boot
@@ -1,6 +1,6 @@
 -- Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd.
 -- All rights reserved.
--- Copyright (C) 2007-2011, Gabriel Dos Reis.
+-- Copyright (C) 2007-2012, Gabriel Dos Reis.
 -- All rights reserved.
 --
 -- Redistribution and use in source and binary forms, with or without
@@ -482,7 +482,7 @@ htDoneButton(func, htPage, :optionalArgs) ==
     htpSetInputAreaAlist(htPage,first optionalArgs)
   typeCheckInputAreas htPage =>
     htMakeErrorPage htPage
-  not FBOUNDP func =>
+  not functionSymbol? func =>
     systemError ['"unknown function", func]
   FUNCALL(symbolFunction func, htPage)
 
diff --git a/src/interp/c-util.boot b/src/interp/c-util.boot
index 21140ca3..0638fd91 100644
--- a/src/interp/c-util.boot
+++ b/src/interp/c-util.boot
@@ -1743,7 +1743,7 @@ backendCompile1 x ==
   backendCompileNEWNAM lamex
   -- Note that category constructors are evaluated before they
   -- their compiled, so this noise is not very helpful.
-  if $verbose and FBOUNDP fname then
+  if $verbose and functionSymbol? fname then
     formatToStdout('"~&~%;;;     ***       ~S REDEFINED~%",fname)
   [[fname,lamex],:$CLOSEDFNS]
 
diff --git a/src/interp/clam.boot b/src/interp/clam.boot
index 1f34ba58..f88f379e 100644
--- a/src/interp/clam.boot
+++ b/src/interp/clam.boot
@@ -147,7 +147,7 @@ clearConstructorAndLisplibCaches() ==
 clearCategoryCaches() ==
   for name in allConstructors() repeat
     if getConstructorKindFromDB name = "category" then
-      if BOUNDP(cacheName:= mkCacheName name)
+      if symbolGlobal?(cacheName:= mkCacheName name)
             then symbolValue(cacheName) := nil
       db := constructorDB name =>
         dbTemplate(db) := nil
diff --git a/src/interp/i-output.boot b/src/interp/i-output.boot
index 2f08582c..25d53edc 100644
--- a/src/interp/i-output.boot
+++ b/src/interp/i-output.boot
@@ -552,7 +552,7 @@ print(x,domain) ==
 outputAsgardForm(x,t) ==
   f := ['%OBJECT,x,devaluate t]
   WRITE(f,KEYWORD::STREAM,$algebraOutputStream)
-  FRESH_-LINE $algebraOutputStream
+  freshLine $algebraOutputStream
 
 mathprintWithNumber(x,t) ==
   x:= outputTran x
diff --git a/src/interp/i-syscmd.boot b/src/interp/i-syscmd.boot
index 02f69f23..cc4b4db8 100644
--- a/src/interp/i-syscmd.boot
+++ b/src/interp/i-syscmd.boot
@@ -1880,7 +1880,7 @@ dewritify ob ==
                 type is 'SPADCLOSURE =>
                     vec := dewritifyInner ob.2
                     name := ob.3
-                    not FBOUNDP name => 
+                    not functionSymbol? name => 
                        error strconc('"undefined function: ", symbolName name)
                     nob := [symbolFunction name,:vec]
                     tableValue($seen, ob) := nob
diff --git a/src/interp/lisp-backend.boot b/src/interp/lisp-backend.boot
index 321fc017..438c191c 100644
--- a/src/interp/lisp-backend.boot
+++ b/src/interp/lisp-backend.boot
@@ -832,7 +832,7 @@ printBackendDecl(label,decl) ==
   st :=
     sp := symbolAssoc('COMPILER_-OUTPUT_-STREAM,OPTIONLIST) => rest sp
     $OutputStream
-  if label ~= nil and ioTerminal? st and FBOUNDP label
+  if label ~= nil and ioTerminal? st and functionSymbol? label
     and not COMPILED_-FUNCTION_-P symbolFunction label then
       COMPILE label
   if $PrettyPrint or not ioTerminal? st then
diff --git a/src/interp/lisplib.boot b/src/interp/lisplib.boot
index a65d6f4a..9f5279b2 100644
--- a/src/interp/lisplib.boot
+++ b/src/interp/lisplib.boot
@@ -358,7 +358,7 @@ makeConstructorsAutoLoad() ==
     systemDependentMkAutoload(getConstructorAbbreviationFromDB cnam,cnam)
  
 systemDependentMkAutoload(fn,cnam) ==
-    FBOUNDP cnam => "next"
+    functionSymbol? cnam => "next"
     symbolFunction(cnam) := mkAutoLoad cnam
 
 mkAutoLoad ctor ==
@@ -444,7 +444,7 @@ compDefineLisplib(df:=["DEF",[op,:.],:.],m,e,fal,fn) ==
   if ok then lisplibDoRename(libName)
   filearg := $FILEP(libName,$spadLibFT,$libraryDirectory)
   RPACKFILE filearg
-  FRESH_-LINE $algebraOutputStream
+  freshLine $algebraOutputStream
   sayMSG fillerSpaces(72,char "-")
   unloadOneConstructor op
   $buildingSystemAlgebra => res
diff --git a/src/interp/sys-driver.boot b/src/interp/sys-driver.boot
index 97ae53a6..55bd3243 100644
--- a/src/interp/sys-driver.boot
+++ b/src/interp/sys-driver.boot
@@ -152,7 +152,7 @@ restart() ==
 )if %hasFeature KEYWORD::GCL
   SYSTEM::GBC_-TIME 0
 )endif
-  if $openServerIfTrue and FBOUNDP "openServer" then
+  if $openServerIfTrue and functionSymbol? "openServer" then
     os := openServer $SpadServerName
     if os = 0 then
       $openServerIfTrue := false
diff --git a/src/interp/sys-utility.boot b/src/interp/sys-utility.boot
index 5a527962..78dbb2c7 100644
--- a/src/interp/sys-utility.boot
+++ b/src/interp/sys-utility.boot
@@ -113,7 +113,7 @@ macrop f ==
 ++ returns true if `f' is bound to a function
 functionp: %Thing -> %Boolean
 functionp f ==
-  ident? f => FBOUNDP f and null MACRO_-FUNCTION f
+  ident? f => functionSymbol? f and null MACRO_-FUNCTION f
   function? f
 
 ++ returns true if `x' is contained in `y'.
diff --git a/src/interp/trace.boot b/src/interp/trace.boot
index 9053bce1..f62db3c4 100644
--- a/src/interp/trace.boot
+++ b/src/interp/trace.boot
@@ -546,7 +546,7 @@ traceDomainConstructor(domainConstructor,options) ==
     repeat spadTrace(domain,options)
   SETQ(_/TRACENAMES,[domainConstructor,:_/TRACENAMES])
   innerDomainConstructor := makeSymbol strconc(domainConstructor,'";")
-  if FBOUNDP innerDomainConstructor then domainConstructor := innerDomainConstructor
+  if functionSymbol? innerDomainConstructor then domainConstructor := innerDomainConstructor
   EMBED(domainConstructor,
     ['LAMBDA, ['_&REST, 'args],
       ['PROG, ['domain],
@@ -566,7 +566,7 @@ untraceDomainConstructor domainConstructor ==
         true
   untraceAllDomainLocalOps domainConstructor
   innerDomainConstructor := makeSymbol strconc(domainConstructor,'";")
-  if FBOUNDP innerDomainConstructor then UNEMBED innerDomainConstructor
+  if functionSymbol? innerDomainConstructor then UNEMBED innerDomainConstructor
     else UNEMBED domainConstructor
   SETQ(_/TRACENAMES,removeSymbol(_/TRACENAMES,domainConstructor))