guile/guile-core ChangeLog Makefile.am NEWS con...

[Mikael Djurfeldt]

CVSROOT:        /cvs
Module name:    guile
Changes by:     Mikael Djurfeldt <address@hidden>       00/10/25 07:45:36

Modified files:
        guile-core     : ChangeLog Makefile.am NEWS configure.in 
                         libguile.h 

Log message:
        

CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/ChangeLog.diff?r1=1.215&r2=1.216
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/Makefile.am.diff?r1=1.18&r2=1.19
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/NEWS.diff?r1=1.208&r2=1.209
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/configure.in.diff?r1=1.123&r2=1.124
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/libguile.h.diff?r1=1.5&r2=1.6

Patches:
Index: guile/guile-core/ChangeLog
diff -u guile/guile-core/ChangeLog:1.215 guile/guile-core/ChangeLog:1.216
--- guile/guile-core/ChangeLog:1.215    Sun Oct  1 04:03:17 2000
+++ guile/guile-core/ChangeLog  Wed Oct 25 07:45:36 2000
@@ -1,3 +1,10 @@
+2000-10-25  Mikael Djurfeldt  <address@hidden>
+
+       * GUILE-VERSION (LIBGUILE_MAJOR_VERSION): Incremented major
+       version number to 10 due to the merge of GOOPS.
+
+       * oop: New directory.
+
 2000-09-20  Keisuke Nishida  <address@hidden>
 
        * libguile.h: #include "libguile/properties.h".
Index: guile/guile-core/Makefile.am
diff -u guile/guile-core/Makefile.am:1.18 guile/guile-core/Makefile.am:1.19
--- guile/guile-core/Makefile.am:1.18   Mon Jun 12 07:03:12 2000
+++ guile/guile-core/Makefile.am        Wed Oct 25 07:45:36 2000
@@ -19,7 +19,7 @@
 ##   to the Free Software Foundation, Inc., 59 Temple Place, Suite
 ##   330, Boston, MA 02111-1307 USA
 
-SUBDIRS = ice-9 qt libltdl libguile guile-config guile-readline doc
+SUBDIRS = ice-9 oop qt libltdl libguile guile-config guile-readline doc
 
 include_HEADERS = libguile.h
 
Index: guile/guile-core/NEWS
diff -u guile/guile-core/NEWS:1.208 guile/guile-core/NEWS:1.209
--- guile/guile-core/NEWS:1.208 Wed Oct 25 05:58:51 2000
+++ guile/guile-core/NEWS       Wed Oct 25 07:45:36 2000
@@ -8,7 +8,72 @@
 
 * Changes to the distribution
 
+** New modules (oop goops) etc
+
+The new modules
+
+  (oop goops)
+  (oop goops describe)
+  (oop goops save)
+  (oop goops active-slot)
+  (oop goops composite-slot)
+
+plus some GOOPS utility modules have been added.
+
 * Changes to the stand-alone interpreter
+
+** GOOPS has been merged into Guile
+
+The Guile Object Oriented Programming System has been integrated into
+Guile.
+
+Type
+
+  (use-modules (oop goops))
+
+access GOOPS bindings.
+
+We're now ready to try some basic GOOPS functionality.
+
+Generic functions
+
+  (define-method (+ (x <string>) (y <string>))
+    (string-append x y))
+
+  (+ 1 2) --> 3
+  (+ "abc" "de") --> "abcde"
+
+User-defined types
+
+  (define-class <2D-vector> ()
+    (x #:init-value 0 #:accessor x-component #:init-keyword #:x)
+    (y #:init-value 0 #:accessor y-component #:init-keyword #:y))
+
+  (define-method write ((obj <2D-vector>) port)
+    (display (format #f "<~S, ~S>" (x-component obj) (y-component obj))
+            port))
+
+  (define v (make <2D-vector> #:x 3 #:y 4))
+  v --> <3, 4>
+
+  (define-method + ((x <2D-vector>) (y <2D-vector>))
+    (make <2D-vector>
+          #:x (+ (x-component x) (x-component y))
+          #:y (+ (y-component x) (y-component y))))
+
+  (+ v v) --> <6, 8>
+
+Asking for the type of an object
+
+  (class-of v) --> #<<class> <2D-vector> 40241ac0>
+  <2D-vector>  --> #<<class> <2D-vector> 40241ac0>
+  (class-of 1) --> #<<class> <integer> 401b2a98>
+  <integer>    --> #<<class> <integer> 401b2a98>
+
+  (is-a? v <2D-vector>) --> #t
+
+See further in the GOOPS tutorial available in the guile-doc
+distribution in info (goops.info) and texinfo formats.
 
 ** It's now possible to create modules with controlled environments
 
Index: guile/guile-core/configure.in
diff -u guile/guile-core/configure.in:1.123 guile/guile-core/configure.in:1.124
--- guile/guile-core/configure.in:1.123 Sun Oct  1 04:03:17 2000
+++ guile/guile-core/configure.in       Wed Oct 25 07:45:36 2000
@@ -507,7 +507,7 @@
 AC_SUBST(LIBLOBJS)
 AC_SUBST(EXTRA_DOT_DOC_FILES)
 
-AC_OUTPUT([Makefile libguile/Makefile libguile/guile-snarf 
libguile/guile-doc-snarf libguile/guile-func-name-check 
libguile/guile-snarf.awk libguile/versiondat.h ice-9/Makefile qt/Makefile 
qt/qt.h qt/md/Makefile qt/time/Makefile guile-config/Makefile doc/Makefile], 
[chmod +x libguile/guile-snarf libguile/guile-doc-snarf 
libguile/guile-func-name-check])
+AC_OUTPUT([Makefile libguile/Makefile libguile/guile-snarf 
libguile/guile-doc-snarf libguile/guile-func-name-check 
libguile/guile-snarf.awk libguile/versiondat.h ice-9/Makefile oop/Makefile 
oop/goops/Makefile qt/Makefile qt/qt.h qt/md/Makefile qt/time/Makefile 
guile-config/Makefile doc/Makefile], [chmod +x libguile/guile-snarf 
libguile/guile-doc-snarf libguile/guile-func-name-check])
 
 dnl Local Variables:
 dnl comment-start: "dnl "
Index: guile/guile-core/libguile.h
diff -u guile/guile-core/libguile.h:1.5 guile/guile-core/libguile.h:1.6
--- guile/guile-core/libguile.h:1.5     Wed Sep 20 09:31:04 2000
+++ guile/guile-core/libguile.h Wed Oct 25 07:45:36 2000
@@ -78,6 +78,7 @@
 #include "libguile/fports.h"
 #include "libguile/gc.h"
 #include "libguile/gdbint.h"
+#include "libguile/goops.h"
 #include "libguile/gsubr.h"
 #include "libguile/guardians.h"
 #include "libguile/hash.h"