Index: Makefile.in =================================================================== diff -u -r57c47e5fff431976511c200231567024bea09ff4 -r35c67391973a07983d0b0dfe70706e6a69fbdbfc --- Makefile.in (.../Makefile.in) (revision 57c47e5fff431976511c200231567024bea09ff4) +++ Makefile.in (.../Makefile.in) (revision 35c67391973a07983d0b0dfe70706e6a69fbdbfc) @@ -351,7 +351,7 @@ $(TCLSH) $(src_test_dir_native)/varresolutiontest.tcl -libdir $(PLATFORM_DIR) $(TESTFLAGS) $(TCLSH) $(src_test_dir_native)/info-method.tcl -libdir $(PLATFORM_DIR) $(TESTFLAGS) $(TCLSH) $(src_test_dir_native)/parameters.tcl -libdir $(PLATFORM_DIR) $(TESTFLAGS) - $(TCLSH) $(src_test_dir_native)/interceptor-slot.xotcl -libdir $(PLATFORM_DIR) $(TESTFLAGS) + $(TCLSH) $(src_test_dir_native)/interceptor-slot.tcl -libdir $(PLATFORM_DIR) $(TESTFLAGS) $(TCLSH) $(src_test_dir_native)/aliastest.tcl -libdir $(PLATFORM_DIR) $(TESTFLAGS) $(TCLSH) $(src_test_dir_native)/protected.tcl -libdir $(PLATFORM_DIR) $(TESTFLAGS) $(TCLSH) $(src_test_dir_native)/testx.xotcl -libdir $(PLATFORM_DIR) $(TESTFLAGS) @@ -430,7 +430,7 @@ install-pkgIndex: # @echo package ifneeded next $(PACKAGE_VERSION) [list load [file join \$$dir .. "$(PKG_LIB_FILE)"] next] > "$(pkglibdir)/pkgIndex.tcl" -nextsh: tclAppInit.o $(PKG_OBJECTS) $(CONDITIONAL_STUB_OBJECTS) +nxsh: tclAppInit.o $(PKG_OBJECTS) $(CONDITIONAL_STUB_OBJECTS) $(CC) -rdynamic -o $@ tclAppInit.o \ $(CFLAGS) $(TCL_LIB_SPEC) \ $(DMALLOC_LIB) $(CONDITIONAL_STUB_OBJECTS) @@ -442,8 +442,8 @@ $(DMALLOC_LIB) $(CONDITIONAL_STUB_OBJECTS) install-shells: - @if test -f nextsh; then \ - $(INSTALL_PROGRAM) nextsh $(DESTDIR)$(bindir); \ + @if test -f nxsh; then \ + $(INSTALL_PROGRAM) nxsh $(DESTDIR)$(bindir); \ fi @if test -f xowish; then \ $(INSTALL_PROGRAM) xowish $(DESTDIR)$(bindir); \ @@ -637,26 +637,26 @@ end: @echo "" @echo "************************************************************" - @echo " Make completed. In order to test 'next', invoke:" + @echo " Make completed. In order to test next-scripting, invoke:" @echo " make test" @echo "" - @echo " In order install next, invoke:" + @echo " In order install next-scripting, invoke:" @echo " make install" @echo "" - @echo " In order to install next for AOLserver 4.x, invoke:" + @echo " In order to install next-scripting for AOLserver 4.x, invoke:" @echo " make install-aol" @echo "" - @echo " In order to invoke next interactively (before install), use:" + @echo " In order to invoke next-scripting interactively (before install), use:" @echo " export TCLLIBPATH=\"$(TCLLIBPATH)\" or " @echo " setenv TCLLIBPATH \"$(TCLLIBPATH)\"" @echo " and" @if test "x$(XOTCLSH)" = "x" ; then \ echo " @TCLSH_PROG@" ; \ - echo " package require next; namespace import -force next::*" ; \ + echo " package require nx; namespace import -force nx::*" ; \ echo " or" ; \ echo " put the 'package require' line into your ~/.tclshrc" ; \ else \ - echo " ./nextsh" ; \ + echo " ./nxsh" ; \ fi @echo "************************************************************" Index: TODO =================================================================== diff -u -r05f429e6986a7ed8c8d36cad30609f457ec93281 -r35c67391973a07983d0b0dfe70706e6a69fbdbfc --- TODO (.../TODO) (revision 05f429e6986a7ed8c8d36cad30609f457ec93281) +++ TODO (.../TODO) (revision 35c67391973a07983d0b0dfe70706e6a69fbdbfc) @@ -837,6 +837,10 @@ - renamed tests/method-modifiers.xotcl to tests/method-modifiers.tcl - changed "require xotcl::test" to "... next::test" +- changed "require next" to "... nx" +- changed "require next::test" to "... nx::test" +- changed "require next::doc" to "... nx::doc" + TODO: - nameing * .c-code: @@ -852,7 +856,7 @@ next scripting language: ::nx::* next scripting framework: ::nx::core::* * distributed packages in namespace ::nx::* - * names of subpackages next::* + * names of subpackages nx::* * should we stay with ::nx::: as namespace prefix? The following looks inconsistent: @@ -861,6 +865,12 @@ package require next::test namespace import ::nx::* + * Now we have + + package require nx + package require nx::test + namespace import ::nx::* + - documentation - documentationssytem - langref (xotcl 2.0 + next-scripting) @@ -882,6 +892,7 @@ TODO "Kleinigkeiten" +- missing in git: ./tests/var-access.tcl - rename predefined.xotcl to .tcl - migrate further test from .xotcl to .tcl (based on next instead of xotcl) - check ::xotcl references in serializer Index: apps/scripts/soccerClub2.tcl =================================================================== diff -u -r752365e2a4c7ef57fc487bfff9bb387e72ccf533 -r35c67391973a07983d0b0dfe70706e6a69fbdbfc --- apps/scripts/soccerClub2.tcl (.../soccerClub2.tcl) (revision 752365e2a4c7ef57fc487bfff9bb387e72ccf533) +++ apps/scripts/soccerClub2.tcl (.../soccerClub2.tcl) (revision 35c67391973a07983d0b0dfe70706e6a69fbdbfc) @@ -2,7 +2,7 @@ # It demonstrates the basic language constructs on the example of # a soccer club. -package require next +package require nx namespace import ::nx::* # All the characters in this example are fictitious, and any Index: apps/scripts/stack.tcl =================================================================== diff -u -r5c200556d0edbe7ef71130caf11c6d04fb0acf0e -r35c67391973a07983d0b0dfe70706e6a69fbdbfc --- apps/scripts/stack.tcl (.../stack.tcl) (revision 5c200556d0edbe7ef71130caf11c6d04fb0acf0e) +++ apps/scripts/stack.tcl (.../stack.tcl) (revision 35c67391973a07983d0b0dfe70706e6a69fbdbfc) @@ -1,4 +1,4 @@ -package req next +package requite nx nx::Class create stack { :method init {} {set :things {}} Index: configure =================================================================== diff -u -r81c800c8b9cb42ef6743d9b80ac2be5ca211a69a -r35c67391973a07983d0b0dfe70706e6a69fbdbfc --- configure (.../configure) (revision 81c800c8b9cb42ef6743d9b80ac2be5ca211a69a) +++ configure (.../configure) (revision 35c67391973a07983d0b0dfe70706e6a69fbdbfc) @@ -2059,7 +2059,7 @@ if test "$with_tk" = no; then with_xowish="" ; fi -if test "$with_xotclsh" = yes; then XOTCLSH="nextsh" ; else XOTCLSH=""; fi +if test "$with_xotclsh" = yes; then XOTCLSH="nxsh" ; else XOTCLSH=""; fi if test "$with_xowish" = yes; then XOWISH="xowish" ; else XOWISH=""; fi Index: configure.in =================================================================== diff -u -r81c800c8b9cb42ef6743d9b80ac2be5ca211a69a -r35c67391973a07983d0b0dfe70706e6a69fbdbfc --- configure.in (.../configure.in) (revision 81c800c8b9cb42ef6743d9b80ac2be5ca211a69a) +++ configure.in (.../configure.in) (revision 35c67391973a07983d0b0dfe70706e6a69fbdbfc) @@ -91,7 +91,7 @@ AC_SUBST(subdirs) if test "$with_tk" = no; then with_xowish="" ; fi -if test "$with_xotclsh" = yes; then XOTCLSH="nextsh" ; else XOTCLSH=""; fi +if test "$with_xotclsh" = yes; then XOTCLSH="nxsh" ; else XOTCLSH=""; fi if test "$with_xowish" = yes; then XOWISH="xowish" ; else XOWISH=""; fi Index: doc/index.html =================================================================== diff -u -r57c47e5fff431976511c200231567024bea09ff4 -r35c67391973a07983d0b0dfe70706e6a69fbdbfc --- doc/index.html (.../index.html) (revision 57c47e5fff431976511c200231567024bea09ff4) +++ doc/index.html (.../index.html) (revision 35c67391973a07983d0b0dfe70706e6a69fbdbfc) @@ -23,7 +23,7 @@
Index: generic/gentclAPI.decls =================================================================== diff -u -ra98ffcaf356b6d0a1e9d58ae7d0835ed11f56fa3 -r35c67391973a07983d0b0dfe70706e6a69fbdbfc --- generic/gentclAPI.decls (.../gentclAPI.decls) (revision a98ffcaf356b6d0a1e9d58ae7d0835ed11f56fa3) +++ generic/gentclAPI.decls (.../gentclAPI.decls) (revision 35c67391973a07983d0b0dfe70706e6a69fbdbfc) @@ -1,7 +1,7 @@ # -*- Tcl -*- # # This script is sourced by the C-code generator gentclAPI.tcl in the -# same directory. It is also used by the next::doc toolkit to generate +# same directory. It is also used by the nx::doc toolkit to generate # the authorative language reference documents. # @package next Index: generic/gentclAPI.tcl =================================================================== diff -u -r81c800c8b9cb42ef6743d9b80ac2be5ca211a69a -r35c67391973a07983d0b0dfe70706e6a69fbdbfc --- generic/gentclAPI.tcl (.../gentclAPI.tcl) (revision 81c800c8b9cb42ef6743d9b80ac2be5ca211a69a) +++ generic/gentclAPI.tcl (.../gentclAPI.tcl) (revision 35c67391973a07983d0b0dfe70706e6a69fbdbfc) @@ -296,8 +296,8 @@ set namespaces [list] foreach {key value} [array get ::ns] { - # no need to create the ::next::core namespace - if {$value eq "::next::core"} continue + # no need to create the ::nx::core namespace + if {$value eq "::nx::core"} continue lappend namespaces "\"$value\"" } set namespaceString [join $namespaces ",\n "] Index: generic/tclAPI.h =================================================================== diff -u -ra98ffcaf356b6d0a1e9d58ae7d0835ed11f56fa3 -r35c67391973a07983d0b0dfe70706e6a69fbdbfc --- generic/tclAPI.h (.../tclAPI.h) (revision a98ffcaf356b6d0a1e9d58ae7d0835ed11f56fa3) +++ generic/tclAPI.h (.../tclAPI.h) (revision 35c67391973a07983d0b0dfe70706e6a69fbdbfc) @@ -141,7 +141,6 @@ static CONST char *method_command_namespace_names[] = { "::nx::core::cmd::ObjectInfo", "::nx::core::cmd::Object", - "::nx::core", "::nx::core::cmd::ClassInfo", "::nx::core::cmd::ParameterType", "::nx::core::cmd::Class" Index: generic/xotcl.c =================================================================== diff -u -ra98ffcaf356b6d0a1e9d58ae7d0835ed11f56fa3 -r35c67391973a07983d0b0dfe70706e6a69fbdbfc --- generic/xotcl.c (.../xotcl.c) (revision a98ffcaf356b6d0a1e9d58ae7d0835ed11f56fa3) +++ generic/xotcl.c (.../xotcl.c) (revision 35c67391973a07983d0b0dfe70706e6a69fbdbfc) @@ -14675,12 +14675,12 @@ /* the AOL server uses a different package loading mechanism */ # ifdef COMPILE_XOTCL_STUBS # if defined(PRE86) - Tcl_PkgProvideEx(interp, "next", PACKAGE_VERSION, (ClientData)&xotclStubs); + Tcl_PkgProvideEx(interp, "nx", PACKAGE_VERSION, (ClientData)&xotclStubs); # else - Tcl_PkgProvideEx(interp, "next", PACKAGE_VERSION, (ClientData)&xotclConstStubPtr); + Tcl_PkgProvideEx(interp, "nx", PACKAGE_VERSION, (ClientData)&xotclConstStubPtr); # endif # else - Tcl_PkgProvide(interp, "next", PACKAGE_VERSION); + Tcl_PkgProvide(interp, "nx", PACKAGE_VERSION); # endif #endif Index: library/lib/doc-tools.xotcl =================================================================== diff -u -rbb58b68431fe35dd6ff16e69044705e1246d0dda -r35c67391973a07983d0b0dfe70706e6a69fbdbfc --- library/lib/doc-tools.xotcl (.../doc-tools.xotcl) (revision bb58b68431fe35dd6ff16e69044705e1246d0dda) +++ library/lib/doc-tools.xotcl (.../doc-tools.xotcl) (revision 35c67391973a07983d0b0dfe70706e6a69fbdbfc) @@ -1,6 +1,6 @@ -# @package next::doc +# @package nx::doc # -# Study for documentation classes for Next. +# Study for documentation classes for Next Scriptint # # Compared to the "old" @ docmentation effort, this is a rather # light-weight structure based on xotcl 2 (next) language @@ -20,11 +20,11 @@ # documentation is in sync with actually defined methods (when these # are available). # -# @require next +# @require nx # @version 0.1 -package provide next::doc 0.1 -package require next +package provide nx::doc 0.1 +package require nx namespace eval ::nx::doc { namespace import -force ::nx::* @@ -35,7 +35,7 @@ # documentation objects with less syntactic overhead. # # @param class Request an instance of a particular entity class (e.g., ...) - # @param name What is the entity name (e.g., next::doc for a package) + # @param name What is the entity name (e.g., nx::doc for a package) # @param args A vector of arbitrary arguments, provided to the entity when being constructed # @return The identifier of the newly created entity object @@ -525,7 +525,7 @@ -entity:optional comment_block } { - next; + next foreach methodName [${:name} info methods -methodtype scripted] { set blocks [doc comment_blocks [${:name} info method \ @@ -690,7 +690,7 @@ Class create TemplateData { # This mixin class realises a rudimentary templating language to - # be used in next::doc templates. It realises language expressions + # be used in nx::doc templates. It realises language expressions # to verify the existence of variables and simple loop constructs :method render { {-initscript ""} @@ -1001,7 +1001,7 @@ # in the current interpreter. set i [interp create] set cmd [subst -nocommands { - package req next::doc + package req nx::doc namespace import -force ::nx::*; ::nx::Class create SourcingTracker { :method create args { @@ -1047,7 +1047,7 @@ # 4) we assume a string block, e.g., to be fed into eval set i [interp create] set cmd [subst { - package req next::doc + package req nx::doc namespace import -force ::nx::doc::* doc analyze -noeval $noeval [list $thing] }] @@ -1665,7 +1665,7 @@ if {[info exists :current_comment_line]} { unset :current_comment_line } - next; + next } :method signal {event line} { Index: library/lib/make.tcl =================================================================== diff -u -r752365e2a4c7ef57fc487bfff9bb387e72ccf533 -r35c67391973a07983d0b0dfe70706e6a69fbdbfc --- library/lib/make.tcl (.../make.tcl) (revision 752365e2a4c7ef57fc487bfff9bb387e72ccf533) +++ library/lib/make.tcl (.../make.tcl) (revision 35c67391973a07983d0b0dfe70706e6a69fbdbfc) @@ -3,7 +3,7 @@ ### Object file added (for better -n processing) lappend auto_path .. -package require next +package require nx namespace import -force ::nx::* ### @@ -166,7 +166,7 @@ :create main } -#puts stderr "+++ make.xotcl finished." +#puts stderr "+++ make.tcl finished." #if {[set ::tcl_platform(platform)] eq "windows"} { # exit #} Index: library/lib/pkgIndex.tcl =================================================================== diff -u -r57c47e5fff431976511c200231567024bea09ff4 -r35c67391973a07983d0b0dfe70706e6a69fbdbfc --- library/lib/pkgIndex.tcl (.../pkgIndex.tcl) (revision 57c47e5fff431976511c200231567024bea09ff4) +++ library/lib/pkgIndex.tcl (.../pkgIndex.tcl) (revision 35c67391973a07983d0b0dfe70706e6a69fbdbfc) @@ -9,8 +9,8 @@ # full path name of this file's directory. package ifneeded XOTcl 2.0 [list source [file join $dir xotcl.tcl]] -package ifneeded next::doc 0.1 [list source [file join $dir doc-tools.xotcl]] -package ifneeded next::test 1.0 [list source [file join $dir test.tcl]] +package ifneeded nx::doc 0.1 [list source [file join $dir doc-tools.xotcl]] +package ifneeded nx::test 1.0 [list source [file join $dir test.tcl]] package ifneeded xotcl::htmllib 0.1 [list source [file join $dir htmllib.xotcl]] package ifneeded xotcl::metadataAnalyzer 0.84 [list source [file join $dir metadataAnalyzer.xotcl]] package ifneeded xotcl::mixinStrategy 0.9 [list source [file join $dir mixinStrategy.xotcl]] Index: library/lib/test.tcl =================================================================== diff -u -r57c47e5fff431976511c200231567024bea09ff4 -r35c67391973a07983d0b0dfe70706e6a69fbdbfc --- library/lib/test.tcl (.../test.tcl) (revision 57c47e5fff431976511c200231567024bea09ff4) +++ library/lib/test.tcl (.../test.tcl) (revision 35c67391973a07983d0b0dfe70706e6a69fbdbfc) @@ -1,5 +1,5 @@ -package provide next::test 1.0 -package require next +package provide nx::test 1.0 +package require nx namespace eval ::nx::test { namespace import ::nx::* Index: library/lib/xotcl.tcl =================================================================== diff -u -rcf4cb6fb4333cf8601b79f037a186a9a2f82fa43 -r35c67391973a07983d0b0dfe70706e6a69fbdbfc --- library/lib/xotcl.tcl (.../xotcl.tcl) (revision cf4cb6fb4333cf8601b79f037a186a9a2f82fa43) +++ library/lib/xotcl.tcl (.../xotcl.tcl) (revision 35c67391973a07983d0b0dfe70706e6a69fbdbfc) @@ -1,5 +1,5 @@ package provide XOTcl 2.0 -package require next +package require nx ####################################################### # Classical ::xotcl* ####################################################### Index: library/serialize/Serializer.xotcl =================================================================== diff -u -r752365e2a4c7ef57fc487bfff9bb387e72ccf533 -r35c67391973a07983d0b0dfe70706e6a69fbdbfc --- library/serialize/Serializer.xotcl (.../Serializer.xotcl) (revision 752365e2a4c7ef57fc487bfff9bb387e72ccf533) +++ library/serialize/Serializer.xotcl (.../Serializer.xotcl) (revision 35c67391973a07983d0b0dfe70706e6a69fbdbfc) @@ -618,7 +618,7 @@ :method serialize-all-start {s} { if {[info command ::Object] ne "" && [namespace origin ::Object] eq "::nx::Object"} { - set intro "package require next; namespace import -force ::nx::*" + set intro "package require nx; namespace import -force ::nx::*" } else { set intro "" } Index: tests/UNIVERSAL.test =================================================================== diff -u -r57c47e5fff431976511c200231567024bea09ff4 -r35c67391973a07983d0b0dfe70706e6a69fbdbfc --- tests/UNIVERSAL.test (.../UNIVERSAL.test) (revision 57c47e5fff431976511c200231567024bea09ff4) +++ tests/UNIVERSAL.test (.../UNIVERSAL.test) (revision 35c67391973a07983d0b0dfe70706e6a69fbdbfc) @@ -5,7 +5,7 @@ set pkgdir [file dir [info script]]/.. lappend auto_path $pkgdir -package require next::test +package require nx::test set tclsh [info nameofexecutable] set dir [file dir [info script]] Index: tests/actiweb.test =================================================================== diff -u -r57c47e5fff431976511c200231567024bea09ff4 -r35c67391973a07983d0b0dfe70706e6a69fbdbfc --- tests/actiweb.test (.../actiweb.test) (revision 57c47e5fff431976511c200231567024bea09ff4) +++ tests/actiweb.test (.../actiweb.test) (revision 35c67391973a07983d0b0dfe70706e6a69fbdbfc) @@ -6,7 +6,7 @@ package require XOTcl; namespace import -force ::xotcl::* set pkgDir [file dirname [info script]]/.. lappend auto_path $pkgDir -package require next::test +package require nx::test #package require xotcl::package; package verbose 1 package require xotcl::comm::httpAccess #package require xotcl::trace Index: tests/aliastest.tcl =================================================================== diff -u -r57c47e5fff431976511c200231567024bea09ff4 -r35c67391973a07983d0b0dfe70706e6a69fbdbfc --- tests/aliastest.tcl (.../aliastest.tcl) (revision 57c47e5fff431976511c200231567024bea09ff4) +++ tests/aliastest.tcl (.../aliastest.tcl) (revision 35c67391973a07983d0b0dfe70706e6a69fbdbfc) @@ -1,5 +1,5 @@ -package require next; namespace import -force ::nx::* -package require next::test +package require nx; namespace import -force ::nx::* +package require nx::test Test parameter count 10 Test case alias-preliminaries { Index: tests/destroytest.tcl =================================================================== diff -u -r57c47e5fff431976511c200231567024bea09ff4 -r35c67391973a07983d0b0dfe70706e6a69fbdbfc --- tests/destroytest.tcl (.../destroytest.tcl) (revision 57c47e5fff431976511c200231567024bea09ff4) +++ tests/destroytest.tcl (.../destroytest.tcl) (revision 35c67391973a07983d0b0dfe70706e6a69fbdbfc) @@ -1,5 +1,5 @@ -package require next; namespace import ::nx::* -package require next::test +package require nx; namespace import ::nx::* +package require nx::test Test parameter count 10 Index: tests/doc.xotcl =================================================================== diff -u -r57c47e5fff431976511c200231567024bea09ff4 -r35c67391973a07983d0b0dfe70706e6a69fbdbfc --- tests/doc.xotcl (.../doc.xotcl) (revision 57c47e5fff431976511c200231567024bea09ff4) +++ tests/doc.xotcl (.../doc.xotcl) (revision 35c67391973a07983d0b0dfe70706e6a69fbdbfc) @@ -1,6 +1,6 @@ -package require next -package require next::test -package require next::doc +package require nx +package require nx::test +package require nx::doc namespace import -force ::nx::* namespace import -force ::nx::doc::* @@ -502,16 +502,16 @@ # # self documentation # - if {[catch {set i [doc process next::doc]} msg]} { + if {[catch {set i [doc process nx::doc]} msg]} { if {[Exception behind? $msg]} { puts stderr [$msg info class]->[$msg message] } else { error $msg } } - ? [list $i eval [list ::nx::core::is [@package id next::doc] object]] 1 - puts stderr [$i eval [list [@package id next::doc] text]] - puts stderr [$i eval [list [@package id next::doc] @require]] + ? [list $i eval [list ::nx::core::is [@package id nx::doc] object]] 1 + puts stderr [$i eval [list [@package id nx::doc] text]] + puts stderr [$i eval [list [@package id nx::doc] @require]] set path [file join /tmp nextdoc] if {[file exists $path]} { file delete -force $path @@ -532,7 +532,7 @@ set i [interp create] $i eval { - package req next::doc + package req nx::doc namespace import ::nx::* namespace import ::nx::doc::* doc process -noeval true /Users/ssoberni/Documents/dev/xotcl/generic/gentclAPI.decls Index: tests/forwardtest.xotcl =================================================================== diff -u -r57c47e5fff431976511c200231567024bea09ff4 -r35c67391973a07983d0b0dfe70706e6a69fbdbfc --- tests/forwardtest.xotcl (.../forwardtest.xotcl) (revision 57c47e5fff431976511c200231567024bea09ff4) +++ tests/forwardtest.xotcl (.../forwardtest.xotcl) (revision 35c67391973a07983d0b0dfe70706e6a69fbdbfc) @@ -1,6 +1,6 @@ # -*- Tcl -*- package require XOTcl; namespace import ::xotcl::* -package require next::test +package require nx::test ########################################### # trivial object delegation Index: tests/info-method.tcl =================================================================== diff -u -r57c47e5fff431976511c200231567024bea09ff4 -r35c67391973a07983d0b0dfe70706e6a69fbdbfc --- tests/info-method.tcl (.../info-method.tcl) (revision 57c47e5fff431976511c200231567024bea09ff4) +++ tests/info-method.tcl (.../info-method.tcl) (revision 35c67391973a07983d0b0dfe70706e6a69fbdbfc) @@ -1,5 +1,5 @@ -package req next -package require next::test +package req nx +package require nx::test nx::Object create o { :alias set ::set Index: tests/interceptor-slot.tcl =================================================================== diff -u --- tests/interceptor-slot.tcl (revision 0) +++ tests/interceptor-slot.tcl (revision 35c67391973a07983d0b0dfe70706e6a69fbdbfc) @@ -0,0 +1,127 @@ +package require nx +package require nx::test + +namespace import ::nx::* + +Class create M { + :method mfoo {} {puts [self proc]} +} +Class create M2 +Class create C + +? {C info callable -which mixin} "::nx::Class forward mixin ::nx::Class::slot::mixin {%1 {get assign}} %self class-mixin" +C mixin M +? {C info precedence} "::nx::Class ::nx::Object" +? {C mixin} "::M" +? {C info mixin} "::M" +C create c1 +? {c1 info precedence} "::M ::C ::nx::Object" +C mixin add M2 +? {c1 info precedence} "::M2 ::M ::C ::nx::Object" +C mixin delete M2 +? {c1 info precedence} "::M ::C ::nx::Object" +C mixin delete M + +# per-object mixins +? {c1 info precedence} "::C ::nx::Object" +c1 mixin add M +? {::nx::core::relation c1 object-mixin} ::M +? {catch {c1 mixin UNKNOWN}} 1 +? {::nx::core::relation c1 object-mixin} "::M" + +# add again the same mixin +c1 mixin add M +? {c1 info precedence} "::M ::C ::nx::Object" +c1 mixin add M2 +? {c1 info precedence} "::M2 ::M ::C ::nx::Object" +c1 mixin delete M +? {c1 info precedence} "::M2 ::C ::nx::Object" +c1 mixin delete M2 +? {c1 info precedence} "::C ::nx::Object" + +# +# adding, removing per-object mixins for classes through relation +# "object-mixin" +# +::nx::core::relation C object-mixin M +? {C info precedence} "::M ::nx::Class ::nx::Object" +? {C object info mixin} "::M" +::nx::core::relation C object-mixin "" +? {C info precedence} "::nx::Class ::nx::Object" + +# +# adding, removing per-object mixins for classes through slot +# "object-mixin" +# +C object-mixin M +? {C info precedence} "::M ::nx::Class ::nx::Object" +? {C object info mixin} "::M" +C object-mixin "" +? {C info precedence} "::nx::Class ::nx::Object" + +# +# add and remove object mixin for classes via modifier "object" and +# "mixin" +# +C object mixin M +? {C info precedence} "::M ::nx::Class ::nx::Object" +? {C object info mixin} "::M" +C object mixin "" +? {C info precedence} "::nx::Class ::nx::Object" + +# +# add and remove object mixin for classes via object mixin add +# +C object mixin add M +? {C info precedence} "::M ::nx::Class ::nx::Object" +? {C object info mixin} "::M" +C object mixin "" +? {C info precedence} "::nx::Class ::nx::Object" + +# +# adding per-object mixins for classes via "object mixin add M" +# +C object mixin add M +? {C info precedence} "::M ::nx::Class ::nx::Object" +? {::nx::core::relation C object-mixin} ::M +? {catch {C object mixin add UNKNOWN}} 1 +? {::nx::core::relation C object-mixin} "::M" +C object mixin "" +? {C info precedence} "::nx::Class ::nx::Object" + +# +# adding per-object mixins for classes via "object mixin M" +# +C object mixin M +? {C info precedence} "::M ::nx::Class ::nx::Object" + +# forwarder with 0 arguments + flag +? {C object-mixin} "::M" + +puts stderr "==================== XOTcl 1" +package require XOTcl +namespace import -force ::xotcl::* + +Class create M1 +Class create M11 +M1 instproc mfoo {} {puts [self proc]} +Class create C1 +? {C1 procsearch mixin} "::xotcl::Object instforward mixin" +C1 mixin M1 +? {C1 info precedence} "::M1 ::xotcl::Class ::xotcl::Object" +C1 create c11 +? {c11 info precedence} "::C1 ::xotcl::Object" +C1 mixin add M11 +? {C1 info precedence} "::M11 ::M1 ::xotcl::Class ::xotcl::Object" +puts stderr ===obj-create+add +Object o -mixin M1 +puts stderr ====[o info class]-[o procsearch mixin]-[Object info instforward -definition mixin] +? {o info precedence} "::M1 ::xotcl::Object" +puts stderr ===class-create+add +Class O +O mixin M1 +? {O info precedence} "::M1 ::xotcl::Class ::xotcl::Object" +puts stderr ===class-create+add-via-parameter +Class O -mixin M1 +puts stderr ====[O info class] +? {O info precedence} "::M1 ::xotcl::Class ::xotcl::Object" Fisheye: Tag 35c67391973a07983d0b0dfe70706e6a69fbdbfc refers to a dead (removed) revision in file `tests/interceptor-slot.xotcl'. Fisheye: No comparison available. Pass `N' to diff? Index: tests/method-modifiers.tcl =================================================================== diff -u -r57c47e5fff431976511c200231567024bea09ff4 -r35c67391973a07983d0b0dfe70706e6a69fbdbfc --- tests/method-modifiers.tcl (.../method-modifiers.tcl) (revision 57c47e5fff431976511c200231567024bea09ff4) +++ tests/method-modifiers.tcl (.../method-modifiers.tcl) (revision 35c67391973a07983d0b0dfe70706e6a69fbdbfc) @@ -1,5 +1,5 @@ -package require next; namespace import ::nx::* -package require next::test +package require nx; namespace import ::nx::* +package require nx::test Test parameter count 10 Index: tests/mixinoftest.xotcl =================================================================== diff -u -r57c47e5fff431976511c200231567024bea09ff4 -r35c67391973a07983d0b0dfe70706e6a69fbdbfc --- tests/mixinoftest.xotcl (.../mixinoftest.xotcl) (revision 57c47e5fff431976511c200231567024bea09ff4) +++ tests/mixinoftest.xotcl (.../mixinoftest.xotcl) (revision 35c67391973a07983d0b0dfe70706e6a69fbdbfc) @@ -1,6 +1,6 @@ # testing mixinof package require XOTcl; namespace import ::xotcl::* -package require next::test +package require nx::test ########################################### # testing simple per object mixins Index: tests/parameters.tcl =================================================================== diff -u -r57c47e5fff431976511c200231567024bea09ff4 -r35c67391973a07983d0b0dfe70706e6a69fbdbfc --- tests/parameters.tcl (.../parameters.tcl) (revision 57c47e5fff431976511c200231567024bea09ff4) +++ tests/parameters.tcl (.../parameters.tcl) (revision 35c67391973a07983d0b0dfe70706e6a69fbdbfc) @@ -1,5 +1,5 @@ -package require next -package require next::test +package require nx +package require nx::test namespace import ::nx::* Test case dummy { Index: tests/protected.tcl =================================================================== diff -u -r57c47e5fff431976511c200231567024bea09ff4 -r35c67391973a07983d0b0dfe70706e6a69fbdbfc --- tests/protected.tcl (.../protected.tcl) (revision 57c47e5fff431976511c200231567024bea09ff4) +++ tests/protected.tcl (.../protected.tcl) (revision 35c67391973a07983d0b0dfe70706e6a69fbdbfc) @@ -1,5 +1,5 @@ -package require next -package require next::test +package require nx +package require nx::test namespace import ::nx::* Test parameter count 1 Index: tests/slottest.xotcl =================================================================== diff -u -r57c47e5fff431976511c200231567024bea09ff4 -r35c67391973a07983d0b0dfe70706e6a69fbdbfc --- tests/slottest.xotcl (.../slottest.xotcl) (revision 57c47e5fff431976511c200231567024bea09ff4) +++ tests/slottest.xotcl (.../slottest.xotcl) (revision 35c67391973a07983d0b0dfe70706e6a69fbdbfc) @@ -1,5 +1,5 @@ package require XOTcl; namespace import ::xotcl::* -package require next::test +package require nx::test Test parameter count 1000 Index: tests/speedtest.xotcl =================================================================== diff -u -r57c47e5fff431976511c200231567024bea09ff4 -r35c67391973a07983d0b0dfe70706e6a69fbdbfc --- tests/speedtest.xotcl (.../speedtest.xotcl) (revision 57c47e5fff431976511c200231567024bea09ff4) +++ tests/speedtest.xotcl (.../speedtest.xotcl) (revision 35c67391973a07983d0b0dfe70706e6a69fbdbfc) @@ -1,7 +1,7 @@ #memory trace on package require XOTcl; namespace import ::xotcl::* -package require next::test +package require nx::test Test parameter count 1000 @ @File {description { Index: tests/varresolutiontest.tcl =================================================================== diff -u -r57c47e5fff431976511c200231567024bea09ff4 -r35c67391973a07983d0b0dfe70706e6a69fbdbfc --- tests/varresolutiontest.tcl (.../varresolutiontest.tcl) (revision 57c47e5fff431976511c200231567024bea09ff4) +++ tests/varresolutiontest.tcl (.../varresolutiontest.tcl) (revision 35c67391973a07983d0b0dfe70706e6a69fbdbfc) @@ -1,7 +1,7 @@ # testing var resolution -package require next; namespace import ::nx::* -package require next::test +package require nx; namespace import ::nx::* +package require nx::test Test parameter count 1 Index: tests/xocomm.test =================================================================== diff -u -r57c47e5fff431976511c200231567024bea09ff4 -r35c67391973a07983d0b0dfe70706e6a69fbdbfc --- tests/xocomm.test (.../xocomm.test) (revision 57c47e5fff431976511c200231567024bea09ff4) +++ tests/xocomm.test (.../xocomm.test) (revision 35c67391973a07983d0b0dfe70706e6a69fbdbfc) @@ -2,7 +2,7 @@ package require XOTcl; namespace import ::xotcl::* lappend auto_path [file dirname [info script]]/.. -package require next::test +package require nx::test @ @File { description {