* looking for address@hidden/axiom--main--1--patch-44 to compare with
* comparing to address@hidden/axiom--main--1--patch-44
M  src/interp/patches.lisp.pamphlet
M  src/interp/daase.lisp.pamphlet
M  src/interp/foam_l.lisp.pamphlet
M  src/interp/ax.boot.pamphlet
M  src/interp/i-syscmd.boot.pamphlet

* modified files

--- orig/src/interp/ax.boot.pamphlet
+++ mod/src/interp/ax.boot.pamphlet
@@ -294,6 +294,7 @@
    op = 'has =>
       [name,type] := args
       if name = '$ then name := '%
+      else name := axFormatOp name
       ftype := axFormatOp type
       if ftype is ['Declare,:.] then
            ftype := ['With, [], ftype]


--- orig/src/interp/daase.lisp.pamphlet
+++ mod/src/interp/daase.lisp.pamphlet
@@ -1465,7 +1465,7 @@
  (set (foam::axiomxl-file-init-name "filecliq") NOPfuncall)
  (set (foam::axiomxl-file-init-name "attrib") NOPfuncall)
 ;; following needs to happen inside restart since $AXIOM may change
- (let ((asharprootlib (strconc (|getEnv| "AXIOM") "/compiler/lib/")))
+ (let ((asharprootlib (strconc (|getEnv| "AXIOM") "/aldor/lib/")))
    (set-file-getter (strconc asharprootlib "runtime"))
    (set-file-getter (strconc asharprootlib "lang"))
    (set-file-getter (strconc asharprootlib "attrib"))


--- orig/src/interp/foam_l.lisp.pamphlet
+++ mod/src/interp/foam_l.lisp.pamphlet
@@ -884,8 +884,8 @@
  (cond ( (or (NULL u) (NULL v)) nil)
        ( (and (ATOM u) (ATOM v)) (eql u v))
        ( (or (ATOM u) (ATOM v)) nil)
-       ( (equal (length u) (length v)) (|magicEq1| u v)) 
-       nil ))
+;;       ( (equal (length u) (length v)) (|magicEq1| u v))
+       (t (eq u v))))
 
 (defun |magicEq1| (u v)
  (cond ( (and (atom u) (atom v)) (|politicallySound| u v))


--- orig/src/interp/i-syscmd.boot.pamphlet
+++ mod/src/interp/i-syscmd.boot.pamphlet
@@ -75,12 +75,12 @@
 new aldor compiler.z
 This used to read:
 \begin{verbatim}
-     STRCONC(TRUENAME(STRCONC(GETENV('"AXIOM"),'"/compiler/bin/")),"axiomxl ", asharpArgs, '" ", namestring args)
+     STRCONC(TRUENAME(STRCONC(GETENV('"ALDORROOT"),'"/bin/")),"aldor ", asharpArgs, '" ", namestring args)
 \end{verbatim}
 but now reads:
 <<remove TRUENAME>>=
-     STRCONC(STRCONC(GETENV('"AXIOM"),'"/compiler/bin/"),_
-               "axiomxl ", asharpArgs, '" ", namestring args)
+     STRCONC(STRCONC(GETENV('"ALDORROOT"),'"/bin/"),_
+               "aldor ", asharpArgs, '" ", namestring args)
 @
 
 \section{License}


--- orig/src/interp/patches.lisp.pamphlet
+++ mod/src/interp/patches.lisp.pamphlet
@@ -266,7 +266,7 @@
   (operationopen);; all of the operations known to the system
   (categoryopen);; answer hasCategory question
   (browseopen)
-  (let ((asharprootlib (strconc (|getEnv| "AXIOM") "/compiler/lib/")))
+  (let ((asharprootlib (strconc (|getEnv| "AXIOM") "/aldor/lib/")))
     (set-file-getter (strconc asharprootlib "runtime.o"))
     (set-file-getter (strconc asharprootlib "lang.o"))
     (set-file-getter (strconc asharprootlib "attrib.o"))