guile/guile-oops active-slot.scm composite-slot...

[Mikael Djurfeldt]

CVSROOT:        /cvs
Module name:    guile
Changes by:     Mikael Djurfeldt <address@hidden>       01/03/09 17:26:38

Modified files:
        guile-oops     : active-slot.scm composite-slot.scm describe.scm 
                         save.scm 

Log message:
        * save.scm, goops.scm, composite-slot.scm, active-slot.scm:
        Use new method syntax.

CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-oops/active-slot.scm.diff?r1=1.2&r2=1.3
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-oops/composite-slot.scm.diff?r1=1.5&r2=1.6
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-oops/describe.scm.diff?r1=1.6&r2=1.7
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-oops/save.scm.diff?r1=1.18&r2=1.19

Patches:
Index: guile/guile-oops/active-slot.scm
diff -u guile/guile-oops/active-slot.scm:1.2 
guile/guile-oops/active-slot.scm:1.3
--- guile/guile-oops/active-slot.scm:1.2        Sat Mar 20 20:41:50 1999
+++ guile/guile-oops/active-slot.scm    Fri Mar  9 17:26:38 2001
@@ -1,6 +1,6 @@
 ;;; installed-scm-file
 
-;;;;   Copyright (C) 1999 Free Software Foundation, Inc.
+;;;;   Copyright (C) 1999, 2001 Free Software Foundation, Inc.
 ;;;; 
 ;;;; This program is free software; you can redistribute it and/or modify
 ;;;; it under the terms of the GNU General Public License as published by
@@ -33,7 +33,7 @@
 
 (define-class <active-class> (<class>))
 
