[Emacs-diffs] Changes to emacs/lisp/calc/calc-vec.el

[Jay Belanger]

Index: emacs/lisp/calc/calc-vec.el
diff -c emacs/lisp/calc/calc-vec.el:1.8 emacs/lisp/calc/calc-vec.el:1.9
*** emacs/lisp/calc/calc-vec.el:1.8     Thu Nov 11 05:53:19 2004
--- emacs/lisp/calc/calc-vec.el Fri Nov 26 22:33:49 2004
***************
*** 3,10 ****
  ;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc.
  
  ;; Author: David Gillespie <address@hidden>
! ;; Maintainers: D. Goel <address@hidden>
! ;;              Colin Walters <address@hidden>
  
  ;; This file is part of GNU Emacs.
  
--- 3,9 ----
  ;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc.
  
  ;; Author: David Gillespie <address@hidden>
! ;; Maintainer: Jay Belanger <address@hidden>
  
  ;; This file is part of GNU Emacs.
  
***************
*** 1101,1121 ****
        (cons 'vec (nreverse (sort (copy-sequence (cdr vec)) 'math-beforep)))
      (math-reject-arg vec 'vectorp)))
  
! (defun calcFunc-grade (grade-vec)
!   (if (math-vectorp grade-vec)
!       (let* ((len (1- (length grade-vec))))
        (cons 'vec (sort (cdr (calcFunc-index len)) 'math-grade-beforep)))
!     (math-reject-arg grade-vec 'vectorp)))
  
! (defun calcFunc-rgrade (grade-vec)
!   (if (math-vectorp grade-vec)
!       (let* ((len (1- (length grade-vec))))
        (cons 'vec (nreverse (sort (cdr (calcFunc-index len))
                                   'math-grade-beforep))))
!     (math-reject-arg grade-vec 'vectorp)))
  
  (defun math-grade-beforep (i j)
!   (math-beforep (nth i grade-vec) (nth j grade-vec)))
  
  
  ;;; Compile a histogram of data from a vector.
--- 1100,1125 ----
        (cons 'vec (nreverse (sort (copy-sequence (cdr vec)) 'math-beforep)))
      (math-reject-arg vec 'vectorp)))
  
! ;; The variable math-grade-vec is local to calcFunc-grade and 
! ;; calcFunc-rgrade, but is used by math-grade-beforep, which is called
! ;; by calcFunc-grade and calcFunc-rgrade.
! (defvar math-grade-vec)
! 
! (defun calcFunc-grade (math-grade-vec)
!   (if (math-vectorp math-grade-vec)
!       (let* ((len (1- (length math-grade-vec))))
        (cons 'vec (sort (cdr (calcFunc-index len)) 'math-grade-beforep)))
!     (math-reject-arg math-grade-vec 'vectorp)))
  
! (defun calcFunc-rgrade (math-grade-vec)
!   (if (math-vectorp math-grade-vec)
!       (let* ((len (1- (length math-grade-vec))))
        (cons 'vec (nreverse (sort (cdr (calcFunc-index len))
                                   'math-grade-beforep))))
!     (math-reject-arg math-grade-vec 'vectorp)))
  
  (defun math-grade-beforep (i j)
!   (math-beforep (nth i math-grade-vec) (nth j math-grade-vec)))
  
  
  ;;; Compile a histogram of data from a vector.
***************
*** 1461,1474 ****
  
  
  
  
! 
! (defun math-read-brackets (space-sep close)
    (and space-sep (setq space-sep (not (math-check-for-commas))))
    (math-read-token)
    (while (eq math-exp-token 'space)
      (math-read-token))
!   (if (or (equal math-expr-data close)
          (eq math-exp-token 'end))
        (progn
        (math-read-token)
--- 1465,1481 ----
  
  
  
+ ;; The variable math-rb-close is local to math-read-brackets, but
+ ;; is used by math-read-vector, which is called (directly and
+ ;; indirectly) by math-read-brackets.
+ (defvar math-rb-close)
  
! (defun math-read-brackets (space-sep math-rb-close)
    (and space-sep (setq space-sep (not (math-check-for-commas))))
    (math-read-token)
    (while (eq math-exp-token 'space)
      (math-read-token))
!   (if (or (equal math-expr-data math-rb-close)
          (eq math-exp-token 'end))
        (progn
        (math-read-token)
***************
*** 1495,1501 ****
                  (setq vals2 (catch 'syntax (math-read-vector))))
                (if (and (not (stringp vals2))
                         (or (assoc math-expr-data '(("\\ldots") ("\\dots") 
(";")))
!                            (equal math-expr-data close)
                             (eq math-exp-token 'end)))
                    (setq space-sep nil
                          vals vals2)
--- 1502,1508 ----
                  (setq vals2 (catch 'syntax (math-read-vector))))
                (if (and (not (stringp vals2))
                         (or (assoc math-expr-data '(("\\ldots") ("\\dots") 
(";")))
!                            (equal math-expr-data math-rb-close)
                             (eq math-exp-token 'end)))
                    (setq space-sep nil
                          vals vals2)
***************
*** 1509,1515 ****
            (math-read-token)
            (setq vals (if (> (length vals) 2)
                           (cons 'calcFunc-mul (cdr vals)) (nth 1 vals)))
!           (let ((exp2 (if (or (equal math-expr-data close)
                                (equal math-expr-data ")")
                                (eq math-exp-token 'end))
                            '(var inf var-inf)
--- 1516,1522 ----
            (math-read-token)
            (setq vals (if (> (length vals) 2)
                           (cons 'calcFunc-mul (cdr vals)) (nth 1 vals)))
!           (let ((exp2 (if (or (equal math-expr-data math-rb-close)
                                (equal math-expr-data ")")
                                (eq math-exp-token 'end))
                            '(var inf var-inf)
***************
*** 1519,1532 ****
                          (if (equal math-expr-data ")") 2 3)
                          vals
                          exp2)))
!           (if (not (or (equal math-expr-data close)
                         (equal math-expr-data ")")
                         (eq math-exp-token 'end)))
                (throw 'syntax "Expected `]'")))
        (if (equal math-expr-data ";")
            (let ((math-exp-keep-spaces space-sep))
              (setq vals (cons 'vec (math-read-matrix (list vals))))))
!       (if (not (or (equal math-expr-data close)
                     (eq math-exp-token 'end)))
            (throw 'syntax "Expected `]'")))
        (or (eq math-exp-token 'end)
--- 1526,1539 ----
                          (if (equal math-expr-data ")") 2 3)
                          vals
                          exp2)))
!           (if (not (or (equal math-expr-data math-rb-close)
                         (equal math-expr-data ")")
                         (eq math-exp-token 'end)))
                (throw 'syntax "Expected `]'")))
        (if (equal math-expr-data ";")
            (let ((math-exp-keep-spaces space-sep))
              (setq vals (cons 'vec (math-read-matrix (list vals))))))
!       (if (not (or (equal math-expr-data math-rb-close)
                     (eq math-exp-token 'end)))
            (throw 'syntax "Expected `]'")))
        (or (eq math-exp-token 'end)
***************
*** 1557,1563 ****
               (math-read-token))
             (and (not (eq math-exp-token 'end))
                  (not (equal math-expr-data ";"))
!                 (not (equal math-expr-data close))
                  (not (equal math-expr-data "\\dots"))
                  (not (equal math-expr-data "\\ldots"))))
        (if (equal math-expr-data ",")
--- 1564,1570 ----
               (math-read-token))
             (and (not (eq math-exp-token 'end))
                  (not (equal math-expr-data ";"))
!                 (not (equal math-expr-data math-rb-close))
                  (not (equal math-expr-data "\\dots"))
                  (not (equal math-expr-data "\\ldots"))))
        (if (equal math-expr-data ",")