doctools::idx::import(n) 0.2 tcllib "Documentation tools"

doctools::idx::import(n) 0.2.1 tcllib "Documentation tools"

Name

doctools::idx::import - Importing keyword indices

@@ -133,13 +133,13 @@

Synopsis

package require doctools::idx::import ?0.2?
package require doctools::idx::import ?0.2.1?
package require Tcl 8.4
package require doctools::config
package require struct::map
package require doctools::idx::structure
package require snit
package require pluginmgr

@@ -519,8 +519,8 @@

Index: idoc/www/tcllib/files/modules/doctools2idx/idx_import_json.html ================================================================== --- idoc/www/tcllib/files/modules/doctools2idx/idx_import_json.html +++ idoc/www/tcllib/files/modules/doctools2idx/idx_import_json.html @@ -91,11 +91,11 @@ } --> -

[ Tcllib Home @@ -105,11 +105,11 @@ | Categories | Modules | Applications ]

doctools::idx::import::json(n) 0.1 tcllib "Documentation tools"

doctools::idx::import::json(n) 0.2.1 tcllib "Documentation tools"

Name

doctools::idx::import::json - JSON import plugin

@@ -126,12 +126,12 @@

Synopsis

package require Tcl 8.4
package require doctools::idx::import::json ?0.1?
package require Tcl 8.5
package require doctools::idx::import::json ?0.2.1?
package require doctools::idx::structure
package require json

import string configuration

Category

Text formatter plugin

Copyright

Index: idoc/www/tcllib/files/modules/doctools2idx/idx_introduction.html ================================================================== --- idoc/www/tcllib/files/modules/doctools2idx/idx_introduction.html +++ idoc/www/tcllib/files/modules/doctools2idx/idx_introduction.html @@ -208,11 +208,11 @@ ~~ | ~~ doctools::idx::export ~~~~~~~~~~~~~~~~~ | ~~~~~~~~~~~~~ doctools::idx::import | | | +---------------+-------------------------+ | +------------------+---------------+-----------------------+---------------+ | | | | | | | | | -doctools::config = | | | = doctools::include doctools::config doctools::paths +struct::map = | | | = doctools::include struct::map fileutil::paths | | | | | doctools::idx::export::<*> | | | doctools::idx::import::<*> docidx | | | docidx, json json | | | | \ html | | | doctools::idx::parse \ Index: idoc/www/tcllib/files/modules/doctools2idx/import_docidx.html ================================================================== --- idoc/www/tcllib/files/modules/doctools2idx/import_docidx.html +++ idoc/www/tcllib/files/modules/doctools2idx/import_docidx.html @@ -91,11 +91,11 @@ } --> -

[ Tcllib Home @@ -105,11 +105,11 @@ | Categories | Modules | Applications ]

doctools::idx::import::docidx(n) 0.1 tcllib "Documentation tools"

doctools::idx::import::docidx(n) 0.2.1 tcllib "Documentation tools"

Name

doctools::idx::import::docidx - docidx import plugin

@@ -126,12 +126,12 @@

Synopsis

package require Tcl 8.4
package require doctools::idx::import::docidx ?0.1?
package require Tcl 8.5
package require doctools::idx::import::docidx ?0.2.1?
package require doctools::idx::parse
package require doctools::idx::structure
package require doctools::msgcat
package require doctools::tcl::parse
package require fileutil

Category

Text formatter plugin

Copyright

Index: idoc/www/tcllib/files/modules/doctools2toc/export_doctoc.html ================================================================== --- idoc/www/tcllib/files/modules/doctools2toc/export_doctoc.html +++ idoc/www/tcllib/files/modules/doctools2toc/export_doctoc.html @@ -91,11 +91,11 @@ } --> -

[ Tcllib Home @@ -105,11 +105,11 @@ | Categories | Modules | Applications ]

doctools::toc::export::doctoc(n) 0.1 tcllib "Documentation tools"

doctools::toc::export::doctoc(n) 0.2.1 tcllib "Documentation tools"

Name

doctools::toc::export::doctoc - doctoc export plugin

@@ -128,11 +128,11 @@

Synopsis

package require Tcl 8.4
package require doctools::toc::export::doctoc ?0.1?
package require doctools::toc::export::doctoc ?0.2.1?

export serial configuration

@@ -325,8 +325,8 @@

Category

Text formatter plugin

Copyright

Index: idoc/www/tcllib/files/modules/doctools2toc/import_doctoc.html ================================================================== --- idoc/www/tcllib/files/modules/doctools2toc/import_doctoc.html +++ idoc/www/tcllib/files/modules/doctools2toc/import_doctoc.html @@ -91,11 +91,11 @@ } --> -

[ Tcllib Home @@ -105,11 +105,11 @@ | Categories | Modules | Applications ]

doctools::toc::import::doctoc(n) 0.1 tcllib "Documentation tools"

doctools::toc::import::doctoc(n) 0.2.1 tcllib "Documentation tools"

Name

doctools::toc::import::doctoc - doctoc import plugin

@@ -126,12 +126,12 @@

Synopsis

package require Tcl 8.4
package require doctools::toc::import::doctoc ?0.1?
package require Tcl 8.5
package require doctools::toc::import::doctoc ?0.2.1?
package require doctools::toc::parse
package require doctools::toc::structure
package require doctools::msgcat
package require doctools::tcl::parse
package require fileutil

Category

Text formatter plugin

Copyright

Index: idoc/www/tcllib/files/modules/doctools2toc/toc_export.html ================================================================== --- idoc/www/tcllib/files/modules/doctools2toc/toc_export.html +++ idoc/www/tcllib/files/modules/doctools2toc/toc_export.html @@ -91,11 +91,11 @@ } --> -

[ Tcllib Home @@ -105,11 +105,11 @@ | Categories | Modules | Applications ]

doctools::toc::export(n) 0.2 tcllib "Documentation tools"

doctools::toc::export(n) 0.2.1 tcllib "Documentation tools"

Name

doctools::toc::export - Exporting tables of contents

@@ -133,13 +133,13 @@

Synopsis

package require doctools::toc::export ?0.2?
package require doctools::toc::export ?0.2.1?
package require Tcl 8.4
package require doctools::config
package require struct::map
package require doctools::toc::structure
package require snit
package require pluginmgr

@@ -476,8 +476,8 @@

Category

Documentation tools

Copyright

Index: idoc/www/tcllib/files/modules/doctools2toc/toc_export_html.html ================================================================== --- idoc/www/tcllib/files/modules/doctools2toc/toc_export_html.html +++ idoc/www/tcllib/files/modules/doctools2toc/toc_export_html.html @@ -91,11 +91,11 @@ } --> -

[ Tcllib Home @@ -358,8 +358,8 @@

Category

Text formatter plugin

Copyright

Index: idoc/www/tcllib/files/modules/doctools2toc/toc_export_json.html ================================================================== --- idoc/www/tcllib/files/modules/doctools2toc/toc_export_json.html +++ idoc/www/tcllib/files/modules/doctools2toc/toc_export_json.html @@ -91,11 +91,11 @@ } --> -

[ Tcllib Home @@ -361,8 +361,8 @@

Category

Text formatter plugin

Copyright

Index: idoc/www/tcllib/files/modules/doctools2toc/toc_export_nroff.html ================================================================== --- idoc/www/tcllib/files/modules/doctools2toc/toc_export_nroff.html +++ idoc/www/tcllib/files/modules/doctools2toc/toc_export_nroff.html @@ -91,11 +91,11 @@ } --> -

[ Tcllib Home @@ -295,8 +295,8 @@

doctools::toc::import(n) 0.2 tcllib "Documentation tools"

doctools::toc::import(n) 0.2.1 tcllib "Documentation tools"

Name

doctools::toc::import - Importing keyword indices

@@ -133,13 +133,13 @@

Synopsis

package require doctools::toc::import ?0.2?
package require doctools::toc::import ?0.2.1?
package require Tcl 8.4
package require doctools::config
package require struct::map
package require doctools::toc::structure
package require snit
package require pluginmgr

@@ -537,8 +537,8 @@

Category

Documentation tools

Copyright

Index: idoc/www/tcllib/files/modules/doctools2toc/toc_import_json.html ================================================================== --- idoc/www/tcllib/files/modules/doctools2toc/toc_import_json.html +++ idoc/www/tcllib/files/modules/doctools2toc/toc_import_json.html @@ -91,11 +91,11 @@ } --> -

[ Tcllib Home @@ -105,11 +105,11 @@ | Categories | Modules | Applications ]

doctools::toc::import::json(n) 0.1 tcllib "Documentation tools"

doctools::toc::import::json(n) 0.2.1 tcllib "Documentation tools"

Name

doctools::toc::import::json - JSON import plugin

@@ -126,12 +126,12 @@

Synopsis

package require Tcl 8.4
package require doctools::toc::import::json ?0.1?
package require Tcl 8.5
package require doctools::toc::import::json ?0.2.1?
package require doctools::toc::structure
package require json

import string configuration

Category

Text formatter plugin

Copyright

Index: idoc/www/tcllib/files/modules/doctools2toc/toc_introduction.html ================================================================== --- idoc/www/tcllib/files/modules/doctools2toc/toc_introduction.html +++ idoc/www/tcllib/files/modules/doctools2toc/toc_introduction.html @@ -208,11 +208,11 @@ ~~ | ~~ doctools::toc::export ~~~~~~~~~~~~~~~~~ | ~~~~~~~~~~~~~ doctools::toc::import | | | +---------------+-------------------------+ | +------------------+---------------+-----------------------+---------------+ | | | | | | | | | -doctools::config = | | | = doctools::include doctools::config doctools::paths +struct:map = | | | = doctools::include struct::map fileutil::paths | | | | | doctools::toc::export::<*> | | | doctools::toc::import::<*> doctoc | | | doctoc, json json | | | | \ html | | | doctools::toc::parse \ ADDED idoc/www/tcllib/files/modules/fileutil/paths.html Index: idoc/www/tcllib/files/modules/fileutil/paths.html ================================================================== --- /dev/null +++ idoc/www/tcllib/files/modules/fileutil/paths.html @@ -0,0 +1,190 @@ + +fileutil::paths - + + + + +

fileutil::paths(n) 1 tcllib ""

Name

fileutil::paths - Manage search path pools

Table Of Contents
Synopsis
Description
API
Bugs, Ideas, Feedback

Synopsis

package require Tcl 8.4
package require fileutil::paths ?1?

::fileutil::paths poolName
poolName method ?arg arg ...?
poolName add path
poolName clear
poolName paths
poolName remove path

Description

Provides a snit class whose instances manage a pool of (search) paths.

API

The main command provides construction of search path pools:

::fileutil::paths poolName

Creates a new, empty pool of search paths with an associated global +Tcl command whose name is poolName. +It may be used to invoke various operations on the pool. +It has the following general form:

poolName method ?arg arg ...?: method and arguments determine the exact behavior of +the command.

If poolName is specified as %AUTO% a unique name will be +generated by the package itself. +The result of the command is the fully-qualified name of the instance +command.

The following commands are possible for pool objects:

poolName add path: Adds the path to the pool. +Nothing is done if the path is already known to the pool. +The result of the command is the empty string.
poolName clear: Clears the entire pool. In other words, removes all paths from it. +The result of the command is the empty string.
poolName paths: Returns the list of all paths known to the pool, in the order they +were added.
poolName remove path: Removes the path from the pool, if it is known to the pool. +Unknown paths are ignored without error. +The result of the command is the empty string.

Bugs, Ideas, Feedback

This document, and the package it describes, will undoubtedly contain +bugs and other problems. +Please report such in the category fileutil of the +Tcllib Trackers. +Please also report any ideas for enhancements you may have for either +package and/or documentation.

When proposing code changes, please provide unified diffs, +i.e the output of diff -u.

Note further that attachments are strongly preferred over +inlined patches. Attachments can be made by going to the Edit +form of the ticket immediately after its creation, and then using the +left-most button in the secondary navigation bar.

Index: idoc/www/tcllib/files/modules/pt/pt_peg_export.html ================================================================== --- idoc/www/tcllib/files/modules/pt/pt_peg_export.html +++ idoc/www/tcllib/files/modules/pt/pt_peg_export.html @@ -105,11 +105,11 @@ | Categories | Modules | Applications ]

pt::peg::export(n) 1 tcllib "Parser Tools"

pt::peg::export(n) 1.0.1 tcllib "Parser Tools"

Name

pt::peg::export - PEG Export

Synopsis

package require Tcl 8.5
package require snit
package require configuration
package require struct::map
package require pt::peg
package require pluginmgr
package require pt::peg::export ?1?
package require pt::peg::export ?1.0.1?

::pt::peg::export objectName
objectName method ?arg arg ...?
objectName destroy

pt::peg::import(n) 1 tcllib "Parser Tools"

pt::peg::import(n) 1.0.1 tcllib "Parser Tools"

Name

pt::peg::import - PEG Import

@@ -141,15 +141,16 @@

Synopsis

package require Tcl 8.5
package require Tcl 8.5
package require snit
package require configuration
package require fileutil::paths
package require pt::peg
package require pluginmgr
package require pt::peg::import ?1?
package require pt::peg::import ?1.0.1?

::pt::peg::import objectName
objectName method ?arg arg ...?
objectName destroy

struct::map -

Tcllib Home

Main Table Of Contents

Table Of Contents

Keyword Index

struct::map(n) 1 tcllib ""

Name

struct::map - Manage key/value maps

Table Of Contents
Synopsis
Description
API
Bugs, Ideas, Feedback

Synopsis

package require struct::map ?1?

::struct::map mapName
mapName method ?arg arg ...?
mapName get
mapName names
mapName set name ?value?
mapName unset ?pattern...?

Description

Provides a snit class whose instances manage a key/value map. +In other words, an object wrapper around Tcl arrays.

API

The main command provides construction of maps:

::struct::map mapName

Creates a new, empty map with an associated global Tcl command whose +name is mapName. +It may be used to invoke various operations on the map. +It has the following general form:

mapName method ?arg arg ...?: method and arguments determine the exact behavior of +the command.

If mapName is specified as %AUTO% a unique name will be +generated by the package itself. +The result of the command is the fully-qualified name of the instance +command.

The following commands are possible for map objects:

mapName get: Returns the entire map as a Tcl dictionary.
mapName names: Returns the list of all keys known to the map, in arbitrary order.
mapName set name ?value?: Sets key name to the specified value, if the value specified. +Returns the value for the key. +Throws an error if the key is not known.
mapName unset ?pattern...?: Removes all keys matching at least one of the glob patterns from +the map. +If no pattern is specified all keys are removed. +In other words, the default pattern is *. +The result of the command is the empty string.

Bugs, Ideas, Feedback

This document, and the package it describes, will undoubtedly contain +bugs and other problems. +Please report such in the category struct :: list of the +Tcllib Trackers. +Please also report any ideas for enhancements you may have for either +package and/or documentation.

When proposing code changes, please provide unified diffs, +i.e the output of diff -u.

grammar::fa::dacceptor

grammar::fa::dexec

grammar::fa::op

grammar::me::cpu

grammar::me::cpu::core

grammar::me::cpu::gasm

map::geocode::nominatim

math::calculus::romberg

math::calculus::symdiff

math::rationalfunctions

pt::cparam::configuration::critcl

pt::cparam::configuration::tea

pt::peg::container::peg

pt::peg::export

pt::peg::export::container

pt::peg::export::json

pt::peg::export::peg

pt::peg::from::container

pt::peg::from::json

pt::peg::from::peg

pt::peg::import

pt::peg::import::container

pt::peg::import::json

pt::peg::import::peg

pt::peg::interp

pt::peg::to::container

