Index: Makefile.in =================================================================== diff -u -rc1c1f1d240f4599a3eee27e2cb01f9de6471eebc -r1d47ca3db133ff4eef6bf13f35c5f4e7bfd49a20 --- Makefile.in (.../Makefile.in) (revision c1c1f1d240f4599a3eee27e2cb01f9de6471eebc) +++ Makefile.in (.../Makefile.in) (revision 1d47ca3db133ff4eef6bf13f35c5f4e7bfd49a20) @@ -192,7 +192,7 @@ TCLSH = $(TCLSH_ENV) $(TCLSH_PROG) SHARED_BUILD = @SHARED_BUILD@ -INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@ @NX_BUILD_INCLUDE_SPEC@ +INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@ @NSF_BUILD_INCLUDE_SPEC@ EXTRA_CFLAGS = @PKG_CFLAGS@ # TCL_DEFS is not strictly need here, but if you remove it, then you @@ -459,10 +459,10 @@ #======================================================================== pkgIndex.tcl: $(PKG_LIB_FILE) - @echo package ifneeded nsf $(PACKAGE_VERSION) [list load [file join \$$dir . $(PKG_LIB_FILE)] nx] > pkgIndex.tcl + @echo package ifneeded nsf $(PACKAGE_VERSION) [list load [file join \$$dir . $(PKG_LIB_FILE)] nsf] > pkgIndex.tcl install-pkgIndex: -# @echo package ifneeded nx $(PACKAGE_VERSION) [list load [file join \$$dir .. "$(PKG_LIB_FILE)"] nx] > "$(pkglibdir)/pkgIndex.tcl" +# @echo package ifneeded nsf $(PACKAGE_VERSION) [list load [file join \$$dir .. "$(PKG_LIB_FILE)"] nsf] > "$(pkglibdir)/pkgIndex.tcl" nxsh: tclAppInit.o $(PKG_OBJECTS) $(CONDITIONAL_STUB_OBJECTS) $(CC) -rdynamic -o $@ tclAppInit.o \ @@ -521,7 +521,7 @@ genstubs: $(TCLSH) $(TCL_SRC_DIR)/tools/genStubs.tcl $(src_generic_dir) \ - $(src_generic_dir)/nx.decls $(src_generic_dir)/nxInt.decls + $(src_generic_dir)/nsf.decls $(src_generic_dir)/nsfInt.decls # # Target to check that all exported functions have an entry in the stubs Index: TODO =================================================================== diff -u -rf93a860bacabe371e1f01bd3f3841015c6b14a21 -r1d47ca3db133ff4eef6bf13f35c5f4e7bfd49a20 --- TODO (.../TODO) (revision f93a860bacabe371e1f01bd3f3841015c6b14a21) +++ TODO (.../TODO) (revision 1d47ca3db133ff4eef6bf13f35c5f4e7bfd49a20) @@ -1269,8 +1269,10 @@ (per default, it is on) - extended regression test for optional argument checking +- reflected changes in /is/objectproperty/info has/info is/ in migration guide +- changed stub naming from "[Nn][Xx]*" to nsf (for next scripting framework) + TODO: -- reflect changes in /is/objectproperty/info has/info is/ in migration guide - implement built-in-converter for "baseclass" and "metaclass"? - check equivalence of the following two commands @@ -1281,9 +1283,6 @@ - check "my" vs. "nsf::dispatch" in xotcl2.tcl - overthink decision about not showing "child objects" per default in "info methods" -- deeper analysis of "contains" -- unify SubcmdObj() and ParamCheckObj() handling? - - subcmd * handle sucmd for other method factories * handle introspection for subcmd nicely @@ -1359,7 +1358,22 @@ Ein paar Punkte im folgenden könnten obsolet sein: TODO "Kleinigkeiten" +- shells: + * do we need nxsh? + - currently a c program, makeing a package require nx + - purely scripted? + * do we need conterpart for xotclsh? + - scripted should be possible + * do we need conterpart for xowish? + - possibility: binary vs. scripted + - scripted xowish / nxwish should be possible +- C-interface + * generic/nsf.decls und generic/nsfInt.decls ausmisten + (leere einträge weg, binärkompatibility mit xotcl nicht notwendig, + da library anders heisst) + * C-interface überarbeiten + - integrate ::nx::doc::make with Makefile.in (provide shell calls and, targets and dependencies) - decide on syntax in documentation Index: configure =================================================================== diff -u -r85e95479856b97a27083b3a7d3513ee417f1371a -r1d47ca3db133ff4eef6bf13f35c5f4e7bfd49a20 --- configure (.../configure) (revision 85e95479856b97a27083b3a7d3513ee417f1371a) +++ configure (.../configure) (revision 1d47ca3db133ff4eef6bf13f35c5f4e7bfd49a20) @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for nx 2.0.0. +# Generated by GNU Autoconf 2.61 for nsf 2.0.0. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -570,10 +570,10 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. -PACKAGE_NAME='nx' -PACKAGE_TARNAME='nx' +PACKAGE_NAME='nsf' +PACKAGE_TARNAME='nsf' PACKAGE_VERSION='2.0.0' -PACKAGE_STRING='nx 2.0.0' +PACKAGE_STRING='nsf 2.0.0' PACKAGE_BUGREPORT='' # Factoring default headers for most tests. @@ -661,10 +661,10 @@ PKG_LIBS PKG_CFLAGS subdirs -NX_VERSION -NX_MAJOR_VERSION -NX_MINOR_VERSION -NX_RELEASE_LEVEL +NSF_VERSION +NSF_MAJOR_VERSION +NSF_MINOR_VERSION +NSF_RELEASE_LEVEL TCL_VERSION TCL_PATCH_LEVEL TCL_BIN_DIR @@ -733,24 +733,24 @@ MAKE_STUB_LIB RANLIB_STUB TCLSH_PROG -NX_COMPATIBLE_TCLSH +NSF_COMPATIBLE_TCLSH PKG_DIR pkgdatadir pkglibdir pkgincludedir SHARED_LIB_SUFFIX UNSHARED_LIB_SUFFIX -NX_BUILD_LIB_SPEC -NX_LIB_SPEC -NX_BUILD_STUB_LIB_SPEC -NX_STUB_LIB_SPEC -NX_BUILD_STUB_LIB_PATH -NX_STUB_LIB_PATH -NX_SRC_DIR +NSF_BUILD_LIB_SPEC +NSF_LIB_SPEC +NSF_BUILD_STUB_LIB_SPEC +NSF_STUB_LIB_SPEC +NSF_BUILD_STUB_LIB_PATH +NSF_STUB_LIB_PATH +NSF_SRC_DIR NXSH XOWISH -NX_BUILD_INCLUDE_DIR -NX_BUILD_INCLUDE_SPEC +NSF_BUILD_INCLUDE_DIR +NSF_BUILD_INCLUDE_SPEC test_actiweb libdirs_actiweb apps_actiweb @@ -1270,7 +1270,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures nx 2.0.0 to adapt to many kinds of systems. +\`configure' configures nsf 2.0.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1318,7 +1318,7 @@ --infodir=DIR info documentation [DATAROOTDIR/info] --localedir=DIR locale-dependent data [DATAROOTDIR/locale] --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/nx] + --docdir=DIR documentation root [DATAROOTDIR/doc/nsf] --htmldir=DIR html documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR] --pdfdir=DIR pdf documentation [DOCDIR] @@ -1331,7 +1331,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of nx 2.0.0:";; + short | recursive ) echo "Configuration of nsf 2.0.0:";; esac cat <<\_ACEOF @@ -1445,7 +1445,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -nx configure 2.0.0 +nsf configure 2.0.0 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1459,7 +1459,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by nx $as_me 2.0.0, which was +It was created by nsf $as_me 2.0.0, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2072,12 +2072,12 @@ # do not modify the following lines manually, they are generated with # the script changeXOTclVersion -NX_MAJOR_VERSION=2 -NX_MINOR_VERSION=0 -NX_RELEASE_LEVEL=.0 +NSF_MAJOR_VERSION=2 +NSF_MINOR_VERSION=0 +NSF_RELEASE_LEVEL=.0 -NX_VERSION=${NX_MAJOR_VERSION}.${NX_MINOR_VERSION} -NODOT_VERSION=${NX_MAJOR_VERSION}${NX_MINOR_VERSION} +NSF_VERSION=${NSF_MAJOR_VERSION}.${NSF_MINOR_VERSION} +NODOT_VERSION=${NSF_MAJOR_VERSION}${NSF_MINOR_VERSION} @@ -7061,7 +7061,7 @@ vars="xotcl.c xotclError.c xotclMetaData.c xotclObjectData.c xotclProfile.c \ - xotclTrace.c xotclUtil.c xotclShadow.c xotclCompile.c aolstub.c nxStubInit.c" + xotclTrace.c xotclUtil.c xotclShadow.c xotclCompile.c aolstub.c nsfStubInit.c" for i in $vars; do case $i in \$*) @@ -7098,7 +7098,7 @@ - vars="generic/xotcl.h generic/xotclInt.h generic/nxDecls.h generic/nxIntDecls.h" + vars="generic/xotcl.h generic/xotclInt.h generic/nsfDecls.h generic/nsfIntDecls.h" for i in $vars; do # check for existence, be strict because it is installed if test ! -f "${srcdir}/$i" ; then @@ -7129,12 +7129,12 @@ - PKG_CFLAGS="$PKG_CFLAGS -DNXVERSION=\\\"$NX_VERSION\\\" -DNXPATCHLEVEL=\\\"$NX_RELEASE_LEVEL\\\" \ + PKG_CFLAGS="$PKG_CFLAGS -DNSF_VERSION=\\\"$NSF_VERSION\\\" -DNSF_PATCHLEVEL=\\\"$NSF_RELEASE_LEVEL\\\" \ $AOL_DEFINES $HAVE_TCL_COMPILE_H" - vars="nxStubLib.c" + vars="nsfStubLib.c" for i in $vars; do # check for existence - allows for generic/win/unix VPATH if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \ @@ -10632,17 +10632,17 @@ -# Without the following two eval statements, NX_SHARED_LIB_SUFFIX +# Without the following two eval statements, NSF_SHARED_LIB_SUFFIX # in xotclConfig.sh has $PACKAGE_VERSION unresolved. When another # app links against xotcl, the PACKAGE_VERSIONs are confused. # # Without the first eval, we get -# NX_SHARED_LIB_SUFFIX=${PACKAGE_VERSION}\$\{DBGX\}${SHLIB_SUFFIX} -# NX_UNSHARED_LIB_SUFFIX=${PACKAGE_VERSION}\$\{DBGX\}.a +# NSF_SHARED_LIB_SUFFIX=${PACKAGE_VERSION}\$\{DBGX\}${SHLIB_SUFFIX} +# NSF_UNSHARED_LIB_SUFFIX=${PACKAGE_VERSION}\$\{DBGX\}.a # # after the first eval, we get -# NX_SHARED_LIB_SUFFIX=1.2.1${DBGX}.so -# NX_UNSHARED_LIB_SUFFIX=1.2.1${DBGX}.a +# NSF_SHARED_LIB_SUFFIX=1.2.1${DBGX}.so +# NSF_UNSHARED_LIB_SUFFIX=1.2.1${DBGX}.a # after the second eval, all variables are resolved. @@ -10849,7 +10849,7 @@ # make this available, for such as xotclConfig.sh -NX_COMPATIBLE_TCLSH=${TCLSH_PROG} +NSF_COMPATIBLE_TCLSH=${TCLSH_PROG} # resolve the variables @@ -10874,34 +10874,34 @@ if test "${TEA_PLATFORM}" != "windows" ; then -NX_BUILD_LIB_SPEC="-L`pwd` -lnext${PACKAGE_VERSION}" -NX_LIB_SPEC="-L${pkglibdir} -lnext${PACKAGE_VERSION}" +NSF_BUILD_LIB_SPEC="-L`pwd` -lnsf${PACKAGE_VERSION}" +NSF_LIB_SPEC="-L${pkglibdir} -lnsf${PACKAGE_VERSION}" # stub libs are not build for 8.0 if test "${TCL_MAJOR_VERSION}" = "8" -a "${TCL_MINOR_VERSION}" = "0"; then - NX_BUILD_STUB_LIB_PATH="" - NX_STUB_LIB_PATH="" - NX_BUILD_STUB_LIB_SPEC="" - NX_STUB_LIB_SPEC="" + NSF_BUILD_STUB_LIB_PATH="" + NSF_STUB_LIB_PATH="" + NSF_BUILD_STUB_LIB_SPEC="" + NSF_STUB_LIB_SPEC="" else - NX_BUILD_STUB_LIB_PATH="`pwd`/${PKG_STUB_LIB_FILE}" - NX_STUB_LIB_PATH="${pkglibdir}/${PKG_STUB_LIB_FILE}" - NX_BUILD_STUB_LIB_SPEC="-L`pwd` -lnextstub${PACKAGE_VERSION}" - NX_STUB_LIB_SPEC="-L${pkglibdir} -lnextstub${PACKAGE_VERSION}" + NSF_BUILD_STUB_LIB_PATH="`pwd`/${PKG_STUB_LIB_FILE}" + NSF_STUB_LIB_PATH="${pkglibdir}/${PKG_STUB_LIB_FILE}" + NSF_BUILD_STUB_LIB_SPEC="-L`pwd` -lnsfstub${PACKAGE_VERSION}" + NSF_STUB_LIB_SPEC="-L${pkglibdir} -lnsfstub${PACKAGE_VERSION}" cat >>confdefs.h <<\_ACEOF -#define COMPILE_NX_STUBS 1 +#define COMPILE_NSF_STUBS 1 _ACEOF fi else -NX_BUILD_LIB_SPEC="`pwd`/${PKG_LIB_FILE}" -NX_LIB_SPEC="${pkglibdir}/${PKG_LIB_FILE}" -NX_BUILD_STUB_LIB_PATH="`pwd`/${PKG_STUB_LIB_FILE}" -NX_STUB_LIB_PATH="${pkglibdir}/${PKG_STUB_LIB_FILE}" -NX_BUILD_STUB_LIB_SPEC="`pwd`/${PKG_STUB_LIB_FILE}" -NX_STUB_LIB_SPEC="${pkglibdir}/${PKG_STUB_LIB_FILE}" +NSF_BUILD_LIB_SPEC="`pwd`/${PKG_LIB_FILE}" +NSF_LIB_SPEC="${pkglibdir}/${PKG_LIB_FILE}" +NSF_BUILD_STUB_LIB_PATH="`pwd`/${PKG_STUB_LIB_FILE}" +NSF_STUB_LIB_PATH="${pkglibdir}/${PKG_STUB_LIB_FILE}" +NSF_BUILD_STUB_LIB_SPEC="`pwd`/${PKG_STUB_LIB_FILE}" +NSF_STUB_LIB_SPEC="${pkglibdir}/${PKG_STUB_LIB_FILE}" fi @@ -10913,14 +10913,14 @@ -NX_SRC_DIR=$srcdir +NSF_SRC_DIR=$srcdir # include dir of xotcl during build process (i.e., does not assume installed) -NX_BUILD_INCLUDE_DIR="${NX_SRC_DIR}/generic" -NX_BUILD_INCLUDE_SPEC="-I${NX_BUILD_INCLUDE_DIR}" +NSF_BUILD_INCLUDE_DIR="${NSF_SRC_DIR}/generic" +NSF_BUILD_INCLUDE_SPEC="-I${NSF_BUILD_INCLUDE_DIR}" @@ -11382,7 +11382,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by nx $as_me 2.0.0, which was +This file was extended by nsf $as_me 2.0.0, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -11425,7 +11425,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -nx config.status 2.0.0 +nsf config.status 2.0.0 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -11639,10 +11639,10 @@ PKG_LIBS!$PKG_LIBS$ac_delim PKG_CFLAGS!$PKG_CFLAGS$ac_delim subdirs!$subdirs$ac_delim -NX_VERSION!$NX_VERSION$ac_delim -NX_MAJOR_VERSION!$NX_MAJOR_VERSION$ac_delim -NX_MINOR_VERSION!$NX_MINOR_VERSION$ac_delim -NX_RELEASE_LEVEL!$NX_RELEASE_LEVEL$ac_delim +NSF_VERSION!$NSF_VERSION$ac_delim +NSF_MAJOR_VERSION!$NSF_MAJOR_VERSION$ac_delim +NSF_MINOR_VERSION!$NSF_MINOR_VERSION$ac_delim +NSF_RELEASE_LEVEL!$NSF_RELEASE_LEVEL$ac_delim TCL_VERSION!$TCL_VERSION$ac_delim TCL_PATCH_LEVEL!$TCL_PATCH_LEVEL$ac_delim TCL_BIN_DIR!$TCL_BIN_DIR$ac_delim @@ -11752,24 +11752,24 @@ MAKE_STUB_LIB!$MAKE_STUB_LIB$ac_delim RANLIB_STUB!$RANLIB_STUB$ac_delim TCLSH_PROG!$TCLSH_PROG$ac_delim -NX_COMPATIBLE_TCLSH!$NX_COMPATIBLE_TCLSH$ac_delim +NSF_COMPATIBLE_TCLSH!$NSF_COMPATIBLE_TCLSH$ac_delim PKG_DIR!$PKG_DIR$ac_delim pkgdatadir!$pkgdatadir$ac_delim pkglibdir!$pkglibdir$ac_delim pkgincludedir!$pkgincludedir$ac_delim SHARED_LIB_SUFFIX!$SHARED_LIB_SUFFIX$ac_delim UNSHARED_LIB_SUFFIX!$UNSHARED_LIB_SUFFIX$ac_delim -NX_BUILD_LIB_SPEC!$NX_BUILD_LIB_SPEC$ac_delim -NX_LIB_SPEC!$NX_LIB_SPEC$ac_delim -NX_BUILD_STUB_LIB_SPEC!$NX_BUILD_STUB_LIB_SPEC$ac_delim -NX_STUB_LIB_SPEC!$NX_STUB_LIB_SPEC$ac_delim -NX_BUILD_STUB_LIB_PATH!$NX_BUILD_STUB_LIB_PATH$ac_delim -NX_STUB_LIB_PATH!$NX_STUB_LIB_PATH$ac_delim -NX_SRC_DIR!$NX_SRC_DIR$ac_delim +NSF_BUILD_LIB_SPEC!$NSF_BUILD_LIB_SPEC$ac_delim +NSF_LIB_SPEC!$NSF_LIB_SPEC$ac_delim +NSF_BUILD_STUB_LIB_SPEC!$NSF_BUILD_STUB_LIB_SPEC$ac_delim +NSF_STUB_LIB_SPEC!$NSF_STUB_LIB_SPEC$ac_delim +NSF_BUILD_STUB_LIB_PATH!$NSF_BUILD_STUB_LIB_PATH$ac_delim +NSF_STUB_LIB_PATH!$NSF_STUB_LIB_PATH$ac_delim +NSF_SRC_DIR!$NSF_SRC_DIR$ac_delim NXSH!$NXSH$ac_delim XOWISH!$XOWISH$ac_delim -NX_BUILD_INCLUDE_DIR!$NX_BUILD_INCLUDE_DIR$ac_delim -NX_BUILD_INCLUDE_SPEC!$NX_BUILD_INCLUDE_SPEC$ac_delim +NSF_BUILD_INCLUDE_DIR!$NSF_BUILD_INCLUDE_DIR$ac_delim +NSF_BUILD_INCLUDE_SPEC!$NSF_BUILD_INCLUDE_SPEC$ac_delim test_actiweb!$test_actiweb$ac_delim libdirs_actiweb!$libdirs_actiweb$ac_delim apps_actiweb!$apps_actiweb$ac_delim Index: configure.in =================================================================== diff -u -r85e95479856b97a27083b3a7d3513ee417f1371a -r1d47ca3db133ff4eef6bf13f35c5f4e7bfd49a20 --- configure.in (.../configure.in) (revision 85e95479856b97a27083b3a7d3513ee417f1371a) +++ configure.in (.../configure.in) (revision 1d47ca3db133ff4eef6bf13f35c5f4e7bfd49a20) @@ -11,8 +11,8 @@ # for this package, and can be a relative path, such as: # #-------------------------------------------------------------------- -define(NxVersion, 2.0.0) -AC_INIT([nx], [NxVersion]) +define(NsfVersion, 2.0.0) +AC_INIT([nsf], [NsfVersion]) #-------------------------------------------------------------------- # Call TEA_INIT as the first TEA_ macro to set up initial vars. @@ -105,17 +105,17 @@ # do not modify the following lines manually, they are generated with # the script changeXOTclVersion -NX_MAJOR_VERSION=2 -NX_MINOR_VERSION=0 -NX_RELEASE_LEVEL=.0 +NSF_MAJOR_VERSION=2 +NSF_MINOR_VERSION=0 +NSF_RELEASE_LEVEL=.0 -NX_VERSION=${NX_MAJOR_VERSION}.${NX_MINOR_VERSION} -NODOT_VERSION=${NX_MAJOR_VERSION}${NX_MINOR_VERSION} +NSF_VERSION=${NSF_MAJOR_VERSION}.${NSF_MINOR_VERSION} +NODOT_VERSION=${NSF_MAJOR_VERSION}${NSF_MINOR_VERSION} -AC_SUBST(NX_VERSION) -AC_SUBST(NX_MAJOR_VERSION) -AC_SUBST(NX_MINOR_VERSION) -AC_SUBST(NX_RELEASE_LEVEL) +AC_SUBST(NSF_VERSION) +AC_SUBST(NSF_MAJOR_VERSION) +AC_SUBST(NSF_MINOR_VERSION) +AC_SUBST(NSF_RELEASE_LEVEL) echo "Configuring next Version $PACKAGE_VERSION" @@ -190,13 +190,13 @@ TEA_ADD_SOURCES([xotcl.c xotclError.c xotclMetaData.c xotclObjectData.c xotclProfile.c \ - xotclTrace.c xotclUtil.c xotclShadow.c xotclCompile.c aolstub.c nxStubInit.c]) -TEA_ADD_HEADERS([generic/xotcl.h generic/xotclInt.h generic/nxDecls.h generic/nxIntDecls.h]) + xotclTrace.c xotclUtil.c xotclShadow.c xotclCompile.c aolstub.c nsfStubInit.c]) +TEA_ADD_HEADERS([generic/xotcl.h generic/xotclInt.h generic/nsfDecls.h generic/nsfIntDecls.h]) TEA_ADD_INCLUDES([]) TEA_ADD_LIBS([]) -TEA_ADD_CFLAGS([-DNXVERSION=\\\"$NX_VERSION\\\" -DNXPATCHLEVEL=\\\"$NX_RELEASE_LEVEL\\\" \ +TEA_ADD_CFLAGS([-DNSF_VERSION=\\\"$NSF_VERSION\\\" -DNSF_PATCHLEVEL=\\\"$NSF_RELEASE_LEVEL\\\" \ $AOL_DEFINES $HAVE_TCL_COMPILE_H]) -TEA_ADD_STUB_SOURCES([nxStubLib.c]) +TEA_ADD_STUB_SOURCES([nsfStubLib.c]) TEA_ADD_TCL_SOURCES([]) @@ -278,17 +278,17 @@ TEA_CONFIG_CFLAGS -# Without the following two eval statements, NX_SHARED_LIB_SUFFIX +# Without the following two eval statements, NSF_SHARED_LIB_SUFFIX # in xotclConfig.sh has $PACKAGE_VERSION unresolved. When another # app links against xotcl, the PACKAGE_VERSIONs are confused. # # Without the first eval, we get -# NX_SHARED_LIB_SUFFIX=${PACKAGE_VERSION}\$\{DBGX\}${SHLIB_SUFFIX} -# NX_UNSHARED_LIB_SUFFIX=${PACKAGE_VERSION}\$\{DBGX\}.a +# NSF_SHARED_LIB_SUFFIX=${PACKAGE_VERSION}\$\{DBGX\}${SHLIB_SUFFIX} +# NSF_UNSHARED_LIB_SUFFIX=${PACKAGE_VERSION}\$\{DBGX\}.a # # after the first eval, we get -# NX_SHARED_LIB_SUFFIX=1.2.1${DBGX}.so -# NX_UNSHARED_LIB_SUFFIX=1.2.1${DBGX}.a +# NSF_SHARED_LIB_SUFFIX=1.2.1${DBGX}.so +# NSF_UNSHARED_LIB_SUFFIX=1.2.1${DBGX}.a # after the second eval, all variables are resolved. @@ -340,8 +340,8 @@ TEA_PROG_TCLSH # make this available, for such as xotclConfig.sh -NX_COMPATIBLE_TCLSH=${TCLSH_PROG} -AC_SUBST(NX_COMPATIBLE_TCLSH) +NSF_COMPATIBLE_TCLSH=${TCLSH_PROG} +AC_SUBST(NSF_COMPATIBLE_TCLSH) # resolve the variables eval "libdir=${libdir}" @@ -365,52 +365,52 @@ if test "${TEA_PLATFORM}" != "windows" ; then -NX_BUILD_LIB_SPEC="-L`pwd` -lnext${PACKAGE_VERSION}" -NX_LIB_SPEC="-L${pkglibdir} -lnext${PACKAGE_VERSION}" +NSF_BUILD_LIB_SPEC="-L`pwd` -lnsf${PACKAGE_VERSION}" +NSF_LIB_SPEC="-L${pkglibdir} -lnsf${PACKAGE_VERSION}" # stub libs are not build for 8.0 if test "${TCL_MAJOR_VERSION}" = "8" -a "${TCL_MINOR_VERSION}" = "0"; then - NX_BUILD_STUB_LIB_PATH="" - NX_STUB_LIB_PATH="" - NX_BUILD_STUB_LIB_SPEC="" - NX_STUB_LIB_SPEC="" + NSF_BUILD_STUB_LIB_PATH="" + NSF_STUB_LIB_PATH="" + NSF_BUILD_STUB_LIB_SPEC="" + NSF_STUB_LIB_SPEC="" else - NX_BUILD_STUB_LIB_PATH="`pwd`/${PKG_STUB_LIB_FILE}" - NX_STUB_LIB_PATH="${pkglibdir}/${PKG_STUB_LIB_FILE}" - NX_BUILD_STUB_LIB_SPEC="-L`pwd` -lnextstub${PACKAGE_VERSION}" - NX_STUB_LIB_SPEC="-L${pkglibdir} -lnextstub${PACKAGE_VERSION}" - AC_DEFINE(COMPILE_NX_STUBS) + NSF_BUILD_STUB_LIB_PATH="`pwd`/${PKG_STUB_LIB_FILE}" + NSF_STUB_LIB_PATH="${pkglibdir}/${PKG_STUB_LIB_FILE}" + NSF_BUILD_STUB_LIB_SPEC="-L`pwd` -lnsfstub${PACKAGE_VERSION}" + NSF_STUB_LIB_SPEC="-L${pkglibdir} -lnsfstub${PACKAGE_VERSION}" + AC_DEFINE(COMPILE_NSF_STUBS) fi else -NX_BUILD_LIB_SPEC="`pwd`/${PKG_LIB_FILE}" -NX_LIB_SPEC="${pkglibdir}/${PKG_LIB_FILE}" -NX_BUILD_STUB_LIB_PATH="`pwd`/${PKG_STUB_LIB_FILE}" -NX_STUB_LIB_PATH="${pkglibdir}/${PKG_STUB_LIB_FILE}" -NX_BUILD_STUB_LIB_SPEC="`pwd`/${PKG_STUB_LIB_FILE}" -NX_STUB_LIB_SPEC="${pkglibdir}/${PKG_STUB_LIB_FILE}" +NSF_BUILD_LIB_SPEC="`pwd`/${PKG_LIB_FILE}" +NSF_LIB_SPEC="${pkglibdir}/${PKG_LIB_FILE}" +NSF_BUILD_STUB_LIB_PATH="`pwd`/${PKG_STUB_LIB_FILE}" +NSF_STUB_LIB_PATH="${pkglibdir}/${PKG_STUB_LIB_FILE}" +NSF_BUILD_STUB_LIB_SPEC="`pwd`/${PKG_STUB_LIB_FILE}" +NSF_STUB_LIB_SPEC="${pkglibdir}/${PKG_STUB_LIB_FILE}" fi AC_SUBST(SHARED_LIB_SUFFIX) AC_SUBST(UNSHARED_LIB_SUFFIX) -AC_SUBST(NX_BUILD_LIB_SPEC) -AC_SUBST(NX_LIB_SPEC) -AC_SUBST(NX_BUILD_STUB_LIB_SPEC) -AC_SUBST(NX_STUB_LIB_SPEC) -AC_SUBST(NX_BUILD_STUB_LIB_PATH) -AC_SUBST(NX_STUB_LIB_PATH) -NX_SRC_DIR=$srcdir -AC_SUBST(NX_SRC_DIR) +AC_SUBST(NSF_BUILD_LIB_SPEC) +AC_SUBST(NSF_LIB_SPEC) +AC_SUBST(NSF_BUILD_STUB_LIB_SPEC) +AC_SUBST(NSF_STUB_LIB_SPEC) +AC_SUBST(NSF_BUILD_STUB_LIB_PATH) +AC_SUBST(NSF_STUB_LIB_PATH) +NSF_SRC_DIR=$srcdir +AC_SUBST(NSF_SRC_DIR) AC_SUBST(NXSH) AC_SUBST(XOWISH) # include dir of xotcl during build process (i.e., does not assume installed) -NX_BUILD_INCLUDE_DIR="${NX_SRC_DIR}/generic" -NX_BUILD_INCLUDE_SPEC="-I${NX_BUILD_INCLUDE_DIR}" -AC_SUBST(NX_BUILD_INCLUDE_DIR) -AC_SUBST(NX_BUILD_INCLUDE_SPEC) +NSF_BUILD_INCLUDE_DIR="${NSF_SRC_DIR}/generic" +NSF_BUILD_INCLUDE_SPEC="-I${NSF_BUILD_INCLUDE_DIR}" +AC_SUBST(NSF_BUILD_INCLUDE_DIR) +AC_SUBST(NSF_BUILD_INCLUDE_SPEC) AC_SUBST(test_actiweb) AC_SUBST(libdirs_actiweb) Index: generic/nsf.decls =================================================================== diff -u --- generic/nsf.decls (revision 0) +++ generic/nsf.decls (revision 1d47ca3db133ff4eef6bf13f35c5f4e7bfd49a20) @@ -0,0 +1,178 @@ +# nx.decls -- +# +# This file contains the declarations for all supported public +# functions that are exported by the Next scripting library via the stubs table. +# This file is used to generate the nxDecls.h, nxPlatDecls.h, +# nxStub.c, and nxPlatStub.c files. +# +# +# Copyright (c) 1998-1999 by Scriptics Corporation. +# See the file "tcl-license.terms" for information on usage and redistribution +# of this file, and for a DISCLAIMER OF ALL WARRANTIES. +# + +library nsf + +interface nsf +hooks {nsfInt} + +# Declare each of the functions in the public Tcl interface. Note that +# the an index should never be reused for a different function in order +# to preserve backwards compatibility. + +declare 0 generic { + int Nsf_Init(Tcl_Interp *interp) +} +# 1 is reserved for safe init +#declare 1 generic { +# int Nsf_SafeInit(Tcl_Interp *interp) +#} +declare 2 generic { + struct XOTcl_Class *XOTclIsClass(Tcl_Interp *interp, ClientData cd) +} +#declare 3 generic { +# +#} +declare 4 generic { + struct XOTcl_Object *XOTclGetObject(Tcl_Interp *interp, CONST char *name) +} +declare 5 generic { + struct XOTcl_Class *XOTclGetClass(Tcl_Interp *interp, CONST char *name) +} +declare 6 generic { + int XOTclCreateObject(Tcl_Interp *interp, Tcl_Obj *name, struct XOTcl_Class *cl) +} +#declare 7 generic { +# +#} +#declare 8 generic { +# int XOTclCreateClass(Tcl_Interp *interp, Tcl_Obj *name, struct XOTcl_Class *cl) +#} +declare 9 generic { + int XOTclDeleteObject(Tcl_Interp *interp, struct XOTcl_Object *obj) +} +#declare 10 generic { +# int XOTclDeleteClass(Tcl_Interp *interp, struct XOTcl_Class *cl) +#} +#declare 11 generic { +# int XOTclAddObjectMethod(Tcl_Interp *interp, struct XOTcl_Object *obj, +# CONST char* nm, Tcl_ObjCmdProc* proc, +# ClientData cd, Tcl_CmdDeleteProc *dp) +#} +#declare 12 generic { +# int XOTclAddClassMethod(Tcl_Interp *interp, struct XOTcl_Class *cl, +# CONST char* nm, Tcl_ObjCmdProc* proc, +# ClientData cd, Tcl_CmdDeleteProc *dp) +#} +declare 13 generic { + int XOTclRemoveObjectMethod(Tcl_Interp *interp,struct XOTcl_Object *obj, CONST char *nm) +} +declare 14 generic { + int XOTclRemoveClassMethod(Tcl_Interp *interp, struct XOTcl_Class *cl, CONST char *nm) +} +declare 15 generic { + Tcl_Obj *XOTclOSetInstVar(struct XOTcl_Object *obj, Tcl_Interp *interp, + Tcl_Obj *name, Tcl_Obj *value, int flgs) +} +declare 16 generic { + Tcl_Obj *XOTclOGetInstVar(struct XOTcl_Object *obj, Tcl_Interp *interp, + Tcl_Obj *name, int flgs) +} +#declare 17 generic { +# int XOTclInstVar(struct XOTcl_Object *obj, Tcl_Interp *interp, +# char *name, char *destName) +#} +#declare 18 generic { +# +#} +declare 19 generic { + Tcl_Obj *XOTcl_ObjSetVar2(struct XOTcl_Object *obj, + Tcl_Interp *interp,Tcl_Obj *name1,Tcl_Obj *name2, + Tcl_Obj *value,int flgs) +} +declare 20 generic { + Tcl_Obj *XOTcl_ObjGetVar2(struct XOTcl_Object *obj, + Tcl_Interp *interp,Tcl_Obj *name1,Tcl_Obj *name2, + int flgs) +} +declare 21 generic { + int XOTclUnsetInstVar2(struct XOTcl_Object *obj, Tcl_Interp *interp, + CONST char *name1, CONST char *name2, + int flgs) +} +#declare 22 generic { +# int XOTcl_TraceObjCmd(ClientData cd, Tcl_Interp *interp, +# int objc, Tcl_Obj *CONST objv[]) +#} +declare 23 generic { + int XOTclErrMsg(Tcl_Interp *interp, char *msg, Tcl_FreeProc *type) +} +declare 24 generic { + int XOTclVarErrMsg(Tcl_Interp *interp, ...) +} +declare 25 generic { + int XOTclErrInProc (Tcl_Interp *interp, Tcl_Obj *objName, + Tcl_Obj *clName, CONST char *procName) +} +#declare 26 generic { +# +#} +declare 27 generic { + int XOTclErrBadVal_(Tcl_Interp *interp, char *expected, char *value) +} +declare 28 generic { + int XOTclObjErrType(Tcl_Interp *interp, Tcl_Obj *nm, char *wt, char *parameterName) +} +declare 29 generic { + void XOTclStackDump (Tcl_Interp *interp) +} +#declare 30 generic { +# void XOTclCallStackDump (Tcl_Interp *interp) +#} +#declare 31 generic { +# void XOTclDeprecatedMsg(char *oldCmd, char *newCmd) +#} +declare 32 generic { + void XOTclSetObjClientData(XOTcl_Object *obj, ClientData data) +} +declare 33 generic { + ClientData XOTclGetObjClientData(XOTcl_Object *obj) +} +declare 34 generic { + void XOTclSetClassClientData(XOTcl_Class *cl, ClientData data) +} +declare 35 generic { + ClientData XOTclGetClassClientData(XOTcl_Class *cl) +} +declare 36 generic { + void XOTclRequireObjNamespace(Tcl_Interp *interp, XOTcl_Object *obj) +} +declare 37 generic { + int XOTclErrBadVal(Tcl_Interp *interp, char *context, char *expected, CONST char *value) +} +declare 38 generic { + int XOTclNextObjCmd(ClientData cd, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) +} +declare 39 generic { + int XOTclCallMethodWithArgs(ClientData cd, Tcl_Interp *interp, + Tcl_Obj *method, Tcl_Obj *arg, + int objc, Tcl_Obj *CONST objv[], int flags) +} +declare 40 generic { + int XOTclObjErrArgCnt(Tcl_Interp *interp, Tcl_Obj *cmdName, Tcl_Obj *methodName, + char *arglist) +} +declare 41 generic { + int XOTclAddObjectMethod(Tcl_Interp *interp, struct XOTcl_Object *obj, + CONST char *nm, Tcl_ObjCmdProc *proc, + ClientData cd, Tcl_CmdDeleteProc *dp, int flags) +} +declare 42 generic { + int XOTclAddClassMethod(Tcl_Interp *interp, struct XOTcl_Class *cl, + CONST char *nm, Tcl_ObjCmdProc *proc, + ClientData cd, Tcl_CmdDeleteProc *dp, int flags) +} +declare 43 generic { + int XOTclCreate(Tcl_Interp *in, XOTcl_Class *class, Tcl_Obj *name, ClientData data, + int objc, Tcl_Obj *CONST objv[]) +} Index: generic/nsfDecls.h =================================================================== diff -u --- generic/nsfDecls.h (revision 0) +++ generic/nsfDecls.h (revision 1d47ca3db133ff4eef6bf13f35c5f4e7bfd49a20) @@ -0,0 +1,445 @@ +/* + * nsfDecls.h -- + * + * Declarations of functions in the platform independent public XOTcl API. + * + * Copyright (C) 1999-2008 Gustaf Neumann, Uwe Zdun + * + * See the file "tcl-license.terms" for information on usage and redistribution + * of this file, and for a DISCLAIMER OF ALL WARRANTIES. + * + */ + +#ifndef _XOTCLDECLS +#define _XOTCLDECLS + +/* + * WARNING: This file is automatically generated by the tools/genStubs.tcl + * script. Any modifications to the function declarations below should be made + * in the xotcl.decls script. + */ + +/* !BEGIN!: Do not edit below this line. */ + +/* + * Exported function declarations: + */ + +#ifndef Nsf_Init_TCL_DECLARED +#define Nsf_Init_TCL_DECLARED +/* 0 */ +EXTERN int Nsf_Init(Tcl_Interp *interp); +#endif +/* Slot 1 is reserved */ +#ifndef XOTclIsClass_TCL_DECLARED +#define XOTclIsClass_TCL_DECLARED +/* 2 */ +EXTERN struct XOTcl_Class * XOTclIsClass(Tcl_Interp *interp, ClientData cd); +#endif +/* Slot 3 is reserved */ +#ifndef XOTclGetObject_TCL_DECLARED +#define XOTclGetObject_TCL_DECLARED +/* 4 */ +EXTERN struct XOTcl_Object * XOTclGetObject(Tcl_Interp *interp, + CONST char *name); +#endif +#ifndef XOTclGetClass_TCL_DECLARED +#define XOTclGetClass_TCL_DECLARED +/* 5 */ +EXTERN struct XOTcl_Class * XOTclGetClass(Tcl_Interp *interp, + CONST char *name); +#endif +#ifndef XOTclCreateObject_TCL_DECLARED +#define XOTclCreateObject_TCL_DECLARED +/* 6 */ +EXTERN int XOTclCreateObject(Tcl_Interp *interp, Tcl_Obj *name, + struct XOTcl_Class *cl); +#endif +/* Slot 7 is reserved */ +/* Slot 8 is reserved */ +#ifndef XOTclDeleteObject_TCL_DECLARED +#define XOTclDeleteObject_TCL_DECLARED +/* 9 */ +EXTERN int XOTclDeleteObject(Tcl_Interp *interp, + struct XOTcl_Object *obj); +#endif +/* Slot 10 is reserved */ +/* Slot 11 is reserved */ +/* Slot 12 is reserved */ +#ifndef XOTclRemoveObjectMethod_TCL_DECLARED +#define XOTclRemoveObjectMethod_TCL_DECLARED +/* 13 */ +EXTERN int XOTclRemoveObjectMethod(Tcl_Interp *interp, + struct XOTcl_Object *obj, CONST char *nm); +#endif +#ifndef XOTclRemoveClassMethod_TCL_DECLARED +#define XOTclRemoveClassMethod_TCL_DECLARED +/* 14 */ +EXTERN int XOTclRemoveClassMethod(Tcl_Interp *interp, + struct XOTcl_Class *cl, CONST char *nm); +#endif +#ifndef XOTclOSetInstVar_TCL_DECLARED +#define XOTclOSetInstVar_TCL_DECLARED +/* 15 */ +EXTERN Tcl_Obj * XOTclOSetInstVar(struct XOTcl_Object *obj, + Tcl_Interp *interp, Tcl_Obj *name, + Tcl_Obj *value, int flgs); +#endif +#ifndef XOTclOGetInstVar_TCL_DECLARED +#define XOTclOGetInstVar_TCL_DECLARED +/* 16 */ +EXTERN Tcl_Obj * XOTclOGetInstVar(struct XOTcl_Object *obj, + Tcl_Interp *interp, Tcl_Obj *name, int flgs); +#endif +/* Slot 17 is reserved */ +/* Slot 18 is reserved */ +#ifndef XOTcl_ObjSetVar2_TCL_DECLARED +#define XOTcl_ObjSetVar2_TCL_DECLARED +/* 19 */ +EXTERN Tcl_Obj * XOTcl_ObjSetVar2(struct XOTcl_Object *obj, + Tcl_Interp *interp, Tcl_Obj *name1, + Tcl_Obj *name2, Tcl_Obj *value, int flgs); +#endif +#ifndef XOTcl_ObjGetVar2_TCL_DECLARED +#define XOTcl_ObjGetVar2_TCL_DECLARED +/* 20 */ +EXTERN Tcl_Obj * XOTcl_ObjGetVar2(struct XOTcl_Object *obj, + Tcl_Interp *interp, Tcl_Obj *name1, + Tcl_Obj *name2, int flgs); +#endif +#ifndef XOTclUnsetInstVar2_TCL_DECLARED +#define XOTclUnsetInstVar2_TCL_DECLARED +/* 21 */ +EXTERN int XOTclUnsetInstVar2(struct XOTcl_Object *obj, + Tcl_Interp *interp, CONST char *name1, + CONST char *name2, int flgs); +#endif +/* Slot 22 is reserved */ +#ifndef XOTclErrMsg_TCL_DECLARED +#define XOTclErrMsg_TCL_DECLARED +/* 23 */ +EXTERN int XOTclErrMsg(Tcl_Interp *interp, char *msg, + Tcl_FreeProc *type); +#endif +#ifndef XOTclVarErrMsg_TCL_DECLARED +#define XOTclVarErrMsg_TCL_DECLARED +/* 24 */ +EXTERN int XOTclVarErrMsg(Tcl_Interp *interp, ...); +#endif +#ifndef XOTclErrInProc_TCL_DECLARED +#define XOTclErrInProc_TCL_DECLARED +/* 25 */ +EXTERN int XOTclErrInProc(Tcl_Interp *interp, Tcl_Obj *objName, + Tcl_Obj *clName, CONST char *procName); +#endif +/* Slot 26 is reserved */ +#ifndef XOTclErrBadVal__TCL_DECLARED +#define XOTclErrBadVal__TCL_DECLARED +/* 27 */ +EXTERN int XOTclErrBadVal_(Tcl_Interp *interp, char *expected, + char *value); +#endif +#ifndef XOTclObjErrType_TCL_DECLARED +#define XOTclObjErrType_TCL_DECLARED +/* 28 */ +EXTERN int XOTclObjErrType(Tcl_Interp *interp, Tcl_Obj *nm, + char *wt, char *parameterName); +#endif +#ifndef XOTclStackDump_TCL_DECLARED +#define XOTclStackDump_TCL_DECLARED +/* 29 */ +EXTERN void XOTclStackDump(Tcl_Interp *interp); +#endif +/* Slot 30 is reserved */ +/* Slot 31 is reserved */ +#ifndef XOTclSetObjClientData_TCL_DECLARED +#define XOTclSetObjClientData_TCL_DECLARED +/* 32 */ +EXTERN void XOTclSetObjClientData(XOTcl_Object *obj, + ClientData data); +#endif +#ifndef XOTclGetObjClientData_TCL_DECLARED +#define XOTclGetObjClientData_TCL_DECLARED +/* 33 */ +EXTERN ClientData XOTclGetObjClientData(XOTcl_Object *obj); +#endif +#ifndef XOTclSetClassClientData_TCL_DECLARED +#define XOTclSetClassClientData_TCL_DECLARED +/* 34 */ +EXTERN void XOTclSetClassClientData(XOTcl_Class *cl, + ClientData data); +#endif +#ifndef XOTclGetClassClientData_TCL_DECLARED +#define XOTclGetClassClientData_TCL_DECLARED +/* 35 */ +EXTERN ClientData XOTclGetClassClientData(XOTcl_Class *cl); +#endif +#ifndef XOTclRequireObjNamespace_TCL_DECLARED +#define XOTclRequireObjNamespace_TCL_DECLARED +/* 36 */ +EXTERN void XOTclRequireObjNamespace(Tcl_Interp *interp, + XOTcl_Object *obj); +#endif +#ifndef XOTclErrBadVal_TCL_DECLARED +#define XOTclErrBadVal_TCL_DECLARED +/* 37 */ +EXTERN int XOTclErrBadVal(Tcl_Interp *interp, char *context, + char *expected, CONST char *value); +#endif +#ifndef XOTclNextObjCmd_TCL_DECLARED +#define XOTclNextObjCmd_TCL_DECLARED +/* 38 */ +EXTERN int XOTclNextObjCmd(ClientData cd, Tcl_Interp *interp, + int objc, Tcl_Obj *CONST objv[]); +#endif +#ifndef XOTclCallMethodWithArgs_TCL_DECLARED +#define XOTclCallMethodWithArgs_TCL_DECLARED +/* 39 */ +EXTERN int XOTclCallMethodWithArgs(ClientData cd, + Tcl_Interp *interp, Tcl_Obj *method, + Tcl_Obj *arg, int objc, + Tcl_Obj *CONST objv[], int flags); +#endif +#ifndef XOTclObjErrArgCnt_TCL_DECLARED +#define XOTclObjErrArgCnt_TCL_DECLARED +/* 40 */ +EXTERN int XOTclObjErrArgCnt(Tcl_Interp *interp, + Tcl_Obj *cmdName, Tcl_Obj *methodName, + char *arglist); +#endif +#ifndef XOTclAddObjectMethod_TCL_DECLARED +#define XOTclAddObjectMethod_TCL_DECLARED +/* 41 */ +EXTERN int XOTclAddObjectMethod(Tcl_Interp *interp, + struct XOTcl_Object *obj, CONST char *nm, + Tcl_ObjCmdProc *proc, ClientData cd, + Tcl_CmdDeleteProc *dp, int flags); +#endif +#ifndef XOTclAddClassMethod_TCL_DECLARED +#define XOTclAddClassMethod_TCL_DECLARED +/* 42 */ +EXTERN int XOTclAddClassMethod(Tcl_Interp *interp, + struct XOTcl_Class *cl, CONST char *nm, + Tcl_ObjCmdProc *proc, ClientData cd, + Tcl_CmdDeleteProc *dp, int flags); +#endif +#ifndef XOTclCreate_TCL_DECLARED +#define XOTclCreate_TCL_DECLARED +/* 43 */ +EXTERN int XOTclCreate(Tcl_Interp *in, XOTcl_Class *class, + Tcl_Obj *name, ClientData data, int objc, + Tcl_Obj *CONST objv[]); +#endif + +typedef struct NsfStubHooks { + struct NsfIntStubs *nsfIntStubs; +} NsfStubHooks; + +typedef struct NsfStubs { + int magic; + struct NsfStubHooks *hooks; + + int (*nsf_Init) (Tcl_Interp *interp); /* 0 */ + void *reserved1; + struct XOTcl_Class * (*xOTclIsClass) (Tcl_Interp *interp, ClientData cd); /* 2 */ + void *reserved3; + struct XOTcl_Object * (*xOTclGetObject) (Tcl_Interp *interp, CONST char *name); /* 4 */ + struct XOTcl_Class * (*xOTclGetClass) (Tcl_Interp *interp, CONST char *name); /* 5 */ + int (*xOTclCreateObject) (Tcl_Interp *interp, Tcl_Obj *name, struct XOTcl_Class *cl); /* 6 */ + void *reserved7; + void *reserved8; + int (*xOTclDeleteObject) (Tcl_Interp *interp, struct XOTcl_Object *obj); /* 9 */ + void *reserved10; + void *reserved11; + void *reserved12; + int (*xOTclRemoveObjectMethod) (Tcl_Interp *interp, struct XOTcl_Object *obj, CONST char *nm); /* 13 */ + int (*xOTclRemoveClassMethod) (Tcl_Interp *interp, struct XOTcl_Class *cl, CONST char *nm); /* 14 */ + Tcl_Obj * (*xOTclOSetInstVar) (struct XOTcl_Object *obj, Tcl_Interp *interp, Tcl_Obj *name, Tcl_Obj *value, int flgs); /* 15 */ + Tcl_Obj * (*xOTclOGetInstVar) (struct XOTcl_Object *obj, Tcl_Interp *interp, Tcl_Obj *name, int flgs); /* 16 */ + void *reserved17; + void *reserved18; + Tcl_Obj * (*xOTcl_ObjSetVar2) (struct XOTcl_Object *obj, Tcl_Interp *interp, Tcl_Obj *name1, Tcl_Obj *name2, Tcl_Obj *value, int flgs); /* 19 */ + Tcl_Obj * (*xOTcl_ObjGetVar2) (struct XOTcl_Object *obj, Tcl_Interp *interp, Tcl_Obj *name1, Tcl_Obj *name2, int flgs); /* 20 */ + int (*xOTclUnsetInstVar2) (struct XOTcl_Object *obj, Tcl_Interp *interp, CONST char *name1, CONST char *name2, int flgs); /* 21 */ + void *reserved22; + int (*xOTclErrMsg) (Tcl_Interp *interp, char *msg, Tcl_FreeProc *type); /* 23 */ + int (*xOTclVarErrMsg) (Tcl_Interp *interp, ...); /* 24 */ + int (*xOTclErrInProc) (Tcl_Interp *interp, Tcl_Obj *objName, Tcl_Obj *clName, CONST char *procName); /* 25 */ + void *reserved26; + int (*xOTclErrBadVal_) (Tcl_Interp *interp, char *expected, char *value); /* 27 */ + int (*xOTclObjErrType) (Tcl_Interp *interp, Tcl_Obj *nm, char *wt, char *parameterName); /* 28 */ + void (*xOTclStackDump) (Tcl_Interp *interp); /* 29 */ + void *reserved30; + void *reserved31; + void (*xOTclSetObjClientData) (XOTcl_Object *obj, ClientData data); /* 32 */ + ClientData (*xOTclGetObjClientData) (XOTcl_Object *obj); /* 33 */ + void (*xOTclSetClassClientData) (XOTcl_Class *cl, ClientData data); /* 34 */ + ClientData (*xOTclGetClassClientData) (XOTcl_Class *cl); /* 35 */ + void (*xOTclRequireObjNamespace) (Tcl_Interp *interp, XOTcl_Object *obj); /* 36 */ + int (*xOTclErrBadVal) (Tcl_Interp *interp, char *context, char *expected, CONST char *value); /* 37 */ + int (*xOTclNextObjCmd) (ClientData cd, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]); /* 38 */ + int (*xOTclCallMethodWithArgs) (ClientData cd, Tcl_Interp *interp, Tcl_Obj *method, Tcl_Obj *arg, int objc, Tcl_Obj *CONST objv[], int flags); /* 39 */ + int (*xOTclObjErrArgCnt) (Tcl_Interp *interp, Tcl_Obj *cmdName, Tcl_Obj *methodName, char *arglist); /* 40 */ + int (*xOTclAddObjectMethod) (Tcl_Interp *interp, struct XOTcl_Object *obj, CONST char *nm, Tcl_ObjCmdProc *proc, ClientData cd, Tcl_CmdDeleteProc *dp, int flags); /* 41 */ + int (*xOTclAddClassMethod) (Tcl_Interp *interp, struct XOTcl_Class *cl, CONST char *nm, Tcl_ObjCmdProc *proc, ClientData cd, Tcl_CmdDeleteProc *dp, int flags); /* 42 */ + int (*xOTclCreate) (Tcl_Interp *in, XOTcl_Class *class, Tcl_Obj *name, ClientData data, int objc, Tcl_Obj *CONST objv[]); /* 43 */ +} NsfStubs; + +#ifdef __cplusplus +extern "C" { +#endif +extern NsfStubs *nsfStubsPtr; +#ifdef __cplusplus +} +#endif + +#if defined(USE_NSF_STUBS) && !defined(USE_NSF_STUB_PROCS) + +/* + * Inline function declarations: + */ + +#ifndef Nsf_Init +#define Nsf_Init \ + (nsfStubsPtr->nsf_Init) /* 0 */ +#endif +/* Slot 1 is reserved */ +#ifndef XOTclIsClass +#define XOTclIsClass \ + (nsfStubsPtr->xOTclIsClass) /* 2 */ +#endif +/* Slot 3 is reserved */ +#ifndef XOTclGetObject +#define XOTclGetObject \ + (nsfStubsPtr->xOTclGetObject) /* 4 */ +#endif +#ifndef XOTclGetClass +#define XOTclGetClass \ + (nsfStubsPtr->xOTclGetClass) /* 5 */ +#endif +#ifndef XOTclCreateObject +#define XOTclCreateObject \ + (nsfStubsPtr->xOTclCreateObject) /* 6 */ +#endif +/* Slot 7 is reserved */ +/* Slot 8 is reserved */ +#ifndef XOTclDeleteObject +#define XOTclDeleteObject \ + (nsfStubsPtr->xOTclDeleteObject) /* 9 */ +#endif +/* Slot 10 is reserved */ +/* Slot 11 is reserved */ +/* Slot 12 is reserved */ +#ifndef XOTclRemoveObjectMethod +#define XOTclRemoveObjectMethod \ + (nsfStubsPtr->xOTclRemoveObjectMethod) /* 13 */ +#endif +#ifndef XOTclRemoveClassMethod +#define XOTclRemoveClassMethod \ + (nsfStubsPtr->xOTclRemoveClassMethod) /* 14 */ +#endif +#ifndef XOTclOSetInstVar +#define XOTclOSetInstVar \ + (nsfStubsPtr->xOTclOSetInstVar) /* 15 */ +#endif +#ifndef XOTclOGetInstVar +#define XOTclOGetInstVar \ + (nsfStubsPtr->xOTclOGetInstVar) /* 16 */ +#endif +/* Slot 17 is reserved */ +/* Slot 18 is reserved */ +#ifndef XOTcl_ObjSetVar2 +#define XOTcl_ObjSetVar2 \ + (nsfStubsPtr->xOTcl_ObjSetVar2) /* 19 */ +#endif +#ifndef XOTcl_ObjGetVar2 +#define XOTcl_ObjGetVar2 \ + (nsfStubsPtr->xOTcl_ObjGetVar2) /* 20 */ +#endif +#ifndef XOTclUnsetInstVar2 +#define XOTclUnsetInstVar2 \ + (nsfStubsPtr->xOTclUnsetInstVar2) /* 21 */ +#endif +/* Slot 22 is reserved */ +#ifndef XOTclErrMsg +#define XOTclErrMsg \ + (nsfStubsPtr->xOTclErrMsg) /* 23 */ +#endif +#ifndef XOTclVarErrMsg +#define XOTclVarErrMsg \ + (nsfStubsPtr->xOTclVarErrMsg) /* 24 */ +#endif +#ifndef XOTclErrInProc +#define XOTclErrInProc \ + (nsfStubsPtr->xOTclErrInProc) /* 25 */ +#endif +/* Slot 26 is reserved */ +#ifndef XOTclErrBadVal_ +#define XOTclErrBadVal_ \ + (nsfStubsPtr->xOTclErrBadVal_) /* 27 */ +#endif +#ifndef XOTclObjErrType +#define XOTclObjErrType \ + (nsfStubsPtr->xOTclObjErrType) /* 28 */ +#endif +#ifndef XOTclStackDump +#define XOTclStackDump \ + (nsfStubsPtr->xOTclStackDump) /* 29 */ +#endif +/* Slot 30 is reserved */ +/* Slot 31 is reserved */ +#ifndef XOTclSetObjClientData +#define XOTclSetObjClientData \ + (nsfStubsPtr->xOTclSetObjClientData) /* 32 */ +#endif +#ifndef XOTclGetObjClientData +#define XOTclGetObjClientData \ + (nsfStubsPtr->xOTclGetObjClientData) /* 33 */ +#endif +#ifndef XOTclSetClassClientData +#define XOTclSetClassClientData \ + (nsfStubsPtr->xOTclSetClassClientData) /* 34 */ +#endif +#ifndef XOTclGetClassClientData +#define XOTclGetClassClientData \ + (nsfStubsPtr->xOTclGetClassClientData) /* 35 */ +#endif +#ifndef XOTclRequireObjNamespace +#define XOTclRequireObjNamespace \ + (nsfStubsPtr->xOTclRequireObjNamespace) /* 36 */ +#endif +#ifndef XOTclErrBadVal +#define XOTclErrBadVal \ + (nsfStubsPtr->xOTclErrBadVal) /* 37 */ +#endif +#ifndef XOTclNextObjCmd +#define XOTclNextObjCmd \ + (nsfStubsPtr->xOTclNextObjCmd) /* 38 */ +#endif +#ifndef XOTclCallMethodWithArgs +#define XOTclCallMethodWithArgs \ + (nsfStubsPtr->xOTclCallMethodWithArgs) /* 39 */ +#endif +#ifndef XOTclObjErrArgCnt +#define XOTclObjErrArgCnt \ + (nsfStubsPtr->xOTclObjErrArgCnt) /* 40 */ +#endif +#ifndef XOTclAddObjectMethod +#define XOTclAddObjectMethod \ + (nsfStubsPtr->xOTclAddObjectMethod) /* 41 */ +#endif +#ifndef XOTclAddClassMethod +#define XOTclAddClassMethod \ + (nsfStubsPtr->xOTclAddClassMethod) /* 42 */ +#endif +#ifndef XOTclCreate +#define XOTclCreate \ + (nsfStubsPtr->xOTclCreate) /* 43 */ +#endif + +#endif /* defined(USE_NSF_STUBS) && !defined(USE_NSF_STUB_PROCS) */ + +/* !END!: Do not edit above this line. */ + +#endif /* _XOTCLDECLS */ + Index: generic/nsfInt.decls =================================================================== diff -u --- generic/nsfInt.decls (revision 0) +++ generic/nsfInt.decls (revision 1d47ca3db133ff4eef6bf13f35c5f4e7bfd49a20) @@ -0,0 +1,117 @@ +# nsfInt.decls -- +# +# This file contains the declarations for all unsupported +# functions that are exported by the Tcl library. This file +# is used to generate the itclIntDecls.h and itclIntStub.c +# files +# +# Copyright (c) 1998-1999 by Scriptics Corporation. +# See the file "tcl-license.terms" for information on usage and redistribution +# of this file, and for a DISCLAIMER OF ALL WARRANTIES. +# + +library nsf + +# Define the unsupported generic interfaces. + +interface nsfInt + + +# +# Functions used within the package, but not considered "public" +# + +#declare 0 generic { + +#} +#declare 1 generic { + +#} +# declare 2 generic { +# int XOTclErrInProc (Tcl_Interp *in, Tcl_Obj* objName, +# Tcl_Obj* clName, char* procName) +# } +# declare 3 generic { +# int XOTclObjErrArgCnt(Tcl_Interp *in, Tcl_Obj *cmdname, char *arglist) +# } +# declare 4 generic { +# int XOTclErrBadVal(Tcl_Interp *in, char *expected, char *value) +# } +# declare 5 generic { +# int XOTclObjErrType(Tcl_Interp *in, Tcl_Obj *nm, char* wt) +# } +# declare 6 generic { +# void XOTclStackTrace (Tcl_Interp* in) +# } +# declare 7 generic { +# void XOTclCallStackTrace (Tcl_Interp* in) +# } +#declare 8 generic { +# void XOTclFilterTrace (Tcl_Interp* in) +#} +#declare 9 generic { +# int XOTclIsType(XOTclObject* obj, XOTclClass* type) +#} +#declare 10 generic { +# void XOTclRemoveClasses(XOTclClasses* sl) +#} +# declare 11 generic { +# XOTclClasses** XOTclAddClass(XOTclClasses** cList, XOTclClass* cl, ClientData cd) +# } +# declare 12 generic { + +# } +# declare 13 generic { +# XOTclClasses* XOTclComputeDependents(register XOTclClass* cl) +# } +# declare 14 generic { +# void XOTclDeprecatedMsg(char* oldCmd, char* newCmd) +# } +# declare 15 generic { +# void XOTclSetObjClientData(XOTclObject* obj, ClientData data) +# } +# declare 16 generic { +# ClientData XOTclGetObjClientData(XOTclObject* obj) +# } +# declare 17 generic { +# void XOTclSetClassClientData(XOTclClass* cl, ClientData data) +# } +# declare 18 generic { +# ClientData XOTclGetClassClientData(XOTclClass* cl) +# } +# declare 19 generic { +# void XOTclRequireObjectOpt(XOTclObject* obj) +# } +# declare 20 generic { +# void XOTclRequireClassOpt(XOTclClass* cl) +# } +# declare 21 generic { +# void XOTclRequireObjNamespace(Tcl_Interp* in, XOTclObject* obj) +# } +# declare 22 generic { + +# } +# declare 23 generic { + +# } +# declare 24 generic { + +# } +# declare 25 generic { + +# } +# declare 26 generic { + +# } +# declare 27 generic { + +# } +# declare 28 generic { + +# } +# declare 29 generic { + +# } +# declare 30 generic { + +# } Index: generic/nsfIntDecls.h =================================================================== diff -u --- generic/nsfIntDecls.h (revision 0) +++ generic/nsfIntDecls.h (revision 1d47ca3db133ff4eef6bf13f35c5f4e7bfd49a20) @@ -0,0 +1,57 @@ +/* + * xotclIntDecls.h -- + * + * This file contains the declarations for all unsupported + * functions that are exported by the Tcl library. These + * interfaces are not guaranteed to remain the same between + * versions. Use at your own risk. + * + * Copyright (c) 1998-2008 Gustaf Neumann, Uwe Zdun + * + * See the file "tcl-license.terms" for information on usage and redistribution + * of this file, and for a DISCLAIMER OF ALL WARRANTIES. + * + */ + +#ifndef _XOTCLINTDECLS +#define _XOTCLINTDECLS + +/* + * WARNING: This file is automatically generated by the tools/genStubs.tcl + * script. Any modifications to the function declarations below should be made + * in the xotclInt.decls script. + */ + +/* !BEGIN!: Do not edit below this line. */ + +/* + * Exported function declarations: + */ + + +typedef struct NsfIntStubs { + int magic; + struct NsfIntStubHooks *hooks; + +} NsfIntStubs; + +#ifdef __cplusplus +extern "C" { +#endif +extern NsfIntStubs *nsfIntStubsPtr; +#ifdef __cplusplus +} +#endif + +#if defined(USE_NSF_STUBS) && !defined(USE_NSF_STUB_PROCS) + +/* + * Inline function declarations: + */ + + +#endif /* defined(USE_NSF_STUBS) && !defined(USE_NSF_STUB_PROCS) */ + +/* !END!: Do not edit above this line. */ + +#endif /* _XOTCLINTDECLS */ Index: generic/nsfStubInit.c =================================================================== diff -u --- generic/nsfStubInit.c (revision 0) +++ generic/nsfStubInit.c (revision 1d47ca3db133ff4eef6bf13f35c5f4e7bfd49a20) @@ -0,0 +1,88 @@ +/* + * nxStubInit.c -- + * + * This file contains the initializers for the XOTcl stub vectors. + * + * Copyright (c) 1998-1999 by XXX + * + * See the file "tcl-license.terms" for information on usage and redistribution + * of this file, and for a DISCLAIMER OF ALL WARRANTIES. + * + */ + +#include "xotclInt.h" + +/* + * Remove macros that will interfere with the definitions below. + */ + +/* + * WARNING: The contents of this file is automatically generated by the + * tools/genStubs.tcl script. Any modifications to the function declarations + * below should be made in the generic/tcl.decls script. + */ + +/* !BEGIN!: Do not edit below this line. */ + +NsfIntStubs nsfIntStubs = { + TCL_STUB_MAGIC, + NULL, +}; + +static NsfStubHooks nsfStubHooks = { + &nsfIntStubs +}; + +NsfStubs nsfStubs = { + TCL_STUB_MAGIC, + &nsfStubHooks, + Nsf_Init, /* 0 */ + NULL, /* 1 */ + XOTclIsClass, /* 2 */ + NULL, /* 3 */ + XOTclGetObject, /* 4 */ + XOTclGetClass, /* 5 */ + XOTclCreateObject, /* 6 */ + NULL, /* 7 */ + NULL, /* 8 */ + XOTclDeleteObject, /* 9 */ + NULL, /* 10 */ + NULL, /* 11 */ + NULL, /* 12 */ + XOTclRemoveObjectMethod, /* 13 */ + XOTclRemoveClassMethod, /* 14 */ + XOTclOSetInstVar, /* 15 */ + XOTclOGetInstVar, /* 16 */ + NULL, /* 17 */ + NULL, /* 18 */ + XOTcl_ObjSetVar2, /* 19 */ + XOTcl_ObjGetVar2, /* 20 */ + XOTclUnsetInstVar2, /* 21 */ + NULL, /* 22 */ + XOTclErrMsg, /* 23 */ + XOTclVarErrMsg, /* 24 */ + XOTclErrInProc, /* 25 */ + NULL, /* 26 */ + XOTclErrBadVal_, /* 27 */ + XOTclObjErrType, /* 28 */ + XOTclStackDump, /* 29 */ + NULL, /* 30 */ + NULL, /* 31 */ + XOTclSetObjClientData, /* 32 */ + XOTclGetObjClientData, /* 33 */ + XOTclSetClassClientData, /* 34 */ + XOTclGetClassClientData, /* 35 */ + XOTclRequireObjNamespace, /* 36 */ + XOTclErrBadVal, /* 37 */ + XOTclNextObjCmd, /* 38 */ + XOTclCallMethodWithArgs, /* 39 */ + XOTclObjErrArgCnt, /* 40 */ + XOTclAddObjectMethod, /* 41 */ + XOTclAddClassMethod, /* 42 */ + XOTclCreate, /* 43 */ +}; + +/* !END!: Do not edit above this line. */ + +MODULE_SCOPE const NsfStubs * const nsfConstStubPtr; +const NsfStubs * const nsfConstStubPtr = &nsfStubs; Index: generic/nsfStubLib.c =================================================================== diff -u --- generic/nsfStubLib.c (revision 0) +++ generic/nsfStubLib.c (revision 1d47ca3db133ff4eef6bf13f35c5f4e7bfd49a20) @@ -0,0 +1,102 @@ +/* + * nsfStubLib.c -- + * + * Stub object that will be statically linked into extensions of XOTcl + * + * Copyright (c) 2001-2008 Gustaf Neumann, Uwe Zdun + * Copyright (c) 1998 Paul Duffin. + * + * See the file "tcl-license.terms" for information on usage and redistribution + * of this file, and for a DISCLAIMER OF ALL WARRANTIES. + * + */ + +/* + * We need to ensure that we use the stub macros so that this file contains + * no references to any of the stub functions. This will make it possible + * to build an extension that references Tcl_InitStubs but doesn't end up + * including the rest of the stub functions. + */ + +#ifndef USE_TCL_STUBS +# define USE_TCL_STUBS +#endif +#undef USE_TCL_STUB_PROCS + +/* + * This ensures that the Nsf_InitStubs has a prototype in + * xotcl.h and is not the macro that turns it into Tcl_PkgRequire + */ + +#ifndef USE_XOTCL_STUBS +# define USE_XOTCL_STUBS +#endif + +#include "xotclInt.h" + +#if defined(PRE86) +extern NsfStubs *nsfStubsPtr; +#else +MODULE_SCOPE const NsfStubs *nsfStubsPtr; +MODULE_SCOPE const NsfIntStubs *nsfIntStubsPtr; +#endif +CONST86 NsfStubs *nsfStubsPtr = NULL; +CONST86 NsfIntStubs *nsfIntStubsPtr = NULL; + + +/* + *---------------------------------------------------------------------- + * + * Xotcl_InitStubs -- + * + * Tries to initialise the stub table pointers and ensures that + * the correct version of XOTcl is loaded. + * + * Results: + * The actual version of XOTcl that satisfies the request, or + * NULL to indicate that an error occurred. + * + * Side effects: + * Sets the stub table pointers. + * + *---------------------------------------------------------------------- + */ + +CONST char * +Xotcl_InitStubs (Tcl_Interp *interp, CONST char *version, int exact) { + CONST char *actualVersion; + const char *packageName = "XOTcl"; + ClientData clientData = NULL; + + actualVersion = Tcl_PkgRequireEx(interp, "XOTcl", version, exact, + &clientData); + + if (clientData == NULL) { + Tcl_ResetResult(interp); + Tcl_AppendResult(interp, "Error loading ", packageName, " package; ", + "package not present or incomplete", NULL); + return NULL; + } else { + CONST86 NsfStubs * const stubsPtr = clientData; + CONST86 NsfIntStubs * const intStubsPtr = stubsPtr->hooks ? + stubsPtr->hooks->nsfIntStubs : NULL; + + if (actualVersion == NULL) { + return NULL; + } + + if (!stubsPtr || !intStubsPtr) { + static char *errMsg = "missing stub table pointer"; + Tcl_ResetResult(interp); + Tcl_AppendResult(interp, "Error loading ", packageName, " package", + " (requested version '", version, "', loaded version '", + actualVersion, "'): ", errMsg, NULL); + return NULL; + } + + nsfStubsPtr = stubsPtr; + nsfIntStubsPtr = intStubsPtr; + + return actualVersion; + } +} Fisheye: Tag 1d47ca3db133ff4eef6bf13f35c5f4e7bfd49a20 refers to a dead (removed) revision in file `generic/nx.decls'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1d47ca3db133ff4eef6bf13f35c5f4e7bfd49a20 refers to a dead (removed) revision in file `generic/nxDecls.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1d47ca3db133ff4eef6bf13f35c5f4e7bfd49a20 refers to a dead (removed) revision in file `generic/nxInt.decls'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1d47ca3db133ff4eef6bf13f35c5f4e7bfd49a20 refers to a dead (removed) revision in file `generic/nxIntDecls.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1d47ca3db133ff4eef6bf13f35c5f4e7bfd49a20 refers to a dead (removed) revision in file `generic/nxStubInit.c'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1d47ca3db133ff4eef6bf13f35c5f4e7bfd49a20 refers to a dead (removed) revision in file `generic/nxStubLib.c'. Fisheye: No comparison available. Pass `N' to diff? Index: generic/xotcl.c =================================================================== diff -u -rf93a860bacabe371e1f01bd3f3841015c6b14a21 -r1d47ca3db133ff4eef6bf13f35c5f4e7bfd49a20 --- generic/xotcl.c (.../xotcl.c) (revision f93a860bacabe371e1f01bd3f3841015c6b14a21) +++ generic/xotcl.c (.../xotcl.c) (revision 1d47ca3db133ff4eef6bf13f35c5f4e7bfd49a20) @@ -11585,14 +11585,14 @@ if (isCreateString(name)) { /* - * The command was an interp create, so perform an Nx_Init() on + * The command was an interp create, so perform an Nsf_Init() on * the new interpreter */ slave = Tcl_GetSlave(interp, ObjStr(objv[2])); if (!slave) { return XOTclVarErrMsg(interp, "Creation of slave interpreter failed", (char *) NULL); } - if (Nx_Init(slave) == TCL_ERROR) { + if (Nsf_Init(slave) == TCL_ERROR) { return TCL_ERROR; } #ifdef XOTCL_MEM_COUNT @@ -15018,7 +15018,7 @@ */ extern int -Nx_Init(Tcl_Interp *interp) { +Nsf_Init(Tcl_Interp *interp) { ClientData runtimeState; int result, i; #ifdef XOTCL_BYTECODE @@ -15143,8 +15143,8 @@ XOTclBytecodeInit(); #endif - Tcl_SetVar(interp, "::nsf::version", NXVERSION, TCL_GLOBAL_ONLY); - Tcl_SetVar(interp, "::nsf::patchlevel", NXPATCHLEVEL, TCL_GLOBAL_ONLY); + Tcl_SetVar(interp, "::nsf::version", NSF_VERSION, TCL_GLOBAL_ONLY); + Tcl_SetVar(interp, "::nsf::patchlevel", NSF_PATCHLEVEL, TCL_GLOBAL_ONLY); Tcl_AddInterpResolvers(interp,"nxt", (Tcl_ResolveCmdProc*)InterpColonCmdResolver, @@ -15201,6 +15201,6 @@ extern int Next_SafeInit(Tcl_Interp *interp) { /*** dummy for now **/ - return Nx_Init(interp); + return Nsf_Init(interp); } Index: generic/xotcl.h =================================================================== diff -u -r649c33f8bca87b389877c3e3c1b7eb8e1182c843 -r1d47ca3db133ff4eef6bf13f35c5f4e7bfd49a20 --- generic/xotcl.h (.../xotcl.h) (revision 649c33f8bca87b389877c3e3c1b7eb8e1182c843) +++ generic/xotcl.h (.../xotcl.h) (revision 1d47ca3db133ff4eef6bf13f35c5f4e7bfd49a20) @@ -151,7 +151,7 @@ * Include the public function declarations that are accessible via * the stubs table. */ -#include "nxDecls.h" +#include "nsfDecls.h" /* * Xotcl_InitStubs is used by extensions that can be linked Index: generic/xotclInt.h =================================================================== diff -u -rf93a860bacabe371e1f01bd3f3841015c6b14a21 -r1d47ca3db133ff4eef6bf13f35c5f4e7bfd49a20 --- generic/xotclInt.h (.../xotclInt.h) (revision f93a860bacabe371e1f01bd3f3841015c6b14a21) +++ generic/xotclInt.h (.../xotclInt.h) (revision 1d47ca3db133ff4eef6bf13f35c5f4e7bfd49a20) @@ -674,7 +674,7 @@ XOTclObject *delegatee; Proc fakeProc; Tcl_Namespace *fakeNS; - NxStubs *nxStubs; + NsfStubs *nsfStubs; Tcl_CallFrame *varFramePtr; Tcl_Command cmdPtr; /* used for ACTIVE_MIXIN */ Tcl_Command colonCmd; @@ -709,7 +709,7 @@ * */ -#include "nxIntDecls.h" +#include "nsfIntDecls.h" /* * Profiling functions Index: unix/tclAppInit.c =================================================================== diff -u -raf4326a00a0f2d0b2f1e0369af71637f48c2d56a -r1d47ca3db133ff4eef6bf13f35c5f4e7bfd49a20 --- unix/tclAppInit.c (.../tclAppInit.c) (revision af4326a00a0f2d0b2f1e0369af71637f48c2d56a) +++ unix/tclAppInit.c (.../tclAppInit.c) (revision 1d47ca3db133ff4eef6bf13f35c5f4e7bfd49a20) @@ -154,9 +154,9 @@ return TCL_ERROR; } - Tcl_StaticPackage(interp, "nx", Next_Init, 0); + Tcl_StaticPackage(interp, "nx", Nsf_Init, 0); #else - if (Tcl_PkgRequire(interp, "nx", NXVERSION, 1) == NULL) { + if (Tcl_PkgRequire(interp, "nx", NSF_VERSION, 1) == NULL) { return TCL_ERROR; } #endif