[Axiom-developer] new boot and old boot

[Gabriel Dos Reis]

Hi,

  I have been experimenting with compiling src/interp with New Boot.
Among many things, there is the nit that "of" is a keyword in New Boot
(src/Makefile.pamphlet does not document that).  Consequently, the
definition of the function str2Tex g-util.boot has to be modified not
to use "of".

-- Gaby

*** src/interp/ChangeLog.build-improvements     (revision 15890)
--- src/interp/ChangeLog.build-improvements     (local)
***************
*** 1,3 ****
--- 1,8 ----
+ 2006-10-16  Gabriel Dos Reis  <address@hidden>
+ 
+       * g-util.boot.pamphlet (str2Tex): Change local variable name "of"
+       to "outf".
+ 
  2006-10-12  Gabriel Dos Reis  <address@hidden>
  
        * Makefile.pamphlet (depsys_lisp_noncompiled_sources, 
*** src/interp/g-util.boot.pamphlet     (revision 15890)
--- src/interp/g-util.boot.pamphlet     (local)
*************** parse2Outform x ==
*** 427,434 ****
    x
  
  str2Tex s ==
!   of := str2Outform s
!   val := coerceInt(mkObj(wrap of, '(OutputForm)), '(TexFormat))
    val := objValUnwrap val
    CAR val.1
  
--- 427,434 ----
    x
  
  str2Tex s ==
!   outf := str2Outform s
!   val := coerceInt(mkObj(wrap outf, '(OutputForm)), '(TexFormat))
    val := objValUnwrap val
    CAR val.1
  
*************** isDefaultPackageName x == (s := PNAME x)
*** 1153,1166 ****
  
  (DEFUN |parse2Outform| (|x|) (PROG (|op| |argl| |nargl| |ISTMP#1| BRACKET 
|r|) (RETURN (SEQ (COND ((AND (PAIRP |x|) (PROGN (SPADLET |op| (QCAR |x|)) 
(SPADLET |argl| (QCDR |x|)) (QUOTE T))) (SPADLET |nargl| (PROG (#0=#:G2887) 
(SPADLET #0# NIL) (RETURN (DO ((#1=#:G2892 |argl| (CDR #1#)) (|y| NIL)) ((OR 
(ATOM #1#) (PROGN (SETQ |y| (CAR #1#)) NIL)) (NREVERSE0 #0#)) (SEQ (EXIT (SETQ 
#0# (CONS (|parse2Outform| |y|) #0#)))))))) (COND ((BOOT-EQUAL |op| (QUOTE 
|construct|)) (CONS (QUOTE BRACKET) (CONS (CONS (QUOTE ARGLST) (PROG 
(#2=#:G2902) (SPADLET #2# NIL) (RETURN (DO ((#3=#:G2907 |argl| (CDR #3#)) (|y| 
NIL)) ((OR (ATOM #3#) (PROGN (SETQ |y| (CAR #3#)) NIL)) (NREVERSE0 #2#)) (SEQ 
(EXIT (SETQ #2# (CONS (|parse2Outform| |y|) #2#)))))))) NIL))) ((AND 
(BOOT-EQUAL |op| (QUOTE |brace|)) (PAIRP |nargl|) (EQ (QCDR |nargl|) NIL) 
(PROGN (SPADLET |ISTMP#1| (QCAR |nargl|)) (AND (PAIRP |ISTMP#1|) (PROGN 
(SPADLET BRACKET (QCAR |ISTMP#1|)) (SPADLET |r| (QCDR |ISTMP#1|)) (QUOTE T))))) 
(CONS (QUOT
 E BRACE) |r|)) ((QUOTE T) (CONS |op| |nargl|)))) ((QUOTE T) |x|)))))) 
  ;str2Tex s ==
! ;  of := str2Outform s
! ;  val := coerceInt(mkObj(wrap of, '(OutputForm)), '(TexFormat))
  ;  val := objValUnwrap val
  ;  CAR val.1
  
  ;;;     ***       |str2Tex| REDEFINED
  
! (DEFUN |str2Tex| (|s|) (PROG (|of| |val|) (RETURN (PROGN (SPADLET |of| 
(|str2Outform| |s|)) (SPADLET |val| (|coerceInt| (|mkObj| (|wrap| |of|) (QUOTE 
(|OutputForm|))) (QUOTE (|TexFormat|)))) (SPADLET |val| (|objValUnwrap| |val|)) 
(CAR (ELT |val| 1)))))) 
  ;opOf x ==
  ;  atom x => x
  ;  first x
--- 1153,1166 ----
  
  (DEFUN |parse2Outform| (|x|) (PROG (|op| |argl| |nargl| |ISTMP#1| BRACKET 
|r|) (RETURN (SEQ (COND ((AND (PAIRP |x|) (PROGN (SPADLET |op| (QCAR |x|)) 
(SPADLET |argl| (QCDR |x|)) (QUOTE T))) (SPADLET |nargl| (PROG (#0=#:G2887) 
(SPADLET #0# NIL) (RETURN (DO ((#1=#:G2892 |argl| (CDR #1#)) (|y| NIL)) ((OR 
(ATOM #1#) (PROGN (SETQ |y| (CAR #1#)) NIL)) (NREVERSE0 #0#)) (SEQ (EXIT (SETQ 
#0# (CONS (|parse2Outform| |y|) #0#)))))))) (COND ((BOOT-EQUAL |op| (QUOTE 
|construct|)) (CONS (QUOTE BRACKET) (CONS (CONS (QUOTE ARGLST) (PROG 
(#2=#:G2902) (SPADLET #2# NIL) (RETURN (DO ((#3=#:G2907 |argl| (CDR #3#)) (|y| 
NIL)) ((OR (ATOM #3#) (PROGN (SETQ |y| (CAR #3#)) NIL)) (NREVERSE0 #2#)) (SEQ 
(EXIT (SETQ #2# (CONS (|parse2Outform| |y|) #2#)))))))) NIL))) ((AND 
(BOOT-EQUAL |op| (QUOTE |brace|)) (PAIRP |nargl|) (EQ (QCDR |nargl|) NIL) 
(PROGN (SPADLET |ISTMP#1| (QCAR |nargl|)) (AND (PAIRP |ISTMP#1|) (PROGN 
(SPADLET BRACKET (QCAR |ISTMP#1|)) (SPADLET |r| (QCDR |ISTMP#1|)) (QUOTE T))))) 
(CONS (QUOT
 E BRACE) |r|)) ((QUOTE T) (CONS |op| |nargl|)))) ((QUOTE T) |x|)))))) 
  ;str2Tex s ==
! ;  outf := str2Outform s
! ;  val := coerceInt(mkObj(wrap outf, '(OutputForm)), '(TexFormat))
  ;  val := objValUnwrap val
  ;  CAR val.1
  
  ;;;     ***       |str2Tex| REDEFINED
  
! (DEFUN |str2Tex| (|s|) (PROG (|outf| |val|) (RETURN (PROGN (SPADLET |outf| 
(|str2Outform| |s|)) (SPADLET |val| (|coerceInt| (|mkObj| (|wrap| |outf|) 
(QUOTE (|OutputForm|))) (QUOTE (|TexFormat|)))) (SPADLET |val| (|objValUnwrap| 
|val|)) (CAR (ELT |val| 1)))))) 
  ;opOf x ==
  ;  atom x => x
  ;  first x