mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00
Code Issues Releases Activity

- Update to 1.15

Browse Source 
Release notes: http://code.activestate.com/lists/tcl-core/13030/
- Simplify regression-test target
- Include some patches that were pushed upstream after 1.15 was released
This commit is contained in:
Pietro Cerutti 2013-04-24 10:12:03 +00:00
parent a13a205e28
commit f7cfec32a6
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=316416
9 changed files with 1669 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
devel/tcllib/Makefile
View File

@ -1,81 +1,57 @@
# New ports collection makefile for: tcllib
# Date created: 27 Apr 2000
# Whom: Mikhail Teterin <mi@aldan.algebra.com>
#
# Created by: Mikhail Teterin <mi@aldan.algebra.com>
# $FreeBSD$
#
PORTNAME= tcllib
PORTVERSION= 1.14
PORTREVISION= 1
PORTVERSION= 1.15
CATEGORIES= devel tcl
MASTER_SITES= SF
MAINTAINER= tcltk@FreeBSD.org
COMMENT= A collection of utility modules for Tcl
USE_TCL_BUILD= 84+
USE_TCL_RUN= ${USE_TCL_BUILD}
USE_TCL= 84+
USE_BZIP2= yes
GNU_CONFIGURE= yes
ALL_TARGET= all
MAKE_ENV+= LANG=C
PORTDOCS= *
.include <bsd.port.pre.mk>
.include <bsd.port.options.mk>
.include "Makefile.man"
CONFIGURE_ENV+= ac_cv_path_tclsh="${TCLSH}"
post-patch:
#
# Ensure, the detailed output of vendors' self-tests is
# available in addition to the pretty progress report:
#
#
# Ensure, the detailed output of vendors' self-tests is
# available in addition to the pretty progress report:
#
${REINPLACE_CMD} -e 's,test run,test run -l testlog,' \
-e 's,$$(libdir)/@PACKAGE@@VERSION@,$$(libdir)/@PACKAGE@,' \
${WRKSRC}/Makefile.in
${FIND} ${WRKSRC}/apps -type f ! -name "*.man" | ${XARGS} \
${REINPLACE_CMD} -e 's,exec tclsh,exec ${TCLSH},'
#
# patch(1) adds a newline at eof, so we need to remove it here
#
#
# patch(1) adds a newline at eof, so we need to remove it here
#
${AWK} 'NR > 1 { print h } { h = $$0 } END { ORS = ""; print h }' \
${WRKSRC}/modules/doctools/tests/text/04 > ${WRKSRC}/modules/doctools/tests/text/04.new
${MV} ${WRKSRC}/modules/doctools/tests/text/04.new ${WRKSRC}/modules/doctools/tests/text/04
#
# .orig files confuse the pt module test suite and eventually get
# installed
#
${FIND} ${WRKSRC} -name "*.orig" -delete
# try(n) is part of Tcl core since 8.6
.if ${TCL_VER:S/.//} < 86
MANN+= try.n
.else
${MV} ${WRKSRC}/modules/try/try.man ${WRKSRC}/modules/try/try.man.noinstall
post-install:
.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${DOCSDIR}
cd ${WRKSRC} && ${MAKE} html-doc
cd ${WRKSRC}/doc/html && ${COPYTREE_SHARE} \* ${DOCSDIR}
.endif
regression-test: build
cd ${WRKSRC} && ${SETENV} LANG=C LC_ALL=C DISPLAY= ${MAKE} test
RUNTEST= ${SETENV} LANG=C DISPLAY= ${MAKE} -C ${WRKSRC} test
MYID != ${ID} -u
.if ${MYID} == 0
RUNTEST:= ${SU_CMD:S/root/-m nobody/} "${RUNTEST}"
pre-build:
#
# Preparing to run the tests as `nobody'
#
${FIND} ${WRKSRC} -type d -o -name jpeg.test | ${XARGS} ${CHOWN} nobody
.endif
test:
@if ! ${RUNTEST}; \
then \
${AWK} '$$NF == "FAILED" { echo = 1 } \
echo { if ($$NF == "start") echo = 0; else print }' \
${WRKSRC}/testlog.log; \
${CAT} ${WRKSRC}/testlog.failures; \
${UNAME} -a; \
${ECHO_MSG} Please, analyze and report the test failures; \
${ECHO_MSG} Be sure to use the latest available microversion; \
${ECHO_MSG} of TCL-${TCL_VER}, however.; \
fi
#post-build: test
.include <bsd.port.post.mk>
.include <bsd.port.mk>

33
devel/tcllib/Makefile.man
View File

@ -4,6 +4,7 @@ INSTALL_TARGET= install-libraries install-applications
MANCOMPRESSED= no
MANN= S3.n \
adjust.n \
adler32.n \
aes.n \
annealing.n \
ansi_cattr.n \
@ -27,6 +28,7 @@ MANN= S3.n \
bignum.n \
blowfish.n \
calculus.n \
cat.n \
cfront.n \
cgen.n \
changelog.n \
@ -40,6 +42,7 @@ MANN= S3.n \
container.n \
control.n \
copyops.n \
core.n \
counter.n \
crc16.n \
crc32.n \
@ -78,6 +81,7 @@ MANN= S3.n \
doctools_plugin_apiref.n \
dsource.n \
dtplite.n \
events.n \
expander.n \
export.n \
export_docidx.n \
@ -88,7 +92,10 @@ MANN= S3.n \
export_text.n \
export_wiki.n \
fa.n \
facade.n \
faop.n \
fifo.n \
fifo2.n \
filetypes.n \
fileutil.n \
fourier.n \
@ -97,15 +104,19 @@ MANN= S3.n \
ftpd.n \
fuzzy.n \
gasm.n \
generator.n \
graph.n \
graph1.n \
graphops.n \
halfpipe.n \
hex.n \
hook.n \
html.n \
html_cssdefaults.n \
htmlparse.n \
huddle.n \
ident.n \
identity.n \
imap4.n \
imenu.n \
import.n \
@ -117,6 +128,7 @@ MANN= S3.n \
introduction.n \
ipager.n \
irc.n \
iso8601.n \
javascript.n \
jpeg.n \
json.n \
@ -124,12 +136,14 @@ MANN= S3.n \
lambda.n \
ldap.n \
ldapx.n \
limitsize.n \
linalg.n \
log.n \
logger.n \
loggerAppender.n \
loggerUtils.n \
machineparameters.n \
map_geocode_nominatim.n \
map_slippy.n \
map_slippy_cache.n \
map_slippy_fetcher.n \
@ -148,6 +162,7 @@ MANN= S3.n \
me_tcl.n \
me_util.n \
me_vm.n \
memchan.n \
mime.n \
mimetypes.n \
montecarlo.n \
@ -174,7 +189,10 @@ MANN= S3.n \
nntp.n \
nroff_manmacros.n \
ntp_time.n \
null.n \
nullzero.n \
numtheory.n \
observe.n \
ooutil.n \
optimize.n \
otp.n \
@ -241,6 +259,8 @@ MANN= S3.n \
pt_to_api.n \
qcomplex.n \
queue.n \
random.n \
randseed.n \
rational_funcs.n \
rc4.n \
rcs.n \
@ -250,10 +270,12 @@ MANN= S3.n \
repeat.n \
report.n \
rest.n \
rfc2822.n \
ripemd128.n \
ripemd160.n \
roman.n \
romberg.n \
rot.n \
rtcore.n \
sasl.n \
sha1.n \
@ -265,10 +287,13 @@ MANN= S3.n \
snit.n \
snitfaq.n \
soundex.n \
spacer.n \
special.n \
stack.n \
statistics.n \
std.n \
stooop.n \
string.n \
stringprep.n \
stringprep_data.n \
struct_list.n \
@ -286,6 +311,7 @@ MANN= S3.n \
tcllib_interp.n \
tcllib_ip.n \
tcllib_msgcat.n \
tcllib_try.n \
tepam_argument_dialogbox.n \
tepam_introduction.n \
tepam_procedure.n \
@ -295,10 +321,12 @@ MANN= S3.n \
textutil.n \
textutil_split.n \
textutil_string.n \
textwindow.n \
tie.n \
tie_std.n \
tiff.n \
tqueue.n \
transformcore.n \
transmitter.n \
traverse.n \
treeql.n \
@ -312,8 +340,11 @@ MANN= S3.n \
urn-scheme.n \
uuencode.n \
uuid.n \
variable.n \
wip.n \
xsxp.n \
yaml.n \
yencode.n
yencode.n \
zero.n \
zlib.n
.endif

4
devel/tcllib/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (tcllib-1.14.tar.bz2) = 1cdcb02f3ac12946f5ba5757141817d447db862a5ed999a52b25f89077945579
SIZE (tcllib-1.14.tar.bz2) = 4398059
SHA256 (tcllib-1.15.tar.gz) = 6d308980d9dace24c6252b96223c1646e83795ba03dbf996525ad27e1b56bffd
SIZE (tcllib-1.15.tar.gz) = 6175150

832
devel/tcllib/files/patch-bug-3601370-td Normal file
View File

@ -0,0 +1,832 @@
Index: modules/doctools/ChangeLog
==================================================================
--- modules/doctools/ChangeLog
+++ modules/doctools/ChangeLog
@@ -1,10 +1,18 @@
+2013-02-25 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+
+ * mpformats/_nroff.tcl (nroff_postprocess): Followup fixes to
+ * mpformats/fmt.nroff: bugs found in branch "bug-3601370-td",
+ * pkgIndex.tcl: Missing markup of several nroff directives as
+ * doctools.tcl: such. Version bumped to 1.4.15.
+ * doctools.man:
+
2013-02-01 Andreas Kupries <andreas_kupries@users.sourceforge.net>
*
* Released and tagged Tcllib 1.15 ========================
- *
+ *
2013-01-29 Andreas Kupries <andreask@activestate.com>
* doctools.man: Bumped version to 1.4.14 for the
* doctools.tcl: last change, see below.
@@ -26,11 +34,11 @@
2011-12-13 Andreas Kupries <andreas_kupries@users.sourceforge.net>
*
* Released and tagged Tcllib 1.14 ========================
- *
+ *
2011-11-07 Andreas Kupries <andreas_kupries@users.sourceforge.net>
* tests/nroff/04: Updated the test outputs to match the changes
* tests/nroff/07: introduced by the last two commits, below.
@@ -63,11 +71,11 @@
2011-01-24 Andreas Kupries <andreas_kupries@users.sourceforge.net>
*
* Released and tagged Tcllib 1.13 ========================
- *
+ *
2011-01-12 Andreas Kupries <andreas_kupries@users.sourceforge.net>
* doctools.test: Updated for the changes made per the entry below.
@@ -104,11 +112,11 @@
* mpformats/fmt.latex:
* mpformats/fmt.tmml:
* mpformats/fmt.html:
* mpformats/fmt.nroff:
* mpformats/fmt.null:
- * doctools.man:
+ * doctools.man:
* pkgIndex.tcl:
* doctools.tcl:
2010-06-17 Andreas Kupries <andreask@activestate.com>
@@ -156,12 +164,12 @@
* ../../apps/dtplite:
* docidx.man: Added missing dt_package and restricted 'file'
* docidx.tcl: support to doctool::toc and doctools::idx. Versions
* doctoc.man: bumped to 1.1.3 and 1.0.4.
- * doctoc.tcl:
- * pkgIndex.tcl:
+ * doctoc.tcl:
+ * pkgIndex.tcl:
* mpformats/toc.text: Fixed command names using various textutil
* mpformats/idx.text: functionality.
2010-02-05 Andreas Kupries <andreask@activestate.com>
@@ -173,11 +181,11 @@
* pkgIndex.tcl: 1.4.6.
2010-02-04 Andreas Kupries <andreask@activestate.com>
* doctools.tcl: Extended with new plugin API command
- * doctools.man: [dt_mainfile], which always returns
+ * doctools.man: [dt_mainfile], which always returns
* doctools_plugin_apiref.man: the toplevel file currently
* pkgIndex.tcl: processed, in contrast to [dt_file] which
returns the currently processed file, which may be included.
Bumped version to 1.4.5.
@@ -186,11 +194,11 @@
instead of the toplevel.
2009-12-09 Andreas Kupries <andreask@activestate.com>
* doctools.tcl: Bumped version to 1.4.4.
- * doctools.man:
+ * doctools.man:
* pkgIndex.tcl:
* mpformats/fmt.html: Extended to support the engine variable
* doctools.test: 'raw' (boolean flag). The default is off, causing
the engine to generate the full html, as usual. If set, the
@@ -213,11 +221,11 @@
2009-12-07 Andreas Kupries <andreas_kupries@users.sourceforge.net>
*
* Released and tagged Tcllib 1.12 ========================
- *
+ *
2009-07-21 Andreas Kupries <andreask@activestate.com>
* doctools.tcl: Fixed @mdgen instructions, added forgotten
ownership reference to man.macros. See ActiveState Bug 83781,
@@ -277,11 +285,11 @@
* doctools.tcl: their result instead of generating a
* doctools.test: '.so man.macros' command. Stuart Cassoff
* doctools_plugin_apiref.man: <stwo@users.sourceforge.net> did the
* mpformats/_nroff.tcl: work and provided the patches as part of
* mpformats/fmt.nroff: his effort on making a Tcllib OpenBSD port.
- * mpformats/idx.nroff:
+ * mpformats/idx.nroff:
* mpformats/toc.nroff:
2009-01-28 Andreas Kupries <andreas_kupries@users.sourceforge.net>
* checker.tcl: Fixed bug in handling 'category' command. Bumped
@@ -316,17 +324,17 @@
2008-12-12 Andreas Kupries <andreas_kupries@users.sourceforge.net>
*
* Released and tagged Tcllib 1.11.1 ========================
- *
+ *
2008-12-01 Andreas Kupries <andreask@activestate.com>
* doctools.tcl: New command in doctools language is extended API.
* doctools.man: Bumped minor version, to 1.4.
- * pkgIndex.tcl:
+ * pkgIndex.tcl:
2008-11-26 Andreas Kupries <andreask@activestate.com>
* api.tcl: Extended doctools language with a 'category'
* checker.tcl: command. This allows manpages to provide
@@ -355,11 +363,11 @@
2008-10-16 Andreas Kupries <andreas_kupries@users.sourceforge.net>
*
* Released and tagged Tcllib 1.11 ========================
- *
+ *
2008-07-08 Andreas Kupries <andreask@activestate.com>
* changelog.man: Bumped the packages to version 1. They have
* changelog.tcl: been on 0 long enough.
@@ -386,11 +394,11 @@
* ../tie/tie.man: Fixed the sectref argument order issues.
2008-05-15 Andreas Kupries <andreas_kupries@users.sourceforge.net>
* doctools.tcl: Bumped version to 1.3.4.
- * doctools.man:
+ * doctools.man:
* pkgIndex.tcl:
* checker.tcl: Reworked the (sub)section handling, enabled the
* doctools_lang_cmdref.man: documentation writer to label
(sub)sections with logical names and use these in references.
@@ -411,11 +419,11 @@
* mpformats/fr.msg:
* mpformats/fmt.html: Updated the backends for the changes in the
* mpformats/fmt.latex: frontend/backend API, and updated testsuite
* mpformats/fmt.nroff: results.
- * mpformats/fmt.text:
+ * mpformats/fmt.text:
* mpformats/fmt.tmml:
* mpformats/fmt.wiki:
* mpformats/_common.tcl:
* tests/latex/00:
* tests/latex/01:
@@ -521,16 +529,16 @@
2008-04-23 Andreas Kupries <andreas_kupries@users.sourceforge.net>
* tests/man/02: Added see_also and keyword references to this
* tests/html/02: example. Updated all changed results.
- * tests/latex/02:
- * tests/list/02:
- * tests/nroff/02:
- * tests/text/02:
- * tests/tmml/02:
- * tests/wiki/02:
+ * tests/latex/02:
+ * tests/list/02:
+ * tests/nroff/02:
+ * tests/text/02:
+ * tests/tmml/02:
+ * tests/wiki/02:
2008-04-21 Andreas Kupries <andreas_kupries@users.sourceforge.net>
* mpformats/fmt.html: Modified to put sections and subsections
* mpformats/_html.tcl: into divisions a CSS can lock onto. Changed
@@ -711,11 +719,11 @@
* doctools.man: first pass, to avoid replication. Bumped version
to 1.3.1. This fixes [SF Tcllib Bug 1800413].
* mpformats/fmt.nroff: Fixed argument swap in fmt_arg_def, fixing
[SF Tcllib Bug 1800420].
-
+
* mpformats/fmt.html: Handled [SF Tcllib Bug 1800408] and [SF
Tcllib Bug 411], removing superfluous whitespace around link
text and adding more class names to semantic markup.
2007-09-20 Andreas Kupries <andreask@activestate.com>
@@ -730,11 +738,11 @@
2007-09-12 Andreas Kupries <andreas_kupries@users.sourceforge.net>
*
* Released and tagged Tcllib 1.10 ========================
- *
+ *
2007-08-20 Andreas Kupries <andreask@activestate.com>
* doctools.tcl: Bumped versions to 1.3 and 0.3 respectively to
* docidx.tcl: reflect the extended syntax and bugfixes listed
@@ -797,11 +805,11 @@
to warnings.
* checker_toc.tcl: Language change (doctoc, docidx). Comments in
* checker_idx.tcl: the input are now swallowed by the checker
layer and not propagated to the backend anymore.
-
+
* checker.tcl: Language changes.
-- Comments are swallowed, backends do not see them anymore.
-- 'require'ments an now go everywhere in the header, not only
after the 'desc'riptions.
-- Warnings now have location information.
@@ -824,11 +832,11 @@
Note that everything which was made deprecated is still accepted
as valid input, however their use does cause the generation of
warnings. This means that the language after the changes is a
proper superset of the language before it. Old documents can be
processed just fine with the new code.
-
+
* mpformats/fmt.html: Use the new list types for translation.
* mpformats/fmt.latex:
* mpformats/fmt.text:
* mpformats/fmt.tmml:
@@ -851,11 +859,11 @@
are now cross-referencable via 'term', allowing direct links
between documents. Comments about internals added. Documentation
updated for the new functionality, and fixed all warnings due to
use of deprecated commands and list types. Added a section on
how to give feedback.
-
+
* cvs.man: Fixed all warnings due to use of deprecated commands
* changelog.man: and list types, tweaked the titles, and added
sections about how to give feedback.
* docidx.man: Significant rewrites for better language, better
@@ -903,11 +911,11 @@
2006-10-03 Andreas Kupries <andreas_kupries@users.sourceforge.net>
*
* Released and tagged Tcllib 1.9 ========================
- *
+ *
2006-10-02 Andreas Kupries <andreas_kupries@users.sourceforge.net>
* doctools.test: Made the testsuite robust against locale
* doctoc.test: settings in the environment. The tests
@@ -914,11 +922,11 @@
* docidx.test: assume the default locale (LANG=C).
2006-09-19 Andreas Kupries <andreask@activestate.com>
* doctools.man: Bumped version to 1.2.1
- * doctools.tcl:
+ * doctools.tcl:
* pkgIndex.tcl:
2006-08-10 Andreas Kupries <andreask@activestate.com>
* mpformats/_text.tcl: Replaced textutil with the exact packages
@@ -955,11 +963,11 @@
2005-10-06 Andreas Kupries <andreas_kupries@users.sourceforge.net>
*
* Released and tagged Tcllib 1.8 ========================
- *
+ *
2005-10-03 Andreas Kupries <andreask@activestate.com>
* checker.tcl: Added code checking for ambiguities in section
* mpformats/c.msg: and subsection titles. It causes warnings.
@@ -983,12 +991,12 @@
* doctools.test: Testsuite package requirements fixed to ensure
* docidx.test: use of local packages.
* doctoc.test:
* doctools.tcl: Typo police.
- * docidx.tcl:
- * doctoc.tcl:
+ * docidx.tcl:
+ * doctoc.tcl:
2005-02-18 Andreas Kupries <andreas_kupries@users.sourceforge.net>
* mpformats/_nroff.tcl: Fixed problem with comment
handling. Before the fix we could generate output where nroff
@@ -1021,11 +1029,11 @@
2004-10-05 Andreas Kupries <andreas_kupries@users.sourceforge.net>
*
* Released and tagged Tcllib 1.7 ========================
- *
+ *
2004-09-23 Andreas Kupries <andreas_kupries@users.sourceforge.net>
* mpformats/_text.tcl: Fixed expr'essions without braces.
@@ -1063,17 +1071,17 @@
* docidx.test:
2004-07-24 Andreas Kupries <andreas_kupries@users.sourceforge.net>
* docidx_fmt.man: More overhaul.
- * docidx_api.man:
- * doctoc_fmt.man:
- * doctoc_api.man:
- * doctoc.man:
- * doctools_fmt.man:
- * doctools_api.man:
- * doctools.man:
+ * docidx_api.man:
+ * doctoc_fmt.man:
+ * doctoc_api.man:
+ * doctoc.man:
+ * doctools_fmt.man:
+ * doctools_api.man:
+ * doctools.man:
* changelog.man:
* cvs.man:
2004-07-23 Andreas Kupries <andreas_kupries@users.sourceforge.net>
@@ -1082,30 +1090,30 @@
* ../../apps/dtplite: Revamped the whole file mapping. Actually
ripped it out. Is not needed, the formatting engine does the
necessary parts for us, if we feed it the correct -file
options. This kills the outstanding bug with xref links.
-
+
* ../../apps/dtplite: Bugfix. Added checks to prevent duplicate
entries in the keyword index. Without these checks going through
a set of packages twice for merging will create double links for
each actual entry. Changed the representation of the index saved
between merge invokations to keep the array for the voiding of
duplicates around.
* docidx.man: Overhaul of documentation.
- * cvs.man:
- * changelog.man:
+ * cvs.man:
+ * changelog.man:
2004-07-22 Andreas Kupries <andreas_kupries@users.sourceforge.net>
* ../../apps/dtplite: Reduced error output, show only the message,
not the whole stack.
* doctools.tcl: Changed processing of error messages so that
* doctoc.tcl: we don't loose the location information.
- * docidx.tcl:
+ * docidx.tcl:
2004-07-22 Andreas Kupries <andreas_kupries@users.sourceforge.net>
* doctools_api.man: Polished the manpages a bit,
* ../../apps/dtplite.man: for better cross-referencing.
@@ -1164,15 +1172,15 @@
2004-05-23 Andreas Kupries <andreas_kupries@users.sourceforge.net>
*
* Released and tagged Tcllib 1.6.1 ========================
- *
+ *
2004-05-23 Andreas Kupries <andreas_kupries@users.sourceforge.net>
- * doctools.tcl: Rel. engineering. Updated version number
+ * doctools.tcl: Rel. engineering. Updated version number
* doctools.man: of doctools to reflect its changes, to 1.0.2.
* pkgIndex.tcl:
2004-05-14 Andreas Kupries <andreas_kupries@users.sourceforge.net>
@@ -1188,14 +1196,14 @@
* mpformats/_nroff.tcl: the validator subsystem, and all formatting
* mpformats/_text.tcl: engines which are coming with the package.
* mpformats/fmt.html: For HTML output subsections are added to
* mpformats/fmt.latex: the TOC (See [SF Tcllib RFE 772491] below)
* mpformats/fmt.nroff: as well.
- * mpformats/fmt.null:
- * mpformats/fmt.text:
- * mpformats/fmt.tmml:
- * mpformats/fmt.wiki:
+ * mpformats/fmt.null:
+ * mpformats/fmt.text:
+ * mpformats/fmt.tmml:
+ * mpformats/fmt.wiki:
2004-05-14 Andreas Kupries <andreas_kupries@users.sourceforge.net>
* mpformats/_text.tcl (SECT): Fixed a small problem in the text
generator which was present for ages. Titles of more than one
@@ -1230,16 +1238,16 @@
'opt_def'.
2004-04-22 Joe English <jenglish@users.sourceforge.net>
* mpformats/fmt.xml: BUGFIX: "puts stderr" ==> "puts_stderr".
-
+
2004-02-15 Andreas Kupries <andreas_kupries@users.sourceforge.net>
*
* Released and tagged Tcllib 1.6 ========================
- *
+ *
2004-02-09 Andreas Kupries <andreas_kupries@users.sourceforge.net>
* doctools.test: Fixed problems with Tcl 8.5, the tests were
dependent on the order of keys in the result of [array get].
@@ -1269,11 +1277,11 @@
2003-05-05 Andreas Kupries <andreas_kupries@users.sourceforge.net>
*
* Released and tagged Tcllib 1.4 ========================
- *
+ *
2003-04-01 Andreas Kupries <andreask@activestate.com>
* checker_toc.tcl: Bug fixes for handling of nested toc divisions.
@@ -1285,12 +1293,12 @@
* docidx.tcl: Added the package and file ops initially created in
doctools.tcl to these packages too, so that their text engines
can use 'textutil' too.
* mpformats/_text.tcl:
- * mpformats/fmt.text:
- * mpformats/toc.text:
+ * mpformats/fmt.text:
+ * mpformats/toc.text:
* mpformats/idx.text: Bug fixes.
2003-03-31 Andreas Kupries <andreask@activestate.com>
* mpformats/toc.text:
@@ -1367,11 +1375,11 @@
cross-references causing unwanted suppression (leakage of
definitions between multiple pages).
* doctoc.tcl: Bug fixes in three return statemments.
* docidx.tcl: (return -code error string, not return -code string)
- * doctools.tcl:
+ * doctools.tcl:
2003-03-11 Andreas Kupries <andreas_kupries@users.sourceforge.net>
* mpformats/fmt.html: Rewrite handling of [keywords] and
* mpformats/fmt.latex: [see_also] to behave like for the TMML
@@ -1460,11 +1468,11 @@
* dtocformat.man: and a number of formatting engines
* dtocengine.man: plugging into this package to
* mpformats/_toc_common.tcl: generate output in various formats.
* mpformats/toc.html: This required additional checker code
* mpformats/toc.nroff: and more messages in the message
- * mpformats/toc.null: catalogs.
+ * mpformats/toc.null: catalogs.
* mpformats/toc.tmml:
* mpformats/toc.wiki:
* pkgIndex.tcl:
* mpformats/c.msg:
* mpformats/en.msg:
@@ -1513,15 +1521,15 @@
* mpformats/fmt.nroff: now also redirects the command to 'emph'.
* mpformats/fmt.wiki: The option -visualwarn (doctools, and
* mpformats/fmt.null: mpexpand) renamed to -deprecated. Message
* mpformats/fmt.list: 'visualmarkup' removed from the catalogs,
* mpformats/c.msg: and 'depr_strong' added instead.
- * mpformats/en.msg:
- * mpformats/de.msg:
- * checker.tcl:
- * doctools.tcl:
- * mpexpand:
+ * mpformats/en.msg:
+ * mpformats/de.msg:
+ * checker.tcl:
+ * doctools.tcl:
+ * mpexpand:
* doctools.man: Updated, converted [strong] to better
* dtformat.man: formatting commands. Ditto for all manpages
* dtformatter.man: in tcllib containing 'strong'. 'strong' is now
* mpexpand.man: not present anymore.
@@ -1534,17 +1542,17 @@
being given to the formatter.
* mpformats/fmt.html: Removed the phrase 'All rights reserved'
* mpformats/fmt.latex: from the code, on recommendation by
* mpformats/fmt.nroff: Joe English.
- * mpformats/fmt.wiki:
+ * mpformats/fmt.wiki:
(In the way to early morrow :)
* mpformats/fmt.html: Changed to display copyright information in
* mpformats/fmt.latex: the conversion result itself and not only
* mpformats/fmt.nroff: embedded in comments.
- * mpformats/fmt.wiki:
+ * mpformats/fmt.wiki:
2003-01-14 Andreas Kupries <andreas_kupries@users.sourceforge.net>
* doctools.tcl: Added a new formatting command,
* doctools.test: 'copyright', to declare/assign copyright
@@ -1557,13 +1565,13 @@
* mpformats/fmt.list: precedence over information coming from the
* mpformats/fmt.nroff: processor. Updated all predefined engines
* mpformats/fmt.null: to handle the new command. TMML done only
* mpformats/fmt.tmml: partially, as I don't know where the copy-
* mpformats/fmt.wiki: right has to go.
- * mpformats/_common.tcl:
- * mpformats/_html.tcl:
- * mpformats/_nroff.tcl:
+ * mpformats/_common.tcl:
+ * mpformats/_html.tcl:
+ * mpformats/_nroff.tcl:
* mpexpand:
2003-01-13 Andreas Kupries <andreas_kupries@users.sourceforge.net>
* mpexpand: Moved format help into the package itself.
@@ -1621,11 +1629,11 @@
* mpformats/fmt.html: Changed bug #578465 which caused
mis-generation of angle-brackets and quotes.
2002-06-06 Andreas Kupries <andreas_kupries@users.sourceforge.net>
- * mpformats/fmt.html:
+ * mpformats/fmt.html:
* mpformats/_html.tcl: Added the missing handling of " (&quot;) to
the format.
2002-05-27 Andreas Kupries <andreas_kupries@users.sourceforge.net>
@@ -1632,11 +1640,11 @@
* mpformats/_xml.tcl: args -> arguments, as the argument is not
the last one. The code as is was not erroneous, but a possible
trouble spot should tcl ever be more strict with 'args'.
2002-05-21 Andreas Kupries <andreas_kupries@users.sourceforge.net>
-
+
* mpformats/fmt.nroff: Accepted patch for bug #556509, both by Joe
English <jenglish@users.sourceforge.net>.
2002-05-09 Andreas Kupries <andreas_kupries@users.sourceforge.net>
@@ -1662,18 +1670,18 @@
* mpformats/fmt.null: Added new list types for arguments, options,
commands, and Tk (widget) options.
2002-04-24 Andreas Kupries <andreas_kupries@users.sourceforge.net>
- * mpformats/fmt.html:
+ * mpformats/fmt.html:
* mpformats/_html.tcl: Changes analogous to TMML (see below) to
differentiate internal markup and external special characters.
2002-04-24 Joe English <jenglish@users.sourceforge.net>
* mpformats/_xml.tcl
- * mpformats/fmt.tmml: Correctly handles XML markup characters
+ * mpformats/fmt.tmml: Correctly handles XML markup characters
in macro arguments. Also correctly escapes apostrophes
in attribute values (previously-unnoticed bug).
* mpformats/fmt.tmml: TMML uses <url> instead of <uri>, and
does not have a <strong> element; changed output accordingly.
@@ -1691,12 +1699,12 @@
are stripped in the post processor of this format, so
unconditionally adding them does not hurt.
2002-04-02 Andreas Kupries <andreas_kupries@users.sourceforge.net>
- * mpformats/en.msg:
- * mpformats/c.msg:
+ * mpformats/en.msg:
+ * mpformats/c.msg:
* mpformats/de.msg: Added the messages required by the new code
below.
* mpexpand: Added code to check that plain text is not used in
places where it is not allowed.
@@ -1716,16 +1724,16 @@
allowing for easy i18n and l10n of mpexpand. Catalogs for the
locales "c", "en", and "de" are provided.
* mpformats/fmt.html: Changed uri formatting to be a link.
- * mpformats/fmt.tmml:
- * mpformats/fmt.html:
- * mpformats/fmt.nroff:
- * mpformats/fmt.latex:
- * mpformats/fmt.list:
- * mpformats/fmt.null:
+ * mpformats/fmt.tmml:
+ * mpformats/fmt.html:
+ * mpformats/fmt.nroff:
+ * mpformats/fmt.latex:
+ * mpformats/fmt.list:
+ * mpformats/fmt.null:
* mpformats/_api.tcl: Added formatting commands "term" and "const"
to allow the structural markup of non-specific terminology and
of constant values.
* mpformats/fmt.nroff (bullet): Bulleting changed, use \(bu as
@@ -1781,13 +1789,13 @@
2002-02-27 Andreas Kupries <andreas_kupries@users.sourceforge.net>
* mpformats/fmt.null: Null format, does not produce any output.
- * mpformats/fmt.tmml:
- * mpformats/fmt.nroff:
- * mpformats/fmt.latex:
+ * mpformats/fmt.tmml:
+ * mpformats/fmt.nroff:
+ * mpformats/fmt.latex:
* mpformats/fmt.html:
* mpformats/fmt.list: Implementations of the new command.
* mpexpand: Added the commands to the processor application. Added
option "-visualwarn". When present the processor warn about
Index: modules/doctools/doctools.man
==================================================================
--- modules/doctools/doctools.man
+++ modules/doctools/doctools.man
@@ -1,13 +1,13 @@
[comment {-*- tcl -*- doctools manpage}]
-[manpage_begin doctools n 1.4.14]
+[manpage_begin doctools n 1.4.15]
[copyright {2003-2013 Andreas Kupries <andreas_kupries@users.sourceforge.net>}]
[moddesc {Documentation tools}]
[titledesc {doctools - Processing documents}]
[category {Documentation tools}]
[require Tcl 8.2]
-[require doctools [opt 1.4.14]]
+[require doctools [opt 1.4.15]]
[description]
This package provides a class for the creation of objects able to
process and convert text written in the [term doctools] markup
language into any output format X for which a
Index: modules/doctools/doctools.tcl
==================================================================
--- modules/doctools/doctools.tcl
+++ modules/doctools/doctools.tcl
@@ -1335,6 +1335,6 @@
#catch {search [file join $here lib doctools mpformats]}
#catch {search [file join [file dirname $here] lib doctools mpformats]}
catch {search [file join $here mpformats]}
}
-package provide doctools 1.4.14
+package provide doctools 1.4.15
Index: modules/doctools/mpformats/_nroff.tcl
==================================================================
--- modules/doctools/mpformats/_nroff.tcl
+++ modules/doctools/mpformats/_nroff.tcl
@@ -13,11 +13,11 @@
# Any empty line created because of this is filtered out in the
# post-processing step.
proc nr_lp {} {return \n\1.LP}
-proc nr_ta {{text {}}} {return ".ta$text"}
+proc nr_ta {{text {}}} {return "\1.ta$text"}
proc nr_bld {} {return \1\\fB}
proc nr_bldt {t} {return "\n\1.B $t\n"}
proc nr_ul {} {return \1\\fI}
proc nr_rst {} {return \1\\fR}
proc nr_p {} {return \n\1.PP\n}
@@ -101,16 +101,18 @@
# - Strip empty lines out of the text
# - Remove leading and trailing whitespace from lines.
# - Exceptions to the above: Keep empty lines and leading
# whitespace when in verbatim sections (no-fill-mode)
- set nfMode [list .nf .CS] ; # commands which start no-fill mode
- set fiMode [list .fi .CE] ; # commands which terminate no-fill mode
+ set nfMode [list \1.nf \1.CS] ; # commands which start no-fill mode
+ set fiMode [list \1.fi \1.CE] ; # commands which terminate no-fill mode
set lines [list] ; # Result buffer
set verbatim 0 ; # Automaton mode/state
foreach line [split $nroff "\n"] {
+ #puts_stderr |[expr {$verbatim ? "VERB" : " "}]|$line|
+
if {!$verbatim} {
# Normal lines, not in no-fill mode.
if {[lsearch -exact $nfMode [split $line]] >= 0} {
# no-fill mode starts after this line.
@@ -134,20 +136,21 @@
# [bug-3601370] Only lift & attach if last line is not
# a directive
set last [lindex $lines end]
if { ! [string match "\1.*" $last] } {
+ #puts_stderr \tLIFT
set lines [lreplace $lines end end]
set line "$last $line"
}
} elseif {[string match {['.]*} $line]} {
- # Apostrophes or periods at the beginning of a line have to
- # quoted to prevent misinterpretation as comments or directives.
- # The true comments and directive are quoted with \1
- # already and will therefore not detected by the code
- # here.
-
+ # Apostrophes or periods at the beginning of a line
+ # have to be quoted to prevent misinterpretation as
+ # comments or directives. The true comments and
+ # directive are quoted with \1 already and will
+ # therefore not detected by the code here.
+ #puts_stderr \tQUOTE
set line \1\\$line
}
} else {
# No-fill mode. We remove trailing whitespace, but keep
# leading whitespace and empty lines.
@@ -164,14 +167,15 @@
set lines [join $lines "\n"]
# Remove superfluous .IP commands (empty paragraph). The first
# identity mapping is there to avoid smashing a man macro
# definition.
- set lines [string map [list \
- \n\1.IP\n\1..\n \n\1.IP\n\1..\n \
- \n\1.IP\n\1. \n\1.] \
- $lines]
+
+ lappend map \n\1.IP\n\1.\1.\n \n\1.IP\n\1.\1.\n
+ lappend map \n\1.IP\n\1. \n\1.
+
+ set lines [string map $map $lines]
# Return the modified result buffer
return [string map $finalMap $lines]
}
Index: modules/doctools/mpformats/fmt.nroff
==================================================================
--- modules/doctools/mpformats/fmt.nroff
+++ modules/doctools/mpformats/fmt.nroff
@@ -267,15 +267,15 @@
proc fmt_image {text {label {}}} {
# text = symbolic name of the image.
set img [dt_imgdata $text {pic}]
if {$img ne {}} {
- return \n.PS\n$img\n.PE\n
+ return \n\1.PS\n$img\n\1.PE\n
}
set img [dt_imgdata $text {txt}]
if {$img ne {}} {
- return \n.PS\n.nf\n$img\n.fi\n.PE\n
+ return \n\1.PS\n\1.nf\n$img\n\1.fi\n\1.PE\n
}
if {$label eq {}} {
return "IMAGE: $text"
} else {
return "IMAGE: $text $label"
Index: modules/doctools/pkgIndex.tcl
==================================================================
--- modules/doctools/pkgIndex.tcl
+++ modules/doctools/pkgIndex.tcl
@@ -1,6 +1,6 @@
if {![package vsatisfies [package provide Tcl] 8.2]} {return}
-package ifneeded doctools 1.4.14 [list source [file join $dir doctools.tcl]]
+package ifneeded doctools 1.4.15 [list source [file join $dir doctools.tcl]]
package ifneeded doctools::toc 1.1.3 [list source [file join $dir doctoc.tcl]]
package ifneeded doctools::idx 1.0.4 [list source [file join $dir docidx.tcl]]
package ifneeded doctools::cvs 1 [list source [file join $dir cvs.tcl]]
package ifneeded doctools::changelog 1.1 [list source [file join $dir changelog.tcl]]

36
devel/tcllib/files/patch-bug-3603702 Normal file
View File

@ -0,0 +1,36 @@
Index: modules/clock/ChangeLog
==================================================================
--- modules/clock/ChangeLog
+++ modules/clock/ChangeLog
@@ -1,5 +1,9 @@
+2013-02-08 Andreas Kupries <andreask@activestate.com>
+
+ * iso8601.test: [Bug 3603702]: Fixed TZ-dependent test case.
+
2013-02-01 Andreas Kupries <andreas_kupries@users.sourceforge.net>
*
* Released and tagged Tcllib 1.15 ========================
*
Index: modules/clock/iso8601.test
==================================================================
--- modules/clock/iso8601.test
+++ modules/clock/iso8601.test
@@ -38,13 +38,12 @@
test clock-iso8601-2.0 {parse_date, bad input} -body {
clock::iso8601 parse_date A
} -returnCodes error -result {not an iso8601 date string}
test clock-iso8601-2.1 {parse_date} -body {
- clock::iso8601 parse_date 1994-11-05
- # It is unclear if this is influenced by TZ.
-} -result 784022400
+ clock format [clock::iso8601 parse_date 1994-11-05] -format %D
+} -result 11/05/1994
# -------------------------------------------------------------------------
test clock-iso8601-2.0.0 {parse_date, format: 19700102, reformatted with clock format -format {%D}} -body {
clock format [clock::iso8601 parse_date {19700102}] -format {%D}

168
devel/tcllib/files/patch-bug-3608240 Normal file
View File

@ -0,0 +1,168 @@
Index: modules/struct/ChangeLog
==================================================================
--- modules/struct/ChangeLog
+++ modules/struct/ChangeLog
@@ -1,5 +1,12 @@
+2013-03-18 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+
+ * queue.testsuite: [Bug 3608240]: Fixed get/peek not taking
+ * queue_oo.tcl: the amount of already delivered elements
+ * queue_tcl.tcl: into account. Extended testsuite. Bumped version
+ to 1.4.5
+
2013-02-01 Andreas Kupries <andreas_kupries@users.sourceforge.net>
*
* Released and tagged Tcllib 1.15 ========================
*
Index: modules/struct/queue.man
==================================================================
--- modules/struct/queue.man
+++ modules/struct/queue.man
@@ -1,12 +1,12 @@
[comment {-*- tcl -*-}]
-[manpage_begin struct::queue n 1.4.4]
+[manpage_begin struct::queue n 1.4.5]
[moddesc {Tcl Data Structures}]
[titledesc {Create and manipulate queue objects}]
[category {Data structures}]
[require Tcl 8.4]
-[require struct::queue [opt 1.4.4]]
+[require struct::queue [opt 1.4.5]]
[description]
The [namespace ::struct] namespace contains a commands for processing
finite queues.
Index: modules/struct/queue.tcl
==================================================================
--- modules/struct/queue.tcl
+++ modules/struct/queue.tcl
@@ -182,6 +182,6 @@
namespace eval ::struct {
# Export the constructor command.
namespace export queue
}
-package provide struct::queue 1.4.4
+package provide struct::queue 1.4.5
Index: modules/struct/queue.testsuite
==================================================================
--- modules/struct/queue.testsuite
+++ modules/struct/queue.testsuite
@@ -336,7 +336,37 @@
myqueue unget foo
set res [myqueue peek [myqueue size]]
myqueue destroy
set res
} {foo d e f}
+
+#----------------------------------------------------------------------
+
+test queue-${impl}-sf-3608240-a {} {
+ struct::queue qp
+ qp put 1 2 3
+ set r {}
+ lappend r [qp peek [qp size]]
+ lappend r [qp get]
+ lappend r [qp peek [qp size]]
+ qp put 4 5
+ lappend r [qp peek [qp size]]
+ qp destroy
+ set r
+} {{1 2 3} 1 {2 3} {2 3 4 5}}
+catch { unset r }
+
+test queue-${impl}-sf-3608240-b {} {
+ struct::queue qp
+ qp put 1 2 3
+ set r {}
+ lappend r [qp peek [qp size]]
+ lappend r [qp get]
+ lappend r [qp peek [qp size]]
+ qp put 4 5
+ lappend r [qp get [qp size]]
+ qp destroy
+ set r
+} {{1 2 3} 1 {2 3} {2 3 4 5}}
+catch { unset r }
#----------------------------------------------------------------------
Index: modules/struct/queue_oo.tcl
==================================================================
--- modules/struct/queue_oo.tcl
+++ modules/struct/queue_oo.tcl
@@ -76,13 +76,13 @@
}
# Otherwise, return a list of items
if {$count > ([llength $qret] - $qat)} {
- # Need all of qret and parts of qadd, maybe all.
+ # Need all of qret (from qat on) and parts of qadd, maybe all.
set max [expr {$qat + $count - 1 - [llength $qret]}]
- set result [concat $qret [lrange $qadd 0 $max]]
+ set result [concat [lrange $qret $qat end] [lrange $qadd 0 $max]]
my Shift
set qat $max
} else {
# Request can be satisified from qret alone.
set max [expr {$qat + $count - 1}]
@@ -123,13 +123,13 @@
}
# Otherwise, return a list of items
if {$count > [llength $qret] - $qat} {
- # Need all of qret and parts of qadd, maybe all.
+ # Need all of qret (from qat on) and parts of qadd, maybe all.
set over [expr {$qat + $count - 1 - [llength $qret]}]
- return [concat $qret [lrange $qadd 0 $over]]
+ return [concat [lrange $qret $qat end] [lrange $qadd 0 $over]]
} else {
# Request can be satisified from qret alone.
return [lrange $qret $qat [expr {$qat + $count - 1}]]
}
}
Index: modules/struct/queue_tcl.tcl
==================================================================
--- modules/struct/queue_tcl.tcl
+++ modules/struct/queue_tcl.tcl
@@ -219,13 +219,13 @@
}
# Otherwise, return a list of items
if {$count > ([llength $RET] - $AT)} {
- # Need all of RET and parts of ADD, maybe all.
+ # Need all of RET (from AT on) and parts of ADD, maybe all.
set max [expr {$count - ([llength $RET] - $AT) - 1}]
- set result [concat $RET [lrange $ADD 0 $max]]
+ set result [concat [lrange $RET $AT end] [lrange $ADD 0 $max]]
Shift $name
set AT $max
} else {
# Request can be satisified from RET alone.
set max [expr {$AT + $count - 1}]
@@ -271,13 +271,13 @@
}
# Otherwise, return a list of items
if {$count > [llength $RET] - $AT} {
- # Need all of RET and parts of ADD, maybe all.
+ # Need all of RET (from AT on) and parts of ADD, maybe all.
set over [expr {$count - ([llength $RET] - $AT) - 1}]
- return [concat $RET [lrange $ADD 0 $over]]
+ return [concat [lrange $RET $AT end] [lrange $ADD 0 $over]]
} else {
# Request can be satisified from RET alone.
return [lrange $RET $AT [expr {$AT + $count - 1}]]
}
}

23
devel/tcllib/files/patch-doctools
View File

@ -1,23 +0,0 @@
--- modules/doctools/ChangeLog.orig 2011/12/13 18:59:14 1.165
+++ modules/doctools/ChangeLog 2012/02/28 03:14:50 1.166
@@ -1,3 +1,9 @@
+2012-02-27 Andreas Kupries <aku@hephaistos>
+
+ * tests/text/04: Update the expected the result to match the new
+ actual result. See the 2011-12-13 last-second bugfix in
+ textutil::adjust::undent for the cause.
+
2011-12-13 Andreas Kupries <andreas_kupries@users.sourceforge.net>
*
--- modules/doctools/tests/text/04.orig 2012-03-05 16:05:43.000000000 +0100
+++ modules/doctools/tests/text/04 2012-03-05 16:05:51.000000000 +0100
@@ -14,7 +14,7 @@
BEGINNE HIER
-| Example Block More Lines
+| Example Block More Lines
| Inlined Example \

562
devel/tcllib/files/patch-json-write Normal file
View File

@ -0,0 +1,562 @@
Index: modules/pt/ChangeLog
==================================================================
--- modules/pt/ChangeLog.orig
+++ modules/pt/ChangeLog
@@ -1,5 +1,20 @@
+2013-03-04 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+
+ * tests/data/ok/peg_json-indalign/0_basic_arithmetic: Updated to match
+ * tests/data/ok/peg_json-indalign/2_fun_arithmetic: json::write 1.0.2
+ * tests/data/ok/peg_json-indalign/3_peg_itself: ("/" not quoted as "\/")
+ * tests/data/ok/peg_json-indalign/4_choice:
+ * tests/data/ok/peg_json-indented/0_basic_arithmetic:
+ * tests/data/ok/peg_json-indented/2_fun_arithmetic:
+ * tests/data/ok/peg_json-indented/3_peg_itself:
+ * tests/data/ok/peg_json-indented/4_choice:
+ * tests/data/ok/peg_json-ultracompact/0_basic_arithmetic:
+ * tests/data/ok/peg_json-ultracompact/2_fun_arithmetic:
+ * tests/data/ok/peg_json-ultracompact/3_peg_itself:
+ * tests/data/ok/peg_json-ultracompact/4_choice:
+
2013-02-01 Andreas Kupries <andreas_kupries@users.sourceforge.net>
*
* Released and tagged Tcllib 1.15 ========================
*
Index: modules/pt/tests/data/ok/peg_json-indalign/0_basic_arithmetic
==================================================================
--- modules/pt/tests/data/ok/peg_json-indalign/0_basic_arithmetic.orig
+++ modules/pt/tests/data/ok/peg_json-indalign/0_basic_arithmetic
@@ -1,34 +1,34 @@
{
"pt::grammar::peg" : {
"rules" : {
"AddOp" : {
- "is" : "\/ {t -} {t +}",
+ "is" : "/ {t -} {t +}",
"mode" : "value"
},
"Digit" : {
- "is" : "\/ {t 0} {t 1} {t 2} {t 3} {t 4} {t 5} {t 6} {t 7} {t 8} {t 9}",
+ "is" : "/ {t 0} {t 1} {t 2} {t 3} {t 4} {t 5} {t 6} {t 7} {t 8} {t 9}",
"mode" : "value"
},
"Expression" : {
- "is" : "\/ {x {t (} {n Expression} {t )}} {x {n Factor} {* {x {n MulOp} {n Factor}}}}",
+ "is" : "/ {x {t (} {n Expression} {t )}} {x {n Factor} {* {x {n MulOp} {n Factor}}}}",
"mode" : "value"
},
"Factor" : {
"is" : "x {n Term} {* {x {n AddOp} {n Term}}}",
"mode" : "value"
},
"MulOp" : {
- "is" : "\/ {t *} {t \/}",
+ "is" : "/ {t *} {t /}",
"mode" : "value"
},
"Number" : {
"is" : "x {? {n Sign}} {+ {n Digit}}",
"mode" : "value"
},
"Sign" : {
- "is" : "\/ {t -} {t +}",
+ "is" : "/ {t -} {t +}",
"mode" : "value"
},
"Term" : {
"is" : "n Number",
"mode" : "value"
Index: modules/pt/tests/data/ok/peg_json-indalign/2_fun_arithmetic
==================================================================
--- modules/pt/tests/data/ok/peg_json-indalign/2_fun_arithmetic.orig
+++ modules/pt/tests/data/ok/peg_json-indalign/2_fun_arithmetic
@@ -1,18 +1,18 @@
{
"pt::grammar::peg" : {
"rules" : {
"AddOp" : {
- "is" : "\/ {t -} {t +}",
+ "is" : "/ {t -} {t +}",
"mode" : "value"
},
"Digit" : {
- "is" : "\/ {t 0} {t 1} {t 2} {t 3} {t 4} {t 5} {t 6} {t 7} {t 8} {t 9}",
+ "is" : "/ {t 0} {t 1} {t 2} {t 3} {t 4} {t 5} {t 6} {t 7} {t 8} {t 9}",
"mode" : "value"
},
"Expression" : {
- "is" : "\/ {n Function} {\/ {x {t (} {n Expression} {t )}} {x {n Factor} {* {x {n MulOp} {n Factor}}}}}",
+ "is" : "/ {n Function} {/ {x {t (} {n Expression} {t )}} {x {n Factor} {* {x {n MulOp} {n Factor}}}}}",
"mode" : "value"
},
"Factor" : {
"is" : "x {n Term} {* {x {n AddOp} {n Term}}}",
"mode" : "value"
@@ -20,19 +20,19 @@
"Function" : {
"is" : "n Sinus",
"mode" : "value"
},
"MulOp" : {
- "is" : "\/ {t *} {t \/}",
+ "is" : "/ {t *} {t /}",
"mode" : "value"
},
"Number" : {
"is" : "x {? {n Sign}} {+ {n Digit}}",
"mode" : "value"
},
"Sign" : {
- "is" : "\/ {t -} {t +}",
+ "is" : "/ {t -} {t +}",
"mode" : "value"
},
"Sinus" : {
"is" : "x {t s} {t i} {t n} {t (} {n Expression} {t )}",
"mode" : "value"
Index: modules/pt/tests/data/ok/peg_json-indalign/3_peg_itself
==================================================================
--- modules/pt/tests/data/ok/peg_json-indalign/3_peg_itself.orig
+++ modules/pt/tests/data/ok/peg_json-indalign/3_peg_itself
@@ -20,15 +20,15 @@
"ASCII" : {
"is" : "x {t <} {t a} {t s} {t c} {t i} {t i} {t >} {n WHITESPACE}",
"mode" : "leaf"
},
"Attribute" : {
- "is" : "x {\/ {n VOID} {n LEAF}} {n COLON}",
+ "is" : "x {/ {n VOID} {n LEAF}} {n COLON}",
"mode" : "value"
},
"Char" : {
- "is" : "\/ {n CharSpecial} {n CharOctalFull} {n CharOctalPart} {n CharUnicode} {n CharUnescaped}",
+ "is" : "/ {n CharSpecial} {n CharOctalFull} {n CharOctalPart} {n CharUnicode} {n CharUnescaped}",
"mode" : "value"
},
"CharOctalFull" : {
"is" : "x {t \\\\} {.. 0 2} {.. 0 7} {.. 0 7}",
"mode" : "leaf"
@@ -36,11 +36,11 @@
"CharOctalPart" : {
"is" : "x {t \\\\} {.. 0 7} {? {.. 0 7}}",
"mode" : "leaf"
},
"CharSpecial" : {
- "is" : "x {t \\\\} {\/ {t n} {t r} {t t} {t '} {t {\"}} {t {[}} {t \\]} {t \\\\}}",
+ "is" : "x {t \\\\} {/ {t n} {t r} {t t} {t '} {t {\"}} {t {[}} {t \\]} {t \\\\}}",
"mode" : "leaf"
},
"CharUnescaped" : {
"is" : "x {! {t \\\\}} dot",
"mode" : "leaf"
@@ -100,11 +100,11 @@
"EOF" : {
"is" : "! dot",
"mode" : "void"
},
"EOL" : {
- "is" : "\/ {t {\n}} {t {\r}}",
+ "is" : "/ {t {\n}} {t {\r}}",
"mode" : "void"
},
"Expression" : {
"is" : "x {n Sequence} {* {x {n SLASH} {n Sequence}}}",
"mode" : "value"
@@ -124,11 +124,11 @@
"Header" : {
"is" : "x {n PEG} {n Identifier} {n StartExpr}",
"mode" : "value"
},
"Ident" : {
- "is" : "x {\/ {t _} {t :} alpha} {* {\/ {t _} {t :} alnum}}",
+ "is" : "x {/ {t _} {t :} alpha} {* {/ {t _} {t :} alnum}}",
"mode" : "leaf"
},
"Identifier" : {
"is" : "x {n Ident} {n WHITESPACE}",
"mode" : "value"
@@ -140,11 +140,11 @@
"LEAF" : {
"is" : "x {t l} {t e} {t a} {t f} {n WHITESPACE}",
"mode" : "leaf"
},
"Literal" : {
- "is" : "\/ {x {n APOSTROPH} {* {x {! {n APOSTROPH}} {n Char}}} {n APOSTROPH} {n WHITESPACE}} {x {n DAPOSTROPH} {* {x {! {n DAPOSTROPH}} {n Char}}} {n DAPOSTROPH} {n WHITESPACE}}",
+ "is" : "/ {x {n APOSTROPH} {* {x {! {n APOSTROPH}} {n Char}}} {n APOSTROPH} {n WHITESPACE}} {x {n DAPOSTROPH} {* {x {! {n DAPOSTROPH}} {n Char}}} {n DAPOSTROPH} {n WHITESPACE}}",
"mode" : "value"
},
"LOWER" : {
"is" : "x {t <} {t l} {t o} {t w} {t e} {t r} {t >} {n WHITESPACE}",
"mode" : "leaf"
@@ -168,15 +168,15 @@
"PLUS" : {
"is" : "x {t +} {n WHITESPACE}",
"mode" : "leaf"
},
"Prefix" : {
- "is" : "x {? {\/ {n AND} {n NOT}}} {n Suffix}",
+ "is" : "x {? {/ {n AND} {n NOT}}} {n Suffix}",
"mode" : "value"
},
"Primary" : {
- "is" : "\/ {n ALNUM} {n ALPHA} {n ASCII} {n CONTROL} {n DDIGIT} {n DIGIT} {n GRAPH} {n LOWER} {n PRINTABLE} {n PUNCT} {n SPACE} {n UPPER} {n WORDCHAR} {n XDIGIT} {n Identifier} {x {n OPEN} {n Expression} {n CLOSE}} {n Literal} {n Class} {n DOT}",
+ "is" : "/ {n ALNUM} {n ALPHA} {n ASCII} {n CONTROL} {n DDIGIT} {n DIGIT} {n GRAPH} {n LOWER} {n PRINTABLE} {n PUNCT} {n SPACE} {n UPPER} {n WORDCHAR} {n XDIGIT} {n Identifier} {x {n OPEN} {n Expression} {n CLOSE}} {n Literal} {n Class} {n DOT}",
"mode" : "value"
},
"PRINTABLE" : {
"is" : "x {t <} {t p} {t r} {t i} {t n} {t t} {t >} {n WHITESPACE}",
"mode" : "leaf"
@@ -188,11 +188,11 @@
"QUESTION" : {
"is" : "x {t ?} {n WHITESPACE}",
"mode" : "leaf"
},
"Range" : {
- "is" : "\/ {x {n Char} {n TO} {n Char}} {n Char}",
+ "is" : "/ {x {n Char} {n TO} {n Char}} {n Char}",
"mode" : "value"
},
"SEMICOLON" : {
"is" : "x {t {;}} {n WHITESPACE}",
"mode" : "void"
@@ -200,11 +200,11 @@
"Sequence" : {
"is" : "+ {n Prefix}",
"mode" : "value"
},
"SLASH" : {
- "is" : "x {t \/} {n WHITESPACE}",
+ "is" : "x {t /} {n WHITESPACE}",
"mode" : "void"
},
"SPACE" : {
"is" : "x {t <} {t s} {t p} {t a} {t c} {t e} {t >} {n WHITESPACE}",
"mode" : "leaf"
@@ -216,11 +216,11 @@
"StartExpr" : {
"is" : "x {n OPEN} {n Expression} {n CLOSE}",
"mode" : "value"
},
"Suffix" : {
- "is" : "x {n Primary} {? {\/ {n QUESTION} {n STAR} {n PLUS}}}",
+ "is" : "x {n Primary} {? {/ {n QUESTION} {n STAR} {n PLUS}}}",
"mode" : "value"
},
"TO" : {
"is" : "t -",
"mode" : "void"
@@ -232,11 +232,11 @@
"VOID" : {
"is" : "x {t v} {t o} {t i} {t d} {n WHITESPACE}",
"mode" : "leaf"
},
"WHITESPACE" : {
- "is" : "* {\/ space {n COMMENT}}",
+ "is" : "* {/ space {n COMMENT}}",
"mode" : "void"
},
"WORDCHAR" : {
"is" : "x {t <} {t w} {t o} {t r} {t d} {t c} {t h} {t a} {t r} {t >} {n WHITESPACE}",
"mode" : "leaf"
Index: modules/pt/tests/data/ok/peg_json-indalign/4_choice
==================================================================
--- modules/pt/tests/data/ok/peg_json-indalign/4_choice.orig
+++ modules/pt/tests/data/ok/peg_json-indalign/4_choice
@@ -1,6 +1,6 @@
{
"pt::grammar::peg" : {
"rules" : {},
- "start" : "\/ {t a} {t b} {t c}"
+ "start" : "/ {t a} {t b} {t c}"
}
}
Index: modules/pt/tests/data/ok/peg_json-indented/0_basic_arithmetic
==================================================================
--- modules/pt/tests/data/ok/peg_json-indented/0_basic_arithmetic.orig
+++ modules/pt/tests/data/ok/peg_json-indented/0_basic_arithmetic
@@ -1,34 +1,34 @@
{
"pt::grammar::peg" : {
"rules" : {
"AddOp" : {
- "is" : "\/ {t -} {t +}",
+ "is" : "/ {t -} {t +}",
"mode" : "value"
},
"Digit" : {
- "is" : "\/ {t 0} {t 1} {t 2} {t 3} {t 4} {t 5} {t 6} {t 7} {t 8} {t 9}",
+ "is" : "/ {t 0} {t 1} {t 2} {t 3} {t 4} {t 5} {t 6} {t 7} {t 8} {t 9}",
"mode" : "value"
},
"Expression" : {
- "is" : "\/ {x {t (} {n Expression} {t )}} {x {n Factor} {* {x {n MulOp} {n Factor}}}}",
+ "is" : "/ {x {t (} {n Expression} {t )}} {x {n Factor} {* {x {n MulOp} {n Factor}}}}",
"mode" : "value"
},
"Factor" : {
"is" : "x {n Term} {* {x {n AddOp} {n Term}}}",
"mode" : "value"
},
"MulOp" : {
- "is" : "\/ {t *} {t \/}",
+ "is" : "/ {t *} {t /}",
"mode" : "value"
},
"Number" : {
"is" : "x {? {n Sign}} {+ {n Digit}}",
"mode" : "value"
},
"Sign" : {
- "is" : "\/ {t -} {t +}",
+ "is" : "/ {t -} {t +}",
"mode" : "value"
},
"Term" : {
"is" : "n Number",
"mode" : "value"
Index: modules/pt/tests/data/ok/peg_json-indented/2_fun_arithmetic
==================================================================
--- modules/pt/tests/data/ok/peg_json-indented/2_fun_arithmetic.orig
+++ modules/pt/tests/data/ok/peg_json-indented/2_fun_arithmetic
@@ -1,18 +1,18 @@
{
"pt::grammar::peg" : {
"rules" : {
"AddOp" : {
- "is" : "\/ {t -} {t +}",
+ "is" : "/ {t -} {t +}",
"mode" : "value"
},
"Digit" : {
- "is" : "\/ {t 0} {t 1} {t 2} {t 3} {t 4} {t 5} {t 6} {t 7} {t 8} {t 9}",
+ "is" : "/ {t 0} {t 1} {t 2} {t 3} {t 4} {t 5} {t 6} {t 7} {t 8} {t 9}",
"mode" : "value"
},
"Expression" : {
- "is" : "\/ {n Function} {\/ {x {t (} {n Expression} {t )}} {x {n Factor} {* {x {n MulOp} {n Factor}}}}}",
+ "is" : "/ {n Function} {/ {x {t (} {n Expression} {t )}} {x {n Factor} {* {x {n MulOp} {n Factor}}}}}",
"mode" : "value"
},
"Factor" : {
"is" : "x {n Term} {* {x {n AddOp} {n Term}}}",
"mode" : "value"
@@ -20,19 +20,19 @@
"Function" : {
"is" : "n Sinus",
"mode" : "value"
},
"MulOp" : {
- "is" : "\/ {t *} {t \/}",
+ "is" : "/ {t *} {t /}",
"mode" : "value"
},
"Number" : {
"is" : "x {? {n Sign}} {+ {n Digit}}",
"mode" : "value"
},
"Sign" : {
- "is" : "\/ {t -} {t +}",
+ "is" : "/ {t -} {t +}",
"mode" : "value"
},
"Sinus" : {
"is" : "x {t s} {t i} {t n} {t (} {n Expression} {t )}",
"mode" : "value"
Index: modules/pt/tests/data/ok/peg_json-indented/3_peg_itself
==================================================================
--- modules/pt/tests/data/ok/peg_json-indented/3_peg_itself.orig
+++ modules/pt/tests/data/ok/peg_json-indented/3_peg_itself
@@ -20,15 +20,15 @@
"ASCII" : {
"is" : "x {t <} {t a} {t s} {t c} {t i} {t i} {t >} {n WHITESPACE}",
"mode" : "leaf"
},
"Attribute" : {
- "is" : "x {\/ {n VOID} {n LEAF}} {n COLON}",
+ "is" : "x {/ {n VOID} {n LEAF}} {n COLON}",
"mode" : "value"
},
"Char" : {
- "is" : "\/ {n CharSpecial} {n CharOctalFull} {n CharOctalPart} {n CharUnicode} {n CharUnescaped}",
+ "is" : "/ {n CharSpecial} {n CharOctalFull} {n CharOctalPart} {n CharUnicode} {n CharUnescaped}",
"mode" : "value"
},
"CharOctalFull" : {
"is" : "x {t \\\\} {.. 0 2} {.. 0 7} {.. 0 7}",
"mode" : "leaf"
@@ -36,11 +36,11 @@
"CharOctalPart" : {
"is" : "x {t \\\\} {.. 0 7} {? {.. 0 7}}",
"mode" : "leaf"
},
"CharSpecial" : {
- "is" : "x {t \\\\} {\/ {t n} {t r} {t t} {t '} {t {\"}} {t {[}} {t \\]} {t \\\\}}",
+ "is" : "x {t \\\\} {/ {t n} {t r} {t t} {t '} {t {\"}} {t {[}} {t \\]} {t \\\\}}",
"mode" : "leaf"
},
"CharUnescaped" : {
"is" : "x {! {t \\\\}} dot",
"mode" : "leaf"
@@ -100,11 +100,11 @@
"EOF" : {
"is" : "! dot",
"mode" : "void"
},
"EOL" : {
- "is" : "\/ {t {\n}} {t {\r}}",
+ "is" : "/ {t {\n}} {t {\r}}",
"mode" : "void"
},
"Expression" : {
"is" : "x {n Sequence} {* {x {n SLASH} {n Sequence}}}",
"mode" : "value"
@@ -124,11 +124,11 @@
"Header" : {
"is" : "x {n PEG} {n Identifier} {n StartExpr}",
"mode" : "value"
},
"Ident" : {
- "is" : "x {\/ {t _} {t :} alpha} {* {\/ {t _} {t :} alnum}}",
+ "is" : "x {/ {t _} {t :} alpha} {* {/ {t _} {t :} alnum}}",
"mode" : "leaf"
},
"Identifier" : {
"is" : "x {n Ident} {n WHITESPACE}",
"mode" : "value"
@@ -140,11 +140,11 @@
"LEAF" : {
"is" : "x {t l} {t e} {t a} {t f} {n WHITESPACE}",
"mode" : "leaf"
},
"Literal" : {
- "is" : "\/ {x {n APOSTROPH} {* {x {! {n APOSTROPH}} {n Char}}} {n APOSTROPH} {n WHITESPACE}} {x {n DAPOSTROPH} {* {x {! {n DAPOSTROPH}} {n Char}}} {n DAPOSTROPH} {n WHITESPACE}}",
+ "is" : "/ {x {n APOSTROPH} {* {x {! {n APOSTROPH}} {n Char}}} {n APOSTROPH} {n WHITESPACE}} {x {n DAPOSTROPH} {* {x {! {n DAPOSTROPH}} {n Char}}} {n DAPOSTROPH} {n WHITESPACE}}",
"mode" : "value"
},
"LOWER" : {
"is" : "x {t <} {t l} {t o} {t w} {t e} {t r} {t >} {n WHITESPACE}",
"mode" : "leaf"
@@ -168,15 +168,15 @@
"PLUS" : {
"is" : "x {t +} {n WHITESPACE}",
"mode" : "leaf"
},
"Prefix" : {
- "is" : "x {? {\/ {n AND} {n NOT}}} {n Suffix}",
+ "is" : "x {? {/ {n AND} {n NOT}}} {n Suffix}",
"mode" : "value"
},
"Primary" : {
- "is" : "\/ {n ALNUM} {n ALPHA} {n ASCII} {n CONTROL} {n DDIGIT} {n DIGIT} {n GRAPH} {n LOWER} {n PRINTABLE} {n PUNCT} {n SPACE} {n UPPER} {n WORDCHAR} {n XDIGIT} {n Identifier} {x {n OPEN} {n Expression} {n CLOSE}} {n Literal} {n Class} {n DOT}",
+ "is" : "/ {n ALNUM} {n ALPHA} {n ASCII} {n CONTROL} {n DDIGIT} {n DIGIT} {n GRAPH} {n LOWER} {n PRINTABLE} {n PUNCT} {n SPACE} {n UPPER} {n WORDCHAR} {n XDIGIT} {n Identifier} {x {n OPEN} {n Expression} {n CLOSE}} {n Literal} {n Class} {n DOT}",
"mode" : "value"
},
"PRINTABLE" : {
"is" : "x {t <} {t p} {t r} {t i} {t n} {t t} {t >} {n WHITESPACE}",
"mode" : "leaf"
@@ -188,11 +188,11 @@
"QUESTION" : {
"is" : "x {t ?} {n WHITESPACE}",
"mode" : "leaf"
},
"Range" : {
- "is" : "\/ {x {n Char} {n TO} {n Char}} {n Char}",
+ "is" : "/ {x {n Char} {n TO} {n Char}} {n Char}",
"mode" : "value"
},
"SEMICOLON" : {
"is" : "x {t {;}} {n WHITESPACE}",
"mode" : "void"
@@ -200,11 +200,11 @@
"Sequence" : {
"is" : "+ {n Prefix}",
"mode" : "value"
},
"SLASH" : {
- "is" : "x {t \/} {n WHITESPACE}",
+ "is" : "x {t /} {n WHITESPACE}",
"mode" : "void"
},
"SPACE" : {
"is" : "x {t <} {t s} {t p} {t a} {t c} {t e} {t >} {n WHITESPACE}",
"mode" : "leaf"
@@ -216,11 +216,11 @@
"StartExpr" : {
"is" : "x {n OPEN} {n Expression} {n CLOSE}",
"mode" : "value"
},
"Suffix" : {
- "is" : "x {n Primary} {? {\/ {n QUESTION} {n STAR} {n PLUS}}}",
+ "is" : "x {n Primary} {? {/ {n QUESTION} {n STAR} {n PLUS}}}",
"mode" : "value"
},
"TO" : {
"is" : "t -",
"mode" : "void"
@@ -232,11 +232,11 @@
"VOID" : {
"is" : "x {t v} {t o} {t i} {t d} {n WHITESPACE}",
"mode" : "leaf"
},
"WHITESPACE" : {
- "is" : "* {\/ space {n COMMENT}}",
+ "is" : "* {/ space {n COMMENT}}",
"mode" : "void"
},
"WORDCHAR" : {
"is" : "x {t <} {t w} {t o} {t r} {t d} {t c} {t h} {t a} {t r} {t >} {n WHITESPACE}",
"mode" : "leaf"
Index: modules/pt/tests/data/ok/peg_json-indented/4_choice
==================================================================
--- modules/pt/tests/data/ok/peg_json-indented/4_choice.orig
+++ modules/pt/tests/data/ok/peg_json-indented/4_choice
@@ -1,6 +1,6 @@
{
"pt::grammar::peg" : {
"rules" : {},
- "start" : "\/ {t a} {t b} {t c}"
+ "start" : "/ {t a} {t b} {t c}"
}
}
Index: modules/pt/tests/data/ok/peg_json-ultracompact/0_basic_arithmetic
==================================================================
--- modules/pt/tests/data/ok/peg_json-ultracompact/0_basic_arithmetic.orig
+++ modules/pt/tests/data/ok/peg_json-ultracompact/0_basic_arithmetic
@@ -1,1 +1,1 @@
-{"pt::grammar::peg":{"rules":{"AddOp":{"is":"\/ {t -} {t +}","mode":"value"},"Digit":{"is":"\/ {t 0} {t 1} {t 2} {t 3} {t 4} {t 5} {t 6} {t 7} {t 8} {t 9}","mode":"value"},"Expression":{"is":"\/ {x {t (} {n Expression} {t )}} {x {n Factor} {* {x {n MulOp} {n Factor}}}}","mode":"value"},"Factor":{"is":"x {n Term} {* {x {n AddOp} {n Term}}}","mode":"value"},"MulOp":{"is":"\/ {t *} {t \/}","mode":"value"},"Number":{"is":"x {? {n Sign}} {+ {n Digit}}","mode":"value"},"Sign":{"is":"\/ {t -} {t +}","mode":"value"},"Term":{"is":"n Number","mode":"value"}},"start":"n Expression"}}
+{"pt::grammar::peg":{"rules":{"AddOp":{"is":"/ {t -} {t +}","mode":"value"},"Digit":{"is":"/ {t 0} {t 1} {t 2} {t 3} {t 4} {t 5} {t 6} {t 7} {t 8} {t 9}","mode":"value"},"Expression":{"is":"/ {x {t (} {n Expression} {t )}} {x {n Factor} {* {x {n MulOp} {n Factor}}}}","mode":"value"},"Factor":{"is":"x {n Term} {* {x {n AddOp} {n Term}}}","mode":"value"},"MulOp":{"is":"/ {t *} {t /}","mode":"value"},"Number":{"is":"x {? {n Sign}} {+ {n Digit}}","mode":"value"},"Sign":{"is":"/ {t -} {t +}","mode":"value"},"Term":{"is":"n Number","mode":"value"}},"start":"n Expression"}}
Index: modules/pt/tests/data/ok/peg_json-ultracompact/2_fun_arithmetic
==================================================================
--- modules/pt/tests/data/ok/peg_json-ultracompact/2_fun_arithmetic.orig
+++ modules/pt/tests/data/ok/peg_json-ultracompact/2_fun_arithmetic
@@ -1,1 +1,1 @@
-{"pt::grammar::peg":{"rules":{"AddOp":{"is":"\/ {t -} {t +}","mode":"value"},"Digit":{"is":"\/ {t 0} {t 1} {t 2} {t 3} {t 4} {t 5} {t 6} {t 7} {t 8} {t 9}","mode":"value"},"Expression":{"is":"\/ {n Function} {\/ {x {t (} {n Expression} {t )}} {x {n Factor} {* {x {n MulOp} {n Factor}}}}}","mode":"value"},"Factor":{"is":"x {n Term} {* {x {n AddOp} {n Term}}}","mode":"value"},"Function":{"is":"n Sinus","mode":"value"},"MulOp":{"is":"\/ {t *} {t \/}","mode":"value"},"Number":{"is":"x {? {n Sign}} {+ {n Digit}}","mode":"value"},"Sign":{"is":"\/ {t -} {t +}","mode":"value"},"Sinus":{"is":"x {t s} {t i} {t n} {t (} {n Expression} {t )}","mode":"value"},"Term":{"is":"n Number","mode":"value"}},"start":"n Expression"}}
+{"pt::grammar::peg":{"rules":{"AddOp":{"is":"/ {t -} {t +}","mode":"value"},"Digit":{"is":"/ {t 0} {t 1} {t 2} {t 3} {t 4} {t 5} {t 6} {t 7} {t 8} {t 9}","mode":"value"},"Expression":{"is":"/ {n Function} {/ {x {t (} {n Expression} {t )}} {x {n Factor} {* {x {n MulOp} {n Factor}}}}}","mode":"value"},"Factor":{"is":"x {n Term} {* {x {n AddOp} {n Term}}}","mode":"value"},"Function":{"is":"n Sinus","mode":"value"},"MulOp":{"is":"/ {t *} {t /}","mode":"value"},"Number":{"is":"x {? {n Sign}} {+ {n Digit}}","mode":"value"},"Sign":{"is":"/ {t -} {t +}","mode":"value"},"Sinus":{"is":"x {t s} {t i} {t n} {t (} {n Expression} {t )}","mode":"value"},"Term":{"is":"n Number","mode":"value"}},"start":"n Expression"}}
Index: modules/pt/tests/data/ok/peg_json-ultracompact/3_peg_itself
==================================================================
--- modules/pt/tests/data/ok/peg_json-ultracompact/3_peg_itself.orig
+++ modules/pt/tests/data/ok/peg_json-ultracompact/3_peg_itself
@@ -1,1 +1,1 @@
-{"pt::grammar::peg":{"rules":{"ALNUM":{"is":"x {t <} {t a} {t l} {t n} {t u} {t m} {t >} {n WHITESPACE}","mode":"leaf"},"ALPHA":{"is":"x {t <} {t a} {t l} {t p} {t h} {t a} {t >} {n WHITESPACE}","mode":"leaf"},"AND":{"is":"x {t &} {n WHITESPACE}","mode":"leaf"},"APOSTROPH":{"is":"t '","mode":"void"},"ASCII":{"is":"x {t <} {t a} {t s} {t c} {t i} {t i} {t >} {n WHITESPACE}","mode":"leaf"},"Attribute":{"is":"x {\/ {n VOID} {n LEAF}} {n COLON}","mode":"value"},"Char":{"is":"\/ {n CharSpecial} {n CharOctalFull} {n CharOctalPart} {n CharUnicode} {n CharUnescaped}","mode":"value"},"CharOctalFull":{"is":"x {t \\\\} {.. 0 2} {.. 0 7} {.. 0 7}","mode":"leaf"},"CharOctalPart":{"is":"x {t \\\\} {.. 0 7} {? {.. 0 7}}","mode":"leaf"},"CharSpecial":{"is":"x {t \\\\} {\/ {t n} {t r} {t t} {t '} {t {\"}} {t {[}} {t \\]} {t \\\\}}","mode":"leaf"},"CharUnescaped":{"is":"x {! {t \\\\}} dot","mode":"leaf"},"CharUnicode":{"is":"x {t \\\\} {t u} xdigit {? {x xdigit {? {x xdigit {? xdigit}}}}}","mode":"leaf"},"Class":{"is":"x {n OPENB} {* {x {! {n CLOSEB}} {n Range}}} {n CLOSEB} {n WHITESPACE}","mode":"value"},"CLOSE":{"is":"x {t )} {n WHITESPACE}","mode":"void"},"CLOSEB":{"is":"t \\]","mode":"void"},"COLON":{"is":"x {t :} {n WHITESPACE}","mode":"void"},"COMMENT":{"is":"x {t #} {* {x {! {n EOL}} dot}} {n EOL}","mode":"void"},"CONTROL":{"is":"x {t <} {t c} {t o} {t n} {t t} {t r} {t o} {t l} {t >} {n WHITESPACE}","mode":"leaf"},"DAPOSTROPH":{"is":"t {\"}","mode":"void"},"DDIGIT":{"is":"x {t <} {t d} {t d} {t i} {t g} {t i} {t t} {t >} {n WHITESPACE}","mode":"leaf"},"Definition":{"is":"x {? {n Attribute}} {n Identifier} {n IS} {n Expression} {n SEMICOLON}","mode":"value"},"DIGIT":{"is":"x {t <} {t d} {t i} {t g} {t i} {t t} {t >} {n WHITESPACE}","mode":"leaf"},"DOT":{"is":"x {t .} {n WHITESPACE}","mode":"leaf"},"END":{"is":"x {t E} {t N} {t D} {n WHITESPACE}","mode":"void"},"EOF":{"is":"! dot","mode":"void"},"EOL":{"is":"\/ {t {\n}} {t {\r}}","mode":"void"},"Expression":{"is":"x {n Sequence} {* {x {n SLASH} {n Sequence}}}","mode":"value"},"Final":{"is":"x {n END} {n SEMICOLON} {n WHITESPACE}","mode":"void"},"Grammar":{"is":"x {n WHITESPACE} {n Header} {* {n Definition}} {n Final} {n EOF}","mode":"value"},"GRAPH":{"is":"x {t <} {t g} {t r} {t a} {t p} {t h} {t >} {n WHITESPACE}","mode":"leaf"},"Header":{"is":"x {n PEG} {n Identifier} {n StartExpr}","mode":"value"},"Ident":{"is":"x {\/ {t _} {t :} alpha} {* {\/ {t _} {t :} alnum}}","mode":"leaf"},"Identifier":{"is":"x {n Ident} {n WHITESPACE}","mode":"value"},"IS":{"is":"x {t <} {t -} {n WHITESPACE}","mode":"void"},"LEAF":{"is":"x {t l} {t e} {t a} {t f} {n WHITESPACE}","mode":"leaf"},"Literal":{"is":"\/ {x {n APOSTROPH} {* {x {! {n APOSTROPH}} {n Char}}} {n APOSTROPH} {n WHITESPACE}} {x {n DAPOSTROPH} {* {x {! {n DAPOSTROPH}} {n Char}}} {n DAPOSTROPH} {n WHITESPACE}}","mode":"value"},"LOWER":{"is":"x {t <} {t l} {t o} {t w} {t e} {t r} {t >} {n WHITESPACE}","mode":"leaf"},"NOT":{"is":"x {t !} {n WHITESPACE}","mode":"leaf"},"OPEN":{"is":"x {t (} {n WHITESPACE}","mode":"void"},"OPENB":{"is":"t {[}","mode":"void"},"PEG":{"is":"x {t P} {t E} {t G} {n WHITESPACE}","mode":"void"},"PLUS":{"is":"x {t +} {n WHITESPACE}","mode":"leaf"},"Prefix":{"is":"x {? {\/ {n AND} {n NOT}}} {n Suffix}","mode":"value"},"Primary":{"is":"\/ {n ALNUM} {n ALPHA} {n ASCII} {n CONTROL} {n DDIGIT} {n DIGIT} {n GRAPH} {n LOWER} {n PRINTABLE} {n PUNCT} {n SPACE} {n UPPER} {n WORDCHAR} {n XDIGIT} {n Identifier} {x {n OPEN} {n Expression} {n CLOSE}} {n Literal} {n Class} {n DOT}","mode":"value"},"PRINTABLE":{"is":"x {t <} {t p} {t r} {t i} {t n} {t t} {t >} {n WHITESPACE}","mode":"leaf"},"PUNCT":{"is":"x {t <} {t p} {t u} {t n} {t c} {t t} {t >} {n WHITESPACE}","mode":"leaf"},"QUESTION":{"is":"x {t ?} {n WHITESPACE}","mode":"leaf"},"Range":{"is":"\/ {x {n Char} {n TO} {n Char}} {n Char}","mode":"value"},"SEMICOLON":{"is":"x {t {;}} {n WHITESPACE}","mode":"void"},"Sequence":{"is":"+ {n Prefix}","mode":"value"},"SLASH":{"is":"x {t \/} {n WHITESPACE}","mode":"void"},"SPACE":{"is":"x {t <} {t s} {t p} {t a} {t c} {t e} {t >} {n WHITESPACE}","mode":"leaf"},"STAR":{"is":"x {t *} {n WHITESPACE}","mode":"leaf"},"StartExpr":{"is":"x {n OPEN} {n Expression} {n CLOSE}","mode":"value"},"Suffix":{"is":"x {n Primary} {? {\/ {n QUESTION} {n STAR} {n PLUS}}}","mode":"value"},"TO":{"is":"t -","mode":"void"},"UPPER":{"is":"x {t <} {t u} {t p} {t p} {t e} {t r} {t >} {n WHITESPACE}","mode":"leaf"},"VOID":{"is":"x {t v} {t o} {t i} {t d} {n WHITESPACE}","mode":"leaf"},"WHITESPACE":{"is":"* {\/ space {n COMMENT}}","mode":"void"},"WORDCHAR":{"is":"x {t <} {t w} {t o} {t r} {t d} {t c} {t h} {t a} {t r} {t >} {n WHITESPACE}","mode":"leaf"},"XDIGIT":{"is":"x {t <} {t x} {t d} {t i} {t g} {t i} {t t} {t >} {n WHITESPACE}","mode":"leaf"}},"start":"n Grammar"}}
+{"pt::grammar::peg":{"rules":{"ALNUM":{"is":"x {t <} {t a} {t l} {t n} {t u} {t m} {t >} {n WHITESPACE}","mode":"leaf"},"ALPHA":{"is":"x {t <} {t a} {t l} {t p} {t h} {t a} {t >} {n WHITESPACE}","mode":"leaf"},"AND":{"is":"x {t &} {n WHITESPACE}","mode":"leaf"},"APOSTROPH":{"is":"t '","mode":"void"},"ASCII":{"is":"x {t <} {t a} {t s} {t c} {t i} {t i} {t >} {n WHITESPACE}","mode":"leaf"},"Attribute":{"is":"x {/ {n VOID} {n LEAF}} {n COLON}","mode":"value"},"Char":{"is":"/ {n CharSpecial} {n CharOctalFull} {n CharOctalPart} {n CharUnicode} {n CharUnescaped}","mode":"value"},"CharOctalFull":{"is":"x {t \\\\} {.. 0 2} {.. 0 7} {.. 0 7}","mode":"leaf"},"CharOctalPart":{"is":"x {t \\\\} {.. 0 7} {? {.. 0 7}}","mode":"leaf"},"CharSpecial":{"is":"x {t \\\\} {/ {t n} {t r} {t t} {t '} {t {\"}} {t {[}} {t \\]} {t \\\\}}","mode":"leaf"},"CharUnescaped":{"is":"x {! {t \\\\}} dot","mode":"leaf"},"CharUnicode":{"is":"x {t \\\\} {t u} xdigit {? {x xdigit {? {x xdigit {? xdigit}}}}}","mode":"leaf"},"Class":{"is":"x {n OPENB} {* {x {! {n CLOSEB}} {n Range}}} {n CLOSEB} {n WHITESPACE}","mode":"value"},"CLOSE":{"is":"x {t )} {n WHITESPACE}","mode":"void"},"CLOSEB":{"is":"t \\]","mode":"void"},"COLON":{"is":"x {t :} {n WHITESPACE}","mode":"void"},"COMMENT":{"is":"x {t #} {* {x {! {n EOL}} dot}} {n EOL}","mode":"void"},"CONTROL":{"is":"x {t <} {t c} {t o} {t n} {t t} {t r} {t o} {t l} {t >} {n WHITESPACE}","mode":"leaf"},"DAPOSTROPH":{"is":"t {\"}","mode":"void"},"DDIGIT":{"is":"x {t <} {t d} {t d} {t i} {t g} {t i} {t t} {t >} {n WHITESPACE}","mode":"leaf"},"Definition":{"is":"x {? {n Attribute}} {n Identifier} {n IS} {n Expression} {n SEMICOLON}","mode":"value"},"DIGIT":{"is":"x {t <} {t d} {t i} {t g} {t i} {t t} {t >} {n WHITESPACE}","mode":"leaf"},"DOT":{"is":"x {t .} {n WHITESPACE}","mode":"leaf"},"END":{"is":"x {t E} {t N} {t D} {n WHITESPACE}","mode":"void"},"EOF":{"is":"! dot","mode":"void"},"EOL":{"is":"/ {t {\n}} {t {\r}}","mode":"void"},"Expression":{"is":"x {n Sequence} {* {x {n SLASH} {n Sequence}}}","mode":"value"},"Final":{"is":"x {n END} {n SEMICOLON} {n WHITESPACE}","mode":"void"},"Grammar":{"is":"x {n WHITESPACE} {n Header} {* {n Definition}} {n Final} {n EOF}","mode":"value"},"GRAPH":{"is":"x {t <} {t g} {t r} {t a} {t p} {t h} {t >} {n WHITESPACE}","mode":"leaf"},"Header":{"is":"x {n PEG} {n Identifier} {n StartExpr}","mode":"value"},"Ident":{"is":"x {/ {t _} {t :} alpha} {* {/ {t _} {t :} alnum}}","mode":"leaf"},"Identifier":{"is":"x {n Ident} {n WHITESPACE}","mode":"value"},"IS":{"is":"x {t <} {t -} {n WHITESPACE}","mode":"void"},"LEAF":{"is":"x {t l} {t e} {t a} {t f} {n WHITESPACE}","mode":"leaf"},"Literal":{"is":"/ {x {n APOSTROPH} {* {x {! {n APOSTROPH}} {n Char}}} {n APOSTROPH} {n WHITESPACE}} {x {n DAPOSTROPH} {* {x {! {n DAPOSTROPH}} {n Char}}} {n DAPOSTROPH} {n WHITESPACE}}","mode":"value"},"LOWER":{"is":"x {t <} {t l} {t o} {t w} {t e} {t r} {t >} {n WHITESPACE}","mode":"leaf"},"NOT":{"is":"x {t !} {n WHITESPACE}","mode":"leaf"},"OPEN":{"is":"x {t (} {n WHITESPACE}","mode":"void"},"OPENB":{"is":"t {[}","mode":"void"},"PEG":{"is":"x {t P} {t E} {t G} {n WHITESPACE}","mode":"void"},"PLUS":{"is":"x {t +} {n WHITESPACE}","mode":"leaf"},"Prefix":{"is":"x {? {/ {n AND} {n NOT}}} {n Suffix}","mode":"value"},"Primary":{"is":"/ {n ALNUM} {n ALPHA} {n ASCII} {n CONTROL} {n DDIGIT} {n DIGIT} {n GRAPH} {n LOWER} {n PRINTABLE} {n PUNCT} {n SPACE} {n UPPER} {n WORDCHAR} {n XDIGIT} {n Identifier} {x {n OPEN} {n Expression} {n CLOSE}} {n Literal} {n Class} {n DOT}","mode":"value"},"PRINTABLE":{"is":"x {t <} {t p} {t r} {t i} {t n} {t t} {t >} {n WHITESPACE}","mode":"leaf"},"PUNCT":{"is":"x {t <} {t p} {t u} {t n} {t c} {t t} {t >} {n WHITESPACE}","mode":"leaf"},"QUESTION":{"is":"x {t ?} {n WHITESPACE}","mode":"leaf"},"Range":{"is":"/ {x {n Char} {n TO} {n Char}} {n Char}","mode":"value"},"SEMICOLON":{"is":"x {t {;}} {n WHITESPACE}","mode":"void"},"Sequence":{"is":"+ {n Prefix}","mode":"value"},"SLASH":{"is":"x {t /} {n WHITESPACE}","mode":"void"},"SPACE":{"is":"x {t <} {t s} {t p} {t a} {t c} {t e} {t >} {n WHITESPACE}","mode":"leaf"},"STAR":{"is":"x {t *} {n WHITESPACE}","mode":"leaf"},"StartExpr":{"is":"x {n OPEN} {n Expression} {n CLOSE}","mode":"value"},"Suffix":{"is":"x {n Primary} {? {/ {n QUESTION} {n STAR} {n PLUS}}}","mode":"value"},"TO":{"is":"t -","mode":"void"},"UPPER":{"is":"x {t <} {t u} {t p} {t p} {t e} {t r} {t >} {n WHITESPACE}","mode":"leaf"},"VOID":{"is":"x {t v} {t o} {t i} {t d} {n WHITESPACE}","mode":"leaf"},"WHITESPACE":{"is":"* {/ space {n COMMENT}}","mode":"void"},"WORDCHAR":{"is":"x {t <} {t w} {t o} {t r} {t d} {t c} {t h} {t a} {t r} {t >} {n WHITESPACE}","mode":"leaf"},"XDIGIT":{"is":"x {t <} {t x} {t d} {t i} {t g} {t i} {t t} {t >} {n WHITESPACE}","mode":"leaf"}},"start":"n Grammar"}}
Index: modules/pt/tests/data/ok/peg_json-ultracompact/4_choice
==================================================================
--- modules/pt/tests/data/ok/peg_json-ultracompact/4_choice.orig
+++ modules/pt/tests/data/ok/peg_json-ultracompact/4_choice
@@ -1,1 +1,1 @@
-{"pt::grammar::peg":{"rules":{},"start":"\/ {t a} {t b} {t c}"}}
+{"pt::grammar::peg":{"rules":{},"start":"/ {t a} {t b} {t c}"}}

11
devel/tcllib/pkg-plist
View File

@ -39,6 +39,9 @@ lib/tcllib/blowfish/blowfish.tcl
lib/tcllib/blowfish/pkgIndex.tcl
lib/tcllib/cache/async.tcl
lib/tcllib/cache/pkgIndex.tcl
lib/tcllib/clock/iso8601.tcl
lib/tcllib/clock/pkgIndex.tcl
lib/tcllib/clock/rfc2822.tcl
lib/tcllib/cmdline/cmdline.tcl
lib/tcllib/cmdline/pkgIndex.tcl
lib/tcllib/comm/comm.tcl
@ -168,6 +171,7 @@ lib/tcllib/doctools2toc/msgcat_fr.tcl
lib/tcllib/doctools2toc/parse.tcl
lib/tcllib/doctools2toc/pkgIndex.tcl
lib/tcllib/doctools2toc/structure.tcl
lib/tcllib/fileutil/decode.tcl
lib/tcllib/fileutil/fileutil.tcl
lib/tcllib/fileutil/multi.tcl
lib/tcllib/fileutil/multiop.tcl
@ -184,6 +188,8 @@ lib/tcllib/fumagic/filetypes.tcl
lib/tcllib/fumagic/mimetypes.tcl
lib/tcllib/fumagic/pkgIndex.tcl
lib/tcllib/fumagic/rtcore.tcl
lib/tcllib/generator/generator.tcl
lib/tcllib/generator/pkgIndex.tcl
lib/tcllib/gpx/gpx.tcl
lib/tcllib/gpx/pkgIndex.tcl
lib/tcllib/grammar_aycock/aycock-build.tcl
@ -243,6 +249,7 @@ lib/tcllib/log/loggerAppender.tcl
lib/tcllib/log/loggerUtils.tcl
lib/tcllib/log/msgs/en.msg
lib/tcllib/log/pkgIndex.tcl
lib/tcllib/map/map_geocode_nominatim.tcl
lib/tcllib/map/map_slippy.tcl
lib/tcllib/map/map_slippy_cache.tcl
lib/tcllib/map/map_slippy_fetcher.tcl
@ -284,6 +291,7 @@ lib/tcllib/math/special.tcl
lib/tcllib/math/statistics.tcl
lib/tcllib/math/symdiff.tcl
lib/tcllib/math/tclIndex
lib/tcllib/math/wilcoxon.tcl
lib/tcllib/md4/md4.tcl
lib/tcllib/md4/md4c.tcl
lib/tcllib/md4/pkgIndex.tcl
@ -612,6 +620,9 @@ lib/tcllib/wip/wip2.tcl
lib/tcllib/yaml/huddle.tcl
lib/tcllib/yaml/pkgIndex.tcl
lib/tcllib/yaml/yaml.tcl
lib/tcllib/zip/decode.tcl
lib/tcllib/zip/encode.tcl
lib/tcllib/zip/pkgIndex.tcl
@dirrm lib/tcllib/yaml
@dirrm lib/tcllib/wip
@dirrm lib/tcllib/virtchannel_transform