aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2008-02-02 13:26:26 +0000
committerdos-reis <gdr@axiomatics.org>2008-02-02 13:26:26 +0000
commitc78c9f3c403b2154127f16dec9b1c95879601f5e (patch)
treecfcffb66952748900ebbd9429d02d7e97b41cb91
parentc2639522f9f219295e0243a3af98b6082a597b3c (diff)
downloadopen-axiom-c78c9f3c403b2154127f16dec9b1c95879601f5e.tar.gz
* interp/setq.lisp: Remove more unused variables.
* interp/nruncomp.boot ($Slot1DataBase): Define here. * interp/parse.boot ($oldParserExpandAbbrs): Likewise. * interp/define.boot ($mutableDomains): Define here. (compDefineFunctor1): Tidy. (clearCmdCompletely): Don't set $functionTable.
-rw-r--r--src/ChangeLog9
-rw-r--r--src/interp/define.boot7
-rw-r--r--src/interp/i-syscmd.boot2
-rw-r--r--src/interp/nruncomp.boot2
-rw-r--r--src/interp/parse.boot4
-rw-r--r--src/interp/setq.lisp34
6 files changed, 25 insertions, 33 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 238a1d5c..50a905f8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2008-02-02 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ * interp/setq.lisp: Remove more unused variables.
+ * interp/nruncomp.boot ($Slot1DataBase): Define here.
+ * interp/parse.boot ($oldParserExpandAbbrs): Likewise.
+ * interp/define.boot ($mutableDomains): Define here.
+ (compDefineFunctor1): Tidy.
+ (clearCmdCompletely): Don't set $functionTable.
+
2008-01-31 Gabriel Dos Reis <gdr@cs.tamu.edu>
* interp/setq.lisp (COPYRIGHTS): Remove.
diff --git a/src/interp/define.boot b/src/interp/define.boot
index 0192427e..92f15d99 100644
--- a/src/interp/define.boot
+++ b/src/interp/define.boot
@@ -40,6 +40,8 @@ import '"category"
NRTPARSE := false
$newCompCompare := false
+++ List of mutable domains.
+$mutableDomains := nil
--% FUNCTIONS WHICH MUNCH ON == STATEMENTS
@@ -401,9 +403,8 @@ compDefineFunctor1(df is ['DEF,form,signature,$functorSpecialCases,body],
$pairlis := [[a,:v] for a in argl for v in $FormalMapVariableList]
$mutableDomain: local :=
-- all defaulting packages should have caching turned off
- isCategoryPackageName $op or
- (if BOUNDP '$mutableDomains then MEMQ($op,$mutableDomains)
- else false ) --true if domain has mutable state
+ isCategoryPackageName $op or MEMQ($op,$mutableDomains)
+ --true if domain has mutable state
signature':=
[first signature,:[getArgumentModeOrMoan(a,form,$e) for a in argl]]
$functorForm:= $form:= [$op,:argl]
diff --git a/src/interp/i-syscmd.boot b/src/interp/i-syscmd.boot
index e6d5ab8a..0745613d 100644
--- a/src/interp/i-syscmd.boot
+++ b/src/interp/i-syscmd.boot
@@ -298,7 +298,7 @@ clearCmdSortedCaches() ==
clearCmdCompletely() ==
clearCmdAll()
$localExposureData := COPY_-SEQ $localExposureDataDefault
- $functionTable := NIL
+ -- $functionTable := NIL
sayKeyedMsg("S2IZ0013",NIL)
clearClams()
clearConstructorCaches()
diff --git a/src/interp/nruncomp.boot b/src/interp/nruncomp.boot
index 9b52de19..71b79c0b 100644
--- a/src/interp/nruncomp.boot
+++ b/src/interp/nruncomp.boot
@@ -51,6 +51,8 @@ $insideCategoryPackageIfTrue := false
++ By default, don't generate info files
$profileCompiler := false
+++
+$Slot1DataBase := MAKE_-HASHTABLE "ID"
-----------------------------NEW buildFunctor CODE-----------------------------
diff --git a/src/interp/parse.boot b/src/interp/parse.boot
index 5309b271..52d29596 100644
--- a/src/interp/parse.boot
+++ b/src/interp/parse.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-2008, Gabriel Dos Reis.
-- All rights reserved.
--
-- Redistribution and use in source and binary forms, with or without
@@ -39,6 +39,8 @@ import '"postpar"
++ If non nil, holds the operator being being defined.
$defOp := nil
+
+$oldParserExpandAbbrs := false
parseTransform x ==
$defOp: local:= nil
diff --git a/src/interp/setq.lisp b/src/interp/setq.lisp
index c624caf5..db0998ff 100644
--- a/src/interp/setq.lisp
+++ b/src/interp/setq.lisp
@@ -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-2008, Gabriel Dos Reis.
;; All rights reserved.
;;
;; Redistribution and use in source and binary forms, with or without
@@ -35,39 +35,18 @@
(import-module "macros")
(in-package "BOOT")
-(SETQ /RELEASE 0)
-
;; These were originally in SPAD LISP
-(SETQ |$mutableChecking| NIL) ; used in DEFINE BOOT
-(SETQ |$mutableDomains| NIL) ; checked in DEFINE BOOT
+(defvar $dalymode nil "if true then leading paren implies lisp cmd")
+(defconstant |$Newline| #\Newline)
-(defvar $dalymode nil "if true then leading paren implies lisp cmd")
-(setq |$Newline| #\Newline)
-
-
-(SETQ STAKCOLUMN -1)
-(SETQ ECHOMETA NIL)
-(SETQ |$checkParseIfTrue| 'NIL)
-(SETQ |$oldParserExpandAbbrs| NIL)
-(SETQ |S:SPADKEY| NIL) ;" this is augmented by MAKESPADOP"
-(SETQ |/EDIT,FT| 'SPAD)
-(SETQ |/EDIT,FM| 'A)
-(SETQ INITCOLUMN 0)
-(SETQ |$functionTable| NIL)
-(SETQ |$spaddefs| NIL)
-(SETQ |$xeditIsConsole| NIL)
-(SETQ |$echoInputLines| NIL) ;; This is in SETVART also
-(SETQ |$Slot1DataBase| (MAKE-HASHTABLE 'ID)) ;; See NRUNTIME BOOT
-(SETQ |$pfKeysForBrowse| NIL)
-(SETQ MARG 0)
+(defvar ECHOMETA NIL)
+(defvar S-SPADKEY NIL) ;" this is augmented by MAKESPADOP"
+(defvar MARG 0)
;" Margin for testing by ?OP"
-(SETQ |$displayParserOutput| 'T)
-(SETQ |$insideReadRulesIfTrue| NIL)
(SETQ |$consistencyCheck| 'T)
-(SETQ |$useUndo| NIL)
(SETQ |$ruleSetsInitialized| NIL)
;; tell the system not to use the new parser
@@ -168,7 +147,6 @@
(SETQ |$NRTdeltaList| NIL)
(SETQ |$NRTdeltaLength| 0)
(SETQ |$NRTopt| NIL) ;; turns off buggy code
-(SETQ |$Slot1DataBase| NIL)
(SETQ |$NRTmonitorIfTrue| NIL)
(SETQ |$useConvertForCoercions| NIL)