Index: Makefile.in =================================================================== diff -u -N -r7cedf8c74c7f7c1db13880614ac11935045ffe06 -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 --- Makefile.in (.../Makefile.in) (revision 7cedf8c74c7f7c1db13880614ac11935045ffe06) +++ Makefile.in (.../Makefile.in) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) @@ -66,9 +66,7 @@ $(xotcl_src_doc_dir)/langRef.xotcl \ $(xotcl_src_lib_dir)/lib/*.xotcl \ $(xotcl_src_test_dir)/*.xotcl \ - $(xotcl_src_app_dir)/scripts/*.xotcl \ $(xotcl_src_app_dir)/comm/[flsw]*.xotcl \ - $(xotcl_src_app_dir)/actiweb/univ/UNIVERSAL.xotcl \ $(xotcl_src_app_dir)/utils/xo-*[a-z0-9] #export TCLLIBPATH=. ${srcdir} Index: TODO =================================================================== diff -u -N -rb9000cff9206c8621e46524c2f12f8fc8fcb6f86 -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 --- TODO (.../TODO) (revision b9000cff9206c8621e46524c2f12f8fc8fcb6f86) +++ TODO (.../TODO) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) @@ -3733,6 +3733,16 @@ ======================================================================== +Release Baustellen: + +README +COMPILE +COMPILE.win +Changelog +doc/tutorial2.html +win/Makefile.vc + +======================================================================== TODO: - warnings for "numeric" names for args and nonpos-args? @@ -4021,4 +4031,7 @@ * Coroutines - extend coro regression test - - coro-enable nsf::proc \ No newline at end of file + - coro-enable nsf::proc + + * renable/translate deletex XOTcl demo scripts, such as + e.g. those from library/xotcl/apps/scripts \ No newline at end of file Index: doc/pkgIndex.tcl =================================================================== diff -u -N --- doc/pkgIndex.tcl (revision c0df808e0c4f79c4c2296174c22cfb331eb4c8f1) +++ doc/pkgIndex.tcl (revision 0) @@ -1,11 +0,0 @@ -# Tcl package index file, version 1.1 -# This file is generated by the "pkg_mkIndex -direct" command -# and sourced either when an application starts up or -# by a "package unknown" script. It invokes the -# "package ifneeded" command to set up package-related -# information so that packages will be loaded automatically -# in response to "package require" commands. When this -# script is sourced, the variable $dir must contain the -# full path name of this file's directory. - -package ifneeded XOTcl-langRef 1.6.0 [list source [file join $dir langRef.xotcl]] Index: generic/aol-xotcl.tcl =================================================================== diff -u -N -r2fc49e291905a8f4ec95b27babdfa6bffa8b5711 -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 --- generic/aol-xotcl.tcl (.../aol-xotcl.tcl) (revision 2fc49e291905a8f4ec95b27babdfa6bffa8b5711) +++ generic/aol-xotcl.tcl (.../aol-xotcl.tcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) @@ -13,7 +13,7 @@ # "lib" directory within the AOLserver tree. # -package require XOTcl; namespace import -force ::xotcl::* +package require XOTcl 2.0; namespace import -force ::xotcl::* package require nx::serializer ns_log notice "XOTcl version $::xotcl::version$::xotcl::patchlevel loaded" Index: generic/nxdocIndex =================================================================== diff -u -N --- generic/nxdocIndex (revision febad4bd293048e0d5c227f0dba33ac7efd8e93c) +++ generic/nxdocIndex (revision 0) @@ -1,31 +0,0 @@ -# NXDoc index file, version 1.0 -# This file was generated by the "::nx::doc::mkIndex" command -# and is optionally sourced by nxdoc to filter the command population -# to be documented. Typically each line is a command that -# sets an element in the ::nxdoc::include array, where the -# element name is the name of a command and the value indicates whether -# the command is to be documented (1) or not (0). -# -# To regenerate this index file, run nxsh in the root dir of the -# source distribution and have the following two liner evaluated: -# -# package req nx::doc -# nx::doc::mkIndex -documentAll -indexfiles nsfAPI.nxdocindex -outdir generic/ generic/nsf.tcl -# - -# Source external (e.g., auto-generated) index files -source [file join [file dirname [info script]] nsfAPI.nxdocindex] -set ::nxdoc::include(::nsf::method::provide) 1 -set ::nxdoc::include(::nsf::method::require) 1 -set ::nxdoc::include(::nsf::strip_proc_name) 0 -set ::nxdoc::include(::nsf::mixin) 1 -set ::nxdoc::include(::nsf::object::unknown) 0 -set ::nxdoc::include(::nsf::object::unknown::add) 0 -set ::nxdoc::include(::nsf::object::unknown::get) 0 -set ::nxdoc::include(::nsf::object::unknown::delete) 0 -set ::nxdoc::include(::nsf::object::unknown::keys) 0 -set ::nxdoc::include(::nsf::exithandler) 1 -set ::nxdoc::include(::nsf::__exithandler) 0 -set ::nxdoc::include(::nsf::log) 1 -set ::nxdoc::include(::nsf::deprecated) 1 -set ::nxdoc::include(::nsf::tmpdir) 1 \ No newline at end of file Index: library/lib/make.tcl =================================================================== diff -u -N -rb3018d3be0f1524a3f1709edc0e2ddb5d8bc4c0b -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 --- library/lib/make.tcl (.../make.tcl) (revision b3018d3be0f1524a3f1709edc0e2ddb5d8bc4c0b) +++ library/lib/make.tcl (.../make.tcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) @@ -7,10 +7,9 @@ package require nx namespace eval ::nx {}; # make pkg_mkIndex happy -namespace import -force ::nx::* ### -Object create make { +nx::Object create make { # # shared lib add files for pkgIndex.tcl # @@ -111,7 +110,7 @@ ### tcl file-command rename file tcl_file -Object create file { +nx::Object create file { :require namespace array set :destructive { @@ -136,7 +135,7 @@ ### minus n option -Class create make::-n +nx::Class create make::-n foreach f [file info methods] { if {$f eq "unknown" || $f eq "next" || $f eq "self"} continue if {![file exists destructive($f)] || [file eval [list set :destructive($f)]]} { @@ -158,7 +157,7 @@ if {![info exists argv] || $argv eq ""} {set argv -all} if {$argv eq "-n"} {set argv "-n -all"} -Class create Script { +nx::Class create Script { :public class method create args { lappend args {*}$::argv set s [next] Index: library/nx/nxdocIndex =================================================================== diff -u -N --- library/nx/nxdocIndex (revision 30410351eef652c4e89ab87475b28cead6add6ac) +++ library/nx/nxdocIndex (revision 0) @@ -1,306 +0,0 @@ -# NXDoc index file, version 1.0 -# This file was generated by the "::nx::doc::mkIndex" command -# and is optionally sourced by nxdoc to filter the command population -# to be documented. Typically each line is a command that -# sets an element in the ::nxdoc::include array, where the -# element name is the name of a command and the value indicates whether -# the command is to be documented (1) or not (0). - -set ::nxdoc::include(::nx::Object) 1 -set ::nxdoc::include(::nx::Class) 1 -set ::nxdoc::include(::nsf::classes::nx::Object::volatile) 1 -set ::nxdoc::include(::nsf::classes::nx::Object::configure) 1 -set ::nxdoc::include(::nsf::classes::nx::Object::upvar) 1 -set ::nxdoc::include(::nsf::classes::nx::Object::destroy) 1 -set ::nxdoc::include(::nsf::classes::nx::Object::uplevel) 1 -set ::nxdoc::include(::nsf::classes::nx::Object::eval) 1 -set ::nxdoc::include(::nsf::methods::object::unknown) 0 -set ::nxdoc::include(::nsf::methods::object::init) 0 -set ::nxdoc::include(::nsf::methods::object::defaultmethod) 0 -set ::nxdoc::include(::nsf::classes::nx::Class::create) 1 -set ::nxdoc::include(::nsf::classes::nx::Class::new) 1 -set ::nxdoc::include(::nsf::classes::nx::Object::__resolve_method_path) 0 -set ::nxdoc::include(::nsf::classes::nx::Object::__default_method_call_protection) 0 -set ::nxdoc::include(::nsf::classes::nx::Object::__default_property_call_protection) 0 -set ::nxdoc::include(::nsf::classes::nx::Class::method) 1 -set ::nxdoc::include(::nsf::classes::nx::Object::method) 1 -set ::nxdoc::include(::nsf::classes::nx::Class::unknown) 1 -set ::nxdoc::include(::nsf::classes::nx::Object::public) 1 -set ::nxdoc::include(::nsf::classes::nx::Object::protected) 1 -set ::nxdoc::include(::nsf::classes::nx::Object::private) 1 -set ::nxdoc::include(::nsf::classes::nx::Class::objectparameter) 1 -set ::nxdoc::include(::nsf::classes::nx::Object::forward) 1 -set ::nxdoc::include(::nsf::classes::nx::Class::forward) 1 -set ::nxdoc::include(::nsf::classes::nx::Object::alias) 1 -set ::nxdoc::include(::nsf::classes::nx::Class::alias) 1 -set ::nxdoc::include(::nx::isSlotContainer) 0 -set ::nxdoc::include(::nx::internal::setSlotContainerProperties) 0 -set ::nxdoc::include(::nx::slotObj) 0 -set ::nxdoc::include(::nx::EnsembleObject) 1 -set ::nxdoc::include(::nsf::classes::nx::EnsembleObject::unknown) 1 -set ::nxdoc::include(::nsf::classes::nx::EnsembleObject::defaultmethod) 1 -set ::nxdoc::include(::nsf::classes::nx::Object::delete) 1 -set ::nxdoc::include(::nx::Object::slot::__delete::property) 1 -set ::nxdoc::include(::nx::Object::slot::__delete::variable) 1 -set ::nxdoc::include(::nx::Object::slot::__delete::method) 1 -set ::nxdoc::include(::nsf::classes::nx::Class::delete) 1 -set ::nxdoc::include(::nx::Class::slot::__delete::property) 1 -set ::nxdoc::include(::nx::Class::slot::__delete::variable) 1 -set ::nxdoc::include(::nx::Class::slot::__delete::method) 1 -set ::nxdoc::include(::nsf::classes::nx::Class::class) 1 -set ::nxdoc::include(::nx::Class::slot::__class::delete) 1 -set ::nxdoc::include(::nx::Class::slot::__class::delete::property) 1 -set ::nxdoc::include(::nx::Class::slot::__class::delete::variable) 1 -set ::nxdoc::include(::nx::Class::slot::__class::delete::method) 1 -set ::nxdoc::include(::nsf::classes::nx::Object::require) 1 -set ::nxdoc::include(::nx::Object::slot::__require::namespace) 1 -set ::nxdoc::include(::nx::Object::slot::__require::method) 1 -set ::nxdoc::include(::nx::Object::slot::__require::class) 1 -set ::nxdoc::include(::nx::Object::slot::__require::class::method) 1 -set ::nxdoc::include(::nx::Object::slot::__require::public) 1 -set ::nxdoc::include(::nx::Object::slot::__require::public::method) 1 -set ::nxdoc::include(::nx::Object::slot::__require::public::class) 1 -set ::nxdoc::include(::nx::Object::slot::__require::public::class::method) 1 -set ::nxdoc::include(::nx::Object::slot::__require::protected) 1 -set ::nxdoc::include(::nx::Object::slot::__require::protected::method) 1 -set ::nxdoc::include(::nx::Object::slot::__require::protected::class) 1 -set ::nxdoc::include(::nx::Object::slot::__require::protected::class::method) 1 -set ::nxdoc::include(::nsf::classes::nx::Object::info) 1 -set ::nxdoc::include(::nx::Object::slot::__info::lookup) 1 -set ::nxdoc::include(::nx::Object::slot::__info::lookup::filter) 1 -set ::nxdoc::include(::nx::Object::slot::__info::lookup::method) 1 -set ::nxdoc::include(::nx::Object::slot::__info::lookup::methods) 1 -set ::nxdoc::include(::nx::Object::slot::__info::lookup::slots) 1 -set ::nxdoc::include(::nx::Object::slot::__info::children) 1 -set ::nxdoc::include(::nx::Object::slot::__info::class) 1 -set ::nxdoc::include(::nx::Object::slot::__info::filter) 1 -set ::nxdoc::include(::nx::Object::slot::__info::filter::guard) 1 -set ::nxdoc::include(::nx::Object::slot::__info::filter::methods) 1 -set ::nxdoc::include(::nx::Object::slot::__info::has) 1 -set ::nxdoc::include(::nx::Object::slot::__info::has::mixin) 1 -set ::nxdoc::include(::nx::Object::slot::__info::has::namespace) 1 -set ::nxdoc::include(::nx::Object::slot::__info::has::type) 1 -set ::nxdoc::include(::nx::Object::slot::__info::is) 1 -set ::nxdoc::include(::nx::Object::slot::__info::methods) 1 -set ::nxdoc::include(::nx::Object::slot::__info::mixin) 1 -set ::nxdoc::include(::nx::Object::slot::__info::mixin::guard) 1 -set ::nxdoc::include(::nx::Object::slot::__info::mixin::classes) 1 -set ::nxdoc::include(::nx::Object::slot::__info::parent) 1 -set ::nxdoc::include(::nx::Object::slot::__info::precedence) 1 -set ::nxdoc::include(::nx::Object::slot::__info::slot) 1 -set ::nxdoc::include(::nx::Object::slot::__info::slot::definition) 1 -set ::nxdoc::include(::nx::Object::slot::__info::slot::names) 1 -set ::nxdoc::include(::nx::Object::slot::__info::slot::objects) 1 -set ::nxdoc::include(::nx::Object::slot::__info::properties) 1 -set ::nxdoc::include(::nx::Object::slot::__info::vars) 1 -set ::nxdoc::include(::nx::Class::slot::__info) 1 -set ::nxdoc::include(::nsf::classes::nx::Class::info) 1 -set ::nxdoc::include(::nx::Class::slot::__info::children) 1 -set ::nxdoc::include(::nx::Class::slot::__info::is) 1 -set ::nxdoc::include(::nx::Class::slot::__info::info) 1 -set ::nxdoc::include(::nx::Class::slot::__info::properties) 1 -set ::nxdoc::include(::nx::Class::slot::__info::parent) 1 -set ::nxdoc::include(::nx::Class::slot::__info::vars) 1 -set ::nxdoc::include(::nx::Class::slot::__info::methods) 1 -set ::nxdoc::include(::nx::Class::slot::__info::precedence) 1 -set ::nxdoc::include(::nx::Class::slot::__info::class) 1 -set ::nxdoc::include(::nx::Class::slot::__info::lookup) 1 -set ::nxdoc::include(::nx::Class::slot::__info::filter) 1 -set ::nxdoc::include(::nx::Class::slot::__info::filter::guard) 1 -set ::nxdoc::include(::nx::Class::slot::__info::filter::methods) 1 -set ::nxdoc::include(::nx::Class::slot::__info::has) 1 -set ::nxdoc::include(::nx::Class::slot::__info::heritage) 1 -set ::nxdoc::include(::nx::Class::slot::__info::instances) 1 -set ::nxdoc::include(::nx::Class::slot::__info::mixin) 1 -set ::nxdoc::include(::nx::Class::slot::__info::mixin::guard) 1 -set ::nxdoc::include(::nx::Class::slot::__info::mixin::classes) 1 -set ::nxdoc::include(::nx::Class::slot::__info::mixinof) 1 -set ::nxdoc::include(::nx::Class::slot::__info::parameter) 1 -set ::nxdoc::include(::nx::Class::slot::__info::parameter::definition) 1 -set ::nxdoc::include(::nx::Class::slot::__info::parameter::list) 1 -set ::nxdoc::include(::nx::Class::slot::__info::parameter::names) 1 -set ::nxdoc::include(::nx::Class::slot::__info::parameter::syntax) 1 -set ::nxdoc::include(::nx::Class::slot::__info::slot) 1 -set ::nxdoc::include(::nx::Class::slot::__info::slot::objects) 1 -set ::nxdoc::include(::nx::Class::slot::__info::slot::definition) 1 -set ::nxdoc::include(::nx::Class::slot::__info::slot::names) 1 -set ::nxdoc::include(::nx::Class::slot::__info::subclass) 1 -set ::nxdoc::include(::nx::Class::slot::__info::superclass) 1 -set ::nxdoc::include(::nx::internal::infoOptions) 0 -set ::nxdoc::include(::nx::Object::slot::__info::unknown) 1 -set ::nxdoc::include(::nx::Object::slot::__info::info) 1 -set ::nxdoc::include(::nx::Object::slot::__info::method) 1 -set ::nxdoc::include(::nx::Class::slot::__info::method) 1 -set ::nxdoc::include(::nx::Class::slot::__class::alias) 1 -set ::nxdoc::include(::nx::Class::slot::__class::forward) 1 -set ::nxdoc::include(::nx::Class::slot::__class::method) 1 -set ::nxdoc::include(::nx::Class::slot::__class::info) 1 -set ::nxdoc::include(::nx::Class::slot::__class::filter) 1 -set ::nxdoc::include(::nx::Class::slot::__class::mixin) 1 -set ::nxdoc::include(::nx::Class::slot::__class::filterguard) 1 -set ::nxdoc::include(::nx::Class::slot::__class::mixinguard) 1 -set ::nxdoc::include(::nx::MetaSlot) 1 -set ::nxdoc::include(::nx::MetaSlot::requireClass) 1 -set ::nxdoc::include(::nx::MetaSlot::parseParameterSpec) 1 -set ::nxdoc::include(::nx::MetaSlot::createFromParameterSpec) 1 -set ::nxdoc::include(::nx::Slot) 1 -set ::nxdoc::include(::nx::ObjectParameterSlot) 1 -set ::nxdoc::include(::nx::MethodParameterSlot) 1 -set ::nxdoc::include(::nx::methodParameterSlot) 1 -set ::nxdoc::include(::nx::createBootstrapVariableSlots) 0 -set ::nxdoc::include(::nsf::classes::nx::ObjectParameterSlot::namedParameterSpec) 1 -set ::nxdoc::include(::nx::BootStrapVariableSlot) 0 -set ::nxdoc::include(::nsf::classes::nx::BootStrapVariableSlot::getParameterSpec) 1 -set ::nxdoc::include(::nsf::classes::nx::BootStrapVariableSlot::init) 0 -set ::nxdoc::include(::nx::ObjectParameterSlot::slot::name) 1 -set ::nxdoc::include(::nsf::classes::nx::ObjectParameterSlot::name) 1 -set ::nxdoc::include(::nx::ObjectParameterSlot::slot::domain) 1 -set ::nxdoc::include(::nsf::classes::nx::ObjectParameterSlot::domain) 1 -set ::nxdoc::include(::nx::ObjectParameterSlot::slot::manager) 1 -set ::nxdoc::include(::nsf::classes::nx::ObjectParameterSlot::manager) 1 -set ::nxdoc::include(::nx::ObjectParameterSlot::slot::per-object) 1 -set ::nxdoc::include(::nsf::classes::nx::ObjectParameterSlot::per-object) 1 -set ::nxdoc::include(::nx::ObjectParameterSlot::slot::methodname) 1 -set ::nxdoc::include(::nsf::classes::nx::ObjectParameterSlot::methodname) 1 -set ::nxdoc::include(::nx::ObjectParameterSlot::slot::forwardername) 1 -set ::nxdoc::include(::nsf::classes::nx::ObjectParameterSlot::forwardername) 1 -set ::nxdoc::include(::nx::ObjectParameterSlot::slot::defaultmethods) 1 -set ::nxdoc::include(::nsf::classes::nx::ObjectParameterSlot::defaultmethods) 1 -set ::nxdoc::include(::nx::ObjectParameterSlot::slot::accessor) 1 -set ::nxdoc::include(::nsf::classes::nx::ObjectParameterSlot::accessor) 1 -set ::nxdoc::include(::nx::ObjectParameterSlot::slot::config) 1 -set ::nxdoc::include(::nsf::classes::nx::ObjectParameterSlot::config) 1 -set ::nxdoc::include(::nx::ObjectParameterSlot::slot::noarg) 1 -set ::nxdoc::include(::nsf::classes::nx::ObjectParameterSlot::noarg) 1 -set ::nxdoc::include(::nx::ObjectParameterSlot::slot::noleadingdash) 1 -set ::nxdoc::include(::nsf::classes::nx::ObjectParameterSlot::noleadingdash) 1 -set ::nxdoc::include(::nx::ObjectParameterSlot::slot::disposition) 1 -set ::nxdoc::include(::nsf::classes::nx::ObjectParameterSlot::disposition) 1 -set ::nxdoc::include(::nx::ObjectParameterSlot::slot::required) 1 -set ::nxdoc::include(::nsf::classes::nx::ObjectParameterSlot::required) 1 -set ::nxdoc::include(::nx::ObjectParameterSlot::slot::default) 1 -set ::nxdoc::include(::nsf::classes::nx::ObjectParameterSlot::default) 1 -set ::nxdoc::include(::nx::ObjectParameterSlot::slot::initcmd) 1 -set ::nxdoc::include(::nsf::classes::nx::ObjectParameterSlot::initcmd) 1 -set ::nxdoc::include(::nx::ObjectParameterSlot::slot::substdefault) 1 -set ::nxdoc::include(::nsf::classes::nx::ObjectParameterSlot::substdefault) 1 -set ::nxdoc::include(::nx::ObjectParameterSlot::slot::position) 1 -set ::nxdoc::include(::nsf::classes::nx::ObjectParameterSlot::position) 1 -set ::nxdoc::include(::nx::ObjectParameterSlot::slot::positional) 1 -set ::nxdoc::include(::nsf::classes::nx::ObjectParameterSlot::positional) 1 -set ::nxdoc::include(::nx::ObjectParameterSlot::slot::elementtype) 1 -set ::nxdoc::include(::nsf::classes::nx::ObjectParameterSlot::elementtype) 1 -set ::nxdoc::include(::nx::ObjectParameterSlot::slot::multiplicity) 1 -set ::nxdoc::include(::nsf::classes::nx::ObjectParameterSlot::multiplicity) 1 -set ::nxdoc::include(::nsf::classes::nx::ObjectParameterSlot::unknown) 0 -set ::nxdoc::include(::nsf::classes::nx::ObjectParameterSlot::init) 0 -set ::nxdoc::include(::nsf::classes::nx::ObjectParameterSlot::destroy) 0 -set ::nxdoc::include(::nsf::classes::nx::ObjectParameterSlot::makeForwarder) 0 -set ::nxdoc::include(::nsf::classes::nx::ObjectParameterSlot::getParameterOptions) 1 -set ::nxdoc::include(::nsf::classes::nx::ObjectParameterSlot::getParameterSpec) 1 -set ::nxdoc::include(::nsf::classes::nx::ObjectParameterSlot::getPropertyDefinition) 1 -set ::nxdoc::include(::nx::RelationSlot) 1 -set ::nxdoc::include(::nx::RelationSlot::slot::accessor) 1 -set ::nxdoc::include(::nsf::classes::nx::RelationSlot::accessor) 1 -set ::nxdoc::include(::nx::RelationSlot::slot::multiplicity) 1 -set ::nxdoc::include(::nsf::classes::nx::RelationSlot::multiplicity) 1 -set ::nxdoc::include(::nsf::classes::nx::RelationSlot::init) 0 -set ::nxdoc::include(::nsf::classes::nx::RelationSlot::assign) 1 -set ::nxdoc::include(::nsf::classes::nx::RelationSlot::delete_value) 1 -set ::nxdoc::include(::nsf::classes::nx::RelationSlot::get) 1 -set ::nxdoc::include(::nsf::classes::nx::RelationSlot::add) 1 -set ::nxdoc::include(::nsf::classes::nx::RelationSlot::delete) 1 -set ::nxdoc::include(::nsf::classes::nx::Object::mixin) 1 -set ::nxdoc::include(::nx::Object::slot::mixin) 1 -set ::nxdoc::include(::nsf::classes::nx::Object::filter) 1 -set ::nxdoc::include(::nx::Object::slot::filter) 1 -set ::nxdoc::include(::nsf::classes::nx::Class::mixin) 1 -set ::nxdoc::include(::nx::Class::slot::mixin) 1 -set ::nxdoc::include(::nsf::classes::nx::Class::filter) 1 -set ::nxdoc::include(::nx::Class::slot::filter) 1 -set ::nxdoc::include(::nx::Class::slot::object-mixin) 1 -set ::nxdoc::include(::nx::Class::slot::object-filter) 1 -set ::nxdoc::include(::nx::Object::slot::noinit) 1 -set ::nxdoc::include(::nx::Object::slot::volatile) 1 -set ::nxdoc::include(::nx::Object::slot::class) 1 -set ::nxdoc::include(::nx::Class::slot::superclass) 1 -set ::nxdoc::include(::nx::Object::slot::__initcmd) 0 -set ::nxdoc::include(::nx::Object::slot::filter::guard) 0 -set ::nxdoc::include(::nx::Class::slot::filter::guard) 0 -set ::nxdoc::include(::nx::Object::slot::mixin::guard) 0 -set ::nxdoc::include(::nx::Class::slot::mixin::guard) 0 -set ::nxdoc::include(::nx::VariableSlot) 1 -set ::nxdoc::include(::nx::VariableSlot::slot::arg) 1 -set ::nxdoc::include(::nsf::classes::nx::VariableSlot::arg) 1 -set ::nxdoc::include(::nx::VariableSlot::slot::convert) 1 -set ::nxdoc::include(::nsf::classes::nx::VariableSlot::convert) 1 -set ::nxdoc::include(::nx::VariableSlot::slot::incremental) 1 -set ::nxdoc::include(::nsf::classes::nx::VariableSlot::incremental) 1 -set ::nxdoc::include(::nx::VariableSlot::slot::multiplicity) 1 -set ::nxdoc::include(::nsf::classes::nx::VariableSlot::multiplicity) 1 -set ::nxdoc::include(::nx::VariableSlot::slot::accessor) 1 -set ::nxdoc::include(::nsf::classes::nx::VariableSlot::accessor) 1 -set ::nxdoc::include(::nx::VariableSlot::slot::type) 1 -set ::nxdoc::include(::nsf::classes::nx::VariableSlot::type) 1 -set ::nxdoc::include(::nx::VariableSlot::slot::valuecmd) 1 -set ::nxdoc::include(::nsf::classes::nx::VariableSlot::valuecmd) 1 -set ::nxdoc::include(::nx::VariableSlot::slot::defaultcmd) 1 -set ::nxdoc::include(::nsf::classes::nx::VariableSlot::defaultcmd) 1 -set ::nxdoc::include(::nx::VariableSlot::slot::valuechangedcmd) 1 -set ::nxdoc::include(::nsf::classes::nx::VariableSlot::valuechangedcmd) 1 -set ::nxdoc::include(::nsf::classes::nx::VariableSlot::setCheckedInstVar) 1 -set ::nxdoc::include(::nsf::classes::nx::VariableSlot::getParameterOptions) 1 -set ::nxdoc::include(::nsf::classes::nx::VariableSlot::isMultivalued) 1 -set ::nxdoc::include(::nsf::classes::nx::VariableSlot::needsForwarder) 1 -set ::nxdoc::include(::nsf::classes::nx::VariableSlot::makeAccessor) 1 -set ::nxdoc::include(::nsf::classes::nx::VariableSlot::reconfigure) 1 -set ::nxdoc::include(::nsf::classes::nx::VariableSlot::init) 0 -set ::nxdoc::include(::nsf::classes::nx::VariableSlot::makeSetter) 0 -set ::nxdoc::include(::nsf::classes::nx::VariableSlot::makeIncrementalOperations) 0 -set ::nxdoc::include(::nsf::classes::nx::VariableSlot::handleTraces) 0 -set ::nxdoc::include(::nsf::classes::nx::VariableSlot::__default_from_cmd) 0 -set ::nxdoc::include(::nsf::classes::nx::VariableSlot::__value_from_cmd) 0 -set ::nxdoc::include(::nsf::classes::nx::VariableSlot::__value_changed_cmd) 0 -set ::nxdoc::include(::nsf::classes::nx::VariableSlot::get) 1 -set ::nxdoc::include(::nsf::classes::nx::VariableSlot::assign) 1 -set ::nxdoc::include(::nsf::classes::nx::VariableSlot::add) 1 -set ::nxdoc::include(::nsf::classes::nx::VariableSlot::delete) 1 -set ::nxdoc::include(::nsf::classes::nx::Object::variable) 1 -set ::nxdoc::include(::nsf::classes::nx::Object::property) 1 -set ::nxdoc::include(::nsf::classes::nx::Class::variable) 1 -set ::nxdoc::include(::nsf::classes::nx::Class::property) 1 -set ::nxdoc::include(::nx::Class::slot::__class::property) 1 -set ::nxdoc::include(::nx::Class::slot::__class::variable) 1 -set ::nxdoc::include(::nx::internal::addProperties) 0 -set ::nxdoc::include(::nx::Object::slot::properties) 1 -set ::nxdoc::include(::nsf::classes::nx::Slot::type=any) 1 -set ::nxdoc::include(::nsf::classes::nx::ScopedNew::withclass) 0 -set ::nxdoc::include(::nx::ScopedNew::slot::withclass) 0 -set ::nxdoc::include(::nsf::classes::nx::ScopedNew::container) 0 -set ::nxdoc::include(::nx::ScopedNew::slot::container) 0 -set ::nxdoc::include(::nsf::classes::nx::ScopedNew::init) 0 -set ::nxdoc::include(::nx::ScopedNew) 0 -set ::nxdoc::include(::nsf::classes::nx::Object::contains) 1 -set ::nxdoc::include(::nsf::classes::nx::CopyHandler::targetList) 1 -set ::nxdoc::include(::nx::CopyHandler::slot::targetList) 1 -set ::nxdoc::include(::nsf::classes::nx::CopyHandler::dest) 1 -set ::nxdoc::include(::nx::CopyHandler::slot::dest) 1 -set ::nxdoc::include(::nsf::classes::nx::CopyHandler::objLength) 1 -set ::nxdoc::include(::nx::CopyHandler::slot::objLength) 1 -set ::nxdoc::include(::nsf::classes::nx::CopyHandler::makeTargetList) 1 -set ::nxdoc::include(::nsf::classes::nx::CopyHandler::copyNSVarsAndCmds) 1 -set ::nxdoc::include(::nsf::classes::nx::CopyHandler::getDest) 1 -set ::nxdoc::include(::nsf::classes::nx::CopyHandler::copyTargets) 1 -set ::nxdoc::include(::nsf::classes::nx::CopyHandler::copy) 1 -set ::nxdoc::include(::nx::CopyHandler) 1 -set ::nxdoc::include(::nsf::classes::nx::Object::copy) 1 -set ::nxdoc::include(::nsf::classes::nx::Object::move) 1 -set ::nxdoc::include(::nx::configure::defaultMethodCallProtection) 0 -set ::nxdoc::include(::nx::configure::defaultPropertyCallProtection) 0 -set ::nxdoc::include(::nx::configure) 1 -set ::nxdoc::include(::nx::var::exists) 1 -set ::nxdoc::include(::nx::var::import) 1 -set ::nxdoc::include(::nx::var::set) 1 -set ::nxdoc::include(::nx::var) 1 -set ::nxdoc::include(::nx::current) 1 -set ::nxdoc::include(::nx::next) 1 Index: library/xotcl/apps/comm/ftp.xotcl =================================================================== diff -u -N -rf3b7952aabc9e4f9079febd1f5b7f5fb833fd50c -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 --- library/xotcl/apps/comm/ftp.xotcl (.../ftp.xotcl) (revision f3b7952aabc9e4f9079febd1f5b7f5fb833fd50c) +++ library/xotcl/apps/comm/ftp.xotcl (.../ftp.xotcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) @@ -1,5 +1,5 @@ #!/usr/bin/env tclsh -package require XOTcl; namespace import -force xotcl::* +package require XOTcl 2.0; namespace import -force xotcl::* @ @File {description { A tiny FTP client }} Index: library/xotcl/apps/comm/get-regression-nb.xotcl =================================================================== diff -u -N -rf3b7952aabc9e4f9079febd1f5b7f5fb833fd50c -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 --- library/xotcl/apps/comm/get-regression-nb.xotcl (.../get-regression-nb.xotcl) (revision f3b7952aabc9e4f9079febd1f5b7f5fb833fd50c) +++ library/xotcl/apps/comm/get-regression-nb.xotcl (.../get-regression-nb.xotcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) @@ -1,5 +1,5 @@ #!/usr/bin/env tclsh -package require XOTcl; namespace import -force xotcl::* +package require XOTcl 2.0; namespace import -force xotcl::* # ./get-regression-nb.xotcl -host swt -parallel 0 # ./get-regression-nb.xotcl -host swt -sequential 0 Index: library/xotcl/apps/comm/get-regression.xotcl =================================================================== diff -u -N -rf3b7952aabc9e4f9079febd1f5b7f5fb833fd50c -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 --- library/xotcl/apps/comm/get-regression.xotcl (.../get-regression.xotcl) (revision f3b7952aabc9e4f9079febd1f5b7f5fb833fd50c) +++ library/xotcl/apps/comm/get-regression.xotcl (.../get-regression.xotcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) @@ -1,5 +1,5 @@ #!/usr/bin/env tclsh -package require XOTcl; namespace import -force xotcl::* +package require XOTcl 2.0; namespace import -force xotcl::* package require xotcl::comm::httpAccess package require xotcl::trace Index: library/xotcl/apps/comm/link-checker.xotcl =================================================================== diff -u -N -rf3b7952aabc9e4f9079febd1f5b7f5fb833fd50c -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 --- library/xotcl/apps/comm/link-checker.xotcl (.../link-checker.xotcl) (revision f3b7952aabc9e4f9079febd1f5b7f5fb833fd50c) +++ library/xotcl/apps/comm/link-checker.xotcl (.../link-checker.xotcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) @@ -1,7 +1,6 @@ #!/usr/bin/env tclsh -# $Id: link-checker.xotcl,v 1.5 2006/09/27 08:12:39 neumann Exp $ # -gn july 2000 -package require XOTcl; namespace import -force xotcl::* +package require XOTcl 2.0; namespace import -force xotcl::* @ @File { description { Index: library/xotcl/apps/comm/secure-webclient.xotcl =================================================================== diff -u -N -rf3b7952aabc9e4f9079febd1f5b7f5fb833fd50c -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 --- library/xotcl/apps/comm/secure-webclient.xotcl (.../secure-webclient.xotcl) (revision f3b7952aabc9e4f9079febd1f5b7f5fb833fd50c) +++ library/xotcl/apps/comm/secure-webclient.xotcl (.../secure-webclient.xotcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) @@ -1,7 +1,6 @@ #!/usr/bin/env tclsh -# $Id: secure-webclient.xotcl,v 1.2 2006/02/18 22:17:32 neumann Exp $ -package require XOTcl; namespace import -force xotcl::* +package require XOTcl 2.0; namespace import -force xotcl::* @ @File { description { Index: library/xotcl/apps/comm/secure-webserver.xotcl =================================================================== diff -u -N -rf3b7952aabc9e4f9079febd1f5b7f5fb833fd50c -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 --- library/xotcl/apps/comm/secure-webserver.xotcl (.../secure-webserver.xotcl) (revision f3b7952aabc9e4f9079febd1f5b7f5fb833fd50c) +++ library/xotcl/apps/comm/secure-webserver.xotcl (.../secure-webserver.xotcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) @@ -1,6 +1,5 @@ #!/usr/bin/env tclsh -# $Id: secure-webserver.xotcl,v 1.2 2006/02/18 22:17:32 neumann Exp $ -package require XOTcl; namespace import -force xotcl::* +package require XOTcl 2.0; namespace import -force xotcl::* @ @File { description { Index: library/xotcl/apps/comm/test-tls-client.xotcl =================================================================== diff -u -N -rf3b7952aabc9e4f9079febd1f5b7f5fb833fd50c -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 --- library/xotcl/apps/comm/test-tls-client.xotcl (.../test-tls-client.xotcl) (revision f3b7952aabc9e4f9079febd1f5b7f5fb833fd50c) +++ library/xotcl/apps/comm/test-tls-client.xotcl (.../test-tls-client.xotcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) @@ -1,7 +1,7 @@ -#!../../src/xotclsh -# -# $Id: test-tls-client.xotcl,v 1.2 2006/02/18 22:17:32 neumann Exp $ +#!/usr/bin/env tclsh +# -*- Tcl -*- +package require XOTcl 2.0; namespace import ::xotcl::* package require tls proc bgerror {err} { Index: library/xotcl/apps/comm/test-tls-server.xotcl =================================================================== diff -u -N -rf3b7952aabc9e4f9079febd1f5b7f5fb833fd50c -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 --- library/xotcl/apps/comm/test-tls-server.xotcl (.../test-tls-server.xotcl) (revision f3b7952aabc9e4f9079febd1f5b7f5fb833fd50c) +++ library/xotcl/apps/comm/test-tls-server.xotcl (.../test-tls-server.xotcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) @@ -1,10 +1,11 @@ -#!../../src/xotclsh -# $Id: test-tls-server.xotcl,v 1.5 2006/09/27 08:12:39 neumann Exp $ +#!/usr/bin/env tclsh +# -*- Tcl -*- # # sample secure server that reflect all incoming data to the client # It uses tls1.3 package of Matt Newman # Fredj Dridi +package require XOTcl 2.0; namespace import ::xotcl::* package require tls proc bgerror {err} { Index: library/xotcl/apps/comm/webclient.xotcl =================================================================== diff -u -N -rf3b7952aabc9e4f9079febd1f5b7f5fb833fd50c -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 --- library/xotcl/apps/comm/webclient.xotcl (.../webclient.xotcl) (revision f3b7952aabc9e4f9079febd1f5b7f5fb833fd50c) +++ library/xotcl/apps/comm/webclient.xotcl (.../webclient.xotcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) @@ -1,6 +1,8 @@ -#!../../src/xotclsh -package require XOTcl; namespace import -force xotcl::* +#!/usr/bin/env tclsh +# -*- Tcl -*- +package require XOTcl 2.0; namespace import ::xotcl::* + @ @File {description {For a sample webclient, see packages/comm/xocomm.test}} package require xotcl::comm::httpAccess set hostport localhost:8086 Index: library/xotcl/apps/utils/xo-daemon =================================================================== diff -u -N -rf3b7952aabc9e4f9079febd1f5b7f5fb833fd50c -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 --- library/xotcl/apps/utils/xo-daemon (.../xo-daemon) (revision f3b7952aabc9e4f9079febd1f5b7f5fb833fd50c) +++ library/xotcl/apps/utils/xo-daemon (.../xo-daemon) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) @@ -1,5 +1,5 @@ #!/usr/bin/env tclsh -package require XOTcl; namespace import -force xotcl::* +package require XOTcl 2.0; namespace import -force xotcl::* @ @File { description { Index: library/xotcl/apps/utils/xo-whichPkg =================================================================== diff -u -N -rf3b7952aabc9e4f9079febd1f5b7f5fb833fd50c -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 --- library/xotcl/apps/utils/xo-whichPkg (.../xo-whichPkg) (revision f3b7952aabc9e4f9079febd1f5b7f5fb833fd50c) +++ library/xotcl/apps/utils/xo-whichPkg (.../xo-whichPkg) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) @@ -1,6 +1,5 @@ #!/usr/bin/env tclsh -# $Id: xo-whichPkg,v 1.2 2006/02/18 22:17:32 neumann Exp $ -package require XOTcl; namespace import -force xotcl::* +package require XOTcl 2.0; namespace import -force xotcl::* @ @File { description { Index: library/xotcl/library/comm/Access.xotcl =================================================================== diff -u -N -r76fadfb3f603f8f96a6064f4bb5342133923ec53 -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 --- library/xotcl/library/comm/Access.xotcl (.../Access.xotcl) (revision 76fadfb3f603f8f96a6064f4bb5342133923ec53) +++ library/xotcl/library/comm/Access.xotcl (.../Access.xotcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) @@ -1,14 +1,14 @@ -# -*- tcl -*- $Id: Access.xotcl,v 1.6 2006/09/27 08:12:40 neumann Exp $ +# -*- tcl -*- $ -set httpAccessVersion 0.91 +set httpAccessVersion 0.92 package provide xotcl::comm::httpAccess $httpAccessVersion package require xotcl::comm::pcache package require xotcl::comm::mime package require xotcl::comm::connection package require xotcl::trace -package require XOTcl +package require XOTcl 2.0 namespace eval ::xotcl::comm::httpAccess { namespace import ::xotcl::* Index: library/xotcl/library/comm/Connection.xotcl =================================================================== diff -u -N -r271cf04e90fb37b157c8da0bdee01b3bf99f4e89 -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 --- library/xotcl/library/comm/Connection.xotcl (.../Connection.xotcl) (revision 271cf04e90fb37b157c8da0bdee01b3bf99f4e89) +++ library/xotcl/library/comm/Connection.xotcl (.../Connection.xotcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) @@ -1,8 +1,8 @@ -# -*- tcl -*- $Id: Connection.xotcl,v 1.6 2006/09/27 08:12:40 neumann Exp $ +# -*- tcl -*- $ -package provide xotcl::comm::connection 1.0 +package provide xotcl::comm::connection 1.1 -package require XOTcl +package require XOTcl 2.0 namespace eval ::xotcl::comm::connection { namespace import ::xotcl::* Index: library/xotcl/library/comm/Dav.xotcl =================================================================== diff -u -N -rf3b7952aabc9e4f9079febd1f5b7f5fb833fd50c -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 --- library/xotcl/library/comm/Dav.xotcl (.../Dav.xotcl) (revision f3b7952aabc9e4f9079febd1f5b7f5fb833fd50c) +++ library/xotcl/library/comm/Dav.xotcl (.../Dav.xotcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) @@ -1,8 +1,8 @@ -# $Id: Dav.xotcl,v 1.4 2006/02/18 22:17:33 neumann Exp $ +# -*- Tcl -*- $ -package provide xotcl::comm::dav 0.9 +package provide xotcl::comm::dav 0.91 -package require XOTcl +package require XOTcl 2.0 namespace eval ::xotcl::comm::dav { package require xotcl::comm::httpAccess Index: library/xotcl/library/comm/Ftp.xotcl =================================================================== diff -u -N -rf3b7952aabc9e4f9079febd1f5b7f5fb833fd50c -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 --- library/xotcl/library/comm/Ftp.xotcl (.../Ftp.xotcl) (revision f3b7952aabc9e4f9079febd1f5b7f5fb833fd50c) +++ library/xotcl/library/comm/Ftp.xotcl (.../Ftp.xotcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) @@ -1,9 +1,9 @@ -# $Id: Ftp.xotcl,v 1.3 2005/09/09 21:09:01 neumann Exp $ +# -*- Tcl -*- $ -package provide xotcl::comm::ftp 0.9 +package provide xotcl::comm::ftp 0.91 package require xotcl::comm::httpAccess -package require XOTcl +package require XOTcl 2.0 namespace eval ::xotcl::comm::ftp { namespace import ::xotcl::* Index: library/xotcl/library/comm/Httpd.xotcl =================================================================== diff -u -N -r76fadfb3f603f8f96a6064f4bb5342133923ec53 -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 --- library/xotcl/library/comm/Httpd.xotcl (.../Httpd.xotcl) (revision 76fadfb3f603f8f96a6064f4bb5342133923ec53) +++ library/xotcl/library/comm/Httpd.xotcl (.../Httpd.xotcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) @@ -1,14 +1,14 @@ -# -*- tcl -*- $Id: Httpd.xotcl,v 1.6 2006/09/27 08:12:40 neumann Exp $ +# -*- Tcl -*- $ # # The XOTcl class Httpd implements an HTTP/1.0 and HTTP/1.1 server with # basic functionality. # # Gustaf Neumann (neumann@wu-wien.ac.at) -set VERSION 1.1 +set VERSION 1.2 package provide xotcl::comm::httpd $VERSION -package require XOTcl +package require XOTcl 2.0 #package require xotcl::comm::httpAccess Index: library/xotcl/library/comm/Imap.xotcl =================================================================== diff -u -N -rf3b7952aabc9e4f9079febd1f5b7f5fb833fd50c -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 --- library/xotcl/library/comm/Imap.xotcl (.../Imap.xotcl) (revision f3b7952aabc9e4f9079febd1f5b7f5fb833fd50c) +++ library/xotcl/library/comm/Imap.xotcl (.../Imap.xotcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) @@ -1,8 +1,8 @@ -# $Id: Imap.xotcl,v 1.4 2006/02/18 22:17:33 neumann Exp $ +# -*- Tcl -*- $ -package provide xotcl::comm::imap 0.9 +package provide xotcl::comm::imap 0.91 -package require XOTcl +package require XOTcl 2.0 namespace eval ::xotcl::comm::imap { package require xotcl::comm::httpAccess Index: library/xotcl/library/comm/Ldap.xotcl =================================================================== diff -u -N -rf3b7952aabc9e4f9079febd1f5b7f5fb833fd50c -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 --- library/xotcl/library/comm/Ldap.xotcl (.../Ldap.xotcl) (revision f3b7952aabc9e4f9079febd1f5b7f5fb833fd50c) +++ library/xotcl/library/comm/Ldap.xotcl (.../Ldap.xotcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) @@ -1,8 +1,9 @@ -package provide xotcl::comm::ldap 0.9 +# -*- Tcl -*- +package provide xotcl::comm::ldap 0.91 package require xotcl::wafecompat ; # Get 'requireModules'. -package require XOTcl +package require XOTcl 2.0 namespace eval ::xotcl::comm::ldap { namespace import ::xotcl::* Index: library/xotcl/library/comm/Mime.xotcl =================================================================== diff -u -N -rf3b7952aabc9e4f9079febd1f5b7f5fb833fd50c -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 --- library/xotcl/library/comm/Mime.xotcl (.../Mime.xotcl) (revision f3b7952aabc9e4f9079febd1f5b7f5fb833fd50c) +++ library/xotcl/library/comm/Mime.xotcl (.../Mime.xotcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) @@ -1,8 +1,8 @@ -# $Id: Mime.xotcl,v 1.6 2006/09/27 08:12:40 neumann Exp $ +# -*- Tcl -*- -package provide xotcl::comm::mime 0.9 +package provide xotcl::comm::mime 0.91 -package require XOTcl +package require XOTcl 2.0 namespace eval ::xotcl::comm::mime { namespace import ::xotcl::* Index: library/xotcl/library/comm/PCache.xotcl =================================================================== diff -u -N -rf3b7952aabc9e4f9079febd1f5b7f5fb833fd50c -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 --- library/xotcl/library/comm/PCache.xotcl (.../PCache.xotcl) (revision f3b7952aabc9e4f9079febd1f5b7f5fb833fd50c) +++ library/xotcl/library/comm/PCache.xotcl (.../PCache.xotcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) @@ -1,4 +1,4 @@ -# -*- Tcl -*- $Id: PCache.xotcl,v 1.6 2006/09/27 08:12:40 neumann Exp $ +# -*- Tcl -*- $ # Persistent Cache object, using gdbm # Configuration: @@ -16,10 +16,10 @@ # file (before the first open) through the instance variable "dir" # in the object persistentCache. -package provide xotcl::comm::pcache 0.9 +package provide xotcl::comm::pcache 0.91 #package require xotcl::package -package require XOTcl +package require XOTcl 2.0 namespace eval ::xotcl::comm::pcache { namespace import ::xotcl::* Index: library/xotcl/library/comm/pkgIndex.tcl =================================================================== diff -u -N -r61ee196901f6c7444523b78c91a98f9f501c8f8b -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 --- library/xotcl/library/comm/pkgIndex.tcl (.../pkgIndex.tcl) (revision 61ee196901f6c7444523b78c91a98f9f501c8f8b) +++ library/xotcl/library/comm/pkgIndex.tcl (.../pkgIndex.tcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) @@ -8,12 +8,12 @@ # script is sourced, the variable $dir must contain the # full path name of this file's directory. -package ifneeded xotcl::comm::connection 1.0 [list source [file join $dir Connection.xotcl]] -package ifneeded xotcl::comm::dav 0.9 [list source [file join $dir Dav.xotcl]] -package ifneeded xotcl::comm::ftp 0.9 [list source [file join $dir Ftp.xotcl]] -package ifneeded xotcl::comm::httpAccess 0.91 [list source [file join $dir Access.xotcl]] -package ifneeded xotcl::comm::httpd 1.1 [list source [file join $dir Httpd.xotcl]] -package ifneeded xotcl::comm::imap 0.9 [list source [file join $dir Imap.xotcl]] -package ifneeded xotcl::comm::ldap 0.9 [list source [file join $dir Ldap.xotcl]] -package ifneeded xotcl::comm::mime 0.9 [list source [file join $dir Mime.xotcl]] -package ifneeded xotcl::comm::pcache 0.9 [list source [file join $dir PCache.xotcl]] +package ifneeded xotcl::comm::connection 1.1 [list source [file join $dir Connection.xotcl]] +package ifneeded xotcl::comm::dav 0.91 [list source [file join $dir Dav.xotcl]] +package ifneeded xotcl::comm::ftp 0.91 [list source [file join $dir Ftp.xotcl]] +package ifneeded xotcl::comm::httpAccess 0.92 [list source [file join $dir Access.xotcl]] +package ifneeded xotcl::comm::httpd 1.2 [list source [file join $dir Httpd.xotcl]] +package ifneeded xotcl::comm::imap 0.91 [list source [file join $dir Imap.xotcl]] +package ifneeded xotcl::comm::ldap 0.91 [list source [file join $dir Ldap.xotcl]] +package ifneeded xotcl::comm::mime 0.91 [list source [file join $dir Mime.xotcl]] +package ifneeded xotcl::comm::pcache 0.91 [list source [file join $dir PCache.xotcl]] Index: library/xotcl/library/lib/Script.xotcl =================================================================== diff -u -N -rf3b7952aabc9e4f9079febd1f5b7f5fb833fd50c -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 --- library/xotcl/library/lib/Script.xotcl (.../Script.xotcl) (revision f3b7952aabc9e4f9079febd1f5b7f5fb833fd50c) +++ library/xotcl/library/lib/Script.xotcl (.../Script.xotcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) @@ -1,8 +1,7 @@ -#$Id: Script.xotcl,v 1.3 2005/09/09 21:09:01 neumann Exp $ +# -*- Tcl -*- +package provide xotcl::script 0.91 +package require XOTcl 2.0 -package provide xotcl::script 0.9 -package require XOTcl - namespace eval ::xotcl::script { namespace import ::xotcl::* Index: library/xotcl/library/lib/htmllib.xotcl =================================================================== diff -u -N -rf3b7952aabc9e4f9079febd1f5b7f5fb833fd50c -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 --- library/xotcl/library/lib/htmllib.xotcl (.../htmllib.xotcl) (revision f3b7952aabc9e4f9079febd1f5b7f5fb833fd50c) +++ library/xotcl/library/lib/htmllib.xotcl (.../htmllib.xotcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) @@ -1,4 +1,4 @@ -## $Header: /home/neumann/cvs/xotcl/xotcl/library/lib/htmllib.xotcl,v 1.6 2006/09/27 08:12:40 neumann Exp $ +## -*- Tcl -*- $ # # htmllib.xotcl @@ -36,7 +36,7 @@ # package provide xotcl::htmllib 0.1 -package require XOTcl +package require XOTcl 2.0 namespace eval ::xotcl::htmllib { namespace import ::xotcl::* Index: library/xotcl/library/lib/makeDoc.xotcl =================================================================== diff -u -N -rf08eb1a13d20ea3027d057142625e7303ef18a83 -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 --- library/xotcl/library/lib/makeDoc.xotcl (.../makeDoc.xotcl) (revision f08eb1a13d20ea3027d057142625e7303ef18a83) +++ library/xotcl/library/lib/makeDoc.xotcl (.../makeDoc.xotcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) @@ -4,7 +4,7 @@ # set auto_path [concat [file dirname [info script]] $auto_path] -package require XOTcl +package require XOTcl 2.0 namespace import ::xotcl::* @ @File { Index: library/xotcl/library/lib/metadataAnalyzer.xotcl =================================================================== diff -u -N -r56f9c69ff0a963e891d38fb48141521f14de6537 -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 --- library/xotcl/library/lib/metadataAnalyzer.xotcl (.../metadataAnalyzer.xotcl) (revision 56f9c69ff0a963e891d38fb48141521f14de6537) +++ library/xotcl/library/lib/metadataAnalyzer.xotcl (.../metadataAnalyzer.xotcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) @@ -1,5 +1,6 @@ -package provide xotcl::metadataAnalyzer 0.85 -package require XOTcl +# -*- Tcl -*- +package provide xotcl::metadataAnalyzer 0.86 +package require XOTcl 2.0 namespace eval ::xotcl::metadataAnalyzer { namespace import ::xotcl::* Index: library/xotcl/library/lib/mixinStrategy.xotcl =================================================================== diff -u -N -rf3b7952aabc9e4f9079febd1f5b7f5fb833fd50c -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 --- library/xotcl/library/lib/mixinStrategy.xotcl (.../mixinStrategy.xotcl) (revision f3b7952aabc9e4f9079febd1f5b7f5fb833fd50c) +++ library/xotcl/library/lib/mixinStrategy.xotcl (.../mixinStrategy.xotcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) @@ -1,7 +1,7 @@ -#$Id: mixinStrategy.xotcl,v 1.6 2006/09/27 08:12:40 neumann Exp $ -package provide xotcl::mixinStrategy 0.9 +# -*- Tcl -*- +package provide xotcl::mixinStrategy 0.91 -package require XOTcl +package require XOTcl 2.0 namespace eval ::xotcl::mixinStrategy { namespace import ::xotcl::* Index: library/xotcl/library/lib/package.xotcl =================================================================== diff -u -N -rf3b7952aabc9e4f9079febd1f5b7f5fb833fd50c -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 --- library/xotcl/library/lib/package.xotcl (.../package.xotcl) (revision f3b7952aabc9e4f9079febd1f5b7f5fb833fd50c) +++ library/xotcl/library/lib/package.xotcl (.../package.xotcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) @@ -1,7 +1,7 @@ -#$Id: package.xotcl,v 1.7 2006/09/27 08:12:40 neumann Exp $ -package provide xotcl::package 0.91 +# -*- Tcl -*- +package provide xotcl::package 0.92 -package require XOTcl +package require XOTcl 2.0 package require xotcl::mixinStrategy # if pgk_mkIndex is running, there is a conflict with the Index: library/xotcl/library/lib/staticMetadata.xotcl =================================================================== diff -u -N -rb19a6e9aa168b386cf12ae0f66998c7a2a9ce495 -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 --- library/xotcl/library/lib/staticMetadata.xotcl (.../staticMetadata.xotcl) (revision b19a6e9aa168b386cf12ae0f66998c7a2a9ce495) +++ library/xotcl/library/lib/staticMetadata.xotcl (.../staticMetadata.xotcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) @@ -1,7 +1,7 @@ # -*- Tcl -*- -package require XOTcl +package require XOTcl 2.0 package require xotcl::metadataAnalyzer -package provide xotcl::staticMetadataAnalyzer 0.84 +package provide xotcl::staticMetadataAnalyzer 0.85 namespace eval ::xotcl::staticMetadataAnalyzer { namespace import ::xotcl::* Index: library/xotcl/library/lib/trace.xotcl =================================================================== diff -u -N -rf3b7952aabc9e4f9079febd1f5b7f5fb833fd50c -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 --- library/xotcl/library/lib/trace.xotcl (.../trace.xotcl) (revision f3b7952aabc9e4f9079febd1f5b7f5fb833fd50c) +++ library/xotcl/library/lib/trace.xotcl (.../trace.xotcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) @@ -1,6 +1,6 @@ -# -*- Tcl -*- $Id: trace.xotcl,v 1.9 2006/10/04 20:40:23 neumann Exp $ -package provide xotcl::trace 0.91 -package require XOTcl +# -*- Tcl -*- $ +package provide xotcl::trace 0.92 +package require XOTcl 2.0 namespace eval ::xotcl::trace { namespace import ::xotcl::* Index: library/xotcl/library/lib/upvarcompat.xotcl =================================================================== diff -u -N -r284ebbf98db5642d609d9bde4911fac68e20d80f -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 --- library/xotcl/library/lib/upvarcompat.xotcl (.../upvarcompat.xotcl) (revision 284ebbf98db5642d609d9bde4911fac68e20d80f) +++ library/xotcl/library/lib/upvarcompat.xotcl (.../upvarcompat.xotcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) @@ -1,7 +1,7 @@ # -*- Tcl -*- -package provide xotcl::upvar-compat 1.0 -package require XOTcl +package provide xotcl::upvar-compat 1.1 +package require XOTcl 2.0 namespace eval ::xotcl::upvar-compat { namespace import ::xotcl::* Index: library/xotcl/library/lib/wafecompat.tcl =================================================================== diff -u -N -rf3b7952aabc9e4f9079febd1f5b7f5fb833fd50c -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 --- library/xotcl/library/lib/wafecompat.tcl (.../wafecompat.tcl) (revision f3b7952aabc9e4f9079febd1f5b7f5fb833fd50c) +++ library/xotcl/library/lib/wafecompat.tcl (.../wafecompat.tcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) @@ -1,5 +1,5 @@ -# $Id: wafecompat.tcl,v 1.4 2006/09/27 08:12:40 neumann Exp $ -package provide xotcl::wafecompat 0.9 +# -*- Tcl -*- +package provide xotcl::wafecompat 0.91 set WAFELIB /usr/lib/X11/wafe/ set MODULE_PATH "$WAFELIB $auto_path" Index: library/xotcl/library/lib/xodoc.xotcl =================================================================== diff -u -N -rf08eb1a13d20ea3027d057142625e7303ef18a83 -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 --- library/xotcl/library/lib/xodoc.xotcl (.../xodoc.xotcl) (revision f08eb1a13d20ea3027d057142625e7303ef18a83) +++ library/xotcl/library/lib/xodoc.xotcl (.../xodoc.xotcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) @@ -1,6 +1,6 @@ # -*- Tcl -*- -package require XOTcl -package provide xotcl::xodoc 0.84 +package require XOTcl 2.0 +package provide xotcl::xodoc 0.85 package require xotcl::staticMetadataAnalyzer package require xotcl::htmllib Index: library/xotcl/library/serialize/RecoveryPoint.xotcl =================================================================== diff -u -N -re8715774bf274fbeadabf08a5a0777a968f71148 -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 --- library/xotcl/library/serialize/RecoveryPoint.xotcl (.../RecoveryPoint.xotcl) (revision e8715774bf274fbeadabf08a5a0777a968f71148) +++ library/xotcl/library/serialize/RecoveryPoint.xotcl (.../RecoveryPoint.xotcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) @@ -1,7 +1,7 @@ -# $Id: RecoveryPoint.xotcl,v 1.4 2006/02/18 22:17:33 neumann Exp $ +# -*- Tcl -*- -package provide xotcl::scriptCreation::recoveryPoint 0.8 -package require XOTcl +package provide xotcl::scriptCreation::recoveryPoint 0.81 +package require XOTcl 2.0 namespace eval ::xotcl::scriptCreation::recoveryPoint { namespace import ::xotcl::* Index: library/xotcl/library/serialize/ScriptCreator.xotcl =================================================================== diff -u -N -re8715774bf274fbeadabf08a5a0777a968f71148 -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 --- library/xotcl/library/serialize/ScriptCreator.xotcl (.../ScriptCreator.xotcl) (revision e8715774bf274fbeadabf08a5a0777a968f71148) +++ library/xotcl/library/serialize/ScriptCreator.xotcl (.../ScriptCreator.xotcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) @@ -1,7 +1,7 @@ -# $Id: ScriptCreator.xotcl,v 1.4 2006/02/18 22:17:33 neumann Exp $ +# -*- Tcl -*- -package provide xotcl::scriptCreation::scriptCreator 0.8 -package require XOTcl +package provide xotcl::scriptCreation::scriptCreator 0.81 +package require XOTcl 2.0 namespace eval ::xotcl::scriptCreation::scriptCreator { namespace import ::xotcl::* Index: library/xotcl/library/serialize/Serializer.xotcl =================================================================== diff -u -N -re8715774bf274fbeadabf08a5a0777a968f71148 -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 --- library/xotcl/library/serialize/Serializer.xotcl (.../Serializer.xotcl) (revision e8715774bf274fbeadabf08a5a0777a968f71148) +++ library/xotcl/library/serialize/Serializer.xotcl (.../Serializer.xotcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) @@ -1,3 +1,4 @@ +# -*- Tcl -*- # offer old package name for backward minimal compatibility package provide xotcl::serializer 1.0 package require nx::serializer \ No newline at end of file Index: library/xotcl/tests/slottest.xotcl =================================================================== diff -u -N -r4e8faf5bc42abdcfc1deb53176ee34cc8a1cbd51 -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 --- library/xotcl/tests/slottest.xotcl (.../slottest.xotcl) (revision 4e8faf5bc42abdcfc1deb53176ee34cc8a1cbd51) +++ library/xotcl/tests/slottest.xotcl (.../slottest.xotcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) @@ -1,6 +1,6 @@ # -*- Tcl -*- package prefer latest -package require XOTcl; namespace import -force ::xotcl::* +package require XOTcl 2.0; namespace import -force ::xotcl::* package require nx::test nx::Test parameter count 1000 Index: library/xotcl/tests/speedtest.xotcl =================================================================== diff -u -N -r4e8faf5bc42abdcfc1deb53176ee34cc8a1cbd51 -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 --- library/xotcl/tests/speedtest.xotcl (.../speedtest.xotcl) (revision 4e8faf5bc42abdcfc1deb53176ee34cc8a1cbd51) +++ library/xotcl/tests/speedtest.xotcl (.../speedtest.xotcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) @@ -1,7 +1,7 @@ # -*- Tcl -*- #memory trace on package prefer latest -package require XOTcl; namespace import ::xotcl::* +package require XOTcl 2.0; namespace import ::xotcl::* package require nx::test; namespace import nx::Test Test parameter count 1000 Index: library/xotcl/tests/testo.xotcl =================================================================== diff -u -N -r4e8faf5bc42abdcfc1deb53176ee34cc8a1cbd51 -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 --- library/xotcl/tests/testo.xotcl (.../testo.xotcl) (revision 4e8faf5bc42abdcfc1deb53176ee34cc8a1cbd51) +++ library/xotcl/tests/testo.xotcl (.../testo.xotcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) @@ -12,7 +12,7 @@ # without express or implied warranty. # package prefer latest -package require XOTcl; namespace import ::xotcl::* +package require XOTcl 2.0; namespace import ::xotcl::* @ @File {description { This is a class which provides regression test objects Index: library/xotcl/tests/testx.xotcl =================================================================== diff -u -N -r4e8faf5bc42abdcfc1deb53176ee34cc8a1cbd51 -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 --- library/xotcl/tests/testx.xotcl (.../testx.xotcl) (revision 4e8faf5bc42abdcfc1deb53176ee34cc8a1cbd51) +++ library/xotcl/tests/testx.xotcl (.../testx.xotcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) @@ -1,6 +1,6 @@ # -*- Tcl -*- package prefer latest -package require XOTcl; namespace import -force ::xotcl::* +package require XOTcl 2.0; namespace import -force ::xotcl::* proc ::errorCheck {got expected msg} { nsf::__db_run_assertions @@ -3213,7 +3213,7 @@ xotcl::interp create in set ::r [in eval { package prefer latest - package req XOTcl; namespace import ::xotcl::* + package req XOTcl 2.0; namespace import ::xotcl::* Object o }] xotcl::interp delete in Index: library/xotcl/tests/xocomm.test =================================================================== diff -u -N -r4e8faf5bc42abdcfc1deb53176ee34cc8a1cbd51 -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 --- library/xotcl/tests/xocomm.test (.../xocomm.test) (revision 4e8faf5bc42abdcfc1deb53176ee34cc8a1cbd51) +++ library/xotcl/tests/xocomm.test (.../xocomm.test) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) @@ -1,6 +1,6 @@ # -*- Tcl -*- package prefer latest -package require XOTcl; namespace import ::xotcl::* +package require XOTcl 2.0; namespace import ::xotcl::* lappend auto_path [file dirname [info script]]/../library package require nx::test Index: library/xotcl/xotclsh.in =================================================================== diff -u -N -r043dc9b94b99894cc9b7ad6b61e469f67023c705 -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 --- library/xotcl/xotclsh.in (.../xotclsh.in) (revision 043dc9b94b99894cc9b7ad6b61e469f67023c705) +++ library/xotcl/xotclsh.in (.../xotclsh.in) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) @@ -8,7 +8,7 @@ # multiple installed shells during development. For installed # versions, it should be sufficient to remove the first line. # -package require XOTcl +package require XOTcl 2.0 namespace import -force ::xotcl::* if {$argc == 0} { Index: library/xotcl/xowish.in =================================================================== diff -u -N -r043dc9b94b99894cc9b7ad6b61e469f67023c705 -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 --- library/xotcl/xowish.in (.../xowish.in) (revision 043dc9b94b99894cc9b7ad6b61e469f67023c705) +++ library/xotcl/xowish.in (.../xowish.in) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) @@ -10,7 +10,7 @@ # remove the first line. # package require Tk -package require XOTcl +package require XOTcl 2.0 namespace import -force ::xotcl::* if {$argc == 0} { Index: tests/alias.test =================================================================== diff -u -N -rc4997e0189bb712287aa53d12bb3e332acfb781d -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 --- tests/alias.test (.../alias.test) (revision c4997e0189bb712287aa53d12bb3e332acfb781d) +++ tests/alias.test (.../alias.test) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) @@ -1,9 +1,11 @@ # -*- Tcl -*- -package require nx; -#::nx::configure defaultMethodCallProtection false +package prefer latest +package require nx package require nx::test namespace import ::nx::* +#::nx::configure defaultMethodCallProtection false + Test parameter count 10 Test case alias-preliminaries { Index: tests/contains.test =================================================================== diff -u -N -re67f194e31b8e0fb4f1312a3257088a94e598b0d -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 --- tests/contains.test (.../contains.test) (revision e67f194e31b8e0fb4f1312a3257088a94e598b0d) +++ tests/contains.test (.../contains.test) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) @@ -1,4 +1,5 @@ # -*- Tcl -*- +package prefer latest package require nx # @@ -105,9 +106,9 @@ package req nx #puts ====XOTCL-[package versions XOTcl]-[set auto_path] -package require XOTcl +package require XOTcl 2.0 package forget XOTcl -package require XOTcl +package require XOTcl 2.0 ######################################################################## Index: tests/disposition.test =================================================================== diff -u -N -r4e8faf5bc42abdcfc1deb53176ee34cc8a1cbd51 -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 --- tests/disposition.test (.../disposition.test) (revision 4e8faf5bc42abdcfc1deb53176ee34cc8a1cbd51) +++ tests/disposition.test (.../disposition.test) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) @@ -1,4 +1,5 @@ # -*- Tcl -*- +package prefer latest package req nx package require nx::test @@ -1368,7 +1369,7 @@ nx::Test case xotcl-residualargs { package prefer latest - puts stderr "XOTcl loaded: [package req XOTcl]" + puts stderr "XOTcl loaded: [package req XOTcl 2.0]" ? {::xotcl::Class create XD -set x 1} "::XD" #? {c1 eval {info exists :args}} 0 @@ -1418,7 +1419,7 @@ # parameter-dispatched methods under residualargs() ... # package prefer latest - package req XOTcl + package req XOTcl 2.0 xotcl::Class C -proc onTheFly {name args} { ? [list set _ [info exists ix]] 0 Index: tests/mixinoftest.xotcl =================================================================== diff -u -N --- tests/mixinoftest.xotcl (revision a976b7c6a116f584114d2612494aaaa8e8028387) +++ tests/mixinoftest.xotcl (revision 0) @@ -1,488 +0,0 @@ -# testing mixinof -package require XOTcl 1 -namespace import -force xotcl::* -package require xotcl::test 1 - -proc ? {cmd expected} { - set t [Test new -cmd $cmd] - $t expected $expected - $t run -} - -########################################### -# testing simple per object mixins -########################################### -Class A -Object o -mixin A -? {o mixin} ::A -? {o info mixin} ::A -? {A info mixinof} ::o - -o destroy -? {A info mixinof} "" - -A destroy - -########################################### -# testing transitive per object mixins -########################################### - -Class B -Class C -superclass B - -Class M -B instmixin M - -Object o -mixin C -Object o1 -mixin B -? {C info mixinof} ::o -? {lsort [B info mixinof -closure]} "::o ::o1" -? {lsort [B info mixinof -closure ::o1]} "::o1" -? {lsort [B info mixinof -closure ::o*]} "::o ::o1" -? {lsort [C info mixinof -closure ::o*]} "::o" -# A class is mixed into a per-object mixin class -? {lsort [M info mixinof -closure ::o*]} "::o ::o1" -? {lsort [M info mixinof]} "" - -M destroy -B destroy -C destroy -::o destroy -::o1 destroy -########################################### -# testing per object mixins with redefinition -########################################### -Class M -instproc foo args {puts x;next} -Object o -mixin M - -? {o info mixin} ::M -? {o info precedence} "::M ::xotcl::Object" -? {o procsearch foo} "::M instproc foo" - -Class M -instproc foo args next -? {o info mixin} ::M -? {o info precedence} "::M ::xotcl::Object" -? {o procsearch foo} "::M instproc foo" - -M destroy -? {o info mixin} "" -? {o info precedence} "::xotcl::Object" -? {o procsearch foo} "" - -o destroy - -########################################### -# testing simple per class mixins -########################################### -::xotcl::test::case pcm -Class A -Class B -instmixin A -Class C -superclass B -C c1 - -? {B instmixin} ::A -? {B info instmixin} ::A -? {A info instmixinof} ::B -? {c1 info precedence} "::A ::C ::B ::xotcl::Object" - -B destroy -? {A info instmixinof} "" -? {c1 info precedence} "::C ::xotcl::Object" - -A destroy -C destroy -c1 destroy - -########################################### -# testing simple per class mixins with guards -########################################### -::xotcl::test::case pcm2 -Class M1 -Class M2 -Class X -Class A -instmixin {M1 M2 X} -A instmixinguard M1 "test" -Class B -superclass A -? {A info instmixin M2} ::M2 -? {A info instmixin M*} "::M1 ::M2" -? {A info instmixin -guards} "{::M1 -guard test} ::M2 ::X" -? {B info instmixin} "" -? {B info instmixin -closure} "::M1 ::M2 ::X" -? {B info instmixin -closure M2} ::M2 -? {B info instmixin -closure M*} "::M1 ::M2" -? {B info instmixin -closure -guards} "{::M1 -guard test} ::M2 ::X" -? {B info instmixin -closure -guards M1} "{::M1 -guard test}" -? {B info instmixin -closure -guards M*} "{::M1 -guard test} ::M2" -A destroy -B destroy -X destroy -M1 destroy -M2 destroy - -########################################### -# testing transitive per class mixins -########################################### -::xotcl::test::case trans-pcm1 -Class A -Class B -instmixin A -Class C -superclass B -A instmixin [Class M] - -A a1 -B b1 -C c1 - -? {B instmixin} ::A -? {B info instmixin} ::A -? {A info instmixinof} ::B -? {a1 info precedence} "::M ::A ::xotcl::Object" -? {b1 info precedence} "::M ::A ::B ::xotcl::Object" -? {c1 info precedence} "::M ::A ::C ::B ::xotcl::Object" - -? {M info instmixinof} "::A" -# since M is an instmixin of A and A is a instmixin of B, -# M is a instmixin of B as well, and of its subclasses -? {M info instmixinof -closure} "::A ::B ::C" -? {A info instmixinof} "::B" -? {A info instmixinof -closure} "::B ::C" -? {B info instmixinof} "" -? {B info instmixinof -closure} "" - -# and now destroy mixin classes -M destroy -? {a1 info precedence} "::A ::xotcl::Object" -? {b1 info precedence} "::A ::B ::xotcl::Object" -? {c1 info precedence} "::A ::C ::B ::xotcl::Object" - -B destroy -? {A info instmixinof} "" -? {c1 info precedence} "::C ::xotcl::Object" - -foreach o {A C a1 b1 c1} { $o destroy } - - -########################################### -# testing transitive per class mixins with subclasses -########################################### -::xotcl::test::case trans-pcm2 -Class X -Class D -Class C -superclass D -Class A -instmixin C -Class B -superclass A -B b1 - -? {C info instmixinof -closure} "::A ::B" -? {D info instmixinof -closure} "" -? {A info instmixinof -closure} "" -? {B info instmixinof -closure} "" -? {X info instmixinof -closure} "" -D instmixin X -? {C info instmixinof -closure} "::A ::B" -? {D info instmixinof -closure} "" -? {A info instmixinof -closure} "" -? {B info instmixinof -closure} "" -? {X info instmixinof -closure} "::D ::C ::A ::B" -? {b1 info precedence} "::C ::X ::D ::B ::A ::xotcl::Object" -B b2 -? {b2 info precedence} "::C ::X ::D ::B ::A ::xotcl::Object" - -foreach o {X D C A B b1 b2} {$o destroy} - -########################################### -# testing transitive per class mixins with subclasses -########################################### -::xotcl::test::case trans-pcm3 -Class A3 -superclass [Class A2 -superclass [Class A1]] -Class B3 -superclass [Class B2 -superclass [Class B1 -superclass [Class B0]]] -Class C3 -superclass [Class C2 -superclass [Class C1]] - -A2 instmixin B2 -B1 instmixin C2 - -? {A1 info instmixinof -closure} "" -? {A2 info instmixinof -closure} "" -? {A3 info instmixinof -closure} "" - -? {B0 info instmixinof -closure} "" -? {B1 info instmixinof -closure} "" -? {B2 info instmixinof -closure} "::A2 ::A3" -? {B3 info instmixinof -closure} "" - -? {C1 info instmixinof -closure} "" -? {C2 info instmixinof -closure} "::B1 ::B2 ::B3 ::A2 ::A3" -? {C3 info instmixinof -closure} "" - -foreach o {A1 A2 A3 B0 B1 B2 B3 C1 C2 C3} {$o destroy} - -########################################### -# testing transitive per class mixins with destroy -########################################### -::xotcl::test::case pcm-trans-destroy-A -Class A -instmixin [Class M] -Class B -instmixin A -Class C -superclass B - -A a1 -B b1 -C c1 - -? {B instmixin} ::A -? {B info instmixin} ::A -? {A info instmixinof} ::B -? {a1 info precedence} "::M ::A ::xotcl::Object" -? {b1 info precedence} "::M ::A ::B ::xotcl::Object" -? {c1 info precedence} "::M ::A ::C ::B ::xotcl::Object" - -# and now destroy A -A destroy -? {a1 info precedence} "::xotcl::Object" -? {b1 info precedence} "::B ::xotcl::Object" -? {c1 info precedence} "::C ::B ::xotcl::Object" - -? {M info instmixinof} "" -? {M info instmixinof -closure} "" - - -B destroy -? {M info instmixinof} "" -? {c1 info precedence} "::C ::xotcl::Object" - -foreach o {M C a1 b1 c1} { $o destroy } - -########################################### -# testing transitive per class mixins with destroy -########################################### -::xotcl::test::case pcm-trans-destroy-B -Class A -instmixin [Class M] -Class B -instmixin A -Class C -superclass B - -A a1 -B b1 -C c1 - -? {B instmixin} ::A -? {B info instmixin} ::A -? {A info instmixinof} ::B -? {a1 info precedence} "::M ::A ::xotcl::Object" -? {b1 info precedence} "::M ::A ::B ::xotcl::Object" -? {c1 info precedence} "::M ::A ::C ::B ::xotcl::Object" - -B destroy -? {a1 info precedence} "::M ::A ::xotcl::Object" -? {b1 info precedence} "::xotcl::Object" -? {c1 info precedence} "::C ::xotcl::Object" - -? {M info instmixinof} "::A" -? {M info instmixinof -closure} "::A" -? {A info instmixinof} "" - -foreach o {M C a1 b1 c1} { - $o destroy -} - -########################################### -# testing simple per class mixins with redefinition -########################################### -::xotcl::test::case pcm-redefine -Class A -Class B -instmixin A -Class C -superclass B -C c1 - -? {B instmixin} ::A -? {B info instmixin} ::A -? {A info instmixinof} ::B -? {c1 info precedence} "::A ::C ::B ::xotcl::Object" -? {B info heritage} "::xotcl::Object" -? {C info heritage} "::B ::xotcl::Object" - -Class B -instmixin A - -? {B info heritage} "::xotcl::Object" -? {C info heritage} "::xotcl::Object" -? {B instmixin} ::A -? {B info instmixin} ::A -? {A info instmixinof} ::B -? {c1 info precedence} "::C ::xotcl::Object" - -B destroy -? {A info instmixinof} "" -? {c1 info precedence} "::C ::xotcl::Object" - -A destroy -C destroy -c1 destroy - - -########################################### -# testing simple per class mixins with -# redefinition and softrecreate -########################################### -::xotcl::test::case pcm-redefine-soft -::xotcl::configure softrecreate true -Class A -Class B -instmixin A -Class C -superclass B -C c1 - -? {B instmixin} ::A -? {B info instmixin} ::A -? {A info instmixinof} ::B -? {c1 info precedence} "::A ::C ::B ::xotcl::Object" -? {C info heritage} "::B ::xotcl::Object" -? {B info heritage} "::xotcl::Object" - -Class B -instmixin A -? {C info heritage} "::B ::xotcl::Object" -? {B info heritage} "::xotcl::Object" -? {B info instmixin} ::A -? {A info instmixinof} ::B -? {c1 info precedence} "::A ::C ::B ::xotcl::Object" - -B destroy -? {A info instmixinof} "" -? {c1 info precedence} "::C ::xotcl::Object" - -A destroy -C destroy -c1 destroy - - -########################################### -# test of recreate with same superclass, -# with softrecreate off -########################################### -::xotcl::test::case precedence -::xotcl::configure softrecreate false -Class O -Class A -superclass O -Class B -superclass A -B b1 -A a1 -O o1 -? {A info superclass} "::O" -? {B info heritage} "::A ::O ::xotcl::Object" -? {list [A info subclass] [B info subclass] [O info subclass]} "::B {} ::A" -? {list [A info superclass] [B info superclass] [O info superclass]} "::O ::A ::xotcl::Object" -? {list [a1 info class] [b1 info class] [o1 info class]} "::A ::B ::O" -? {o1 info precedence} "::O ::xotcl::Object" -? {a1 info precedence} "::A ::O ::xotcl::Object" -? {b1 info precedence} "::B ::A ::O ::xotcl::Object" -# we recreate the class new, with the same superclass -Class A -superclass O -? {A info superclass} "::O" -? {B info heritage} "::xotcl::Object" -? {list [A info subclass] [B info subclass] [O info subclass]} "{} {} ::A" -? {list [A info superclass] [B info superclass] [O info superclass]} "::O ::xotcl::Object ::xotcl::Object" -? {list [a1 info class] [b1 info class] [o1 info class]} "::xotcl::Object ::B ::O" -? {o1 info precedence} "::O ::xotcl::Object" -? {a1 info precedence} "::xotcl::Object" -? {b1 info precedence} "::B ::xotcl::Object" -foreach o {A O B a1 b1 o1} {$o destroy} - -########################################### -# test of recreate with different superclass -# with softrecreate on -########################################### -::xotcl::test::case alternate-precedence -::xotcl::configure softrecreate false -Class O -Class A -superclass O -Class B -superclass A -B b1 -A a1 -O o1 -? {A info superclass} "::O" -? {B info heritage} "::A ::O ::xotcl::Object" -? {list [A info subclass] [B info subclass] [O info subclass]} "::B {} ::A" -? {list [A info superclass] [B info superclass] [O info superclass]} "::O ::A ::xotcl::Object" -? {list [a1 info class] [b1 info class] [o1 info class]} "::A ::B ::O" -? {o1 info precedence} "::O ::xotcl::Object" -? {a1 info precedence} "::A ::O ::xotcl::Object" -? {b1 info precedence} "::B ::A ::O ::xotcl::Object" -# we recreate the class new, with a different superclass -Class A -? {A info superclass} "::xotcl::Object" -? {B info heritage} "::xotcl::Object" -? {list [A info subclass] [B info subclass] [O info subclass]} "{} {} {}" -? {list [A info superclass] [B info superclass] [O info superclass]} "::xotcl::Object ::xotcl::Object ::xotcl::Object" -? {list [a1 info class] [b1 info class] [o1 info class]} "::xotcl::Object ::B ::O" -? {o1 info precedence} "::O ::xotcl::Object" -? {a1 info precedence} "::xotcl::Object" -? {b1 info precedence} "::B ::xotcl::Object" -foreach o {A O B a1 b1 o1} {$o destroy} - - -########################################### -# test of recreate with same superclass, -# with softrecreate on -########################################### -::xotcl::test::case recreate-precedence -::xotcl::configure softrecreate true -Class O -Class A -superclass O -Class B -superclass A -B b1 -A a1 -O o1 -? {A info superclass} "::O" -? {B info heritage} "::A ::O ::xotcl::Object" -? {list [A info subclass] [B info subclass] [O info subclass]} "::B {} ::A" -? {list [A info superclass] [B info superclass] [O info superclass]} "::O ::A ::xotcl::Object" -? {list [a1 info class] [b1 info class] [o1 info class]} "::A ::B ::O" -? {o1 info precedence} "::O ::xotcl::Object" -? {a1 info precedence} "::A ::O ::xotcl::Object" -? {b1 info precedence} "::B ::A ::O ::xotcl::Object" -# we recreate the class new, with the same superclass -Class A -superclass O -? {A info superclass} "::O" -? {B info heritage} "::A ::O ::xotcl::Object" -? {list [A info subclass] [B info subclass] [O info subclass]} "::B {} ::A" -? {list [A info superclass] [B info superclass] [O info superclass]} "::O ::A ::xotcl::Object" -? {list [a1 info class] [b1 info class] [o1 info class]} "::A ::B ::O" -? {o1 info precedence} "::O ::xotcl::Object" -? {a1 info precedence} "::A ::O ::xotcl::Object" -? {b1 info precedence} "::B ::A ::O ::xotcl::Object" -foreach o {A O B a1 b1 o1} {$o destroy} - -########################################### -# test of recreate with different superclass -# with softrecreate on -########################################### -::xotcl::test::case recreate-alternate-precedence -::xotcl::configure softrecreate true -Class O -Class A -superclass O -Class B -superclass A -B b1 -A a1 -O o1 -? {B info heritage} "::A ::O ::xotcl::Object" -? {list [A info subclass] [B info subclass] [O info subclass]} "::B {} ::A" -? {list [A info superclass] [B info superclass] [O info superclass]} "::O ::A ::xotcl::Object" -? {list [a1 info class] [b1 info class] [o1 info class]} "::A ::B ::O" -? {o1 info precedence} "::O ::xotcl::Object" -? {a1 info precedence} "::A ::O ::xotcl::Object" -? {b1 info precedence} "::B ::A ::O ::xotcl::Object" -# we recreate the class new, with a different superclass -Class A -? {A info superclass} "::xotcl::Object" -? {B info heritage} "::A ::xotcl::Object" -? {B info heritage} "::A ::xotcl::Object" -? {list [A info subclass] [B info subclass] [O info subclass]} "::B {} {}" -? {list [A info superclass] [B info superclass] [O info superclass]} "::xotcl::Object ::A ::xotcl::Object" -? {list [a1 info class] [b1 info class] [o1 info class]} "::A ::B ::O" -? {o1 info precedence} "::O ::xotcl::Object" -? {a1 info precedence} "::A ::xotcl::Object" -? {b1 info precedence} "::B ::A ::xotcl::Object" -foreach o {A O B a1 b1 o1} {$o destroy} - - - - -#foreach o [::xotcl::test::Test info instances] {$o destroy} -#::xotcl::test::Test destroy -#puts [lsort [::xotcl::Object allinstances]] - Index: tests/parameters.test =================================================================== diff -u -N -rc4997e0189bb712287aa53d12bb3e332acfb781d -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 --- tests/parameters.test (.../parameters.test) (revision c4997e0189bb712287aa53d12bb3e332acfb781d) +++ tests/parameters.test (.../parameters.test) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) @@ -1586,7 +1586,7 @@ nx::Test parameter count 1 package prefer latest - package req XOTcl + package req XOTcl 2.0 xotcl::Class create CC -parameter {package_id parameter_declaration user_id} # first, without list notation Index: tests/varresolutiontest.xotcl =================================================================== diff -u -N --- tests/varresolutiontest.xotcl (revision a976b7c6a116f584114d2612494aaaa8e8028387) +++ tests/varresolutiontest.xotcl (revision 0) @@ -1,152 +0,0 @@ -# testing var resolution for namespace-shadowed objects - -package require XOTcl 1 -package require xotcl::test 1 -namespace import -force xotcl::* - -proc ? {cmd expected {iterations 1000}} { - set t [Test new \ - -cmd $cmd \ - -expected $expected \ - -count $iterations] - $t run -} - -########################################### -# Basic tests for var resolution under -# per-object namespaces ... -########################################### -set ::globalVar 1 -Object o -requireNamespace -? {o info vars} "" -? {info exists ::globalVar} 1 -? {set ::globalVar} 1 -? {o exists globalVar} 0 -? {o array exists globalVar} 0 -o array set globalVar {1 2} -? {o exists globalVar} 1 -? {o info vars} globalVar -? {o array exists globalVar} 1 -? {set ::globalVar} 1 -? {o set globalVar(1)} 2 - -o destroy -unset ::globalVar - -########################################### -# scopes -########################################### - -Object o -eval { - my requireNamespace - global z - my instvar y - set x 1 - set y 2 - set z 3 - set [self]::X 4 -} -set ::o::Y 5 - -? {info exists ::z} 1 -? {set ::z} 3 -? {lsort [o info vars]} {X Y y} -? {o exists x} 0 -? {o exists y} 1 -? {o exists z} 0 -? {o exists X} 1 -? {o exists Y} 1 -? {o set y} 2 - -o destroy -unset ::z - -########################################### -# mix & match namespace and object interfaces -########################################### - -Object o -requireNamespace - -o set x 1 -? {namespace eval ::o set x} 1 -? {::o set x} 1 -? {namespace eval ::o set x 3} 3 -? {::o set x} 3 -? {namespace eval ::o info exists x} 1 -? {::o unset x} "" 1 -? {namespace eval ::o info exists x} 0 -o lappend y 3 -? {namespace eval ::o llength y} 1 -? {namespace eval ::o unset y} "" 1 -? {::o exists y} 0 -o destroy - -########################################### -# array-specific tests -########################################### - -Object o -requireNamespace - -? {o array exists a} 0 -? {namespace eval ::o array exists a} 0 -o array set a {1 2 3 4 5 6} -? {o array exists a} 1 -? {namespace eval ::o array exists a} 1 -? {namespace eval ::o array names a} [::o array names a] -? {namespace eval ::o array size a} [::o array size a] -? {o set a(1) 7} 7 -? {namespace eval ::o array get a 1} {1 7} -? {namespace eval ::o set a(1) 2} 2 -? {o array get a 1} {1 2} -? {::o unset a} "" 1 -? {::o array unset a} "" -? {o array exists a} 0 -? {namespace eval ::o array exists a} 0 - -o destroy - -########################################### -# tests on namespace-qualified var names -########################################### - -Object o -requireNamespace -Object o::oo -requireNamespace - -? {::o set ::x 1} 1 -? {info exists ::x} [set ::x] -? {catch {unset ::x}} 0 1 - -? {::o set ::o::x 1} 1 -? {o exists x} [::o set ::o::x] -? {namespace eval ::o unset x} "" 1 -? {o exists x} 0 - -# Note, relatively qualified var names (not prefixed with ::*) -# are always resolved relative to the per-object namespace -? {catch {::o set o::x 1} msg} 1 -? {::o set oo::x 1} 1 -? {o::oo exists x} [::o set oo::x] -? {o unset oo::x} "" 1 -? {o::oo exists x} 0 - -o destroy - -########################################### -# tests on namespace-qualified on objects -# without namespaces -########################################### - -# the tests below fail. We could consider -# to require namespaces on the fly in the future -Object o -#? {::o set ::o::x 1} 1 -#? {o exists x} [::o set ::o::x] -#? {namespace eval ::o unset x} "" 1 -#? {o exists x} 0 - -#? {::o set o::x 1} 1 -#? {o exists x} [::o set o::x] -#? {namespace eval ::o unset x} "" 1 -#? {o exists x} 0 - -o destroy \ No newline at end of file Index: tests/volatile.test =================================================================== diff -u -N -r4e8faf5bc42abdcfc1deb53176ee34cc8a1cbd51 -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 --- tests/volatile.test (.../volatile.test) (revision 4e8faf5bc42abdcfc1deb53176ee34cc8a1cbd51) +++ tests/volatile.test (.../volatile.test) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) @@ -1,7 +1,7 @@ # -*- Tcl -*- package req nx::test package prefer latest -package req XOTcl +package req XOTcl 2.0 # # Wrapper to call a command in a proc/method Index: win/Makefile.vc =================================================================== diff -u -N -r8eddf67371ec031084a6ef98fdec21e38dff85ff -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 --- win/Makefile.vc (.../Makefile.vc) (revision 8eddf67371ec031084a6ef98fdec21e38dff85ff) +++ win/Makefile.vc (.../Makefile.vc) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) @@ -216,7 +216,7 @@ @echo * In order install XOTcl, invoke the installWin.tcl @echo * installation script, like: @echo * - @echo * tclsh83 installWin.tcl c:\Progra~1 + @echo * tclsh installWin.tcl c:\Progra~1 @echo * @echo * or: @echo * @@ -227,8 +227,8 @@ @echo * execute tclsh: @echo * @echo * set TCLLIBPATH=$(ROOT) - @echo * tclsh83 - @echo * package require XOTcl; namespace import -force nsf::* + @echo * tclsh + @echo * package require XOTcl 2.0; namespace import -force xotcl::* @echo * @echo ************************************************************