pt::peg::to::tclparam

pt::tclparam::configuration::nx

pt::tclparam::configuration::snit

pt::tclparam::configuration::tcloo

simulation::annealing

simulation::montecarlo

map::geocode::nominatim

math::calculus::symdiff

tclrep/machineparameters

fileutil::multi::op

fileutil::paths

fileutil_traverse

ftp: @@ -3406,50 +3418,54 @@ struct::list Procedures for manipulating lists +struct::map +Manage key/value maps + + struct::matrix Create and manipulate matrix objects - + struct::matrix_v1 Create and manipulate matrix objects - + struct::pool Create and manipulate pool objects (of discrete items) - + struct::prioqueue Create and manipulate prioqueue objects - + struct::queue Create and manipulate queue objects - + struct::record Define and create records (similar to 'C' structures) - + struct::set Procedures for manipulating sets - + struct::skiplist Create and manipulate skiplists - + struct::stack Create and manipulate stack objects - + struct::tree Create and manipulate tree objects - + struct::tree_v1 Create and manipulate tree objects

tar: Index: idoc/www/toc0.html ================================================================== --- idoc/www/toc0.html +++ idoc/www/toc0.html @@ -1645,57 +1645,65 @@ cache::async Asynchronous in-memory cache +fileutil::paths +Manage search path pools + + generator Procedures for creating and using generators. - + huddle Create and manipulate huddle object - + map::geocode::nominatim Resolving geographical names with a Nominatim service - + map::slippy Common code for slippy based map packages - + map::slippy::cache Management of a tile cache in the local filesystem - + map::slippy::fetcher Accessing a server providing tiles for slippy-based maps - + mapproj Map projection routines - + math::calculus::symdiff Symbolic differentiation for Tcl - + namespacex Namespace utility commands - + rest define REST web APIs and call them inline or asychronously - + stringprep Implementation of stringprep - + stringprep::data stringprep data tables, generated, internal + +struct::map +Manage key/value maps + tclrep/machineparameters Compute double precision machine parameters. Index: idoc/www/toc1.html ================================================================== --- idoc/www/toc1.html +++ idoc/www/toc1.html @@ -579,10 +579,14 @@ fileutil::multi::op Multi-file operation, scatter/gather +fileutil::paths +Manage search path pools + + fileutil_traverse Iterative directory traversal

ftp: @@ -1572,50 +1576,54 @@ struct::list Procedures for manipulating lists +struct::map +Manage key/value maps + + struct::matrix Create and manipulate matrix objects - + struct::matrix_v1 Create and manipulate matrix objects - + struct::pool Create and manipulate pool objects (of discrete items) - + struct::prioqueue Create and manipulate prioqueue objects - + struct::queue Create and manipulate queue objects - + struct::record Define and create records (similar to 'C' structures) - + struct::set Procedures for manipulating sets - + struct::skiplist Create and manipulate skiplists - + struct::stack Create and manipulate stack objects - + struct::tree Create and manipulate tree objects - + struct::tree_v1 Create and manipulate tree objects

