aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/ChangeLog16
-rw-r--r--src/boot/ast.boot6
-rw-r--r--src/boot/strap/tokens.clisp5
-rw-r--r--src/boot/tokens.boot3
-rw-r--r--src/interp/br-saturn.boot4
-rw-r--r--src/interp/c-util.boot2
-rw-r--r--src/interp/clam.boot2
-rw-r--r--src/interp/i-output.boot2
-rw-r--r--src/interp/i-syscmd.boot2
-rw-r--r--src/interp/lisp-backend.boot2
-rw-r--r--src/interp/lisplib.boot4
-rw-r--r--src/interp/sys-driver.boot2
-rw-r--r--src/interp/sys-utility.boot2
-rw-r--r--src/interp/trace.boot4
14 files changed, 38 insertions, 18 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index cce2e321..9f822929 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,19 @@
+2012-05-26 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ * 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.
+
2012-05-24 Gabriel Dos Reis <gdr@cs.tamu.edu>
* interp/sys-globals.boot ($compCount): Remove.
diff --git a/src/boot/ast.boot b/src/boot/ast.boot
index 3d21b6f7..fe569735 100644
--- a/src/boot/ast.boot
+++ b/src/boot/ast.boot
@@ -1050,9 +1050,9 @@ shoeATOMs x ==
isDynamicVariable x ==
symbol? x and bfBeginsDollar x =>
symbolMember?(x,$constantIdentifiers) => false
- CONSTANTP x => false
- BOUNDP x or $activeNamespace = nil => true
- y := symbolBinding(symbolName x,$activeNamespace) => not CONSTANTP y
+ readOnly? x => false
+ symbolGlobal? x or $activeNamespace = nil => true
+ y := symbolBinding(symbolName x,$activeNamespace) => not readOnly? y
true
false
diff --git a/src/boot/strap/tokens.clisp b/src/boot/strap/tokens.clisp
index 34e00c36..4c088f8d 100644
--- a/src/boot/strap/tokens.clisp
+++ b/src/boot/strap/tokens.clisp
@@ -218,7 +218,8 @@
(LIST '|exit| 'EXIT) (LIST '|false| 'NIL) (LIST '|fifth| 'FIFTH)
(LIST '|first| 'CAR) (LIST '|float?| 'FLOATP)
(LIST '|flushOutput| 'FORCE-OUTPUT) (LIST '|fourth| 'CADDDR)
- (LIST '|function?| 'FUNCTIONP) (LIST '|gensym| 'GENSYM)
+ (LIST '|freshLine| 'FRESH-LINE) (LIST '|function?| 'FUNCTIONP)
+ (LIST '|functionSymbol?| 'FBOUNDP) (LIST '|gensym| 'GENSYM)
(LIST '|genvar| 'GENVAR) (LIST '|integer?| 'INTEGERP)
(LIST 'LAST '|last|) (LIST '|list| 'LIST) (LIST '|listEq?| 'EQUAL)
(LIST '|lowerCase?| 'LOWER-CASE-P) (LIST '|makeSymbol| 'INTERN)
@@ -238,7 +239,7 @@
(LIST '|subSequence| 'SUBSEQ) (LIST '|symbolBinding| 'FIND-SYMBOL)
(LIST '|symbolScope| 'SYMBOL-PACKAGE) (LIST '|symbolEq?| 'EQ)
(LIST '|symbolFunction| 'SYMBOL-FUNCTION)
- (LIST '|symbolName| 'SYMBOL-NAME)
+ (LIST '|symbolGlobal?| 'BOUNDP) (LIST '|symbolName| 'SYMBOL-NAME)
(LIST '|symbolValue| 'SYMBOL-VALUE) (LIST '|symbol?| 'SYMBOLP)
(LIST '|third| 'CADDR) (LIST '|toString| 'WRITE-TO-STRING)
(LIST '|true| 'T) (LIST '|upperCase?| 'UPPER-CASE-P)
diff --git a/src/boot/tokens.boot b/src/boot/tokens.boot
index 7b0c786f..8af76c86 100644
--- a/src/boot/tokens.boot
+++ b/src/boot/tokens.boot
@@ -287,7 +287,9 @@ for i in [ _
["float?", "FLOATP"] , _
["flushOutput", "FORCE-OUTPUT"], _
["fourth", "CADDDR"] , _
+ ["freshLine", "FRESH-LINE" ], _
["function?","FUNCTIONP"] , _
+ ["functionSymbol?", "FBOUNDP"] , _
["gensym", "GENSYM"] , _
["genvar", "GENVAR"] , _
["integer?","INTEGERP"] , _
@@ -326,6 +328,7 @@ for i in [ _
["symbolScope", "SYMBOL-PACKAGE"] , _
["symbolEq?", "EQ"], _
["symbolFunction", "SYMBOL-FUNCTION"], _
+ ["symbolGlobal?", "BOUNDP"], _
["symbolName", "SYMBOL-NAME"], _
["symbolValue", "SYMBOL-VALUE"], _
["symbol?", "SYMBOLP"] , _
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))
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-23 08:17:40 +0000