From patchwork Mon Feb 5 16:12:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mike FABIAN X-Patchwork-Id: 25820 Received: (qmail 25050 invoked by alias); 5 Feb 2018 16:13:13 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 24752 invoked by uid 89); 5 Feb 2018 16:13:09 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.0 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_NUMSUBJECT, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.2 spammy=af, mat, 20032, z X-HELO: mail-wr0-f193.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:organization:date:message-id :user-agent:mime-version:content-disposition :content-transfer-encoding; bh=9N7Xuw/wtlHYLCD//qCZg4Qf3kXPufuwKLum9xM1aDw=; b=N5K6F4y8KZK5R5TCf02tfNRf69k7afae5XqmsnfvWV08J5XPrjxGn9Fpt8AknQnzF1 siHlZLaeac8vKpPG4FoygabP2ystC91kC9hffoKTVUE1rnqjq9d1vXuYO4qpaD8iz2DE TclqBleqBTYRxiAMjiVuuc6nSXKlZZZ1qlBN/kKV9+QHuYgNupmdq7vOwNBXCUw5Xxyi YV+Sik+cFfCqo34lSn1phO9x2FkuJjH/ObH4wmiMwrYeiAt+9WCl2AaoVXJlHlg6ehPc uduDd8NKaai9vxVF9Xh3ad02Qy5t0VW5UArBNcCtru8mokFZwC6oC1SDdk7uRzlNHzoD hdUg== X-Gm-Message-State: AKwxytePJDY7TptpTqZ09E0YdJEEvqkWg1+3yJrLmXdJaP65rt7K636C lMA3NvJ8LNfcAdUxHnXpRJBM X-Google-Smtp-Source: AH8x227ISCyKfydXCYeo5SzHH943ecDvQJCM51gY+sDT9RPDZW2I2LrP/5QQeIrZg7aWYDi3lGhZyg== X-Received: by 10.223.164.199 with SMTP id h7mr21947998wrb.83.1517847178397; Mon, 05 Feb 2018 08:12:58 -0800 (PST) From: Mike FABIAN To: libc-alpha@sourceware.org Cc: "Dmitry V. Levin" Subject: [Patch v2 11/14] [BZ #14095] update collation data from Unicode / ISO 14651 Date: Mon, 05 Feb 2018 17:12:56 +0100 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) MIME-Version: 1.0 Content-Disposition: inline; filename=0011-Fix-test-cases-tst-fnmatch-and-tst-regexloc-for-the-.patch From 7bd32b54d54e4cc924309373f4c4ad59de6ef1d8 Mon Sep 17 00:00:00 2001 From: Mike FABIAN Date: Tue, 23 Jan 2018 17:29:36 +0100 Subject: [PATCH 11/14] Fix test cases tst-fnmatch and tst-regexloc for the new iso14651_t1_common file. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See: http://pubs.opengroup.org/onlinepubs/7908799/xbd/re.html > A range expression represents the set of collating elements that fall > between two elements in the current collation sequence, > inclusively. It is expressed as the starting point and the ending > point separated by a hyphen (-). > > Range expressions must not be used in portable applications because > their behaviour is dependent on the collating sequence. Ranges will be > treated according to the current collating sequence, and include such > characters that fall within the range based on that collating > sequence, regardless of character values. This, however, means that > the interpretation will differ depending on collating sequence. If, > for instance, one collating sequence defines ä as a variant of a, > while another defines it as a letter following z, then the expression > [ä-z] is valid in the first language and invalid in the second. Therefore, using [a-z] does not make much sense except in the C/POSIX locale. The new iso14651_t1_common lists upper case and lower case Latin characters in a different order than the old one which causes surprising results for example in the de_DE locale: [a-z] now includes A because A comes after a in iso14651_t1_common but does not include Z because that comes after z in iso14651_t1_common. * posix/tst-fnmatch.input: Use range expressions only in C locale. * posix/tst-regexloc.c: Do not use a range expression for de_DE.ISO-8859-1 locale. --- posix/tst-fnmatch.input | 40 ---------------------------------------- posix/tst-regexloc.c | 4 ++-- 2 files changed, 2 insertions(+), 42 deletions(-) diff --git a/posix/tst-fnmatch.input b/posix/tst-fnmatch.input index 88b3f739a5..1e2f62c0ed 100644 --- a/posix/tst-fnmatch.input +++ b/posix/tst-fnmatch.input @@ -418,26 +418,6 @@ C "-" "[Z-\\]]" NOMATCH # Following are tests outside the scope of IEEE 2003.2 since they are using # locales other than the C locale. The main focus of the tests is on the # handling of ranges and the recognition of character (vs bytes). -de_DE.ISO-8859-1 "a" "[a-z]" 0 -de_DE.ISO-8859-1 "z" "[a-z]" 0 -de_DE.ISO-8859-1 "ä" "[a-z]" 0 -de_DE.ISO-8859-1 "ö" "[a-z]" 0 -de_DE.ISO-8859-1 "ü" "[a-z]" 0 -de_DE.ISO-8859-1 "A" "[a-z]" NOMATCH -de_DE.ISO-8859-1 "Z" "[a-z]" NOMATCH -de_DE.ISO-8859-1 "Ä" "[a-z]" NOMATCH -de_DE.ISO-8859-1 "Ö" "[a-z]" NOMATCH -de_DE.ISO-8859-1 "Ü" "[a-z]" NOMATCH -de_DE.ISO-8859-1 "a" "[A-Z]" NOMATCH -de_DE.ISO-8859-1 "z" "[A-Z]" NOMATCH -de_DE.ISO-8859-1 "ä" "[A-Z]" NOMATCH -de_DE.ISO-8859-1 "ö" "[A-Z]" NOMATCH -de_DE.ISO-8859-1 "ü" "[A-Z]" NOMATCH -de_DE.ISO-8859-1 "A" "[A-Z]" 0 -de_DE.ISO-8859-1 "Z" "[A-Z]" 0 -de_DE.ISO-8859-1 "Ä" "[A-Z]" 0 -de_DE.ISO-8859-1 "Ö" "[A-Z]" 0 -de_DE.ISO-8859-1 "Ü" "[A-Z]" 0 de_DE.ISO-8859-1 "a" "[[:lower:]]" 0 de_DE.ISO-8859-1 "z" "[[:lower:]]" 0 de_DE.ISO-8859-1 "ä" "[[:lower:]]" 0 @@ -510,26 +490,6 @@ de_DE.ISO-8859-1 "ba" "[[.a.]]a" NOMATCH # And with a multibyte character set. -de_DE.UTF-8 "a" "[a-z]" 0 -de_DE.UTF-8 "z" "[a-z]" 0 -de_DE.UTF-8 "ä" "[a-z]" 0 -de_DE.UTF-8 "ö" "[a-z]" 0 -de_DE.UTF-8 "ü" "[a-z]" 0 -de_DE.UTF-8 "A" "[a-z]" NOMATCH -de_DE.UTF-8 "Z" "[a-z]" NOMATCH -de_DE.UTF-8 "Ä" "[a-z]" NOMATCH -de_DE.UTF-8 "Ö" "[a-z]" NOMATCH -de_DE.UTF-8 "Ãœ" "[a-z]" NOMATCH -de_DE.UTF-8 "a" "[A-Z]" NOMATCH -de_DE.UTF-8 "z" "[A-Z]" NOMATCH -de_DE.UTF-8 "ä" "[A-Z]" NOMATCH -de_DE.UTF-8 "ö" "[A-Z]" NOMATCH -de_DE.UTF-8 "ü" "[A-Z]" NOMATCH -de_DE.UTF-8 "A" "[A-Z]" 0 -de_DE.UTF-8 "Z" "[A-Z]" 0 -de_DE.UTF-8 "Ä" "[A-Z]" 0 -de_DE.UTF-8 "Ö" "[A-Z]" 0 -de_DE.UTF-8 "Ãœ" "[A-Z]" 0 de_DE.UTF-8 "a" "[[:lower:]]" 0 de_DE.UTF-8 "z" "[[:lower:]]" 0 de_DE.UTF-8 "ä" "[[:lower:]]" 0 diff --git a/posix/tst-regexloc.c b/posix/tst-regexloc.c index 60235b4d3b..7fbc496d0c 100644 --- a/posix/tst-regexloc.c +++ b/posix/tst-regexloc.c @@ -29,8 +29,8 @@ do_test (void) if (setlocale (LC_ALL, "de_DE.ISO-8859-1") == NULL) puts ("cannot set locale"); - else if (regcomp (&re, "[a-f]*", 0) != REG_NOERROR) - puts ("cannot compile expression \"[a-f]*\""); + else if (regcomp (&re, "[abcdef]*", 0) != REG_NOERROR) + puts ("cannot compile expression \"[abcdef]*\""); else if (regexec (&re, "abcdefCDEF", 1, mat, 0) == REG_NOMATCH) puts ("no match"); else -- 2.14.3