tar: ADDED modules/0compatibility/d_config.tcl Index: modules/0compatibility/d_config.tcl ================================================================== --- /dev/null +++ modules/0compatibility/d_config.tcl @@ -0,0 +1,16 @@ +# (c) 2019 Andreas Kupries +# Redirection wrapper for deprecated package +# Deprecated: +# - doctools::config +# Replacement: +# - struct::map + +package require Tcl 8.4 +package require struct::map + +namespace eval ::doctools {} + +proc ::doctools::config {args} { uplevel 1 [linsert $args 0 ::struct::map] } + +package provide doctools::config 0.1 +return ADDED modules/0compatibility/d_config.test Index: modules/0compatibility/d_config.test ================================================================== --- /dev/null +++ modules/0compatibility/d_config.test @@ -0,0 +1,144 @@ +# -*- tcl -*- +# config.test: Testsuite for DEPRECATED package doctools::config +# +# Copyright (c) 2019 by Andreas Kupries +# All rights reserved. + +# ------------------------------------------------------------------------- + +source [file join \ + [file dirname [file dirname [file join [pwd] [info script]]]] \ + devtools testutilities.tcl] + +testsNeedTcl 8.4 +testsNeedTcltest 2.0 + +support { + use snit/snit.tcl snit + use struct/map.tcl struct::map +} +testing { + useLocal d_config.tcl doctools::config +} + +# --------------------------------------------------------------------- +# [] constructor +# [] destructor +# [] get +# [] names +# [] set +# [] unset + +#---------------------------------------------------------------------- +## Constructor, destructor + +test doctools-config-1.0 {constructor, wrong args, too many} -body { + doctools::config M X +} -returnCodes error -result {Error in constructor: wrong # args: should be "::struct::map::I::Snit_constructor type selfns win self"} + +test doctools-config-1.1 {instance, bogus method} -setup { + doctools::config M +} -cleanup { + M destroy +} -body { + M bogus +} -returnCodes error -result {"::M bogus" is not defined} + +#---------------------------------------------------------------------- +## get + +test doctools-config-2.0 {get, wrong args, too many} -setup { + doctools::config M +} -cleanup { + M destroy +} -body { + M get X +} -returnCodes error -result {wrong # args: should be "::struct::map::I::Snit_methodget type selfns win self"} + +test doctools-config-2.1 {get, base state, none} -setup { + doctools::config M +} -cleanup { + M destroy +} -body { + M get +} -result {} + +#---------------------------------------------------------------------- +## names + +test doctools-config-3.0 {names, wrong args, too many} -setup { + doctools::config M +} -cleanup { + M destroy +} -body { + M names X +} -returnCodes error -result {wrong # args: should be "::struct::map::I::Snit_methodnames type selfns win self"} + +test doctools-config-3.1 {names, base state, none} -setup { + doctools::config M +} -cleanup { + M destroy +} -body { + M names +} -result {} + +#---------------------------------------------------------------------- +## set + +test doctools-config-4.0 {set, wrong args, not enough} -setup { + doctools::config M +} -cleanup { + M destroy +} -body { + M set +} -returnCodes error -result {wrong # args: should be "::struct::map::I::Snit_methodset type selfns win self name ?value?"} + +test doctools-config-4.1 {set, wrong args, too many} -setup { + doctools::config M +} -cleanup { + M destroy +} -body { + M set K V X +} -returnCodes error -result {wrong # args: should be "::struct::map::I::Snit_methodset type selfns win self name ?value?"} + +test doctools-config-4.2 {set, state change, result} -setup { + doctools::config M +} -cleanup { + M destroy +} -body { + list [M names] [M get] [M set K V] [M names] [M get] +} -result {{} {} V K {K V}} + +#---------------------------------------------------------------------- +## unset + +test doctools-config-5.2 {unset, known key, state change, result} -setup { + doctools::config M + M set K V +} -cleanup { + M destroy +} -body { + list [M names] [M get] [M unset K] [M names] [M get] +} -result {K {K V} {} {} {}} + +test doctools-config-5.3 {unset, missing key, no state change, result} -setup { + doctools::config M + M set K V +} -cleanup { + M destroy +} -body { + list [M names] [M get] [M unset K'] [M names] [M get] +} -result {K {K V} {} K {K V}} + +test doctools-config-5.4 {unset, no pattern, clear, result} -setup { + doctools::config M + M set K V +} -cleanup { + M destroy +} -body { + list [M names] [M get] [M unset] [M names] [M get] +} -result {K {K V} {} {} {}} + +#---------------------------------------------------------------------- +testsuiteCleanup +return ADDED modules/0compatibility/d_paths.tcl Index: modules/0compatibility/d_paths.tcl ================================================================== --- /dev/null +++ modules/0compatibility/d_paths.tcl @@ -0,0 +1,16 @@ +# (c) 2019 Andreas Kupries +# Redirection wrapper for deprecated package +# Deprecated: +# - doctools::paths +# Replacement: +# - fileutil::paths + +package require Tcl 8.4 +package require fileutil::paths + +namespace eval ::doctools {} + +proc ::doctools::paths {args} { uplevel 1 [linsert $args 0 ::fileutil::paths] } + +package provide doctools::paths 0.1 +return ADDED modules/0compatibility/d_paths.test Index: modules/0compatibility/d_paths.test ================================================================== --- /dev/null +++ modules/0compatibility/d_paths.test @@ -0,0 +1,152 @@ +# -*- tcl -*- +# paths.test: Testsuite for DEPRECATED package doctools::paths +# +# Copyright (c) 2019 by Andreas Kupries +# All rights reserved. + +# ------------------------------------------------------------------------- + +source [file join \ + [file dirname [file dirname [file join [pwd] [info script]]]] \ + devtools testutilities.tcl] + +testsNeedTcl 8.4 +testsNeedTcltest 2.0 + +support { + use snit/snit.tcl snit + use fileutil/paths.tcl fileutil::paths +} +testing { + useLocal d_paths.tcl doctools::paths +} + +# --------------------------------------------------------------------- +# [] constructor +# [] destructor +# [] paths +# [] add +# [] remove +# [] clear + +#---------------------------------------------------------------------- +## Constructor, destructor + +test doctools-paths-1.0 {constructor, wrong args, too many} -body { + doctools::paths P X +} -returnCodes error -result {Error in constructor: wrong # args: should be "::fileutil::paths::Snit_constructor type selfns win self"} + +test doctools-paths-1.1 {instance, bogus method} -setup { + doctools::paths P +} -cleanup { + P destroy +} -body { + P bogus +} -returnCodes error -result {"::P bogus" is not defined} + +#---------------------------------------------------------------------- +## paths + +test doctools-paths-2.0 {paths, wrong args, too many} -setup { + doctools::paths P +} -cleanup { + P destroy +} -body { + P paths X +} -returnCodes error -result {wrong # args: should be "::fileutil::paths::Snit_methodpaths type selfns win self"} + +test doctools-paths-2.1 {paths, base state, none} -setup { + doctools::paths P +} -cleanup { + P destroy +} -body { + P paths +} -result {} + +#---------------------------------------------------------------------- +## add + +test doctools-paths-3.0 {add, wrong args, not enough} -setup { + doctools::paths P +} -cleanup { + P destroy +} -body { + P add +} -returnCodes error -result {wrong # args: should be "::fileutil::paths::Snit_methodadd type selfns win self path"} + +test doctools-paths-3.1 {add, wrong args, too many} -setup { + doctools::paths P +} -cleanup { + P destroy +} -body { + P add F X +} -returnCodes error -result {wrong # args: should be "::fileutil::paths::Snit_methodadd type selfns win self path"} + +test doctools-paths-3.2 {add, state change, result} -setup { + doctools::paths P +} -cleanup { + P destroy +} -body { + list [P add F] [P paths] +} -result {{} F} + +#---------------------------------------------------------------------- +## remove + +test doctools-paths-4.0 {remove, wrong args, not enough} -setup { + doctools::paths P +} -cleanup { + P destroy +} -body { + P remove +} -returnCodes error -result {wrong # args: should be "::fileutil::paths::Snit_methodremove type selfns win self path"} + +test doctools-paths-4.1 {remove, wrong args, too many} -setup { + doctools::paths P +} -cleanup { + P destroy +} -body { + P remove F X +} -returnCodes error -result {wrong # args: should be "::fileutil::paths::Snit_methodremove type selfns win self path"} + +test doctools-paths-4.2 {remove, known path, state change, result} -setup { + doctools::paths P + P add F +} -cleanup { + P destroy +} -body { + list [P remove F] [P paths] +} -result {{} {}} + +test doctools-paths-4.3 {remove, missing path, no state change, result} -setup { + doctools::paths P + P add Z +} -cleanup { + P destroy +} -body { + list [P remove F] [P paths] +} -result {{} Z} + +#---------------------------------------------------------------------- +## clear + +test doctools-paths-5.0 {clear, wrong args, too many} -setup { + doctools::paths P +} -cleanup { + P destroy +} -body { + P clear X +} -returnCodes error -result {wrong # args: should be "::fileutil::paths::Snit_methodclear type selfns win self"} + +test doctools-paths-5.1 {clear, return to base state} -setup { + doctools::paths P + P add F +} -cleanup { + P destroy +} -body { + list [P clear] [P paths] +} -result {{} {}} + +#---------------------------------------------------------------------- +testsuiteCleanup +return ADDED modules/0compatibility/p_config.tcl Index: modules/0compatibility/p_config.tcl ================================================================== --- /dev/null +++ modules/0compatibility/p_config.tcl @@ -0,0 +1,14 @@ +# (c) 2019 Andreas Kupries +# Redirection wrapper for deprecated package +# Deprecated: +# - configuration +# Replacement: +# - struct::map + +package require Tcl 8.4 +package require struct::map + +proc ::configuration {args} { uplevel 1 [linsert $args 0 ::struct::map] } + +package provide configuration 1 +return ADDED modules/0compatibility/p_config.test Index: modules/0compatibility/p_config.test ================================================================== --- /dev/null +++ modules/0compatibility/p_config.test @@ -0,0 +1,144 @@ +# -*- tcl -*- +# config.test: Testsuite for DEPRECATED package configuration +# +# Copyright (c) 2019 by Andreas Kupries +# All rights reserved. + +# ------------------------------------------------------------------------- + +source [file join \ + [file dirname [file dirname [file join [pwd] [info script]]]] \ + devtools testutilities.tcl] + +testsNeedTcl 8.4 +testsNeedTcltest 2.0 + +support { + use snit/snit.tcl snit + use struct/map.tcl struct::map +} +testing { + useLocal p_config.tcl configuration +} + +# --------------------------------------------------------------------- +# [] constructor +# [] destructor +# [] get +# [] names +# [] set +# [] unset + +#---------------------------------------------------------------------- +## Constructor, destructor + +test configuration-1.0 {constructor, wrong args, too many} -body { + configuration M X +} -returnCodes error -result {Error in constructor: wrong # args: should be "::struct::map::I::Snit_constructor type selfns win self"} + +test configuration-1.1 {instance, bogus method} -setup { + configuration M +} -cleanup { + M destroy +} -body { + M bogus +} -returnCodes error -result {"::M bogus" is not defined} + +#---------------------------------------------------------------------- +## get + +test configuration-2.0 {get, wrong args, too many} -setup { + configuration M +} -cleanup { + M destroy +} -body { + M get X +} -returnCodes error -result {wrong # args: should be "::struct::map::I::Snit_methodget type selfns win self"} + +test configuration-2.1 {get, base state, none} -setup { + configuration M +} -cleanup { + M destroy +} -body { + M get +} -result {} + +#---------------------------------------------------------------------- +## names + +test configuration-3.0 {names, wrong args, too many} -setup { + configuration M +} -cleanup { + M destroy +} -body { + M names X +} -returnCodes error -result {wrong # args: should be "::struct::map::I::Snit_methodnames type selfns win self"} + +test configuration-3.1 {names, base state, none} -setup { + configuration M +} -cleanup { + M destroy +} -body { + M names +} -result {} + +#---------------------------------------------------------------------- +## set + +test configuration-4.0 {set, wrong args, not enough} -setup { + configuration M +} -cleanup { + M destroy +} -body { + M set +} -returnCodes error -result {wrong # args: should be "::struct::map::I::Snit_methodset type selfns win self name ?value?"} + +test configuration-4.1 {set, wrong args, too many} -setup { + configuration M +} -cleanup { + M destroy +} -body { + M set K V X +} -returnCodes error -result {wrong # args: should be "::struct::map::I::Snit_methodset type selfns win self name ?value?"} + +test configuration-4.2 {set, state change, result} -setup { + configuration M +} -cleanup { + M destroy +} -body { + list [M names] [M get] [M set K V] [M names] [M get] +} -result {{} {} V K {K V}} + +#---------------------------------------------------------------------- +## unset + +test configuration-5.2 {unset, known key, state change, result} -setup { + configuration M + M set K V +} -cleanup { + M destroy +} -body { + list [M names] [M get] [M unset K] [M names] [M get] +} -result {K {K V} {} {} {}} + +test configuration-5.3 {unset, missing key, no state change, result} -setup { + configuration M + M set K V +} -cleanup { + M destroy +} -body { + list [M names] [M get] [M unset K'] [M names] [M get] +} -result {K {K V} {} K {K V}} + +test configuration-5.4 {unset, no pattern, clear, result} -setup { + configuration M + M set K V +} -cleanup { + M destroy +} -body { + list [M names] [M get] [M unset] [M names] [M get] +} -result {K {K V} {} {} {}} + +#---------------------------------------------------------------------- +testsuiteCleanup +return ADDED modules/0compatibility/p_paths.tcl Index: modules/0compatibility/p_paths.tcl ================================================================== --- /dev/null +++ modules/0compatibility/p_paths.tcl @@ -0,0 +1,14 @@ +# (c) 2019 Andreas Kupries +# Redirection wrapper for deprecated package +# Deprecated: +# - paths +# Replacement: +# - fileutil::paths + +package require Tcl 8.4 +package require fileutil::paths + +proc ::paths {args} { uplevel 1 [linsert $args 0 ::fileutil::paths] } + +package provide paths 1 +return ADDED modules/0compatibility/p_paths.test Index: modules/0compatibility/p_paths.test ================================================================== --- /dev/null +++ modules/0compatibility/p_paths.test @@ -0,0 +1,152 @@ +# -*- tcl -*- +# paths.test: Testsuite for DEPRECATED package paths (pt) +# +# Copyright (c) 2019 by Andreas Kupries +# All rights reserved. + +# ------------------------------------------------------------------------- + +source [file join \ + [file dirname [file dirname [file join [pwd] [info script]]]] \ + devtools testutilities.tcl] + +testsNeedTcl 8.4 +testsNeedTcltest 2.0 + +support { + use snit/snit.tcl snit + use fileutil/paths.tcl fileutil::paths +} +testing { + useLocal p_paths.tcl paths +} + +# --------------------------------------------------------------------- +# [] constructor +# [] destructor +# [] paths +# [] add +# [] remove +# [] clear + +#---------------------------------------------------------------------- +## Constructor, destructor + +test paths-1.0 {constructor, wrong args, too many} -body { + paths P X +} -returnCodes error -result {Error in constructor: wrong # args: should be "::fileutil::paths::Snit_constructor type selfns win self"} + +test paths-1.1 {instance, bogus method} -setup { + paths P +} -cleanup { + P destroy +} -body { + P bogus +} -returnCodes error -result {"::P bogus" is not defined} + +#---------------------------------------------------------------------- +## paths + +test paths-2.0 {paths, wrong args, too many} -setup { + paths P +} -cleanup { + P destroy +} -body { + P paths X +} -returnCodes error -result {wrong # args: should be "::fileutil::paths::Snit_methodpaths type selfns win self"} + +test paths-2.1 {paths, base state, none} -setup { + paths P +} -cleanup { + P destroy +} -body { + P paths +} -result {} + +#---------------------------------------------------------------------- +## add + +test paths-3.0 {add, wrong args, not enough} -setup { + paths P +} -cleanup { + P destroy +} -body { + P add +} -returnCodes error -result {wrong # args: should be "::fileutil::paths::Snit_methodadd type selfns win self path"} + +test paths-3.1 {add, wrong args, too many} -setup { + paths P +} -cleanup { + P destroy +} -body { + P add F X +} -returnCodes error -result {wrong # args: should be "::fileutil::paths::Snit_methodadd type selfns win self path"} + +test paths-3.2 {add, state change, result} -setup { + paths P +} -cleanup { + P destroy +} -body { + list [P add F] [P paths] +} -result {{} F} + +#---------------------------------------------------------------------- +## remove + +test paths-4.0 {remove, wrong args, not enough} -setup { + paths P +} -cleanup { + P destroy +} -body { + P remove +} -returnCodes error -result {wrong # args: should be "::fileutil::paths::Snit_methodremove type selfns win self path"} + +test paths-4.1 {remove, wrong args, too many} -setup { + paths P +} -cleanup { + P destroy +} -body { + P remove F X +} -returnCodes error -result {wrong # args: should be "::fileutil::paths::Snit_methodremove type selfns win self path"} + +test paths-4.2 {remove, known path, state change, result} -setup { + paths P + P add F +} -cleanup { + P destroy +} -body { + list [P remove F] [P paths] +} -result {{} {}} + +test paths-4.3 {remove, missing path, no state change, result} -setup { + paths P + P add Z +} -cleanup { + P destroy +} -body { + list [P remove F] [P paths] +} -result {{} Z} + +#---------------------------------------------------------------------- +## clear + +test paths-5.0 {clear, wrong args, too many} -setup { + paths P +} -cleanup { + P destroy +} -body { + P clear X +} -returnCodes error -result {wrong # args: should be "::fileutil::paths::Snit_methodclear type selfns win self"} + +test paths-5.1 {clear, return to base state} -setup { + paths P + P add F +} -cleanup { + P destroy +} -body { + list [P clear] [P paths] +} -result {{} {}} + +#---------------------------------------------------------------------- +testsuiteCleanup +return ADDED modules/0compatibility/pkgIndex.tcl Index: modules/0compatibility/pkgIndex.tcl ================================================================== --- /dev/null +++ modules/0compatibility/pkgIndex.tcl @@ -0,0 +1,29 @@ +# Compatibility wrapper for deprecated packages. +## +# Stages +# [D1] Next Release - Noted deprecated, with redirection wrappers +# [D2] Release After - Wrappers become Boockers, throwing error noting redirection +# [D3] Release Beyond - All removed. +## +# Currently in deprecation +# - D1 doctools::path (doctools2base) +# - D1 doctools::config (doctools2base) +# - D1 configuration (pt) +# - D1 paths (pt) +# +# :Attention: +# - Original `doctools::paths` Tcl 8.4 required +# Replacement `fileutilutil::paths` Tcl 8.5 required! + +if {![package vsatisfies [package provide Tcl] 8.4]} {return} + +package ifneeded configuration 1 [list source [file join $dir p_config.tcl]] +package ifneeded doctools::config 0.1 [list source [file join $dir d_config.tcl]] +package ifneeded doctools::paths 0.1 [list source [file join $dir d_paths.tcl]] +package ifneeded paths 1 [list source [file join $dir p_paths.tcl]] + +if {![package vsatisfies [package provide Tcl] 8.5]} {return} + + +if {![package vsatisfies [package provide Tcl] 8.6]} {return} + DELETED modules/doctools2base/config.tcl Index: modules/doctools2base/config.tcl ================================================================== --- modules/doctools2base/config.tcl +++ /dev/null @@ -1,81 +0,0 @@ -# docidx.tcl -- -# -# Generic configuration management, for use by import and export -# managers. -# -# Copyright (c) 2009 Andreas Kupries -# -# See the file "license.terms" for information on usage and redistribution -# of this file, and for a DISCLAIMER OF ALL WARRANTIES. -# -# RCS: @(#) $Id: config.tcl,v 1.2 2011/11/17 08:00:45 andreas_kupries Exp $ - -# Each object manages a set of configuration variables. - -# ### ### ### ######### ######### ######### -## Requisites - -package require Tcl 8.4 -package require snit - -# ### ### ### ######### ######### ######### -## API - -snit::type ::doctools::config { - - # ### ### ### ######### ######### ######### - ## Options :: None - - # ### ### ### ######### ######### ######### - ## Creating, destruction - - # Default constructor. - # Default destructor. - - # ### ### ### ######### ######### ######### - ## Public methods. Reading and writing the configuration. - - method names {} { - return [array names myconfiguration] - } - - method get {} { - return [array get myconfiguration] - } - - method set {name {value {}}} { - # 7 instead of 3 in the condition below, because of the 4 - # implicit arguments snit is providing to each method. - if {[llength [info level 0]] == 7} { - set myconfiguration($name) $value - } elseif {![info exists myconfiguration($name)]} { - return -code error "can't read \"$name\": no such variable" - } - return $myconfiguration($name) - } - - method unset {args} { - if {![llength $args]} { lappend args * } - foreach pattern $args { - array unset myconfiguration $pattern - } - return - } - - # ### ### ### ######### ######### ######### - ## Internal methods :: None. - - # ### ### ### ######### ######### ######### - ## State :: Configuration data, Tcl array - - variable myconfiguration -array {} - - ## - # ### ### ### ######### ######### ######### -} - -# ### ### ### ######### ######### ######### -## Ready - -package provide doctools::config 0.1 -return DELETED modules/doctools2base/paths.tcl Index: modules/doctools2base/paths.tcl ================================================================== --- modules/doctools2base/paths.tcl +++ /dev/null @@ -1,76 +0,0 @@ -# docidx.tcl -- -# -# Generic path list management, for use by import management. -# -# Copyright (c) 2009 Andreas Kupries -# -# See the file "license.terms" for information on usage and redistribution -# of this file, and for a DISCLAIMER OF ALL WARRANTIES. -# -# RCS: @(#) $Id: paths.tcl,v 1.2 2009/04/29 02:09:46 andreas_kupries Exp $ - -# Each object manages a list of paths. - -# ### ### ### ######### ######### ######### -## Requisites - -package require Tcl 8.4 -package require snit - -# ### ### ### ######### ######### ######### -## API - -snit::type ::doctools::paths { - - # ### ### ### ######### ######### ######### - ## Options :: None - - # ### ### ### ######### ######### ######### - ## Creation, destruction - - # Default constructor. - # Default destructor. - - # ### ### ### ######### ######### ######### - ## Methods :: Querying and manipulating the list of paths. - - method paths {} { - return $mypaths - } - - method add {path} { - set pos [lsearch $mypaths $path] - if {$pos >= 0 } return - lappend mypaths $path - return - } - - method remove {path} { - set pos [lsearch $mypaths $path] - if {$pos < 0} return - set mypaths [lreplace $mypaths $pos $pos] - return - } - - method clear {} { - set mypaths {} - return - } - - # ### ### ### ######### ######### ######### - ## Internal methods :: None - - # ### ### ### ######### ######### ######### - ## State :: List of paths. - - variable mypaths {} - - ## - # ### ### ### ######### ######### ######### -} - -# ### ### ### ######### ######### ######### -## Ready - -package provide doctools::paths 0.1 -return Index: modules/doctools2base/pkgIndex.tcl ================================================================== --- modules/doctools2base/pkgIndex.tcl +++ modules/doctools2base/pkgIndex.tcl @@ -2,18 +2,15 @@ # Packages for the doctools {idx,toc,doc} v2 implementation # (still v1.1 doc{idx,toc} languages). # Supporting packages -# - Handling configuration variables, and include paths. # - Handling text generation, the nroff man.macros definitions, # HTML/XML generation, and the default CSS style # - Handling of message catalogs as packages. # - Recursive descent parser for Tcl strings (as expected by 'subst -novariables'). -package ifneeded doctools::config 0.1 [list source [file join $dir config.tcl]] -package ifneeded doctools::paths 0.1 [list source [file join $dir paths.tcl]] package ifneeded doctools::text 0.1 [list source [file join $dir text.tcl]] package ifneeded doctools::nroff::man_macros 0.1 [list source [file join $dir nroff_manmacros.tcl]] package ifneeded doctools::html 0.1 [list source [file join $dir html.tcl]] package ifneeded doctools::html::cssdefaults 0.1 [list source [file join $dir html_cssdefaults.tcl]] package ifneeded doctools::msgcat 0.1 [list source [file join $dir msgcat.tcl]] Index: modules/doctools2idx/container.test ================================================================== --- modules/doctools2idx/container.test +++ modules/doctools2idx/container.test @@ -1,12 +1,10 @@ # -*- tcl -*- # idx.test: Tests for the doctools::idx package. Index management. # -# Copyright (c) 2009 by Andreas Kupries +# Copyright (c) 2009-2019 by Andreas Kupries # All rights reserved. -# -# RCS: @(#) $Id: container.test,v 1.2 2009/04/29 02:10:34 andreas_kupries Exp $ # ------------------------------------------------------------------------- source [file join \ [file dirname [file dirname [file join [pwd] [info script]]]] \ @@ -17,15 +15,15 @@ support { use struct/list.tcl struct::list use snit/snit.tcl snit use fileutil/fileutil.tcl fileutil + use fileutil/paths.tcl fileutil::paths use log/logger.tcl logger use pluginmgr/pluginmgr.tcl pluginmgr + use struct/map.tcl struct::map - use doctools2base/config.tcl doctools::config - use doctools2base/paths.tcl doctools::paths useLocal export.tcl doctools::idx::export useLocal import.tcl doctools::idx::import use doctools2base/nroff_manmacros.tcl doctools::nroff::man_macros source [tcllibPath doctools2base/tests/common] Index: modules/doctools2idx/export.tcl ================================================================== --- modules/doctools2idx/export.tcl +++ modules/doctools2idx/export.tcl @@ -1,25 +1,23 @@ # export.tcl -- # # Exporting indices into other formats. # -# Copyright (c) 2009-2018 Andreas Kupries +# Copyright (c) 2009-2019 Andreas Kupries # # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. -# -# RCS: @(#) $Id: export.tcl,v 1.1 2009/04/01 04:28:37 andreas_kupries Exp $ # Each object manages a set of plugins for the conversion of keyword # indices into some textual representation. I.e. this object manages # the conversion to specialized serializations of keyword indices. # ### ### ### ######### ######### ######### ## Requisites package require Tcl 8.4 -package require doctools::config +package require struct::map package require doctools::idx::structure package require pluginmgr package require snit # ### ### ### ######### ######### ######### @@ -32,11 +30,11 @@ # ### ### ### ######### ######### ######### ## Creation, destruction. constructor {} { - install myconfig using ::doctools::config ${selfns}::config + install myconfig using ::struct::map ${selfns}::config return } destructor { $myconfig destroy @@ -119,7 +117,7 @@ } # ### ### ### ######### ######### ######### ## Ready -package provide doctools::idx::export 0.2 +package provide doctools::idx::export 0.2.1 return Index: modules/doctools2idx/export.test ================================================================== --- modules/doctools2idx/export.test +++ modules/doctools2idx/export.test @@ -1,12 +1,10 @@ # -*- tcl -*- # idx.test: tests for the doctools::idx package. # -# Copyright (c) 2009 by Andreas Kupries +# Copyright (c) 2009-2019 by Andreas Kupries # All rights reserved. -# -# RCS: @(#) $Id: export.test,v 1.2 2009/04/29 02:10:34 andreas_kupries Exp $ # ------------------------------------------------------------------------- source [file join \ [file dirname [file dirname [file join [pwd] [info script]]]] \ @@ -20,12 +18,12 @@ use struct/list.tcl struct::list use snit/snit.tcl snit use log/logger.tcl logger use pluginmgr/pluginmgr.tcl pluginmgr + use struct/map.tcl struct::map - use doctools2base/config.tcl doctools::config useLocal structure.tcl doctools::idx::structure use doctools2base/nroff_manmacros.tcl doctools::nroff::man_macros source [tcllibPath doctools2base/tests/common] } @@ -75,35 +73,35 @@ doctools::idx::export E } -body { E config names X } -cleanup { E destroy -} -returnCodes error -result {wrong # args: should be "::doctools::config::Snit_methodnames type selfns win self"} +} -returnCodes error -result {wrong # args: should be "::struct::map::I::Snit_methodnames type selfns win self"} test doctools-idx-export-6.0 {config get, wrong#args} -setup { doctools::idx::export E } -body { E config get X } -cleanup { E destroy -} -returnCodes error -result {wrong # args: should be "::doctools::config::Snit_methodget type selfns win self"} +} -returnCodes error -result {wrong # args: should be "::struct::map::I::Snit_methodget type selfns win self"} test doctools-idx-export-7.0 {config set, wrong#args} -setup { doctools::idx::export E } -body { E config set } -cleanup { E destroy -} -returnCodes error -result {wrong # args: should be "::doctools::config::Snit_methodset type selfns win self name ?value?"} +} -returnCodes error -result {wrong # args: should be "::struct::map::I::Snit_methodset type selfns win self name ?value?"} test doctools-idx-export-7.1 {config set, wrong#args} -setup { doctools::idx::export E } -body { E config set N V X } -cleanup { E destroy -} -returnCodes error -result {wrong # args: should be "::doctools::config::Snit_methodset type selfns win self name ?value?"} +} -returnCodes error -result {wrong # args: should be "::struct::map::I::Snit_methodset type selfns win self name ?value?"} # ------------------------------------------------------------------------- test doctools-idx-export-12.0 {config set, define single var} -setup { doctools::idx::export E Index: modules/doctools2idx/export_docidx.man ================================================================== --- modules/doctools2idx/export_docidx.man +++ modules/doctools2idx/export_docidx.man @@ -1,7 +1,7 @@ [comment {-*- tcl -*- --- doctools ---}] [vset PACKAGE docidx] [vset NAME docidx] [vset REQUIRE null] [vset CONFIG docidx] -[vset VERSION 0.1] +[vset VERSION 0.2.1] [include include/export/plugin.inc] Index: modules/doctools2idx/idx_export.man ================================================================== --- modules/doctools2idx/idx_export.man +++ modules/doctools2idx/idx_export.man @@ -1,6 +1,6 @@ -[vset VERSION 0.2] +[vset VERSION 0.2.1] [comment {-*- tcl -*- doctools manpage}] [manpage_begin doctools::idx::export n [vset VERSION]] [keywords conversion] [keywords docidx] [keywords documentation] @@ -18,17 +18,17 @@ [keywords reference] [keywords {tcler's wiki}] [keywords text] [keywords url] [keywords wiki] -[copyright {2009-2018 Andreas Kupries }] +[copyright {2009-2019 Andreas Kupries }] [moddesc {Documentation tools}] [titledesc {Exporting keyword indices}] [category {Documentation tools}] [require doctools::idx::export [opt [vset VERSION]]] [require Tcl 8.4] -[require doctools::config] +[require struct::map] [require doctools::idx::structure] [require snit] [require pluginmgr] [description] Index: modules/doctools2idx/idx_import.man ================================================================== --- modules/doctools2idx/idx_import.man +++ modules/doctools2idx/idx_import.man @@ -1,6 +1,6 @@ -[vset VERSION 0.2] +[vset VERSION 0.2.1] [comment {-*- tcl -*- doctools manpage}] [manpage_begin doctools::idx::import n [vset VERSION]] [keywords conversion] [keywords docidx] [keywords documentation] @@ -12,17 +12,17 @@ [keywords markup] [keywords parsing] [keywords plugin] [keywords reference] [keywords url] -[copyright {2009-2018 Andreas Kupries }] +[copyright {2009-2019 Andreas Kupries }] [moddesc {Documentation tools}] [titledesc {Importing keyword indices}] [category {Documentation tools}] [require doctools::idx::import [opt [vset VERSION]]] [require Tcl 8.4] -[require doctools::config] +[require struct::map] [require doctools::idx::structure] [require snit] [require pluginmgr] [description] Index: modules/doctools2idx/import.tcl ================================================================== --- modules/doctools2idx/import.tcl +++ modules/doctools2idx/import.tcl @@ -1,27 +1,25 @@ # import.tcl -- # # Importing indices into other formats. # -# Copyright (c) 2009-2018 Andreas Kupries +# Copyright (c) 2009-2019 Andreas Kupries # # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. -# -# RCS: @(#) $Id: import.tcl,v 1.2 2011/11/17 08:00:45 andreas_kupries Exp $ # Each object manages a set of plugins for the conversion of keyword # indices into some textual representation. I.e. this object manages # the conversion to specialized serializations of keyword indices. # ### ### ### ######### ######### ######### ## Requisites package require Tcl 8.4 -package require doctools::config +package require struct::map package require doctools::idx::structure -package require doctools::paths +package require fileutil::paths package require pluginmgr package require snit # ### ### ### ######### ######### ######### ## API @@ -33,12 +31,12 @@ # ### ### ### ######### ######### ######### ## Creation, destruction. constructor {} { - install myconfig using ::doctools::config ${selfns}::config - install myinclude using ::doctools::paths ${selfns}::include + install myconfig using ::struct::map ${selfns}::config + install myinclude using ::fileutil::paths ${selfns}::include return } destructor { $myconfig destroy @@ -185,7 +183,7 @@ } # ### ### ### ######### ######### ######### ## Ready -package provide doctools::idx::import 0.2 +package provide doctools::idx::import 0.2.1 return Index: modules/doctools2idx/import.test ================================================================== --- modules/doctools2idx/import.test +++ modules/doctools2idx/import.test @@ -1,13 +1,11 @@ # -*- tcl -*- # -- idx_import.test: # -- Tests for package "doctools::idx::import": Management of import plugins. # -# Copyright (c) 2009 by Andreas Kupries +# Copyright (c) 2009-2019 by Andreas Kupries # All rights reserved. -# -# RCS: @(#) $Id: import.test,v 1.1 2009/04/01 04:28:37 andreas_kupries Exp $ # ------------------------------------------------------------------------- source [file join \ [file dirname [file dirname [file join [pwd] [info script]]]] \ @@ -18,15 +16,14 @@ support { use struct/list.tcl struct::list use snit/snit.tcl snit use fileutil/fileutil.tcl fileutil + use fileutil/paths.tcl fileutil::paths use log/logger.tcl logger use pluginmgr/pluginmgr.tcl pluginmgr - - use doctools2base/config.tcl doctools::config - use doctools2base/paths.tcl doctools::paths + use struct/map.tcl struct::map source [tcllibPath doctools2base/tests/common] } testing { useLocalKeep import.tcl doctools::idx::import @@ -122,85 +119,88 @@ doctools::idx::import I } -body { I config names X } -cleanup { I destroy -} -returnCodes error -result {wrong # args: should be "::doctools::config::Snit_methodnames type selfns win self"} +} -returnCodes error -result {wrong # args: should be "::struct::map::I::Snit_methodnames type selfns win self"} test doctools-idx-import-6.0 {config get, wrong#args} -setup { doctools::idx::import I } -body { I config get X } -cleanup { I destroy -} -returnCodes error -result {wrong # args: should be "::doctools::config::Snit_methodget type selfns win self"} +} -returnCodes error -result {wrong # args: should be "::struct::map::I::Snit_methodget type selfns win self"} test doctools-idx-import-7.0 {config set, wrong#args} -setup { doctools::idx::import I } -body { I config set } -cleanup { I destroy -} -returnCodes error -result {wrong # args: should be "::doctools::config::Snit_methodset type selfns win self name ?value?"} +} -returnCodes error -result {wrong # args: should be "::struct::map::I::Snit_methodset type selfns win self name ?value?"} test doctools-idx-import-7.1 {config set, wrong#args} -setup { doctools::idx::import I } -body { I config set N V X } -cleanup { I destroy -} -returnCodes error -result {wrong # args: should be "::doctools::config::Snit_methodset type selfns win self name ?value?"} +} -returnCodes error -result {wrong # args: should be "::struct::map::I::Snit_methodset type selfns win self name ?value?"} # config unset - accepts any number of arguments. +# ------------------------------------------------------------------------- +## `include paths` component, provided via fileutil::paths, search path for includes + test doctools-idx-import-8.0 {include paths, wrong#args} -setup { doctools::idx::import I } -body { I include paths X } -cleanup { I destroy -} -returnCodes error -result {wrong # args: should be "::doctools::paths::Snit_methodpaths type selfns win self"} +} -returnCodes error -result {wrong # args: should be "::fileutil::paths::Snit_methodpaths type selfns win self"} test doctools-idx-import-9.0 {include clear, wrong#args} -setup { doctools::idx::import I } -body { I include clear X } -cleanup { I destroy -} -returnCodes error -result {wrong # args: should be "::doctools::paths::Snit_methodclear type selfns win self"} +} -returnCodes error -result {wrong # args: should be "::fileutil::paths::Snit_methodclear type selfns win self"} test doctools-idx-import-10.0 {include add, wrong#args} -setup { doctools::idx::import I } -body { I include add } -cleanup { I destroy -} -returnCodes error -result {wrong # args: should be "::doctools::paths::Snit_methodadd type selfns win self path"} +} -returnCodes error -result {wrong # args: should be "::fileutil::paths::Snit_methodadd type selfns win self path"} test doctools-idx-import-10.1 {include add, wrong#args} -setup { doctools::idx::import I } -body { I include add P X } -cleanup { I destroy -} -returnCodes error -result {wrong # args: should be "::doctools::paths::Snit_methodadd type selfns win self path"} +} -returnCodes error -result {wrong # args: should be "::fileutil::paths::Snit_methodadd type selfns win self path"} test doctools-idx-import-11.0 {include remove, wrong#args} -setup { doctools::idx::import I } -body { I include remove } -cleanup { I destroy -} -returnCodes error -result {wrong # args: should be "::doctools::paths::Snit_methodremove type selfns win self path"} +} -returnCodes error -result {wrong # args: should be "::fileutil::paths::Snit_methodremove type selfns win self path"} test doctools-idx-import-11.1 {include remove, wrong#args} -setup { doctools::idx::import I } -body { I include remove P X } -cleanup { I destroy -} -returnCodes error -result {wrong # args: should be "::doctools::paths::Snit_methodremove type selfns win self path"} +} -returnCodes error -result {wrong # args: should be "::fileutil::paths::Snit_methodremove type selfns win self path"} # ------------------------------------------------------------------------- test doctools-idx-import-12.0 {config set, define single var} -setup { doctools::idx::import I Index: modules/doctools2idx/include/dependencies.inc ================================================================== --- modules/doctools2idx/include/dependencies.inc +++ modules/doctools2idx/include/dependencies.inc @@ -6,11 +6,11 @@ ~~ | ~~ doctools::idx::export ~~~~~~~~~~~~~~~~~ | ~~~~~~~~~~~~~ doctools::idx::import | | | +---------------+-------------------------+ | +------------------+---------------+-----------------------+---------------+ | | | | | | | | | -doctools::config = | | | = doctools::include doctools::config doctools::paths +struct::map = | | | = doctools::include struct::map fileutil::paths | | | | | doctools::idx::export::<*> | | | doctools::idx::import::<*> docidx | | | docidx, json json | | | | \\ html | | | doctools::idx::parse \\ Index: modules/doctools2idx/include/export/plugin.inc ================================================================== --- modules/doctools2idx/include/export/plugin.inc +++ modules/doctools2idx/include/export/plugin.inc @@ -1,8 +1,8 @@ [comment {-*- tcl -*- --- !doctools ---}] [manpage_begin doctools::idx::export::[vset PACKAGE] n [vset VERSION]] -[copyright {2009 Andreas Kupries }] +[copyright {2009-2019 Andreas Kupries }] [moddesc {Documentation tools}] [titledesc "[vset NAME] export plugin"] [category {Text formatter plugin}] [require Tcl 8.4] [require doctools::idx::export::[vset PACKAGE] [opt [vset VERSION]]] Index: modules/doctools2idx/include/import/plugin.inc ================================================================== --- modules/doctools2idx/include/import/plugin.inc +++ modules/doctools2idx/include/import/plugin.inc @@ -1,13 +1,14 @@ [comment {-*- tcl -*- --- !doctools ---}] -[manpage_begin doctools::idx::import::[vset PACKAGE] n 0.1] -[copyright {2009 Andreas Kupries }] +[vset VERSION 0.2.1] +[manpage_begin doctools::idx::import::[vset PACKAGE] n [vset VERSION]] +[copyright {2009-2019 Andreas Kupries }] [moddesc {Documentation tools}] [titledesc "[vset NAME] import plugin"] [category {Text formatter plugin}] -[require Tcl 8.4] -[require doctools::idx::import::[vset PACKAGE] [opt 0.1]] +[require Tcl 8.5] +[require doctools::idx::import::[vset PACKAGE] [opt [vset VERSION]]] [include format/[vset REQUIRE].inc] [keywords doctools index deserialization import [vset NAME]] [description] This package implements the doctools keyword index import plugin for Index: modules/doctools2idx/pkgIndex.tcl ================================================================== --- modules/doctools2idx/pkgIndex.tcl +++ modules/doctools2idx/pkgIndex.tcl @@ -7,14 +7,12 @@ # - Export and import management # - Export and import plugins # - Parser for docidx markup, and handling serializations # - Message catalogs for the parser -package ifneeded doctools::idx 2 [list source [file join $dir container.tcl]] - -package ifneeded doctools::idx::export 0.2 [list source [file join $dir export.tcl]] -package ifneeded doctools::idx::import 0.2 [list source [file join $dir import.tcl]] +package ifneeded doctools::idx 2 [list source [file join $dir container.tcl]] +package ifneeded doctools::idx::export 0.2.1 [list source [file join $dir export.tcl]] package ifneeded doctools::idx::export::docidx 0.1 [list source [file join $dir export_docidx.tcl]] package ifneeded doctools::idx::export::html 0.2 [list source [file join $dir export_html.tcl]] package ifneeded doctools::idx::export::json 0.1 [list source [file join $dir export_json.tcl]] package ifneeded doctools::idx::export::nroff 0.3 [list source [file join $dir export_nroff.tcl]] @@ -29,5 +27,9 @@ package ifneeded doctools::msgcat::idx::c 0.1 [list source [file join $dir msgcat_c.tcl]] package ifneeded doctools::msgcat::idx::de 0.1 [list source [file join $dir msgcat_de.tcl]] package ifneeded doctools::msgcat::idx::en 0.1 [list source [file join $dir msgcat_en.tcl]] package ifneeded doctools::msgcat::idx::fr 0.1 [list source [file join $dir msgcat_fr.tcl]] + +if {![package vsatisfies [package provide Tcl] 8.5]} {return} + +package ifneeded doctools::idx::import 0.2.1 [list source [file join $dir import.tcl]] Index: modules/doctools2toc/container.test ================================================================== --- modules/doctools2toc/container.test +++ modules/doctools2toc/container.test @@ -1,12 +1,10 @@ # -*- tcl -*- # toc.test: Tests for the doctools::toc package. ToC management. # -# Copyright (c) 2009 by Andreas Kupries +# Copyright (c) 2009-2019 by Andreas Kupries # All rights reserved. -# -# RCS: @(#) $Id: container.test,v 1.3 2009/11/15 05:50:03 andreas_kupries Exp $ # ------------------------------------------------------------------------- source [file join \ [file dirname [file dirname [file join [pwd] [info script]]]] \ @@ -20,15 +18,15 @@ TestAccelInit struct::tree use struct/list.tcl struct::list use snit/snit.tcl snit use fileutil/fileutil.tcl fileutil + use fileutil/paths.tcl fileutil::paths use log/logger.tcl logger use pluginmgr/pluginmgr.tcl pluginmgr + use struct/map.tcl struct::map - use doctools2base/config.tcl doctools::config - use doctools2base/paths.tcl doctools::paths useLocal export.tcl doctools::toc::export useLocal import.tcl doctools::toc::import use doctools2base/nroff_manmacros.tcl doctools::nroff::man_macros source [tcllibPath doctools2base/tests/common] Index: modules/doctools2toc/export.tcl ================================================================== --- modules/doctools2toc/export.tcl +++ modules/doctools2toc/export.tcl @@ -1,25 +1,23 @@ # export.tcl -- # # Exporting indices into other formats. # -# Copyright (c) 2009-2018 Andreas Kupries +# Copyright (c) 2009-2019 Andreas Kupries # # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. -# -# RCS: @(#) $Id: export.tcl,v 1.2 2009/11/15 05:50:03 andreas_kupries Exp $ # Each object manages a set of plugins for the conversion of keyword # indices into some textual representation. I.e. this object manages # the conversion to specialized serializations of keyword indices. # ### ### ### ######### ######### ######### ## Requisites package require Tcl 8.4 -package require doctools::config +package require struct::map package require doctools::toc::structure package require pluginmgr package require snit # ### ### ### ######### ######### ######### @@ -32,11 +30,11 @@ # ### ### ### ######### ######### ######### ## Creation, destruction. constructor {} { - install myconfig using ::doctools::config ${selfns}::config + install myconfig using ::struct::map ${selfns}::config return } destructor { $myconfig destroy @@ -119,7 +117,7 @@ } # ### ### ### ######### ######### ######### ## Ready -package provide doctools::toc::export 0.2 +package provide doctools::toc::export 0.2.1 return Index: modules/doctools2toc/export.test ================================================================== --- modules/doctools2toc/export.test +++ modules/doctools2toc/export.test @@ -1,12 +1,10 @@ # -*- tcl -*- # toc.test: tests for the doctools::toc package. # -# Copyright (c) 2009 by Andreas Kupries +# Copyright (c) 2009-2019 by Andreas Kupries # All rights reserved. -# -# RCS: @(#) $Id: export.test,v 1.2 2009/04/29 02:10:56 andreas_kupries Exp $ # ------------------------------------------------------------------------- source [file join \ [file dirname [file dirname [file join [pwd] [info script]]]] \ @@ -20,12 +18,12 @@ use struct/list.tcl struct::list use snit/snit.tcl snit use log/logger.tcl logger use pluginmgr/pluginmgr.tcl pluginmgr + use struct/map.tcl struct::map - use doctools2base/config.tcl doctools::config useLocal structure.tcl doctools::toc::structure use doctools2base/nroff_manmacros.tcl doctools::nroff::man_macros source [tcllibPath doctools2base/tests/common] } @@ -75,35 +73,35 @@ doctools::toc::export E } -body { E config names X } -cleanup { E destroy -} -returnCodes error -result {wrong # args: should be "::doctools::config::Snit_methodnames type selfns win self"} +} -returnCodes error -result {wrong # args: should be "::struct::map::I::Snit_methodnames type selfns win self"} test doctools-toc-export-6.0 {config get, wrong#args} -setup { doctools::toc::export E } -body { E config get X } -cleanup { E destroy -} -returnCodes error -result {wrong # args: should be "::doctools::config::Snit_methodget type selfns win self"} +} -returnCodes error -result {wrong # args: should be "::struct::map::I::Snit_methodget type selfns win self"} test doctools-toc-export-7.0 {config set, wrong#args} -setup { doctools::toc::export E } -body { E config set } -cleanup { E destroy -} -returnCodes error -result {wrong # args: should be "::doctools::config::Snit_methodset type selfns win self name ?value?"} +} -returnCodes error -result {wrong # args: should be "::struct::map::I::Snit_methodset type selfns win self name ?value?"} test doctools-toc-export-7.1 {config set, wrong#args} -setup { doctools::toc::export E } -body { E config set N V X } -cleanup { E destroy -} -returnCodes error -result {wrong # args: should be "::doctools::config::Snit_methodset type selfns win self name ?value?"} +} -returnCodes error -result {wrong # args: should be "::struct::map::I::Snit_methodset type selfns win self name ?value?"} # ------------------------------------------------------------------------- test doctools-toc-export-12.0 {config set, define single var} -setup { doctools::toc::export E Index: modules/doctools2toc/export_doctoc.man ================================================================== --- modules/doctools2toc/export_doctoc.man +++ modules/doctools2toc/export_doctoc.man @@ -1,7 +1,7 @@ [comment {-*- tcl -*- --- doctools ---}] [vset PACKAGE doctoc] [vset NAME doctoc] [vset REQUIRE null] [vset CONFIG doctoc] -[vset VERSION 0.1] +[vset VERSION 0.2.1] [include include/export/plugin.inc] Index: modules/doctools2toc/import.tcl ================================================================== --- modules/doctools2toc/import.tcl +++ modules/doctools2toc/import.tcl @@ -1,27 +1,25 @@ # import.tcl -- # # Importing indices into other formats. # -# Copyright (c) 2009-2018 Andreas Kupries +# Copyright (c) 2009-2019 Andreas Kupries # # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. -# -# RCS: @(#) $Id: import.tcl,v 1.3 2011/11/17 08:00:45 andreas_kupries Exp $ # Each object manages a set of plugins for the conversion of keyword # indices into some textual representation. I.e. this object manages # the conversion to specialized serializations of keyword indices. # ### ### ### ######### ######### ######### ## Requisites package require Tcl 8.4 -package require doctools::config +package require struct::map package require doctools::toc::structure -package require doctools::paths +package require fileutil::paths package require pluginmgr package require snit # ### ### ### ######### ######### ######### ## API @@ -33,12 +31,12 @@ # ### ### ### ######### ######### ######### ## Creation, destruction. constructor {} { - install myconfig using ::doctools::config ${selfns}::config - install myinclude using ::doctools::paths ${selfns}::include + install myconfig using ::struct::map ${selfns}::config + install myinclude using ::fileutil::paths ${selfns}::include return } destructor { $myconfig destroy @@ -185,7 +183,7 @@ } # ### ### ### ######### ######### ######### ## Ready -package provide doctools::toc::import 0.2 +package provide doctools::toc::import 0.2.1 return Index: modules/doctools2toc/import.test ================================================================== --- modules/doctools2toc/import.test +++ modules/doctools2toc/import.test @@ -1,13 +1,11 @@ # -*- tcl -*- # -- toc_import.test: # -- Tests for package "doctools::toc::import": Management of import plugins. # -# Copyright (c) 2009 by Andreas Kupries +# Copyright (c) 2009-2019 by Andreas Kupries # All rights reserved. -# -# RCS: @(#) $Id: import.test,v 1.1 2009/04/18 21:14:18 andreas_kupries Exp $ # ------------------------------------------------------------------------- source [file join \ [file dirname [file dirname [file join [pwd] [info script]]]] \ @@ -18,15 +16,14 @@ support { use struct/list.tcl struct::list use snit/snit.tcl snit use fileutil/fileutil.tcl fileutil + use fileutil/paths.tcl fileutil::paths use log/logger.tcl logger use pluginmgr/pluginmgr.tcl pluginmgr - - use doctools2base/config.tcl doctools::config - use doctools2base/paths.tcl doctools::paths + use struct/map.tcl struct::map source [tcllibPath doctools2base/tests/common] } testing { useLocalKeep import.tcl doctools::toc::import @@ -122,85 +119,88 @@ doctools::toc::import I } -body { I config names X } -cleanup { I destroy -} -returnCodes error -result {wrong # args: should be "::doctools::config::Snit_methodnames type selfns win self"} +} -returnCodes error -result {wrong # args: should be "::struct::map::I::Snit_methodnames type selfns win self"} test doctools-toc-import-6.0 {config get, wrong#args} -setup { doctools::toc::import I } -body { I config get X } -cleanup { I destroy -} -returnCodes error -result {wrong # args: should be "::doctools::config::Snit_methodget type selfns win self"} +} -returnCodes error -result {wrong # args: should be "::struct::map::I::Snit_methodget type selfns win self"} test doctools-toc-import-7.0 {config set, wrong#args} -setup { doctools::toc::import I } -body { I config set } -cleanup { I destroy -} -returnCodes error -result {wrong # args: should be "::doctools::config::Snit_methodset type selfns win self name ?value?"} +} -returnCodes error -result {wrong # args: should be "::struct::map::I::Snit_methodset type selfns win self name ?value?"} test doctools-toc-import-7.1 {config set, wrong#args} -setup { doctools::toc::import I } -body { I config set N V X } -cleanup { I destroy -} -returnCodes error -result {wrong # args: should be "::doctools::config::Snit_methodset type selfns win self name ?value?"} +} -returnCodes error -result {wrong # args: should be "::struct::map::I::Snit_methodset type selfns win self name ?value?"} # config unset - accepts any number of arguments. +# ------------------------------------------------------------------------- +## `include paths` component, provided via fileutil::paths, search path for includes + test doctools-toc-import-8.0 {include paths, wrong#args} -setup { doctools::toc::import I } -body { I include paths X } -cleanup { I destroy -} -returnCodes error -result {wrong # args: should be "::doctools::paths::Snit_methodpaths type selfns win self"} +} -returnCodes error -result {wrong # args: should be "::fileutil::paths::Snit_methodpaths type selfns win self"} test doctools-toc-import-9.0 {include clear, wrong#args} -setup { doctools::toc::import I } -body { I include clear X } -cleanup { I destroy -} -returnCodes error -result {wrong # args: should be "::doctools::paths::Snit_methodclear type selfns win self"} +} -returnCodes error -result {wrong # args: should be "::fileutil::paths::Snit_methodclear type selfns win self"} test doctools-toc-import-10.0 {include add, wrong#args} -setup { doctools::toc::import I } -body { I include add } -cleanup { I destroy -} -returnCodes error -result {wrong # args: should be "::doctools::paths::Snit_methodadd type selfns win self path"} +} -returnCodes error -result {wrong # args: should be "::fileutil::paths::Snit_methodadd type selfns win self path"} test doctools-toc-import-10.1 {include add, wrong#args} -setup { doctools::toc::import I } -body { I include add P X } -cleanup { I destroy -} -returnCodes error -result {wrong # args: should be "::doctools::paths::Snit_methodadd type selfns win self path"} +} -returnCodes error -result {wrong # args: should be "::fileutil::paths::Snit_methodadd type selfns win self path"} test doctools-toc-import-11.0 {include remove, wrong#args} -setup { doctools::toc::import I } -body { I include remove } -cleanup { I destroy -} -returnCodes error -result {wrong # args: should be "::doctools::paths::Snit_methodremove type selfns win self path"} +} -returnCodes error -result {wrong # args: should be "::fileutil::paths::Snit_methodremove type selfns win self path"} test doctools-toc-import-11.1 {include remove, wrong#args} -setup { doctools::toc::import I } -body { I include remove P X } -cleanup { I destroy -} -returnCodes error -result {wrong # args: should be "::doctools::paths::Snit_methodremove type selfns win self path"} +} -returnCodes error -result {wrong # args: should be "::fileutil::paths::Snit_methodremove type selfns win self path"} # ------------------------------------------------------------------------- test doctools-toc-import-12.0 {config set, define single var} -setup { doctools::toc::import I Index: modules/doctools2toc/include/dependencies.inc ================================================================== --- modules/doctools2toc/include/dependencies.inc +++ modules/doctools2toc/include/dependencies.inc @@ -6,11 +6,11 @@ ~~ | ~~ doctools::toc::export ~~~~~~~~~~~~~~~~~ | ~~~~~~~~~~~~~ doctools::toc::import | | | +---------------+-------------------------+ | +------------------+---------------+-----------------------+---------------+ | | | | | | | | | -doctools::config = | | | = doctools::include doctools::config doctools::paths +struct:map = | | | = doctools::include struct::map fileutil::paths | | | | | doctools::toc::export::<*> | | | doctools::toc::import::<*> doctoc | | | doctoc, json json | | | | \\ html | | | doctools::toc::parse \\ Index: modules/doctools2toc/include/export/plugin.inc ================================================================== --- modules/doctools2toc/include/export/plugin.inc +++ modules/doctools2toc/include/export/plugin.inc @@ -1,8 +1,8 @@ [comment {-*- tcl -*- --- !doctools ---}] [manpage_begin doctools::toc::export::[vset PACKAGE] n [vset VERSION]] -[copyright {2009 Andreas Kupries }] +[copyright {2009-2019 Andreas Kupries }] [moddesc {Documentation tools}] [titledesc "[vset NAME] export plugin"] [category {Text formatter plugin}] [require Tcl 8.4] [require doctools::toc::export::[vset PACKAGE] [opt [vset VERSION]]] Index: modules/doctools2toc/include/import/plugin.inc ================================================================== --- modules/doctools2toc/include/import/plugin.inc +++ modules/doctools2toc/include/import/plugin.inc @@ -1,13 +1,14 @@ [comment {-*- tcl -*- --- !doctools ---}] -[manpage_begin doctools::toc::import::[vset PACKAGE] n 0.1] -[copyright {2009 Andreas Kupries }] +[vset VERSION 0.2.1] +[manpage_begin doctools::toc::import::[vset PACKAGE] n [vset VERSION]] +[copyright {2009-2019 Andreas Kupries }] [moddesc {Documentation tools}] [titledesc "[vset NAME] import plugin"] [category {Text formatter plugin}] -[require Tcl 8.4] -[require doctools::toc::import::[vset PACKAGE] [opt 0.1]] +[require Tcl 8.5] +[require doctools::toc::import::[vset PACKAGE] [opt [vset VERSION]]] [include format/[vset REQUIRE].inc] [keywords doctools toc {table of contents} deserialization import [vset NAME]] [description] This package implements the doctools table of contents import plugin Index: modules/doctools2toc/pkgIndex.tcl ================================================================== --- modules/doctools2toc/pkgIndex.tcl +++ modules/doctools2toc/pkgIndex.tcl @@ -7,14 +7,12 @@ # - Export and import management # - Export and import plugins # - Parser for doctoc markup, and handling serializations # - Message catalogs for the parser -package ifneeded doctools::toc 2 [list source [file join $dir container.tcl]] - -package ifneeded doctools::toc::export 0.2 [list source [file join $dir export.tcl]] -package ifneeded doctools::toc::import 0.2 [list source [file join $dir import.tcl]] +package ifneeded doctools::toc 2 [list source [file join $dir container.tcl]] +package ifneeded doctools::toc::export 0.2.1 [list source [file join $dir export.tcl]] package ifneeded doctools::toc::export::doctoc 0.1 [list source [file join $dir export_doctoc.tcl]] package ifneeded doctools::toc::export::html 0.1 [list source [file join $dir export_html.tcl]] package ifneeded doctools::toc::export::json 0.1 [list source [file join $dir export_json.tcl]] package ifneeded doctools::toc::export::nroff 0.2 [list source [file join $dir export_nroff.tcl]] @@ -29,5 +27,9 @@ package ifneeded doctools::msgcat::toc::c 0.1 [list source [file join $dir msgcat_c.tcl]] package ifneeded doctools::msgcat::toc::de 0.1 [list source [file join $dir msgcat_de.tcl]] package ifneeded doctools::msgcat::toc::en 0.1 [list source [file join $dir msgcat_en.tcl]] package ifneeded doctools::msgcat::toc::fr 0.1 [list source [file join $dir msgcat_fr.tcl]] + +if {![package vsatisfies [package provide Tcl] 8.5]} {return} + +package ifneeded doctools::toc::import 0.2.1 [list source [file join $dir import.tcl]] Index: modules/doctools2toc/toc_export.man ================================================================== --- modules/doctools2toc/toc_export.man +++ modules/doctools2toc/toc_export.man @@ -1,6 +1,6 @@ -[vset VERSION 0.2] +[vset VERSION 0.2.1] [comment {-*- tcl -*- doctools manpage}] [manpage_begin doctools::toc::export n [vset VERSION]] [keywords conversion] [keywords doctoc] [keywords documentation] @@ -18,17 +18,17 @@ [keywords {table of contents}] [keywords {tcler's wiki}] [keywords text] [keywords url] [keywords wiki] -[copyright {2009-2018 Andreas Kupries }] +[copyright {2009-2019 Andreas Kupries }] [moddesc {Documentation tools}] [titledesc {Exporting tables of contents}] [category {Documentation tools}] [require doctools::toc::export [opt [vset VERSION]]] [require Tcl 8.4] -[require doctools::config] +[require struct::map] [require doctools::toc::structure] [require snit] [require pluginmgr] [description] Index: modules/doctools2toc/toc_import.man ================================================================== --- modules/doctools2toc/toc_import.man +++ modules/doctools2toc/toc_import.man @@ -1,6 +1,6 @@ -[vset VERSION 0.2] +[vset VERSION 0.2.1] [comment {-*- tcl -*- doctools manpage}] [manpage_begin doctools::toc::import n [vset VERSION]] [keywords conversion] [keywords doctoc] [keywords documentation] @@ -12,17 +12,17 @@ [keywords plugin] [keywords reference] [keywords table] [keywords {table of contents}] [keywords url] -[copyright {2009-2018 Andreas Kupries }] +[copyright {2009-2019 Andreas Kupries }] [moddesc {Documentation tools}] [titledesc {Importing keyword indices}] [category {Documentation tools}] [require doctools::toc::import [opt [vset VERSION]]] [require Tcl 8.4] -[require doctools::config] +[require struct::map] [require doctools::toc::structure] [require snit] [require pluginmgr] [description] ADDED modules/fileutil/paths.man Index: modules/fileutil/paths.man ================================================================== --- /dev/null +++ modules/fileutil/paths.man @@ -0,0 +1,76 @@ +[comment {-*- text -*- doctools manpage}] +[vset VERSION 1] +[manpage_begin fileutil::paths n [vset VERSION]] +[titledesc {Manage search path pools}] +[require Tcl 8.4] +[require fileutil::paths [opt [vset VERSION]]] +[description] + +Provides a snit class whose instances manage a pool of (search) paths. + +[section API] + +The main command provides construction of search path pools: + +[list_begin definitions] + +[call [cmd ::fileutil::paths] [arg poolName]] + +Creates a new, empty pool of search paths with an associated global +Tcl command whose name is [arg poolName]. + +It may be used to invoke various operations on the pool. + +It has the following general form: + +[list_begin definitions] +[call [cmd poolName] [method method] [opt [arg "arg arg ..."]]] +[method method] and [arg arg]uments determine the exact behavior of +the command. +[list_end][comment --instance-command--] + +If [arg poolName] is specified as [const %AUTO%] a unique name will be +generated by the package itself. + +The result of the command is the fully-qualified name of the instance +command. + +[list_end][comment --class-command--] + +[para] + +The following commands are possible for pool objects: + +[list_begin definitions] + +[call [arg poolName] [method add] [arg path]] + +Adds the [arg path] to the pool. + +Nothing is done if the [arg path] is already known to the pool. + +The result of the command is the empty string. + +[call [arg poolName] [method clear]] + +Clears the entire pool. In other words, removes all paths from it. + +The result of the command is the empty string. + +[call [arg poolName] [method paths]] + +Returns the list of all paths known to the pool, in the order they +were added. + +[call [arg poolName] [method remove] [arg path]] + +Removes the [arg path] from the pool, if it is known to the pool. + +Unknown paths are ignored without error. + +The result of the command is the empty string. + +[list_end] + +[include ../doctools2base/include/feedback.inc] +[manpage_end] ADDED modules/fileutil/paths.tcl Index: modules/fileutil/paths.tcl ================================================================== --- /dev/null +++ modules/fileutil/paths.tcl @@ -0,0 +1,74 @@ +# paths.tcl -- +# +# Manage lists of search paths. +# +# Copyright (c) 2009-2019 Andreas Kupries +# +# See the file "license.terms" for information on usage and redistribution +# of this file, and for a DISCLAIMER OF ALL WARRANTIES. + +# Each object instance manages a list of paths. + +# ### ### ### ######### ######### ######### +## Requisites + +package require Tcl 8.4 +package require snit + +# ### ### ### ######### ######### ######### +## API + +snit::type ::fileutil::paths { + + # ### ### ### ######### ######### ######### + ## Options :: None + + # ### ### ### ######### ######### ######### + ## Creation, destruction + + # Default constructor. + # Default destructor. + + # ### ### ### ######### ######### ######### + ## Methods :: Querying and manipulating the list of paths. + + method paths {} { + return $mypaths + } + + method add {path} { + set pos [lsearch $mypaths $path] + if {$pos >= 0 } return + lappend mypaths $path + return + } + + method remove {path} { + set pos [lsearch $mypaths $path] + if {$pos < 0} return + set mypaths [lreplace $mypaths $pos $pos] + return + } + + method clear {} { + set mypaths {} + return + } + + # ### ### ### ######### ######### ######### + ## Internal methods :: None + + # ### ### ### ######### ######### ######### + ## State :: List of paths. + + variable mypaths {} + + ## + # ### ### ### ######### ######### ######### +} + +# ### ### ### ######### ######### ######### +## Ready + +package provide fileutil::paths 1 +return ADDED modules/fileutil/paths.test Index: modules/fileutil/paths.test ================================================================== --- /dev/null +++ modules/fileutil/paths.test @@ -0,0 +1,151 @@ +# -*- tcl -*- +# paths.test: Testsuite for package fileutil::paths +# +# Copyright (c) 2019 by Andreas Kupries +# All rights reserved. + +# ------------------------------------------------------------------------- + +source [file join \ + [file dirname [file dirname [file join [pwd] [info script]]]] \ + devtools testutilities.tcl] + +testsNeedTcl 8.4 +testsNeedTcltest 2.0 + +support { + use snit/snit.tcl snit +} +testing { + useLocal paths.tcl fileutil::paths +} + +# --------------------------------------------------------------------- +# [] constructor +# [] destructor +# [] paths +# [] add +# [] remove +# [] clear + +#---------------------------------------------------------------------- +## Constructor, destructor + +test fileutil-paths-1.0 {constructor, wrong args, too many} -body { + fileutil::paths P X +} -returnCodes error -result {Error in constructor: wrong # args: should be "::fileutil::paths::Snit_constructor type selfns win self"} + +test fileutil-paths-1.1 {instance, bogus method} -setup { + fileutil::paths P +} -cleanup { + P destroy +} -body { + P bogus +} -returnCodes error -result {"::P bogus" is not defined} + +#---------------------------------------------------------------------- +## paths + +test fileutil-paths-2.0 {paths, wrong args, too many} -setup { + fileutil::paths P +} -cleanup { + P destroy +} -body { + P paths X +} -returnCodes error -result {wrong # args: should be "::fileutil::paths::Snit_methodpaths type selfns win self"} + +test fileutil-paths-2.1 {paths, base state, none} -setup { + fileutil::paths P +} -cleanup { + P destroy +} -body { + P paths +} -result {} + +#---------------------------------------------------------------------- +## add + +test fileutil-paths-3.0 {add, wrong args, not enough} -setup { + fileutil::paths P +} -cleanup { + P destroy +} -body { + P add +} -returnCodes error -result {wrong # args: should be "::fileutil::paths::Snit_methodadd type selfns win self path"} + +test fileutil-paths-3.1 {add, wrong args, too many} -setup { + fileutil::paths P +} -cleanup { + P destroy +} -body { + P add F X +} -returnCodes error -result {wrong # args: should be "::fileutil::paths::Snit_methodadd type selfns win self path"} + +test fileutil-paths-3.2 {add, state change, result} -setup { + fileutil::paths P +} -cleanup { + P destroy +} -body { + list [P add F] [P paths] +} -result {{} F} + +#---------------------------------------------------------------------- +## remove + +test fileutil-paths-4.0 {remove, wrong args, not enough} -setup { + fileutil::paths P +} -cleanup { + P destroy +} -body { + P remove +} -returnCodes error -result {wrong # args: should be "::fileutil::paths::Snit_methodremove type selfns win self path"} + +test fileutil-paths-4.1 {remove, wrong args, too many} -setup { + fileutil::paths P +} -cleanup { + P destroy +} -body { + P remove F X +} -returnCodes error -result {wrong # args: should be "::fileutil::paths::Snit_methodremove type selfns win self path"} + +test fileutil-paths-4.2 {remove, known path, state change, result} -setup { + fileutil::paths P + P add F +} -cleanup { + P destroy +} -body { + list [P remove F] [P paths] +} -result {{} {}} + +test fileutil-paths-4.3 {remove, missing path, no state change, result} -setup { + fileutil::paths P + P add Z +} -cleanup { + P destroy +} -body { + list [P remove F] [P paths] +} -result {{} Z} + +#---------------------------------------------------------------------- +## clear + +test fileutil-paths-5.0 {clear, wrong args, too many} -setup { + fileutil::paths P +} -cleanup { + P destroy +} -body { + P clear X +} -returnCodes error -result {wrong # args: should be "::fileutil::paths::Snit_methodclear type selfns win self"} + +test fileutil-paths-5.1 {clear, return to base state} -setup { + fileutil::paths P + P add F +} -cleanup { + P destroy +} -body { + list [P clear] [P paths] +} -result {{} {}} + +#---------------------------------------------------------------------- +testsuiteCleanup +return Index: modules/fileutil/pkgIndex.tcl ================================================================== --- modules/fileutil/pkgIndex.tcl +++ modules/fileutil/pkgIndex.tcl @@ -6,5 +6,10 @@ if {![package vsatisfies [package provide Tcl] 8.4]} {return} package ifneeded fileutil::multi 0.1 [list source [file join $dir multi.tcl]] package ifneeded fileutil::multi::op 0.5.3 [list source [file join $dir multiop.tcl]] package ifneeded fileutil::decode 0.2.1 [list source [file join $dir decode.tcl]] +package ifneeded fileutil::paths 1 [list source [file join $dir paths.tcl]] + +if {![package vsatisfies [package provide Tcl] 8.5]} return + +if {![package vsatisfies [package provide Tcl] 8.6]} return DELETED modules/pt/configuration.tcl Index: modules/pt/configuration.tcl ================================================================== --- modules/pt/configuration.tcl +++ /dev/null @@ -1,81 +0,0 @@ -# configuration.tcl -- -# -# Generic configuration management, for use by import and export -# managers. -# -# Copyright (c) 2009 Andreas Kupries -# -# See the file "license.terms" for information on usage and redistribution -# of this file, and for a DISCLAIMER OF ALL WARRANTIES. -# -# RCS: @(#) $Id: configuration.tcl,v 1.1 2010/03/26 05:07:24 andreas_kupries Exp $ - -# Each object manages a set of configuration variables. - -# ### ### ### ######### ######### ######### -## Requisites - -package require Tcl 8.5 -package require snit - -# ### ### ### ######### ######### ######### -## API - -snit::type ::configuration { - - # ### ### ### ######### ######### ######### - ## Options :: None - - # ### ### ### ######### ######### ######### - ## Creating, destruction - - # Default constructor. - # Default destructor. - - # ### ### ### ######### ######### ######### - ## Public methods. Reading and writing the configuration. - - method names {} { - return [array names myconfiguration] - } - - method get {} { - return [array get myconfiguration] - } - - method set {name {value {}}} { - # 7 instead of 3 in the condition below, because of the 4 - # implicit arguments snit is providing to each method. - if {[llength [info level 0]] == 7} { - set myconfiguration($name) $value - } elseif {![info exists myconfiguration($name)]} { - return -code error "can't read \"$name\": no such variable" - } - return $myconfiguration($name) - } - - method unset {args} { - if {![llength $args]} { lappend args * } - foreach pattern $args { - array unset myconfiguration $pattern - } - return - } - - # ### ### ### ######### ######### ######### - ## Internal methods :: None. - - # ### ### ### ######### ######### ######### - ## State :: Configuration data, Tcl array - - variable myconfiguration -array {} - - ## - # ### ### ### ######### ######### ######### -} - -# ### ### ### ######### ######### ######### -## Ready - -package provide configuration 1 -return DELETED modules/pt/paths.tcl Index: modules/pt/paths.tcl ================================================================== --- modules/pt/paths.tcl +++ /dev/null @@ -1,75 +0,0 @@ -# paths.tcl -- -# -# Generic path list management, for use by import management. -# -# Copyright (c) 2009 Andreas Kupries -# -# See the file "license.terms" for information on usage and redistribution -# of this file, and for a DISCLAIMER OF ALL WARRANTIES. -# -# RCS: @(#) $Id: paths.tcl,v 1.1 2010/03/26 05:07:24 andreas_kupries Exp $ - -# Each object manages a list of paths. - -# ### ### ### ######### ######### ######### -## Requisites - -package require Tcl 8.5 -package require snit - -# ### ### ### ######### ######### ######### -## API - -snit::type ::paths { - - # ### ### ### ######### ######### ######### - ## Options :: None - - # ### ### ### ######### ######### ######### - ## Creation, destruction - - # Default constructor. - # Default destructor. - - # ### ### ### ######### ######### ######### - ## Methods :: Querying and manipulating the list of paths. - - method paths {} { - return $mypaths - } - - method add {path} { - if {$path in $mypaths} return - lappend mypaths $path - return - } - - method remove {path} { - set pos [lsearch $mypaths $path] - if {$pos < 0} return - set mypaths [lreplace $mypaths $pos $pos] - return - } - - method clear {} { - set mypaths {} - return - } - - # ### ### ### ######### ######### ######### - ## Internal methods :: None - - # ### ### ### ######### ######### ######### - ## State :: List of paths. - - variable mypaths {} - - ## - # ### ### ### ######### ######### ######### -} - -# ### ### ### ######### ######### ######### -## Ready - -package provide paths 1 -return Index: modules/pt/pkgIndex.tcl ================================================================== --- modules/pt/pkgIndex.tcl +++ modules/pt/pkgIndex.tcl @@ -1,11 +1,9 @@ if {![package vsatisfies [package provide Tcl] 8.5]} return # General utilities. package ifneeded char 1.0.1 [list source [file join $dir char.tcl]] -package ifneeded configuration 1 [list source [file join $dir configuration.tcl]] -package ifneeded paths 1 [list source [file join $dir paths.tcl]] package ifneeded text::write 1 [list source [file join $dir text_write.tcl]] # AST support package ifneeded pt::ast 1.1 [list source [file join $dir pt_astree.tcl]] @@ -24,12 +22,12 @@ package ifneeded pt::peg::op 1.1.0 [list source [file join $dir pt_peg_op.tcl]] package ifneeded pt::parse::peg 1.0.1 [list source [file join $dir pt_parse_peg.tcl]] # Export/import managers. Assumes an untrusted environment. -package ifneeded pt::peg::export 1 [list source [file join $dir pt_peg_export.tcl]] -package ifneeded pt::peg::import 1 [list source [file join $dir pt_peg_import.tcl]] +package ifneeded pt::peg::export 1.0.1 [list source [file join $dir pt_peg_export.tcl]] +package ifneeded pt::peg::import 1.0.1 [list source [file join $dir pt_peg_import.tcl]] # Export plugins, connecting manager to the core conversion packages. package ifneeded pt::peg::export::container 1 [list source [file join $dir pt_peg_export_container.tcl]] package ifneeded pt::peg::export::json 1 [list source [file join $dir pt_peg_export_json.tcl]] package ifneeded pt::peg::export::peg 1 [list source [file join $dir pt_peg_export_peg.tcl]] Index: modules/pt/pt_peg_export.man ================================================================== --- modules/pt/pt_peg_export.man +++ modules/pt/pt_peg_export.man @@ -1,14 +1,15 @@ [comment {-*- tcl -*- doctools manpage}] -[manpage_begin pt::peg::export n 1] +[vset VERSION 1.0.1] +[manpage_begin pt::peg::export n [vset VERSION]] [include include/module.inc] [titledesc {PEG Export}] [require snit] -[require configuration] +[require struct::map] [require pt::peg] [require pluginmgr] -[require pt::peg::export [opt 1]] +[require pt::peg::export [opt [vset VERSION]]] [description] [include include/ref_intro.inc] This package provides a manager for parsing expression grammars, with each instance handling a set of plugins for the export of them to Index: modules/pt/pt_peg_export.tcl ================================================================== --- modules/pt/pt_peg_export.tcl +++ modules/pt/pt_peg_export.tcl @@ -4,12 +4,10 @@ # # Copyright (c) 2009 Andreas Kupries # # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. -# -# RCS: @(#) $Id: pt_peg_export.tcl,v 1.1 2010/03/26 05:07:24 andreas_kupries Exp $ # Each object manages a set of plugins for the conversion of parsing # expression grammars into some textual representation. I.e. this # object manages the conversion to specialized serializations of # parsing expression grammars. @@ -16,14 +14,14 @@ # ### ### ### ######### ######### ######### ## Requisites package require Tcl 8.5 -package require configuration +package require snit package require pt::peg package require pluginmgr -package require snit +package require struct::map # ### ### ### ######### ######### ######### ## API snit::type ::pt::peg::export { @@ -33,11 +31,11 @@ # ### ### ### ######### ######### ######### ## Creation, destruction. constructor {} { - install myconfig using ::configuration ${selfns}::CONFIG + install myconfig using ::struct::map ${selfns}::CONFIG return } destructor { $myconfig destroy @@ -113,7 +111,7 @@ } # ### ### ### ######### ######### ######### ## Ready -package provide pt::peg::export 1 +package provide pt::peg::export 1.0.1 return Index: modules/pt/pt_peg_export.test ================================================================== --- modules/pt/pt_peg_export.test +++ modules/pt/pt_peg_export.test @@ -1,12 +1,10 @@ # -*- tcl -*- # peg_export.test: tests for the pt::peg::export package. # -# Copyright (c) 2009 by Andreas Kupries +# Copyright (c) 2009-2019 by Andreas Kupries # All rights reserved. -# -# RCS: @(#) $Id: pt_peg_export.test,v 1.1 2010/03/26 05:07:24 andreas_kupries Exp $ # ------------------------------------------------------------------------- source [file join \ [file dirname [file dirname [file join [pwd] [info script]]]] \ @@ -20,12 +18,12 @@ TestAccelInit struct::set use fileutil/fileutil.tcl fileutil ;# tests/common use snit/snit.tcl snit use pluginmgr/pluginmgr.tcl pluginmgr + use struct/map.tcl struct::map - useLocal configuration.tcl configuration useLocal pt_pexpression.tcl pt::pe useLocal pt_pegrammar.tcl pt::peg source [localPath tests/common] } Index: modules/pt/pt_peg_import.man ================================================================== --- modules/pt/pt_peg_import.man +++ modules/pt/pt_peg_import.man @@ -1,14 +1,16 @@ [comment {-*- tcl -*- doctools manpage}] -[manpage_begin pt::peg::import n 1] +[vset VERSION 1.0.1] +[manpage_begin pt::peg::import n [vset VERSION]] [include include/module.inc] [titledesc {PEG Import}] +[require Tcl 8.5] [require snit] -[require configuration] +[require fileutil::paths] [require pt::peg] [require pluginmgr] -[require pt::peg::import [opt 1]] +[require pt::peg::import [opt [vset VERSION]]] [description] [include include/ref_intro.inc] This package provides a manager for parsing expression grammars, with each instance handling a set of plugins for the import of them from Index: modules/pt/pt_peg_import.tcl ================================================================== --- modules/pt/pt_peg_import.tcl +++ modules/pt/pt_peg_import.tcl @@ -1,26 +1,24 @@ # import.tcl -- # # Importing parsing expression grammars from other formats. # -# Copyright (c) 2009 Andreas Kupries +# Copyright (c) 2009-2019 Andreas Kupries # # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. -# -# RCS: @(#) $Id: pt_peg_import.tcl,v 1.1 2010/03/26 05:07:24 andreas_kupries Exp $ # Each object manages a set of plugins for the creation of parsing # expression grammars from some textual representation. I.e. this # object manages the conversion from specialized serializations of # parsing expression grammars into their standard form. # ### ### ### ######### ######### ######### ## Requisites -package require Tcl 8.5 -package require paths +package require Tcl 8.4 +package require fileutil::paths package require pt::peg package require pluginmgr package require snit # ### ### ### ######### ######### ######### @@ -33,11 +31,11 @@ # ### ### ### ######### ######### ######### ## Creation, destruction. constructor {} { - install myinclude using ::paths ${selfns}::INCLUDE + install myinclude using ::fileutil::paths ${selfns}::INCLUDE return } destructor { $myinclude destroy @@ -184,7 +182,7 @@ } # ### ### ### ######### ######### ######### ## Ready -package provide pt::peg::import 1 +package provide pt::peg::import 1.0.1 return Index: modules/pt/pt_peg_import.test ================================================================== --- modules/pt/pt_peg_import.test +++ modules/pt/pt_peg_import.test @@ -1,12 +1,10 @@ # -*- tcl -*- # peg_import.test: tests for the pt::peg::import package. # -# Copyright (c) 2009 by Andreas Kupries +# Copyright (c) 2009-2019 by Andreas Kupries # All rights reserved. -# -# RCS: @(#) $Id: pt_peg_import.test,v 1.1 2010/03/26 05:07:24 andreas_kupries Exp $ # ------------------------------------------------------------------------- source [file join \ [file dirname [file dirname [file join [pwd] [info script]]]] \ @@ -16,13 +14,13 @@ testsNeedTcltest 2 support { use fileutil/fileutil.tcl fileutil ;# tests/common use snit/snit.tcl snit + use fileutil/paths.tcl fileutil::paths use pluginmgr/pluginmgr.tcl pluginmgr - useLocal paths.tcl paths useLocal pt_pexpression.tcl pt::pe useLocal pt_pegrammar.tcl pt::peg source [localPath tests/common] } Index: modules/pt/tests/pt_peg_export.tests ================================================================== --- modules/pt/tests/pt_peg_export.tests +++ modules/pt/tests/pt_peg_export.tests @@ -36,35 +36,35 @@ pt::peg::export E } -body { E configuration names X } -cleanup { E destroy -} -returnCodes error -result {wrong # args: should be "::configuration::Snit_methodnames type selfns win self"} +} -returnCodes error -result {wrong # args: should be "::struct::map::I::Snit_methodnames type selfns win self"} test pt-peg-export-set:${setimpl}-6.0 {configuration get, wrong#args} -setup { pt::peg::export E } -body { E configuration get X } -cleanup { E destroy -} -returnCodes error -result {wrong # args: should be "::configuration::Snit_methodget type selfns win self"} +} -returnCodes error -result {wrong # args: should be "::struct::map::I::Snit_methodget type selfns win self"} test pt-peg-export-set:${setimpl}-7.0 {configuration set, wrong#args} -setup { pt::peg::export E } -body { E configuration set } -cleanup { E destroy -} -returnCodes error -result {wrong # args: should be "::configuration::Snit_methodset type selfns win self name ?value?"} +} -returnCodes error -result {wrong # args: should be "::struct::map::I::Snit_methodset type selfns win self name ?value?"} test pt-peg-export-set:${setimpl}-7.1 {configuration set, wrong#args} -setup { pt::peg::export E } -body { E configuration set N V X } -cleanup { E destroy -} -returnCodes error -result {wrong # args: should be "::configuration::Snit_methodset type selfns win self name ?value?"} +} -returnCodes error -result {wrong # args: should be "::struct::map::I::Snit_methodset type selfns win self name ?value?"} # ------------------------------------------------------------------------- test pt-peg-export-set:${setimpl}-12.0 {configuration set, define single var} -setup { pt::peg::export E Index: modules/pt/tests/pt_peg_import.tests ================================================================== --- modules/pt/tests/pt_peg_import.tests +++ modules/pt/tests/pt_peg_import.tests @@ -80,57 +80,60 @@ I destroy } -returnCodes error -result {wrong # args: should be "::pt::peg::import::Snit_hmethodimport_object_file type selfns win self obj path ?format?"} # config unset - accepts any number of arguments. +# ------------------------------------------------------------------------- +## `include` component, provided via fileutil::paths, search path for includes + test pt-peg-import-5.0 {include paths, wrong#args} -setup { pt::peg::import I } -body { I include paths X } -cleanup { I destroy -} -returnCodes error -result {wrong # args: should be "::paths::Snit_methodpaths type selfns win self"} +} -returnCodes error -result {wrong # args: should be "::fileutil::paths::Snit_methodpaths type selfns win self"} test pt-peg-import-6.0 {include clear, wrong#args} -setup { pt::peg::import I } -body { I include clear X } -cleanup { I destroy -} -returnCodes error -result {wrong # args: should be "::paths::Snit_methodclear type selfns win self"} +} -returnCodes error -result {wrong # args: should be "::fileutil::paths::Snit_methodclear type selfns win self"} test pt-peg-import-7.0 {include add, wrong#args} -setup { pt::peg::import I } -body { I include add } -cleanup { I destroy -} -returnCodes error -result {wrong # args: should be "::paths::Snit_methodadd type selfns win self path"} +} -returnCodes error -result {wrong # args: should be "::fileutil::paths::Snit_methodadd type selfns win self path"} test pt-peg-import-7.1 {include add, wrong#args} -setup { pt::peg::import I } -body { I include add P X } -cleanup { I destroy -} -returnCodes error -result {wrong # args: should be "::paths::Snit_methodadd type selfns win self path"} +} -returnCodes error -result {wrong # args: should be "::fileutil::paths::Snit_methodadd type selfns win self path"} test pt-peg-import-8.0 {include remove, wrong#args} -setup { pt::peg::import I } -body { I include remove } -cleanup { I destroy -} -returnCodes error -result {wrong # args: should be "::paths::Snit_methodremove type selfns win self path"} +} -returnCodes error -result {wrong # args: should be "::fileutil::paths::Snit_methodremove type selfns win self path"} test pt-peg-import-8.1 {include remove, wrong#args} -setup { pt::peg::import I } -body { I include remove P X } -cleanup { I destroy -} -returnCodes error -result {wrong # args: should be "::paths::Snit_methodremove type selfns win self path"} +} -returnCodes error -result {wrong # args: should be "::fileutil::paths::Snit_methodremove type selfns win self path"} # ------------------------------------------------------------------------- test pt-peg-import9.0 {include paths, empty} -setup { pt::peg::import I ADDED modules/struct/map.tcl Index: modules/struct/map.tcl ================================================================== --- /dev/null +++ modules/struct/map.tcl @@ -0,0 +1,104 @@ +# map.tcl -- +# Copyright (c) 2009-2019 Andreas Kupries +# +# Object wrapper around array/dict. Useful as key/value store in +# larger systems. +# +# Examples: +# - configuration mgmt in doctools v2 import/export managers +# - pt import/export managers +# +# Each object manages a key/value map. + +# ### ### ### ######### ######### ######### +## Requisites + +package require Tcl 8.4 +package require snit + +# ### ### ### ######### ######### ######### +## API + +# ATTENTION: +## +# From an API point of view the code below is equivalent to the much +# shorter `snit::type struct::map { ... }`. +# +# Then why the more complex form ? +# +# When snit compiles the class to Tcl code, and later on when methods +# are executed it will happen in the `struct` namespace. The moment +# this package is used together with `struct::set` all unqualified +# `set` statements will go bonkers, eiter in snit, or, here, in method +# `set`, because they get resolved to the `struct::set` dispatcher +# instead of `::set`. Moving the implementation a level deeper makes +# the `struct::map` namespace the context, with no conflict. + +# Future / TODO: Convert all the OO stuff here over to TclOO, as much +# as possible (snit configure/cget support is currently still better, +# ditto hierarchical methods). + +namespace eval ::struct {} + +proc ::struct::map {args} { + uplevel 1 [linsert $args 0 struct::map::I] +} + +snit::type ::struct::map::I { + + # ### ### ### ######### ######### ######### + ## Options :: None + + # ### ### ### ######### ######### ######### + ## Creating, destruction + + # Default constructor. + # Default destructor. + + # ### ### ### ######### ######### ######### + ## Public methods. Reading and writing the map. + + method names {} { + return [array names mymap] + } + + method get {} { + return [array get mymap] + } + + method set {name {value {}}} { + # 7 instead of 3 in the condition below, because of the 4 + # implicit arguments snit is providing to each method. + if {[llength [info level 0]] == 7} { + ::set mymap($name) $value + } elseif {![info exists mymap($name)]} { + return -code error "can't read \"$name\": no such variable" + } + return $mymap($name) + } + + method unset {args} { + if {![llength $args]} { lappend args * } + foreach pattern $args { + array unset mymap $pattern + } + return + } + + # ### ### ### ######### ######### ######### + ## Internal methods :: None. + + # ### ### ### ######### ######### ######### + ## State :: Map data, Tcl array + + variable mymap -array {} + + ## + # ### ### ### ######### ######### ######### +} + +# ### ### ### ######### ######### ######### +## Ready + +package provide struct::map 1 +return ADDED modules/struct/map.test Index: modules/struct/map.test ================================================================== --- /dev/null +++ modules/struct/map.test @@ -0,0 +1,143 @@ +# -*- tcl -*- +# map.test: Testsuite for package struct::map +# +# Copyright (c) 2019 by Andreas Kupries +# All rights reserved. + +# ------------------------------------------------------------------------- + +source [file join \ + [file dirname [file dirname [file join [pwd] [info script]]]] \ + devtools testutilities.tcl] + +testsNeedTcl 8.4 +testsNeedTcltest 2.0 + +support { + use snit/snit.tcl snit +} +testing { + useLocal map.tcl struct::map +} + +# --------------------------------------------------------------------- +# [] constructor +# [] destructor +# [] get +# [] names +# [] set +# [] unset + +#---------------------------------------------------------------------- +## Constructor, destructor + +test struct-map-1.0 {constructor, wrong args, too many} -body { + struct::map M X +} -returnCodes error -result {Error in constructor: wrong # args: should be "::struct::map::I::Snit_constructor type selfns win self"} + +test struct-map-1.1 {instance, bogus method} -setup { + struct::map M +} -cleanup { + M destroy +} -body { + M bogus +} -returnCodes error -result {"::M bogus" is not defined} + +#---------------------------------------------------------------------- +## get + +test struct-map-2.0 {get, wrong args, too many} -setup { + struct::map M +} -cleanup { + M destroy +} -body { + M get X +} -returnCodes error -result {wrong # args: should be "::struct::map::I::Snit_methodget type selfns win self"} + +test struct-map-2.1 {get, base state, none} -setup { + struct::map M +} -cleanup { + M destroy +} -body { + M get +} -result {} + +#---------------------------------------------------------------------- +## names + +test struct-map-3.0 {names, wrong args, too many} -setup { + struct::map M +} -cleanup { + M destroy +} -body { + M names X +} -returnCodes error -result {wrong # args: should be "::struct::map::I::Snit_methodnames type selfns win self"} + +test struct-map-3.1 {names, base state, none} -setup { + struct::map M +} -cleanup { + M destroy +} -body { + M names +} -result {} + +#---------------------------------------------------------------------- +## set + +test struct-map-4.0 {set, wrong args, not enough} -setup { + struct::map M +} -cleanup { + M destroy +} -body { + M set +} -returnCodes error -result {wrong # args: should be "::struct::map::I::Snit_methodset type selfns win self name ?value?"} + +test struct-map-4.1 {set, wrong args, too many} -setup { + struct::map M +} -cleanup { + M destroy +} -body { + M set K V X +} -returnCodes error -result {wrong # args: should be "::struct::map::I::Snit_methodset type selfns win self name ?value?"} + +test struct-map-4.2 {set, state change, result} -setup { + struct::map M +} -cleanup { + M destroy +} -body { + list [M names] [M get] [M set K V] [M names] [M get] +} -result {{} {} V K {K V}} + +#---------------------------------------------------------------------- +## unset + +test struct-map-5.2 {unset, known key, state change, result} -setup { + struct::map M + M set K V +} -cleanup { + M destroy +} -body { + list [M names] [M get] [M unset K] [M names] [M get] +} -result {K {K V} {} {} {}} + +test struct-map-5.3 {unset, missing key, no state change, result} -setup { + struct::map M + M set K V +} -cleanup { + M destroy +} -body { + list [M names] [M get] [M unset K'] [M names] [M get] +} -result {K {K V} {} K {K V}} + +test struct-map-5.4 {unset, no pattern, clear, result} -setup { + struct::map M + M set K V +} -cleanup { + M destroy +} -body { + list [M names] [M get] [M unset] [M names] [M get] +} -result {K {K V} {} {} {}} + +#---------------------------------------------------------------------- +testsuiteCleanup +return Index: modules/struct/pkgIndex.tcl ================================================================== --- modules/struct/pkgIndex.tcl +++ modules/struct/pkgIndex.tcl @@ -17,10 +17,11 @@ package ifneeded struct::matrix 1.2.1 [list source [file join $dir matrix1.tcl]] if {![package vsatisfies [package provide Tcl] 8.4]} {return} package ifneeded struct::list 1.8.4 [list source [file join $dir list.tcl]] package ifneeded struct::graph 2.4.2 [list source [file join $dir graph.tcl]] +package ifneeded struct::map 1 [list source [file join $dir map.tcl]] if {![package vsatisfies [package provide Tcl] 8.5]} {return} if {![package vsatisfies [package provide Tcl] 8.6]} {return} package ifneeded struct::disjointset 1.1 [list source [file join $dir disjointset.tcl]] ADDED modules/struct/struct_map.man Index: modules/struct/struct_map.man ================================================================== --- /dev/null +++ modules/struct/struct_map.man @@ -0,0 +1,75 @@ +[comment {-*- text -*- doctools manpage}] +[vset VERSION 1] +[manpage_begin struct::map n [vset VERSION]] +[titledesc {Manage key/value maps}] +[require struct::map [opt [vset VERSION]]] +[description] + +Provides a snit class whose instances manage a key/value map. +In other words, an object wrapper around Tcl arrays. + +[section API] + +The main command provides construction of maps: + +[list_begin definitions] + +[call [cmd ::struct::map] [arg mapName]] + +Creates a new, empty map with an associated global Tcl command whose +name is [arg mapName]. + +It may be used to invoke various operations on the map. + +It has the following general form: + +[list_begin definitions] +[call [cmd mapName] [method method] [opt [arg "arg arg ..."]]] +[method method] and [arg arg]uments determine the exact behavior of +the command. +[list_end][comment --instance-command--] + +If [arg mapName] is specified as [const %AUTO%] a unique name will be +generated by the package itself. + +The result of the command is the fully-qualified name of the instance +command. + +[list_end][comment --class-command--] + +[para] + +The following commands are possible for map objects: + +[list_begin definitions] + +[call [arg mapName] [method get]] + +Returns the entire map as a Tcl dictionary. + +[call [arg mapName] [method names]] + +Returns the list of all keys known to the map, in arbitrary order. + +[call [arg mapName] [method set] [arg name] [opt [arg value]]] + +Sets key [arg name] to the specified [arg value], if the value specified. + +Returns the value for the key. + +Throws an error if the key is not known. + +[call [arg mapName] [method unset] [opt [arg pattern]...]] + +Removes all keys matching at least one of the glob [arg pattern]s from +the map. + +If no pattern is specified all keys are removed. +In other words, the default pattern is [const *]. + +The result of the command is the empty string. + +[list_end] + +[include ../doctools2base/include/feedback.inc] +[manpage_end] Index: support/devel/sak/doc/manpages.txt ================================================================== --- support/devel/sak/doc/manpages.txt +++ support/devel/sak/doc/manpages.txt @@ -121,10 +121,11 @@ modules/doctools2toc/toc_structure.man modules/dtplite/pkg_dtplite.man modules/fileutil/fileutil.man modules/fileutil/multi.man modules/fileutil/multiop.man +modules/fileutil/paths.man modules/fileutil/traverse.man modules/ftp/ftp.man modules/ftp/ftp_geturl.man modules/ftpd/ftpd.man modules/fumagic/cfront.man @@ -324,10 +325,11 @@ modules/struct/queue.man modules/struct/record.man modules/struct/skiplist.man modules/struct/stack.man modules/struct/struct_list.man +modules/struct/struct_map.man modules/struct/struct_set.man modules/struct/struct_tree.man modules/struct/struct_tree1.man modules/tar/tar.man modules/tepam/tepam_argument_dialogbox.man Index: support/devel/sak/doc/toc.txt ================================================================== --- support/devel/sak/doc/toc.txt +++ support/devel/sak/doc/toc.txt @@ -436,10 +436,11 @@ [item modules/transfer/receiver.man transfer::receiver {Data source}] [item modules/transfer/transmitter.man transfer::transmitter {Data source}] [division_end] [division_start Unfiled] [item modules/cache/async.man cache::async {Asynchronous in-memory cache}] +[item modules/fileutil/paths.man fileutil::paths {Manage search path pools}] [item modules/generator/generator.man generator {Procedures for creating and using generators.}] [item modules/yaml/huddle.man huddle {Create and manipulate huddle object}] [item modules/map/map_geocode_nominatim.man map::geocode::nominatim {Resolving geographical names with a Nominatim service}] [item modules/map/map_slippy.man map::slippy {Common code for slippy based map packages}] [item modules/map/map_slippy_cache.man map::slippy::cache {Management of a tile cache in the local filesystem}] @@ -448,10 +449,11 @@ [item modules/math/symdiff.man math::calculus::symdiff {Symbolic differentiation for Tcl}] [item modules/namespacex/namespacex.man namespacex {Namespace utility commands}] [item modules/rest/rest.man rest {define REST web APIs and call them inline or asychronously}] [item modules/stringprep/stringprep.man stringprep {Implementation of stringprep}] [item modules/stringprep/stringprep_data.man stringprep::data {stringprep data tables, generated, internal}] +[item modules/struct/struct_map.man struct::map {Manage key/value maps}] [item modules/math/machineparameters.man tclrep/machineparameters {Compute double precision machine parameters.}] [item modules/uev/uevent_onidle.man uevent::onidle {Request merging and deferal to idle time}] [item modules/stringprep/unicode.man unicode {Implementation of Unicode normalization}] [item modules/stringprep/unicode_data.man unicode::data {unicode data tables, generated, internal}] [item modules/units/units.man units {unit conversion}] @@ -674,10 +676,11 @@ [division_end] [division_start fileutil] [item modules/fileutil/fileutil.man fileutil {Procedures implementing some file utilities}] [item modules/fileutil/multi.man fileutil::multi {Multi-file operation, scatter/gather, standard object}] [item modules/fileutil/multiop.man fileutil::multi::op {Multi-file operation, scatter/gather}] +[item modules/fileutil/paths.man fileutil::paths {Manage search path pools}] [item modules/fileutil/traverse.man fileutil_traverse {Iterative directory traversal}] [division_end] [division_start ftp] [item modules/ftp/ftp.man ftp {Client-side tcl implementation of the ftp protocol}] [item modules/ftp/ftp_geturl.man ftp::geturl {Uri handler for ftp urls}] @@ -1011,10 +1014,11 @@ [item modules/struct/disjointset.man struct::disjointset {Disjoint set data structure}] [item modules/struct/graph.man struct::graph {Create and manipulate directed graph objects}] [item modules/struct/graphops.man struct::graph::op {Operation for (un)directed graph objects}] [item modules/struct/graph1.man struct::graph_v1 {Create and manipulate directed graph objects}] [item modules/struct/struct_list.man struct::list {Procedures for manipulating lists}] +[item modules/struct/struct_map.man struct::map {Manage key/value maps}] [item modules/struct/matrix.man struct::matrix {Create and manipulate matrix objects}] [item modules/struct/matrix1.man struct::matrix_v1 {Create and manipulate matrix objects}] [item modules/struct/pool.man struct::pool {Create and manipulate pool objects (of discrete items)}] [item modules/struct/prioqueue.man struct::prioqueue {Create and manipulate prioqueue objects}] [item modules/struct/queue.man struct::queue {Create and manipulate queue objects}] Index: support/devel/sak/doc/toc_cats.txt ================================================================== --- support/devel/sak/doc/toc_cats.txt +++ support/devel/sak/doc/toc_cats.txt @@ -436,10 +436,11 @@ [item modules/transfer/receiver.man transfer::receiver {Data source}] [item modules/transfer/transmitter.man transfer::transmitter {Data source}] [division_end] [division_start Unfiled] [item modules/cache/async.man cache::async {Asynchronous in-memory cache}] +[item modules/fileutil/paths.man fileutil::paths {Manage search path pools}] [item modules/generator/generator.man generator {Procedures for creating and using generators.}] [item modules/yaml/huddle.man huddle {Create and manipulate huddle object}] [item modules/map/map_geocode_nominatim.man map::geocode::nominatim {Resolving geographical names with a Nominatim service}] [item modules/map/map_slippy.man map::slippy {Common code for slippy based map packages}] [item modules/map/map_slippy_cache.man map::slippy::cache {Management of a tile cache in the local filesystem}] @@ -448,10 +449,11 @@ [item modules/math/symdiff.man math::calculus::symdiff {Symbolic differentiation for Tcl}] [item modules/namespacex/namespacex.man namespacex {Namespace utility commands}] [item modules/rest/rest.man rest {define REST web APIs and call them inline or asychronously}] [item modules/stringprep/stringprep.man stringprep {Implementation of stringprep}] [item modules/stringprep/stringprep_data.man stringprep::data {stringprep data tables, generated, internal}] +[item modules/struct/struct_map.man struct::map {Manage key/value maps}] [item modules/math/machineparameters.man tclrep/machineparameters {Compute double precision machine parameters.}] [item modules/uev/uevent_onidle.man uevent::onidle {Request merging and deferal to idle time}] [item modules/stringprep/unicode.man unicode {Implementation of Unicode normalization}] [item modules/stringprep/unicode_data.man unicode::data {unicode data tables, generated, internal}] [item modules/units/units.man units {unit conversion}] Index: support/devel/sak/doc/toc_mods.txt ================================================================== --- support/devel/sak/doc/toc_mods.txt +++ support/devel/sak/doc/toc_mods.txt @@ -177,10 +177,11 @@ [division_end] [division_start fileutil] [item modules/fileutil/fileutil.man fileutil {Procedures implementing some file utilities}] [item modules/fileutil/multi.man fileutil::multi {Multi-file operation, scatter/gather, standard object}] [item modules/fileutil/multiop.man fileutil::multi::op {Multi-file operation, scatter/gather}] +[item modules/fileutil/paths.man fileutil::paths {Manage search path pools}] [item modules/fileutil/traverse.man fileutil_traverse {Iterative directory traversal}] [division_end] [division_start ftp] [item modules/ftp/ftp.man ftp {Client-side tcl implementation of the ftp protocol}] [item modules/ftp/ftp_geturl.man ftp::geturl {Uri handler for ftp urls}] @@ -514,10 +515,11 @@ [item modules/struct/disjointset.man struct::disjointset {Disjoint set data structure}] [item modules/struct/graph.man struct::graph {Create and manipulate directed graph objects}] [item modules/struct/graphops.man struct::graph::op {Operation for (un)directed graph objects}] [item modules/struct/graph1.man struct::graph_v1 {Create and manipulate directed graph objects}] [item modules/struct/struct_list.man struct::list {Procedures for manipulating lists}] +[item modules/struct/struct_map.man struct::map {Manage key/value maps}] [item modules/struct/matrix.man struct::matrix {Create and manipulate matrix objects}] [item modules/struct/matrix1.man struct::matrix_v1 {Create and manipulate matrix objects}] [item modules/struct/pool.man struct::pool {Create and manipulate pool objects (of discrete items)}] [item modules/struct/prioqueue.man struct::prioqueue {Create and manipulate prioqueue objects}] [item modules/struct/queue.man struct::queue {Create and manipulate queue objects}] Index: support/installation/modules.tcl ================================================================== --- support/installation/modules.tcl +++ support/installation/modules.tcl @@ -31,10 +31,15 @@ # @@ Registration START Exclude calendar Exclude exif +# name pkg doc example +Module 0compatibility _tcl _null _null +# Wrapper packages redirecting deprecated/moved packages to their old +# implementations. See pkgIndex.tcl for more notes. + # name pkg doc example Module aes _tcl _man _null Module amazon-s3 _tcl _man _null Module asn _tcl _man _null Module base32 _tcl _man _null

