From patchwork Fri Feb 23 10:24:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mike FABIAN X-Patchwork-Id: 877031 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-90524-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="tgeLIDoE"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3znnQq5fFSz9sW0 for ; Fri, 23 Feb 2018 21:24:51 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id :mime-version:content-type:content-transfer-encoding; q=dns; s= default; b=snL5ggqBW9I3wNzcYy0CP6Ndc0l+y9kojTQUGzx7OzxJwpbr39dap vSW2hHbQYCVv+hGiHxE5gDN9ebPC8QZosSeQokfiMmV4B9jOyh1Z9EhS5LDkZNHH 425/WIC+vWpV72YY4BvX851xU5smnExZVh+51pKCqLLIZlxj+gFCxU= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id :mime-version:content-type:content-transfer-encoding; s=default; bh=3YsbPUEmKkP3/HzHI9NzFPuKL4c=; b=tgeLIDoEgD2N8eTlJ8GKLb1axqZU 5nGRhjhHQeU2NtTFhNMfDUNIxwrpb2vtJseh8dd1EBcaXL313PSg7m/LfVZXEJJN Xn0EJ3isISjILXsTy2z4vM5Pe0Wm2G6yR0tc2v6Im3zpbV4tyLGebDsBWmJ0PcKI 7xv/XgO++mAAleY= Received: (qmail 85804 invoked by alias); 23 Feb 2018 10:24:46 -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 85782 invoked by uid 89); 23 Feb 2018 10:24:45 -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=Hx-languages-length:4664, z X-HELO: mail-wm0-f67.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=qUzdRbYH/zr901S7H50pvLDg9z/Nqz072jQyuX9TL+4=; b=rm0Z53hCL1p2FOBzpmWjIxcXpadztdRXnsR+6WNhcyYFAtp5uDgRDUQl4NYFJm0iaL I7E5UgtWUgNL+lFGoSD17YnfkEhlJV3egxaXoNxhBeFzj1vwI8PvnqKqS2OD4zSdZxuk GNCBqsSzdguM7R5kRtKhEF05SBWbycjGVfjfWzy6MPSEUOame4gnIhoZivCT2XbLClAi WJvINMxMOYEjUs/Qqktidwp8WzNv6+C3exUlHkMzmV1FR1obaWh1lLNgrBUB8OSlevg7 YbgwsZSggbEiPqQqx+snO/tZcUS1ZzSI5ncl8tBvC6NLXwwGv5g9Vx6C6hz0o/EIKPC+ CB5A== X-Gm-Message-State: APf1xPBhf23uaBHaDYU0ID3MkkAfn2DvO2llD/KBAtO08xWDz8D7k2Jl kiJ/GNXchRPEJGaDhhZnPO9Ni7iHFw== X-Google-Smtp-Source: AH8x225oOSfUt2aTmGzWKr+0Ka3qRp9EiG99Jfm9rcrynxQ61pAYzSg+vpRYXdgL6Iv3QZ8O6wePjw== X-Received: by 10.28.18.77 with SMTP id 74mr1178821wms.30.1519381481084; Fri, 23 Feb 2018 02:24:41 -0800 (PST) From: Mike FABIAN To: libc-alpha@sourceware.org Cc: "Dmitry V. Levin" Subject: [Patch v3 11/14] [BZ #14095] update collation data from Unicode / ISO 14651 Date: Fri, 23 Feb 2018 11:24:39 +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 Reviewed-by: Carlos O'Donell From 5c65168e569ba0c59ad43bbd88f37cdb356c16b6 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