Index: xotcl/ChangeLog
===================================================================
diff -u -rf909cd44b7d6b7fe9a120885b206d34100c46c0d -r55764ef8921abb0e4f506e0ae6b0caf3f842276d
--- xotcl/ChangeLog (.../ChangeLog) (revision f909cd44b7d6b7fe9a120885b206d34100c46c0d)
+++ xotcl/ChangeLog (.../ChangeLog) (revision 55764ef8921abb0e4f506e0ae6b0caf3f842276d)
@@ -1,3 +1,7 @@
+2005-01-10 Gustaf.Neumann@wu-wien.ac.at
+ * added instproc for ::xotcl::Class allinstances
+ to list all instances for the actual class
+
2005-01-07 Gustaf.Neumann@wu-wien.ac.at
* code cleanup for nonpos args
* new methods for Serialzer:
@@ -11,7 +15,7 @@
2005-01-06 Gustaf.Neumann@wu-wien.ac.at
* made introspection options for methods with nonpos args
- compatible with tcl
+ compatible with Tcl
* adding functionality to allow nonpos args and positional args
to be specified in the same argument list (still supporting
the syntax with separate lists)
Index: xotcl/Makefile
===================================================================
diff -u -rf909cd44b7d6b7fe9a120885b206d34100c46c0d -r55764ef8921abb0e4f506e0ae6b0caf3f842276d
--- xotcl/Makefile (.../Makefile) (revision f909cd44b7d6b7fe9a120885b206d34100c46c0d)
+++ xotcl/Makefile (.../Makefile) (revision 55764ef8921abb0e4f506e0ae6b0caf3f842276d)
@@ -12,7 +12,7 @@
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
-# RCS: @(#) $Id: Makefile,v 1.32 2005/01/07 12:41:26 neumann Exp $
+# RCS: @(#) $Id: Makefile,v 1.33 2005/01/10 11:57:35 neumann Exp $
#========================================================================
# Add additional lines to handle any additional AC_SUBST cases that
@@ -27,10 +27,10 @@
src_test_dir = ${srcdir}/tests
src_app_dir = ${srcdir}/apps
src_generic_dir = ${srcdir}/generic
-TCL_LIB_SPEC = -L/home/neumann/tcl8.4.7/unix -ltcl8.4
+TCL_LIB_SPEC = -L/home/neumann/import/tcl8.4.9/unix -ltcl8.4
TK_LIB_SPEC =
subdirs =
-aol_prefix = /usr/local/aolserver40r8/
+aol_prefix = /usr/local/aolserver
# Requires native paths
PLATFORM_DIR = `echo $(srcdir)/unix`
@@ -107,14 +107,14 @@
SHELL = /bin/sh
srcdir = .
-prefix = /usr/local/aolserver40r8/
-exec_prefix = /usr/local/aolserver40r8/
+prefix = /usr
+exec_prefix = /usr
bindir = ${exec_prefix}/bin
-libdir = /usr/local/aolserver40r8//lib
-datadir = /usr/local/aolserver40r8//share
+libdir = /usr/lib
+datadir = /usr/share
mandir = ${prefix}/man
-includedir = /usr/local/aolserver40r8//include
+includedir = /usr/include
DESTDIR =
@@ -143,19 +143,19 @@
SHLIB_CFLAGS = -fPIC
SHLIB_LD = gcc -pipe -shared
SHLIB_LD_FLAGS =
-SHLIB_LD_LIBS = ${LIBS} -L/home/neumann/tcl8.4.7/unix -ltclstub8.4
+SHLIB_LD_LIBS = ${LIBS} -L/home/neumann/import/tcl8.4.9/unix -ltclstub8.4
STLIB_LD = ${AR} cr
-TCL_DEFS = -DTCL_THREADS=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_PTHREAD_ATFORK=1 -DHAVE_READDIR_R=1 -DPEEK_XCLOSEIM=1 -D_LARGEFILE64_SOURCE=1 -DTCL_WIDE_INT_TYPE=long\ long -DHAVE_STRUCT_STAT64=1 -DHAVE_TYPE_OFF64_T=1 -DHAVE_GETCWD=1 -DHAVE_OPENDIR=1 -DHAVE_STRSTR=1 -DHAVE_STRTOL=1 -DHAVE_STRTOLL=1 -DHAVE_STRTOULL=1 -DHAVE_TMPNAM=1 -DHAVE_WAITPID=1 -DHAVE_LIMITS_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_TERMIOS=1 -DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_TM_ZONE=1 -DHAVE_GMTIME_R=1 -DHAVE_LOCALTIME_R=1 -DHAVE_TM_GMTOFF=1 -DHAVE_TIMEZONE_VAR=1 -DHAVE_ST_BLKSIZE=1 -DSTDC_HEADERS=1 -DHAVE_SIGNED_CHAR=1 -DHAVE_LANGINFO=1 -DHAVE_SYS_IOCTL_H=1
-TCL_BIN_DIR = /home/neumann/tcl8.4.7/unix
-TCL_SRC_DIR = /home/neumann/tcl8.4.7
+TCL_DEFS = -DTCL_THREADS=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_PTHREAD_ATFORK=1 -DHAVE_READDIR_R=1 -DHAVE_THREE_ARG_READDIR_R=1 -DPEEK_XCLOSEIM=1 -D_LARGEFILE64_SOURCE=1 -DTCL_WIDE_INT_TYPE=long\ long -DHAVE_STRUCT_STAT64=1 -DHAVE_OPEN64=1 -DHAVE_LSEEK64=1 -DHAVE_TYPE_OFF64_T=1 -DHAVE_GETCWD=1 -DHAVE_OPENDIR=1 -DHAVE_STRSTR=1 -DHAVE_STRTOL=1 -DHAVE_STRTOLL=1 -DHAVE_STRTOULL=1 -DHAVE_TMPNAM=1 -DHAVE_WAITPID=1 -DHAVE_LIMITS_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_TERMIOS=1 -DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_TM_ZONE=1 -DHAVE_GMTIME_R=1 -DHAVE_LOCALTIME_R=1 -DHAVE_TM_GMTOFF=1 -DHAVE_TIMEZONE_VAR=1 -DHAVE_ST_BLKSIZE=1 -DSTDC_HEADERS=1 -DHAVE_SIGNED_CHAR=1 -DHAVE_LANGINFO=1 -DHAVE_SYS_IOCTL_H=1
+TCL_BIN_DIR = /home/neumann/tcl8.4.9/unix
+TCL_SRC_DIR = /home/neumann/import/tcl8.4.9
# This is necessary for packages that use private Tcl headers
#TCL_TOP_DIR_NATIVE = $(TCL_SRC_DIR)
# Not used, but retained for reference of what libs Tcl required
TCL_LIBS = ${DL_LIBS} ${LIBS} ${MATH_LIBS}
-pkgdatadir = /usr/local/aolserver40r8//share/xotcl1.3.5
-pkglibdir = /usr/local/aolserver40r8//lib/xotcl1.3.5
-pkgincludedir = /usr/local/aolserver40r8//include/xotcl1.3.5
+pkgdatadir = /usr/share/xotcl1.3.5
+pkglibdir = /usr/lib/xotcl1.3.5
+pkgincludedir = /usr/include/xotcl1.3.5
#========================================================================
# TCLLIBPATH seeds the auto_path in Tcl's init.tcl so we can test our
@@ -169,7 +169,7 @@
LD_LIBRARY_PATH="$(EXTRA_PATH):$(LD_LIBRARY_PATH)" \
PATH="$(EXTRA_PATH):$(PATH)" \
TCLLIBPATH="$(top_builddir) ${srcdir}"
-TCLSH_PROG = /home/neumann/tcl8.4.7/unix/tclsh
+TCLSH_PROG = /home/neumann/tcl8.4.9/unix/tclsh
TCLSH = $(TCLSH_ENV) $(TCLSH_PROG)
SHARED_BUILD = 1
@@ -617,7 +617,7 @@
@echo " setenv TCLLIBPATH \"$(TCLLIBPATH)\""
@echo " and"
@if test "x$(XOTCLSH)" = "x" ; then \
- echo " /home/neumann/tcl8.4.7/unix/tclsh" ; \
+ echo " /home/neumann/tcl8.4.9/unix/tclsh" ; \
echo " package require XOTcl; namespace import -force xotcl::*" ; \
echo " or" ; \
echo " put the 'package require' line into your ~/.tclshrc" ; \
Index: xotcl/apps/utils/xotclsh
===================================================================
diff -u -rf909cd44b7d6b7fe9a120885b206d34100c46c0d -r55764ef8921abb0e4f506e0ae6b0caf3f842276d
--- xotcl/apps/utils/xotclsh (.../xotclsh) (revision f909cd44b7d6b7fe9a120885b206d34100c46c0d)
+++ xotcl/apps/utils/xotclsh (.../xotclsh) (revision 55764ef8921abb0e4f506e0ae6b0caf3f842276d)
@@ -1,7 +1,7 @@
-#!/home/neumann/tcl8.4.7/unix/tclsh
+#!/home/neumann/tcl8.4.9/unix/tclsh
if {$argc == 0} {
puts "Don't use [info script] as interactive shell! Use instead:"
- puts " /home/neumann/tcl8.4.7/unix/tclsh"
+ puts " /home/neumann/tcl8.4.9/unix/tclsh"
puts " package require XOTcl; namespace import ::xotcl::*"
} else {
package require XOTcl
Index: xotcl/apps/utils/xowish
===================================================================
diff -u -rf909cd44b7d6b7fe9a120885b206d34100c46c0d -r55764ef8921abb0e4f506e0ae6b0caf3f842276d
--- xotcl/apps/utils/xowish (.../xowish) (revision f909cd44b7d6b7fe9a120885b206d34100c46c0d)
+++ xotcl/apps/utils/xowish (.../xowish) (revision 55764ef8921abb0e4f506e0ae6b0caf3f842276d)
@@ -1,5 +1,5 @@
#!@WISH_PROG@
-###!/home/neumann/tcl8.4.7/unix/tclsh
+###!/home/neumann/tcl8.4.9/unix/tclsh
###package require Tk
if {$argc == 0} {
puts "Don't use [info script] as interactive shell! Use instead:"
Index: xotcl/doc/langRef.xotcl
===================================================================
diff -u -r2c6cdd4f5d1c45c96e996a70b54ae4c5f46a40fd -r55764ef8921abb0e4f506e0ae6b0caf3f842276d
--- xotcl/doc/langRef.xotcl (.../langRef.xotcl) (revision 2c6cdd4f5d1c45c96e996a70b54ae4c5f46a40fd)
+++ xotcl/doc/langRef.xotcl (.../langRef.xotcl) (revision 55764ef8921abb0e4f506e0ae6b0caf3f842276d)
@@ -1,4 +1,4 @@
-# $Id: langRef.xotcl,v 1.6 2004/10/30 20:19:55 neumann Exp $
+# $Id: langRef.xotcl,v 1.7 2005/01/10 11:57:35 neumann Exp $
package provide XOTcl-langRef 1.3.3
package require Tcl
@@ -62,7 +62,7 @@
<@/p>
}
- date { $Date: 2004/10/30 20:19:55 $ }
+ date { $Date: 2005/01/10 11:57:35 $ }
}
##
@@ -403,13 +403,10 @@
<@li><@TT>objName info invar@TT>: Returns object invariants.
- <@li><@TT>objName info nonposargs methodName@TT>: Returns
- non-positional arg list of methodName
-
<@li><@TT>objName info metadata ?pattern?@TT>:
Returns available metadata options.
- <@li><@TT>objName info methods@TT>: Returns the list of all method
+ <@li><@TT>objName info methods@TT>: Returns the list of all methods
currently reachable for objName. Includes procs, instprocs, cmds,
instcommands on object, class hierarchy and mixins.
Modifier <@TT>-noprocs@TT> only returns instcommands,
@@ -420,6 +417,9 @@
of the object. With <@TT>-order@TT> modifier the order of mixins
(whole hierarchy) is printed.
+ <@li><@TT>objName info nonposargs methodName@TT>: Returns
+ non-positional arg list of methodName
+
<@li><@TT>objName info parent@TT>:
Returns parent object name (or "::" for no parent),
in fully qualified form.
@@ -601,7 +601,7 @@
@ Object instproc proc {
name "method name"
- ?non-pos-args?" "optinal non-positional arguments"
+ ?non-pos-args? "optinal non-positional arguments"
args "method arguments"
body "method body"
"?preAssertion?" "optional assertions that must hold before the proc executes"
@@ -767,6 +767,14 @@
return "new class name"
}
+@ Class instproc allinstances {
+} {
+ description {
+ Compute all immediate and indirect instances of a class
+ }
+ return "fully qualified list of instances"
+}
+
@ Class instproc create {
objName "name of a new class or object"
?args? "arguments passed to the constructor"
Index: xotcl/doc/xo-daemon.html
===================================================================
diff -u -rf909cd44b7d6b7fe9a120885b206d34100c46c0d -r55764ef8921abb0e4f506e0ae6b0caf3f842276d
--- xotcl/doc/xo-daemon.html (.../xo-daemon.html) (revision f909cd44b7d6b7fe9a120885b206d34100c46c0d)
+++ xotcl/doc/xo-daemon.html (.../xo-daemon.html) (revision 55764ef8921abb0e4f506e0ae6b0caf3f842276d)
@@ -76,7 +76,7 @@
Date:
- [::xotcl::rcs date {$Date: 2005/01/07 12:41:26 $}]
+ [::xotcl::rcs date {$Date: 2005/01/10 11:57:35 $}]
|
Index: xotcl/doc/xo-whichPkg.html
===================================================================
diff -u -rf909cd44b7d6b7fe9a120885b206d34100c46c0d -r55764ef8921abb0e4f506e0ae6b0caf3f842276d
--- xotcl/doc/xo-whichPkg.html (.../xo-whichPkg.html) (revision f909cd44b7d6b7fe9a120885b206d34100c46c0d)
+++ xotcl/doc/xo-whichPkg.html (.../xo-whichPkg.html) (revision 55764ef8921abb0e4f506e0ae6b0caf3f842276d)
@@ -52,7 +52,7 @@
Date:
- [::xotcl::rcs date {$Date: 2005/01/07 12:41:26 $}]
+ [::xotcl::rcs date {$Date: 2005/01/10 11:57:35 $}]
|
Index: xotcl/generic/aol-xotcl.tcl
===================================================================
diff -u -r836f3964b3b9bff2d75f7f0b5dbc7939164ba24e -r55764ef8921abb0e4f506e0ae6b0caf3f842276d
--- xotcl/generic/aol-xotcl.tcl (.../aol-xotcl.tcl) (revision 836f3964b3b9bff2d75f7f0b5dbc7939164ba24e)
+++ xotcl/generic/aol-xotcl.tcl (.../aol-xotcl.tcl) (revision 55764ef8921abb0e4f506e0ae6b0caf3f842276d)
@@ -1,4 +1,4 @@
-# $Id: aol-xotcl.tcl,v 1.4 2005/01/07 02:40:59 neumann Exp $
+# $Id: aol-xotcl.tcl,v 1.5 2005/01/10 11:57:35 neumann Exp $
#
# Load XOTcl library and some related packages.
Index: xotcl/generic/predefined.h
===================================================================
diff -u -r225b8b992e16760eca2a7fa7bf51533499c7cc84 -r55764ef8921abb0e4f506e0ae6b0caf3f842276d
--- xotcl/generic/predefined.h (.../predefined.h) (revision 225b8b992e16760eca2a7fa7bf51533499c7cc84)
+++ xotcl/generic/predefined.h (.../predefined.h) (revision 55764ef8921abb0e4f506e0ae6b0caf3f842276d)
@@ -1,5 +1,5 @@
static char cmd[] =
-"# $Id: predefined.h,v 1.5 2004/07/20 12:57:59 neumann Exp $\n"
+"# $Id: predefined.h,v 1.6 2005/01/10 11:57:35 neumann Exp $\n"
"::xotcl::Object instproc init args {}\n"
"::xotcl::Object create ::xotcl::@\n"
"::xotcl::@ proc unknown args {}\n"
@@ -54,6 +54,11 @@
"::xotcl::Object instproc hasclass cl {\n"
"if {[::xotcl::my ismixin $cl]} {return 1}\n"
"::xotcl::my istype $cl}\n"
+"::xotcl::Class instproc allinstances {} {\n"
+"set set [::xotcl::my info instances]\n"
+"foreach sc [::xotcl::my info subclass] {\n"
+"eval lappend set [$sc allinstances]}\n"
+"return $set}\n"
"::xotcl::Object proc unsetExitHandler {} {\n"
"::xotcl::Object proc __exitHandler {} {\n"
";}}\n"
@@ -247,7 +252,7 @@
"close $t\n"
"cd $old\n"
"return \"$oc objects, $mc methods\"}\n"
-"xotcl::Object instproc extractConfigureArg {al name {cutTheArg 0}} {\n"
+"::xotcl::Object instproc extractConfigureArg {al name {cutTheArg 0}} {\n"
"set value \"\"\n"
"upvar $al argList\n"
"set largs [llength $argList]\n"
Index: xotcl/generic/predefined.xotcl
===================================================================
diff -u -r225b8b992e16760eca2a7fa7bf51533499c7cc84 -r55764ef8921abb0e4f506e0ae6b0caf3f842276d
--- xotcl/generic/predefined.xotcl (.../predefined.xotcl) (revision 225b8b992e16760eca2a7fa7bf51533499c7cc84)
+++ xotcl/generic/predefined.xotcl (.../predefined.xotcl) (revision 55764ef8921abb0e4f506e0ae6b0caf3f842276d)
@@ -1,4 +1,4 @@
-# $Id: predefined.xotcl,v 1.4 2004/07/20 12:57:59 neumann Exp $
+# $Id: predefined.xotcl,v 1.5 2005/01/10 11:57:35 neumann Exp $
# init must exist on Object. per default it is empty.
::xotcl::Object instproc init args {}
@@ -94,7 +94,15 @@
if {[::xotcl::my ismixin $cl]} {return 1}
::xotcl::my istype $cl
}
+::xotcl::Class instproc allinstances {} {
+ set set [::xotcl::my info instances]
+ foreach sc [::xotcl::my info subclass] {
+ eval lappend set [$sc allinstances]
+ }
+ return $set
+}
+
# Exit Handler
::xotcl::Object proc unsetExitHandler {} {
::xotcl::Object proc __exitHandler {} {
@@ -407,7 +415,7 @@
#
# if cutTheArg not 0, it cut from upvar argsList
#
-xotcl::Object instproc extractConfigureArg {al name {cutTheArg 0}} {
+::xotcl::Object instproc extractConfigureArg {al name {cutTheArg 0}} {
set value ""
upvar $al argList
set largs [llength $argList]
Index: xotcl/library/serialize/Serializer.xotcl
===================================================================
diff -u -rcd58a8b1dc35b5bf8d1ca585355d22bf9d71e73c -r55764ef8921abb0e4f506e0ae6b0caf3f842276d
--- xotcl/library/serialize/Serializer.xotcl (.../Serializer.xotcl) (revision cd58a8b1dc35b5bf8d1ca585355d22bf9d71e73c)
+++ xotcl/library/serialize/Serializer.xotcl (.../Serializer.xotcl) (revision 55764ef8921abb0e4f506e0ae6b0caf3f842276d)
@@ -1,4 +1,4 @@
-# $Id: Serializer.xotcl,v 1.10 2005/01/07 12:51:47 neumann Exp $
+# $Id: Serializer.xotcl,v 1.11 2005/01/10 11:57:35 neumann Exp $
package require XOTcl 1.3
package provide xotcl::serializer 0.8
@@ -15,14 +15,14 @@
authors {
Gustaf Neumann, Gustaf.Neumann@wu-wien.ac.at
}
- date { $Date: 2005/01/07 12:51:47 $ }
+ date { $Date: 2005/01/10 11:57:35 $ }
}
@ Serializer proc all {
- ?-ignoreVarsRE RE?
- "provide regular expression; matching vars are ignored"
- ?-ignore obj1 obj2 ...?
- "provide a list of objects to be omitted"} {
+ ?-ignoreVarsRE RE?
+ "provide regular expression; matching vars are ignored"
+ ?-ignore obj1 obj2 ...?
+ "provide a list of objects to be omitted"} {
Description {
Serialize all objects and classes that are currently
defined (except the specified omissions and the current
@@ -40,12 +40,12 @@
}
@ Serializer proc deepSerialize {
- objs "Objects to be serialized"
- ?-ignoreVarsRE RE?
- "provide regular expression; matching vars are ignored"
- ?-ignore obj1 obj2 ...?
- "provide a list of objects to be omitted"
- ?-map list? "translate object names in serialized code"
+ objs "Objects to be serialized"
+ ?-ignoreVarsRE RE?
+ "provide regular expression; matching vars are ignored"
+ ?-ignore obj1 obj2 ...?
+ "provide a list of objects to be omitted"
+ ?-map list? "translate object names in serialized code"
} {
Description {
Serialize object with all child objects (deep operation)
@@ -76,9 +76,9 @@
}
@ Serializer proc methodSerialize {
- object "object or class"
- method "name of method"
- prefix "either empty or 'inst' (latter for instprocs)"
+ object "object or class"
+ method "name of method"
+ prefix "either empty or 'inst' (latter for instprocs)"
} {
Description {
Serialize the specified method. In order to serialize
@@ -126,7 +126,9 @@
variables, invariants, filters and mixins}
}
- ########################################################################################
+ ##################################################################################
+ # real clode starts here.....
+ # ################################################################################
Class Serializer -parameter {ignoreVarsRE map}
namespace export Serializer
Serializer proc ignore args {
@@ -253,11 +255,12 @@
return $set
}
- Serializer instproc topoSort {set} {
+ Serializer instproc topoSort {set all} {
if {[my array exists s]} {my array unset s}
if {[my array exists level]} {my array unset level}
foreach c $set {
- if {[string match ::xotcl::* $c] &&
+ if {!$all &&
+ [string match ::xotcl::* $c] &&
![[self class] exists exportObjects($c)]} continue
if {[my exists skip($c)]} continue
my set s($c) 1
@@ -309,8 +312,8 @@
Serializer instproc serialize {objectOrClass} {
string trimright [my [my category $objectOrClass]-serialize $objectOrClass] "\\\n"
}
- Serializer instproc serializeList {list} {
- my topoSort $list
+ Serializer instproc serializeList {list all} {
+ my topoSort $list $all
#foreach i [lsort [my array names level]] {puts "$i: [my set level($i)]"}
set result ""
foreach l [lsort [my array names level]] {
@@ -344,7 +347,7 @@
}
Serializer instproc deepSerialize o {
# assumes $o to be fully qualified
- my serializeList [my allChildren $o]
+ my serializeList [my allChildren $o] 1
}
Serializer proc exportMethods list {
@@ -356,7 +359,7 @@
Serializer proc all {args} {
set s [eval my new -childof [self] -volatile $args]
- set r [$s serializeList [$s allInstances ::xotcl::Object]]
+ set r [$s serializeList [$s allInstances ::xotcl::Object] 0]
my exportMethods [list ::xotcl::Object proc __exitHandler]
foreach k [my array names exportMethods] {
foreach {o p m} [split $k ,] break
@@ -389,5 +392,7 @@
}
Serializer exportObjects [namespace current]::Serializer
- namespace eval :: "namespace import [namespace current]::*"
+ namespace eval :: "namespace import -force [namespace current]::*"
+
+ #ns_log notice "???? sourceing.....Serializer"
}
Index: xotcl/tests/testx.xotcl
===================================================================
diff -u -r0896d4deb00780e48b5b03269bf9c4ecca948919 -r55764ef8921abb0e4f506e0ae6b0caf3f842276d
--- xotcl/tests/testx.xotcl (.../testx.xotcl) (revision 0896d4deb00780e48b5b03269bf9c4ecca948919)
+++ xotcl/tests/testx.xotcl (.../testx.xotcl) (revision 55764ef8921abb0e4f506e0ae6b0caf3f842276d)
@@ -1,4 +1,4 @@
-#$Id: testx.xotcl,v 1.23 2005/01/06 03:10:05 neumann Exp $
+#$Id: testx.xotcl,v 1.24 2005/01/10 11:57:35 neumann Exp $
package require XOTcl
namespace import -force xotcl::*
@@ -2865,7 +2865,7 @@
::errorCheck [b info methods -nocmds -noprocs] "" "[self]: b info methods -nocmds -noprocs"
- ::errorCheck [lsort [B info methods -nocmds]] "abstract copy defaultmethod extractConfigureArg f filterappend hasclass infoTraceFilter init instfilterappend instmixinappend insttclcmd mixinappend move recreate self setFilter tclcmd" "[self]: B info methods -nocmds"
+ ::errorCheck [lsort [B info methods -nocmds]] "abstract allinstances copy defaultmethod extractConfigureArg f filterappend hasclass infoTraceFilter init instfilterappend instmixinappend insttclcmd mixinappend move recreate self setFilter tclcmd" "[self]: B info methods -nocmds"
namespace eval a {
proc o args {return o}
Index: xotcl/unix/xotcl.spec
===================================================================
diff -u -rf909cd44b7d6b7fe9a120885b206d34100c46c0d -r55764ef8921abb0e4f506e0ae6b0caf3f842276d
--- xotcl/unix/xotcl.spec (.../xotcl.spec) (revision f909cd44b7d6b7fe9a120885b206d34100c46c0d)
+++ xotcl/unix/xotcl.spec (.../xotcl.spec) (revision 55764ef8921abb0e4f506e0ae6b0caf3f842276d)
@@ -25,7 +25,7 @@
%build
-./configure --with-tcl=/usr/lib --with-all --prefix=/usr/local/aolserver40r8/ --exec-prefix=/usr/local/aolserver40r8/
+./configure --with-tcl=/usr/lib --with-all --prefix=/usr --exec-prefix=/usr
#make CFLAGS_DEFAULT='-O3 -mcpu=i686 -Wall -fomit-frame-pointer'
make CFLAGS_DEFAULT='-O3 -Wall -fomit-frame-pointer'
@@ -37,10 +37,10 @@
%undefine __check_files
%doc doc
-/usr/local/aolserver40r8//lib/xotcl1.3.5
-/usr/local/aolserver40r8//bin/xotclsh
-/usr/local/aolserver40r8//bin/xowish
-/usr/local/aolserver40r8//include/xotclDecls.h
-/usr/local/aolserver40r8//include/xotcl.h
-/usr/local/aolserver40r8//include/xotclIntDecls.h
-/usr/local/aolserver40r8//include/xotclInt.h
+/usr/lib/xotcl1.3.5
+/usr/bin/xotclsh
+/usr/bin/xowish
+/usr/include/xotclDecls.h
+/usr/include/xotcl.h
+/usr/include/xotclIntDecls.h
+/usr/include/xotclInt.h
Index: xotcl/xotclConfig.sh
===================================================================
diff -u -rf909cd44b7d6b7fe9a120885b206d34100c46c0d -r55764ef8921abb0e4f506e0ae6b0caf3f842276d
--- xotcl/xotclConfig.sh (.../xotclConfig.sh) (revision f909cd44b7d6b7fe9a120885b206d34100c46c0d)
+++ xotcl/xotclConfig.sh (.../xotclConfig.sh) (revision 55764ef8921abb0e4f506e0ae6b0caf3f842276d)
@@ -24,7 +24,7 @@
# String to pass to compiles to pick up the XOTcl includes from their
# installed directory.
-XOTCL_INCLUDE_DIR="/usr/local/aolserver40r8//include/xotcl1.3.5"
+XOTCL_INCLUDE_DIR="/usr/include/xotcl1.3.5"
XOTCL_INCLUDE_SPEC="-I$XOTCL_INCLUDE_DIR"
# The name of the XOTcl library (may be either a .a file or a shared library):
@@ -36,7 +36,7 @@
# String to pass to linker to pick up the XOTcl library from its
# installed directory.
-XOTCL_LIB_SPEC='-L/usr/local/aolserver40r8//lib/xotcl1.3.5 -lxotcl1.3.5'
+XOTCL_LIB_SPEC='-L/usr/lib/xotcl1.3.5 -lxotcl1.3.5'
# The name of the XOTcl stub library (a .a file):
# XOTCL_STUB_LIB_FILE=libxotclstub1.3.5.a
@@ -47,11 +47,11 @@
# String to pass to linker to pick up the XOTcl stub library from its
# installed directory.
-XOTCL_STUB_LIB_SPEC='-L/usr/local/aolserver40r8//lib/xotcl1.3.5 -lxotclstub1.3.5'
+XOTCL_STUB_LIB_SPEC='-L/usr/lib/xotcl1.3.5 -lxotclstub1.3.5'
# Name of the xotcl stub library with full path in build and install directory
XOTCL_BUILD_STUB_LIB_PATH='/home/neumann/xotcl-1.3.5/libxotclstub1.3.5.a'
-XOTCL_STUB_LIB_PATH='/usr/local/aolserver40r8//lib/xotcl1.3.5/libxotclstub1.3.5.a'
+XOTCL_STUB_LIB_PATH='/usr/lib/xotcl1.3.5/libxotclstub1.3.5.a'
# Location of the top-level source directories from which XOTcl
# was built. This is the directory that contains generic, unix, etc.
@@ -65,5 +65,5 @@
XOTCL_UNSHARED_LIB_SUFFIX=1.3.5${DBGX}.a
# the shell in whose installation dirs the xotcl package is installed
-XOTCL_COMPATIBLE_TCLSH=/home/neumann/tcl8.4.7/unix/tclsh
+XOTCL_COMPATIBLE_TCLSH=/home/neumann/tcl8.4.9/unix/tclsh