doctools::idx::export::docidx(n) 0.1 tcllib "Documentation tools"

doctools::idx::export::docidx(n) 0.2.1 tcllib "Documentation tools"

doctools::idx::export(n) 0.2 tcllib "Documentation tools"

doctools::idx::export(n) 0.2.1 tcllib "Documentation tools"

doctools::idx::import(n) 0.2 tcllib "Documentation tools"

doctools::idx::import(n) 0.2.1 tcllib "Documentation tools"

doctools::idx::import::json(n) 0.1 tcllib "Documentation tools"

doctools::idx::import::json(n) 0.2.1 tcllib "Documentation tools"

doctools::idx::import::docidx(n) 0.1 tcllib "Documentation tools"

doctools::idx::import::docidx(n) 0.2.1 tcllib "Documentation tools"

doctools::toc::export::doctoc(n) 0.1 tcllib "Documentation tools"

doctools::toc::export::doctoc(n) 0.2.1 tcllib "Documentation tools"

doctools::toc::import::doctoc(n) 0.1 tcllib "Documentation tools"

doctools::toc::import::doctoc(n) 0.2.1 tcllib "Documentation tools"

doctools::toc::export(n) 0.2 tcllib "Documentation tools"

doctools::toc::export(n) 0.2.1 tcllib "Documentation tools"

doctools::toc::import(n) 0.2 tcllib "Documentation tools"

doctools::toc::import(n) 0.2.1 tcllib "Documentation tools"

doctools::toc::import::json(n) 0.1 tcllib "Documentation tools"

doctools::toc::import::json(n) 0.2.1 tcllib "Documentation tools"

fileutil::paths(n) 1 tcllib ""

pt::peg::export(n) 1 tcllib "Parser Tools"

pt::peg::export(n) 1.0.1 tcllib "Parser Tools"

pt::peg::import(n) 1 tcllib "Parser Tools"

pt::peg::import(n) 1.0.1 tcllib "Parser Tools"

struct::map(n) 1 tcllib ""