From b893a938b4051bc30a9c44bdcf6000bff11969c4 Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Tue, 19 Apr 2011 13:18:04 +0000
Subject: 	* interp/newfort.boot: Likewise. 	* interp/define.boot
 (orderBySubsumption): Fix thinko. 	* interp/boot-pkg.lisp: Use BOOTTRAN
 package.  Don't import names 	individually. 	* boot/utility.boot: New. 
 * boot/translator.boot (exportNames): Fix thinko. 	* boot/tokens.boot:
 Add charEq? and scalarEq? builtiin functions. 	* boot/ast.boot (bfMember):
 Generate call to symbolMember? for 	membership tests for symbols.

---
 src/interp/boot-pkg.lisp | 11 +----------
 src/interp/define.boot   |  3 ++-
 src/interp/newfort.boot  |  5 +++--
 3 files changed, 6 insertions(+), 13 deletions(-)

(limited to 'src/interp')

diff --git a/src/interp/boot-pkg.lisp b/src/interp/boot-pkg.lisp
index aa16ed6f..39e52c06 100644
--- a/src/interp/boot-pkg.lisp
+++ b/src/interp/boot-pkg.lisp
@@ -36,16 +36,7 @@
   #+:common-lisp (:use "COMMON-LISP")
   #-:common-lisp (:use "LISP")
   #+:SBCL (:use "SB-ALIEN")
-  (:use "AxiomCore")
-  (:import-from "BOOTTRAN" 
-		"systemRootDirectory"
-		"systemLibraryDirectory"
-		"loadNativeModule"
-		"loadSystemRuntimeCore"
-		"loadFileIfPresent"
-                "$InteractiveMode"
-		"string2BootTree"
-		"genImportDeclaration"))
+  (:use "AxiomCore" "BOOTTRAN"))
 
 (in-package "BOOT")
   
diff --git a/src/interp/define.boot b/src/interp/define.boot
index 352d1aef..c1e34171 100644
--- a/src/interp/define.boot
+++ b/src/interp/define.boot
@@ -204,7 +204,8 @@ makeCompactDirect1(op,items) ==
 orderBySubsumption items ==
   acc := subacc := nil
   for x in items repeat
-    not $op in '(Zero One) and x is [.,.,.,'Subsumed] => subacc := [x,:subacc]
+    not ($op in '(Zero One)) and x is [.,.,.,'Subsumed] =>
+      subacc := [x,:subacc]
     acc := [x,:acc]
   y := z := nil
   for [a,b,:.] in subacc | b repeat   
diff --git a/src/interp/newfort.boot b/src/interp/newfort.boot
index e5c92359..38b6c069 100644
--- a/src/interp/newfort.boot
+++ b/src/interp/newfort.boot
@@ -372,8 +372,9 @@ formatAsFortranExpression x ==
 
  
 dispfortexp x ==
-  if atom(x) or x is [op,:.] and not object2Identifier op in
-    '(_= MATRIX construct ) then
+  if atom(x) or x is [op,:.] and
+    not (object2Identifier op in '(_= MATRIX construct ))
+  then
       var := makeSymbol strconc('"R",object2String $IOindex)
       x := ['"=",var,x]
   dispfortexp1 x
-- 
cgit v1.2.3