Merge 9.0

5 files changed, 57 insertions, 53 deletions

diff --git a/tests/get.test b/tests/get.test
index 936bdda..eb26484 100644
--- a/tests/get.test
+++ b/tests/get.test
@@ -20,7 +20,6 @@ catch [list package require -exact tcl::test [info patchlevel]]
 
 testConstraint testgetint [llength [info commands testgetint]]
 testConstraint testdoubleobj [llength [info commands testdoubleobj]]
-testConstraint longIs32bit [expr {$tcl_platform(wordSize) == 4}]
 testConstraint longIs64bit [expr {$tcl_platform(wordSize) == 8}]
 
 test get-1.1 {Tcl_GetInt procedure} testgetint {
@@ -41,7 +40,7 @@ test get-1.5 {Tcl_GetInt procedure} testgetint {
 test get-1.6 {Tcl_GetInt procedure} testgetint {
     list [catch {testgetint 44 {16	 x}} msg] $msg
 } {1 {expected integer but got "16	 x"}}
-test get-1.7 {Tcl_GetInt procedure} {testgetint longIs64bit} {
+test get-1.7 {Tcl_GetInt procedure} testgetint {
     list [catch {testgetint 44 18446744073709551616} msg] $msg $errorCode
 } {1 {integer value too large to represent} {ARITH IOVERFLOW {integer value too large to represent}}}
 test get-1.8 {Tcl_GetInt procedure} {testgetint longIs64bit} {
@@ -50,19 +49,19 @@ test get-1.8 {Tcl_GetInt procedure} {testgetint longIs64bit} {
 test get-1.9 {Tcl_GetInt procedure} {testgetint longIs64bit} {
     testgetint +18446744073709551614
 } {-2}
-test get-1.10 {Tcl_GetInt procedure} {testgetint longIs64bit} {
+test get-1.10 {Tcl_GetInt procedure} testgetint {
     list [catch {testgetint -18446744073709551614} msg] $msg $errorCode
 } {1 {integer value too large to represent} {ARITH IOVERFLOW {integer value too large to represent}}}
-test get-1.11 {Tcl_GetInt procedure} {testgetint longIs32bit} {
+test get-1.11 {Tcl_GetInt procedure} testgetint {
     list [catch {testgetint 44 4294967296} msg] $msg $errorCode
 } {1 {integer value too large to represent} {ARITH IOVERFLOW {integer value too large to represent}}}
-test get-1.12 {Tcl_GetInt procedure} {testgetint longIs32bit} {
+test get-1.12 {Tcl_GetInt procedure} testgetint {
     list [catch {testgetint 4294967294} msg] $msg
 } {0 -2}
-test get-1.13 {Tcl_GetInt procedure} {testgetint longIs32bit} {
+test get-1.13 {Tcl_GetInt procedure} testgetint {
     list [catch {testgetint +4294967294} msg] $msg
 } {0 -2}
-test get-1.14 {Tcl_GetInt procedure} {testgetint longIs32bit} {
+test get-1.14 {Tcl_GetInt procedure} testgetint {
     list [catch {testgetint -4294967294} msg] $msg
 } {1 {integer value too large to represent}}
 
diff --git a/tests/http.test b/tests/http.test
index aeb1029..221985f 100644
--- a/tests/http.test
+++ b/tests/http.test
@@ -686,7 +686,7 @@ test http-7.4 {http::formatQuery} -setup {
     set enc [http::config -urlencoding]
 } -body {
     # this would be reverting to http <=2.4 behavior w/o errors
-    # with Tcl 8.x (unknown chars become '?'), generating a 
+    # with Tcl 8.x (unknown chars become '?'), generating a
     # proper exception with Tcl 9.0
     http::config -urlencoding "iso8859-1"
     http::mapReply "∈"
diff --git a/tests/interp.test b/tests/interp.test
index 385d3e2..532f1e5 100644
--- a/tests/interp.test
+++ b/tests/interp.test
@@ -2414,21 +2414,21 @@ test interp-29.1.4 {interp recursionlimit argument checking} {
     interp delete moo
     list $result $msg
 } {1 {expected integer but got "bar"}}
-test interp-29.1.5 {interp recursionlimit argument checking} {
+test interp-29.1.5 {interp recursionlimit argument checking} -body {
     interp create moo
     set result [catch {interp recursionlimit moo 0} msg]
     interp delete moo
     list $result $msg
-} {1 {recursion limit must be > 0}}
-test interp-29.1.6 {interp recursionlimit argument checking} {
+} -match glob -result {1 {recursion limit must be > 0 and < *}}
+test interp-29.1.6 {interp recursionlimit argument checking} -body {
     interp create moo
     set result [catch {interp recursionlimit moo -1} msg]
     interp delete moo
     list $result $msg
-} {1 {recursion limit must be > 0}}
+} -match glob -result {1 {recursion limit must be > 0 and < *}}
 test interp-29.1.7 {interp recursionlimit argument checking} {
     interp create moo
-    set result [catch {interp recursionlimit moo [expr {wide(1)<<32}]} msg]
+    set result [catch {interp recursionlimit moo [expr {wide(1)<<64}]} msg]
     interp delete moo
     list $result [string range $msg 0 35]
 } {1 {integer value too large to represent}}
@@ -2444,21 +2444,21 @@ test interp-29.1.9 {child recursionlimit argument checking} {
     interp delete moo
     list $result $msg
 } {1 {expected integer but got "foo"}}
-test interp-29.1.10 {child recursionlimit argument checking} {
+test interp-29.1.10 {child recursionlimit argument checking} -body {
     interp create moo
     set result [catch {moo recursionlimit 0} msg]
     interp delete moo
     list $result $msg
-} {1 {recursion limit must be > 0}}
-test interp-29.1.11 {child recursionlimit argument checking} {
+} -match glob -result {1 {recursion limit must be > 0 and < *}}
+test interp-29.1.11 {child recursionlimit argument checking} -body {
     interp create moo
     set result [catch {moo recursionlimit -1} msg]
     interp delete moo
     list $result $msg
-} {1 {recursion limit must be > 0}}
+} -match glob -result {1 {recursion limit must be > 0 and < *}}
 test interp-29.1.12 {child recursionlimit argument checking} {
     interp create moo
-    set result [catch {moo recursionlimit [expr {wide(1)<<32}]} msg]
+    set result [catch {moo recursionlimit [expr {wide(1)<<64}]} msg]
     interp delete moo
     list $result [string range $msg 0 35]
 } {1 {integer value too large to represent}}
diff --git a/tests/string.test b/tests/string.test
index b6b6843..8769556 100644
--- a/tests/string.test
+++ b/tests/string.test
@@ -32,7 +32,7 @@ proc makeShared {s} {uplevel 1 [list lappend copy $s]; return $s}
 testConstraint testobj [expr {[info commands testobj] ne {}}]
 testConstraint testindexobj [expr {[info commands testindexobj] ne {}}]
 testConstraint testevalex [expr {[info commands testevalex] ne {}}]
-testConstraint fullutf [expr {[string length \U010000] == 1}]
+testConstraint utf32 [expr {[string length \U010000] == 1}]
 testConstraint testbytestring   [llength [info commands testbytestring]]
 testConstraint utf32 [expr {[testConstraint fullutf]
 		&& [string length [format %c 0x10000]] == 1}]
@@ -368,7 +368,6 @@ test string-3.42.$noComp {string equal, binary neq inequal length} {
     run {string equal [binary format a20a 0 1] [binary format a100a 0 0]}
 } 0
 
-
 test string-4.1.$noComp {string first, not enough args} {
     list [catch {run {string first a}} msg] $msg
 } {1 {wrong # args: should be "string first needleString haystackString ?startIndex?"}}
@@ -427,22 +426,22 @@ test string-4.16.$noComp {string first, normal string vs pure unicode string} -b
 } -result {{string 1} {string 0} 2}
 test string-4.17.$noComp {string first, corner case} -body {
     run {string first a aaa 4294967295}
-} -result {-1}
+} -result -1
 test string-4.18.$noComp {string first, corner case} -body {
     run {string first a aaa -1}
-} -result {0}
+} -result 0
 test string-4.19.$noComp {string first, corner case} -body {
     run {string first a aaa end-5}
-} -result {0}
+} -result 0
 test string-4.20.$noComp {string last, corner case} -body {
     run {string last a aaa 4294967295}
-} -result {2}
+} -result 2
 test string-4.21.$noComp {string last, corner case} -body {
     run {string last a aaa -1}
-} -result {-1}
+} -result -1
 test string-4.22.$noComp {string last, corner case} {
     run {string last a aaa end-5}
-} {-1}
+} -1
 
 test string-5.1.$noComp {string index} {
     list [catch {run {string index}} msg] $msg
@@ -503,13 +502,13 @@ test string-5.17.$noComp {string index, bad integer} -body {
 test string-5.18.$noComp {string index, bad integer} -body {
     list [catch {run {string index "abc" end-0o0289}} msg] $msg
 } -match glob -result {1 {*}}
-test string-5.19.$noComp {string index, bytearray object out of bounds} -body {
+test string-5.19.$noComp {string index, bytearray object out of bounds} {
     run {string index [binary format I* {0x50515253 0x52}] -1}
-} -result {}
+} {}
 test string-5.20.$noComp {string index, bytearray object out of bounds} -body {
     run {string index [binary format I* {0x50515253 0x52}] 20}
 } -result {}
-test string-5.21.$noComp {string index, surrogates, bug [11ae2be95dac9417]} -constraints fullutf -body {
+test string-5.21.$noComp {string index, surrogates, bug [11ae2be95dac9417]} -constraints utf32 -body {
     run {list [string index a\U100000b 1] [string index a\U100000b 2] [string index a\U100000b 3]}
 } -result [list \U100000 b {}]
 test string-5.22.$noComp {string index} -constraints testbytestring -body {
@@ -988,6 +987,12 @@ test string-6.137.$noComp {string is unicode, noncharacter} {
 test string-6.138.$noComp {string is unicode, noncharacter} {
     run {string is unicode \uFDEF}
 } 0
+test string-6.139.$noComp {string is integer, bug [76ad7aeba3]} {
+    run {string is integer 18446744073709551615}
+} 1
+test string-6.140.$noComp {string is integer, bug [76ad7aeba3]} {
+    run {string is integer -18446744073709551615}
+} 1
 
 
 test string-7.1.$noComp {string last, not enough args} {
@@ -1074,13 +1079,13 @@ test string-10.3.$noComp {string map, too many args} {
 } {1 {wrong # args: should be "string map ?-nocase? charMap string"}}
 test string-10.4.$noComp {string map} {
     run {string map {a b} abba}
-} {bbbb}
+} bbbb
 test string-10.5.$noComp {string map} {
     run {string map {a b} a}
-} {b}
+} b
 test string-10.6.$noComp {string map -nocase} {
     run {string map -nocase {a b} Abba}
-} {bbbb}
+} bbbb
 test string-10.7.$noComp {string map} {
     run {string map {abc 321 ab * a A} aabcabaababcab}
 } {A321*A*321*}
@@ -1095,7 +1100,7 @@ test string-10.10.$noComp {string map} {
 } {1 {char map list unbalanced}}
 test string-10.11.$noComp {string map, nulls} {
     run {string map {\x00 NULL blah \x00nix} {qwerty}}
-} {qwerty}
+} qwerty
 test string-10.12.$noComp {string map, unicode} {
     run {string map [list ü ue UE Ü] "aüueUE\x00EU"}
 } aueueÜ\x00EU
@@ -1107,13 +1112,13 @@ test string-10.14.$noComp {string map, -nocase null arguments} {
 } foo
 test string-10.15.$noComp {string map, one pair case} {
     run {string map -nocase {abc 32} aAbCaBaAbAbcAb}
-} {a32aBaAb32Ab}
+} a32aBaAb32Ab
 test string-10.16.$noComp {string map, one pair case} {
     run {string map -nocase {ab 4321} aAbCaBaAbAbcAb}
-} {a4321C4321a43214321c4321}
+} a4321C4321a43214321c4321
 test string-10.17.$noComp {string map, one pair case} {
     run {string map {Ab 4321} aAbCaBaAbAbcAb}
-} {a4321CaBa43214321c4321}
+} a4321CaBa43214321c4321
 test string-10.18.$noComp {string map, empty argument} {
     run {string map -nocase {{} abc} foo}
 } foo
@@ -1507,7 +1512,7 @@ test string-12.22.$noComp {string range, shimmering binary/index} {
     binary scan $s a* x
     run {string range $s $s end}
 } 000000001
-test string-12.23.$noComp {string range, surrogates, bug [11ae2be95dac9417]} fullutf {
+test string-12.23.$noComp {string range, surrogates, bug [11ae2be95dac9417]} utf32 {
     run {list [string range a\U100000b 1 1] [string range a\U100000b 2 2] [string range a\U100000b 3 3]}
 } [list \U100000 b {}]
 test string-12.24.$noComp {bignum index arithmetic} -setup {
@@ -1585,22 +1590,22 @@ test string-14.5.$noComp {string replace} {
 } {abp}
 test string-14.6.$noComp {string replace} -body {
     run {string replace abcdefghijklmnop 7 1000}
-} -result {abcdefg}
+} -result abcdefg
 test string-14.7.$noComp {string replace} {
     run {string replace abcdefghijklmnop 10 end}
-} {abcdefghij}
+} abcdefghij
 test string-14.8.$noComp {string replace} {
     run {string replace abcdefghijklmnop 10 9}
-} {abcdefghijklmnop}
+} abcdefghijklmnop
 test string-14.9.$noComp {string replace} {
     run {string replace abcdefghijklmnop -3 2}
-} {defghijklmnop}
+} defghijklmnop
 test string-14.10.$noComp {string replace} {
     run {string replace abcdefghijklmnop -3 -2}
-} {abcdefghijklmnop}
+} abcdefghijklmnop
 test string-14.11.$noComp {string replace} -body {
     run {string replace abcdefghijklmnop 1000 1010}
-} -result {abcdefghijklmnop}
+} -result abcdefghijklmnop
 test string-14.12.$noComp {string replace} {
     run {string replace abcdefghijklmnop -100 end}
 } {}
@@ -1777,7 +1782,7 @@ test string-17.7.$noComp {string totitle, unicode} {
 test string-17.8.$noComp {string totitle, compiled} {
     lindex [run {string totitle [list aa bb [list cc]]}] 0
 } Aa
-test string-17.9.$noComp {string totitle, surrogates, bug [11ae2be95dac9417]} fullutf {
+test string-17.9.$noComp {string totitle, surrogates, bug [11ae2be95dac9417]} utf32 {
     run {list [string totitle a\U118c0c 1 1] [string totitle a\U118c0c 2 2] \
 	[string totitle a\U118c0c 3 3]}
 } [list a\U118a0c a\U118c0C a\U118c0c]
@@ -1847,7 +1852,7 @@ test string-20.5.$noComp {string trimright} {
 test string-20.6.$noComp {string trimright, unicode default} {
     run {string trimright ABC\u1361\x85\x00\xA0\u1680\u180E\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u200B\u2028\u2029\u202F\u205F\u3000}
 } ABC\u1361
-test string-20.7.$noComp {string trim on not valid utf-8 sequence (consider NTS as continuation char), bug [c61818e4c9]} {testbytestring} {
+test string-20.7.$noComp {string trim on not valid utf-8 sequence (consider NTS as continuation char), bug [c61818e4c9]} testbytestring {
     set result {}
     set a [testbytestring \xC0\x80\xA0]
     set b foo$a
@@ -1860,7 +1865,7 @@ test string-20.7.$noComp {string trim on not valid utf-8 sequence (consider NTS
     lappend result [string map $m [run {string trim $b fox}]]
     lappend result [string map $m [run {string trim $b fo\x00}]]
 } [list {*}[lrepeat 3 fooUV] {*}[lrepeat 2 UV V]]
-test string-20.8.$noComp {[c61818e4c9] [string trimright] fails when UtfPrev is ok} {testbytestring} {
+test string-20.8.$noComp {[c61818e4c9] [string trimright] fails when UtfPrev is ok} testbytestring {
     set result {}
     set a [testbytestring \xE8\xA0]
     set b foo$a
@@ -1921,7 +1926,7 @@ test string-21.14.$noComp {string wordend, unicode} -body {
 test string-21.15.$noComp {string wordend, unicode} -body {
     run {string wordend "\U1D7CA\U1D7CA abc" 0}
 } -result 2
-test string-21.16.$noComp {string wordend, unicode} -constraints fullutf -body {
+test string-21.16.$noComp {string wordend, unicode} -constraints utf32 -body {
     run {string wordend "\U1D7CA\U1D7CA abc" 10}
 } -result 6
 test string-21.17.$noComp {string trim, unicode} {
@@ -1999,7 +2004,7 @@ test string-22.14.$noComp {string wordstart, invalid UTF-8} -constraints testbyt
 test string-22.15.$noComp {string wordstart, unicode} -body {
     run {string wordstart "\U1D7CA\U1D7CA abc" 0}
 } -result 0
-test string-22.16.$noComp {string wordstart, unicode} -constraints fullutf -body {
+test string-22.16.$noComp {string wordstart, unicode} -constraints utf32 -body {
     run {string wordstart "\U1D7CA\U1D7CA abc" 10}
 } -result 3
 
diff --git a/tests/stringObj.test b/tests/stringObj.test

path: root/doc/src/topics.qdoc

/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the documentation of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** No Commercial Usage
** This file contains pre-release code and may not be distributed.
** You may use this file in accordance with the terms and conditions
** contained in the either Technology Preview License Agreement or the
** Beta Release License Agreement.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file.  Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Nokia gives you certain
** additional rights. These rights are described in the Nokia Qt LGPL
** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
** package.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3.0 as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL included in the
** packaging of this file.  Please review the following information to
** ensure the GNU General Public License version 3.0 requirements will be
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/

/*!
\group topics
\title Topics

This page provides a collection of documents grouped by topic.

The \l{Grouped Classes} page contains a similar list of groups for
Qt's class documentation.

\generatelist{related}
*/

/*!
\group architecture
\title Architecture
\ingroup topics
\brief Documents about Qt's architecture and design.

These documents describe aspects of Qt's architecture and design,
including overviews of core Qt features and technologies.

\generatelist{related}
*/

/*!
\group buildsystem
\title Build System
\ingroup topics
\brief Tools to help automate building and installation of Qt applications.

Qt is provided with a set of build tools to help developers automate
the process of building and installing Qt applications.

\table 100%
\header \o Development \o Cross-Platform Issues \o Specific Tools
\row
\o
 \list
    \o \l {Debugging Techniques}
    \o \l {Qt's Tools}
    \o \l {The Qt Resource System}
    \o \l {Using Precompiled Headers}
\endlist
\o
\list
    \o \l {Cross Compiling Qt for Embedded Linux Applications}
    \o \l {Deploying Qt Applications}
    \o \l {Installation}{Installing Qt}
    \o \l {Window System Specific Notes}
\endlist
\o
\list
    \o \l lupdate and \l lrelease
    \o \l {moc}{Meta-Object Compiler (moc)}
    \o \l {User Interface Compiler (uic)}
    \o \l {Resource Compiler (rcc)}
\endlist
\endtable


*/

/*!
\group classlists
\title Class and Function Indexes
\ingroup topics
\brief Collections of classes and functions grouped together into lists.

The following documents contain collections of classes, grouped by
subject area or related to particular functionality, or comprehensive
lists of classes and functions.

\generatelist{related}
*/

/*!
\group codecs
\title Codecs
\ingroup topics
\brief Codec support in Qt.

These codecs provide facilities for conversion between Unicode and
specific text encodings.

\generatelist{related}
*/

/*!
\group gui-programming
\title GUI Programming
\ingroup topics
\brief Resources for developers of GUI applications.

The following list contains links to guides and other resources for
developers of graphical user interface (GUI) applications.

\generatelist{related}
*/

/*!
\group howto
\title How To Guides and Learning Resources
\ingroup topics
\brief Guides providing help on aspects of using Qt.

These guides provide specific help about specific Qt-related topics.

\generatelist{related}
*/

/*!
\group platform-notes
\title Platform-Specific Notes
\ingroup topics
\brief Documents describing platform-specific features of Qt.

These documents describe platform-specific features provided by Qt, and
discuss issues related to particular platforms and environments.

\generatelist{related}
*/

/*!
\group porting
\title Porting Guides
\ingroup topics
\brief Guides related to porting Qt applications and libraries.

A number of guides and documents are available that cover porting issues,
from detailed coverage of API differences between Qt 3 and Qt 4 to
platform and tool-specific documentation.

\generatelist{related}
*/

/*!
\group text-processing
\title Text Processing
\ingroup topics
\brief Text processing guides and classes.

Qt provides an extensive collection of classes for text handling.
The following guides and references describe basic text handling, support
for internationalization and character encodings, and Qt's rich text
system.

\generatelist{related}
*/

/*!
    \group tutorials
    \title Tutorials
    \ingroup topics
    \brief Tutorials, guides and overviews to help you learn Qt.

    A collection of tutorials and "walkthrough" guides are provided with Qt to
    help new users get started with Qt development. These documents cover a
    range of topics, from basic use of widgets to step-by-step tutorials that
    show how an application is put together.

    \section1 \l{Widgets Tutorial}

    \inlineimage widget-examples.png

    A beginner's guide to getting started with widgets and layouts to create
    GUI applications.

    \section1 \l{Address Book Tutorial}

    \inlineimage addressbook-tutorial.png

    A seven part guide to creating a fully-functioning address book
    application. This tutorial is also available with
    \l{Tutoriel "Carnet d'adresses"}{French explanation}.

*/

/*!
\group activeqt-tools
\title Tools for ActiveQt
\ingroup topics
\brief Tools to help integrate Qt applications with ActiveX components.

These tools provide support for integrating Qt with ActiveX components.

\generatelist{related}

\sa {ActiveQt Framework}
*/

/*!
\group scripting
\title Scripting with ECMAScript
\ingroup topics
\brief Guides and references covering application scripting with ECMAScript.

Qt 4.3 and later provides support for application scripting with ECMAScript.
The following guides and references cover aspects of programming with
ECMAScript and Qt.

\generatelist{related}
*/

/*!
\group threading
\title Threading and Concurrent Programming
\ingroup topics
\brief Guides and references covering threading and concurrent programming.

Qt provides a number of classes to handle the primitives used for multithreaded
programming. From Qt 4.4, the QtConcurrent namespace also provides a set of higher
level classes for concurrent programming.

\generatelist{related}
*/

/*!
\group qtce
\title Qt for Windows CE
\ingroup topics
\ingroup qt-embedded
\brief Documents related to Qt on Windows CE

Qt for Windows CE is a C++ framework for GUI and application development
for embedded devices running Windows CE. It runs on a variety of processors,
including ARM, Intel x86, MIPS and SH-4.

\table 100%
\header \o Getting Started \o Reference \o Performance and Optimization
\row
\o
 \list
    \o \l {Qt for Windows CE Requirements}
    \o \l {Installing Qt on Windows CE}
    \o \l {Windows CE - Introduction to using Qt}{Introduction to using Qt}
\endlist
\o
\list
    \o \l {Windows CE - Using shadow builds}{Using shadow builds}
    \o \l {Windows CE - Working with Custom SDKs}{Working with Custom SDKs}
\endlist
\o
\list
    \o \l {Windows CE OpenGL ES}{OpenGL ES}
    \o \l {Qt Performance Tuning}
    \o \l {Fine-Tuning Features in Qt}
\endlist
\endtable
*/