-(define-method compute-get-n-set ((class <active-class>) slot)
+(define-method (compute-get-n-set (class <active-class>) slot)
   (if (eq? (slot-definition-allocation slot) #:active)
       (let* ((index      (slot-ref class 'nfields))
             (name        (car slot))
Index: guile/guile-oops/composite-slot.scm
diff -u guile/guile-oops/composite-slot.scm:1.5 
guile/guile-oops/composite-slot.scm:1.6
--- guile/guile-oops/composite-slot.scm:1.5     Tue Aug  8 09:15:34 2000
+++ guile/guile-oops/composite-slot.scm Fri Mar  9 17:26:38 2001
@@ -1,6 +1,6 @@
 ;;; installed-scm-file
 
-;;;;   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+;;;;   Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
 ;;;; 
 ;;;; This program is free software; you can redistribute it and/or modify
 ;;;; it under the terms of the GNU General Public License as published by
@@ -50,7 +50,7 @@
 
 (define-class <composite-class> (<class>))
 
-(define-method compute-get-n-set ((class <composite-class>) slot)
+(define-method (compute-get-n-set (class <composite-class>) slot)
   (if (eq? (slot-definition-allocation slot) #:propagated)
       (compute-propagated-get-n-set slot)
       (next-method)))
Index: guile/guile-oops/describe.scm
diff -u guile/guile-oops/describe.scm:1.6 guile/guile-oops/describe.scm:1.7
--- guile/guile-oops/describe.scm:1.6   Wed Sep 15 10:48:17 1999
+++ guile/guile-oops/describe.scm       Fri Mar  9 17:26:38 2001
@@ -1,6 +1,6 @@
 ;;; installed-scm-file
 
-;;;;   Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+;;;;   Copyright (C) 1998, 1999, 2001 Free Software Foundation, Inc.
 ;;;; 
 ;;;; This program is free software; you can redistribute it and/or modify
 ;;;; it under the terms of the GNU General Public License as published by
@@ -36,7 +36,7 @@
 ;;;
 ;;; describe for simple objects
 ;;;
-(define-method describe ((x <top>))
+(define-method (describe (x <top>))
   (format #t "~s is " x)
   (cond
      ((integer? x)      (format #t "an integer"))
@@ -62,7 +62,7 @@
   (format #t ".~%")
   *unspecified*)
 
-(define-method describe ((x <procedure>))
+(define-method (describe (x <procedure>))
   (let ((name (procedure-name x)))
     (if name
        (format #t "`~s'" name)
@@ -84,7 +84,7 @@
       (class-name class)
       class))
 
-(define-method describe ((x <object>))
+(define-method (describe (x <object>))
   (format #t "~S is an instance of class ~A~%"
          x (safe-class-name (class-of x)))
 
@@ -103,7 +103,7 @@
 ;;;
 ;;; Describe for classes
 ;;;
-(define-method describe ((x <class>))
+(define-method (describe (x <class>))
   (format #t "~S is a class. It's an instance of ~A~%" 
          (safe-class-name x) (safe-class-name (class-of x)))
   
@@ -156,7 +156,7 @@
 ;;;
 ;;; Describe for generic functions
 ;;;
-(define-method describe ((x <generic>))
+(define-method (describe (x <generic>))
   (let ((name    (generic-function-name x))
        (methods (generic-function-methods x)))
     ;; Title
@@ -172,7 +172,7 @@
 ;;;
 ;;; Describe for methods
 ;;;
-(define-method describe ((x <method>) . omit-generic)
+(define-method (describe (x <method>) . omit-generic)
   (letrec ((print-args (lambda (args)
                         ;; take care of dotted arg lists
                         (cond ((null? args) (newline))
Index: guile/guile-oops/save.scm
diff -u guile/guile-oops/save.scm:1.18 guile/guile-oops/save.scm:1.19
--- guile/guile-oops/save.scm:1.18      Sat Apr 15 19:36:22 2000
+++ guile/guile-oops/save.scm   Fri Mar  9 17:26:38 2001
@@ -1,6 +1,6 @@
 ;;; installed-scm-file
 
-;;;;   Copyright (C) 2000 Free Software Foundation, Inc.
+;;;;   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
 ;;;; 
 ;;;; This program is free software; you can redistribute it and/or modify
 ;;;; it under the terms of the GNU General Public License as published by
@@ -88,22 +88,22 @@
 ;;; literal? COMPONENT ENV
 ;;;
 
-(define-method immediate? ((o <top>)) #f)
+(define-method (immediate? (o <top>)) #f)
 
-(define-method immediate? ((o <null>)) #t)
-(define-method immediate? ((o <number>)) #t)
-(define-method immediate? ((o <boolean>)) #t)
-(define-method immediate? ((o <symbol>)) #t)
-(define-method immediate? ((o <char>)) #t)
-(define-method immediate? ((o <keyword>)) #t)
+(define-method (immediate? (o <null>)) #t)
+(define-method (immediate? (o <number>)) #t)
+(define-method (immediate? (o <boolean>)) #t)
+(define-method (immediate? (o <symbol>)) #t)
+(define-method (immediate? (o <char>)) #t)
+(define-method (immediate? (o <keyword>)) #t)
 
 ;;; enumerate! OBJECT ENVIRONMENT
 ;;;
 ;;; Return #t if object is a literal.
 ;;;
-(define-method enumerate! ((o <top>) env) #t)
+(define-method (enumerate! (o <top>) env) #t)
 
-(define-method write-readably ((o <top>) file env)
+(define-method (write-readably (o <top>) file env)
   ;;(goops-error "No read-syntax defined for object `~S'" o)
   (write o file) ;doesn't catch bugs, but is much more flexible
   )
@@ -135,13 +135,13 @@
 ;;; Strings
 ;;;
 
-(define-method enumerate! ((o <string>) env) #f)
+(define-method (enumerate! (o <string>) env) #f)
 
 ;;;
 ;;; Vectors
 ;;;
 
-(define-method enumerate! ((o <vector>) env)
+(define-method (enumerate! (o <vector>) env)
   (or (not (vector? o))
       (let ((literal? #t))
        (array-for-each (lambda (o)
@@ -150,7 +150,7 @@
                        o)
        literal?)))
 
-(define-method write-readably ((o <vector>) file env)
+(define-method (write-readably (o <vector>) file env)
   (if (not (vector? o))
       (write o file)
       (let ((n (vector-length o)))
@@ -185,7 +185,7 @@
 ;;; Arrays
 ;;;
 
-(define-method enumerate! ((o <array>) env)
+(define-method (enumerate! (o <array>) env)
   (enumerate-component! (shared-array-root o) env))
 
 (define (make-mapper array)
@@ -249,7 +249,7 @@
                 (display #\) file))))))
     (display #\) file)))
 
-(define-method write-readably ((o <array>) file env)
+(define-method (write-readably (o <array>) file env)
   (let ((root (shared-array-root o)))
     (cond ((literal? o env)
           (if (not (vector? root))
@@ -288,12 +288,12 @@
 ;;; `write-component'.
 ;;;
 
-(define-method enumerate! ((o <pair>) env)
+(define-method (enumerate! (o <pair>) env)
   (let ((literal? (enumerate-component! (car o) env)))
     (and (enumerate-component! (cdr o) env)
         literal?)))
 
-(define-method write-readably ((o <pair>) file env)
+(define-method (write-readably (o <pair>) file env)
   (let ((proper? (let loop ((ls o))
                   (or (null? ls)
                       (and (pair? ls)
@@ -390,7 +390,7 @@
                   (list ,@(cdddr exp)))
         o))))
 
-(define-method enumerate! ((o <object>) env)
+(define-method (enumerate! (o <object>) env)
   (get-set-for-each (lambda (get set)
                      (let ((val (get o)))
                        (if (not (unbound? val))
@@ -398,7 +398,7 @@
                    (class-of o))
   #f)
 
-(define-method write-readably ((o <object>) file env)
+(define-method (write-readably (o <object>) file env)
   (let ((class (class-of o)))
     (display "(restore " file)
     (display (class-name class) file)
@@ -444,9 +444,9 @@
 ;;; Currently, we don't support reading in class objects
 ;;;
 
-(define-method enumerate! ((o <class>) env) #f)
+(define-method (enumerate! (o <class>) env) #f)
 
-(define-method write-readably ((o <class>) file env)
+(define-method (write-readably (o <class>) file env)
   (display (class-name o) file))
 
 ;;;
@@ -456,9 +456,9 @@
 ;;; Currently, we don't support reading in generic functions
 ;;;
 
-(define-method enumerate! ((o <generic>) env) #f)
+(define-method (enumerate! (o <generic>) env) #f)
 
-(define-method write-readably ((o <generic>) file env)
+(define-method (write-readably (o <generic>) file env)
   (display (generic-function-name o) file))
 
 ;;;
@@ -468,9 +468,9 @@
 ;;; Currently, we don't support reading in methods
 ;;;
 
-(define-method enumerate! ((o <method>) env) #f)
+(define-method (enumerate! (o <method>) env) #f)
 
-(define-method write-readably ((o <method>) file env)
+(define-method (write-readably (o <method>) file env)
   (goops-error "No read-syntax for <method> defined"))
 
 ;;;
@@ -820,13 +820,13 @@
                                            written)))))
              alist)))
 
-(define-method save-objects ((alist <pair>) (file <string>) . rest)
+(define-method (save-objects (alist <pair>) (file <string>) . rest)
   (let ((port (open-output-file file)))
     (apply save-objects alist port rest)
     (close-port port)
     *unspecified*))
 
-(define-method save-objects ((alist <pair>) (file <output-port>) . rest)
+(define-method (save-objects (alist <pair>) (file <output-port>) . rest)
   (let ((excluded (if (>= (length rest) 1) (car rest) '()))
        (uses     (if (>= (length rest) 2) (cadr rest) '())))
     (let ((env (make <environment> #:excluded excluded)))
@@ -853,13 +853,13 @@
       (write-readables! alist file env)
       (write-rebindings! "(define " (reverse (multiple-bound env)) file env))))
 
-(define-method load-objects ((file <string>))
+(define-method (load-objects (file <string>))
   (let* ((port (open-input-file file))
         (objects (load-objects port)))
     (close-port port)
     objects))
 
-(define-method load-objects ((file <input-port>))
+(define-method (load-objects (file <input-port>))
   (let ((m (make-module)))
     (module-use! m the-scm-module)
     (module-use! m %module-public-interface)