From owner-svn-src-all@freebsd.org  Sun Dec 18 02:02:34 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id CF5CFC71629;
 Sun, 18 Dec 2016 02:02:34 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9F07D1A50;
 Sun, 18 Dec 2016 02:02:34 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBI22XmX005423;
 Sun, 18 Dec 2016 02:02:33 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBI22XCu005422;
 Sun, 18 Dec 2016 02:02:33 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201612180202.uBI22XCu005422@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bapt set sender to
 bapt@FreeBSD.org using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sun, 18 Dec 2016 02:02:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r310198 - head/tools/tools/locale/tools
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 18 Dec 2016 02:02:34 -0000

Author: bapt
Date: Sun Dec 18 02:02:33 2016
New Revision: 310198
URL: https://svnweb.freebsd.org/changeset/base/310198

Log:
  Simplify extraction of static collation definition

Modified:
  head/tools/tools/locale/tools/extract-colldef.awk

Modified: head/tools/tools/locale/tools/extract-colldef.awk
==============================================================================
--- head/tools/tools/locale/tools/extract-colldef.awk	Sun Dec 18 01:52:16 2016	(r310197)
+++ head/tools/tools/locale/tools/extract-colldef.awk	Sun Dec 18 02:02:33 2016	(r310198)
@@ -5,14 +5,8 @@ BEGIN {
 	print "# from CLDR project data, obtained from http://cldr.unicode.org/"
 	print "# -----------------------------------------------------------------------------"
 }
-$1 == "comment_char" { print $0 }
-$1 == "escape_char" { print $0 }
-$1 == "LC_COLLATE" {
-	print $0
-	while (getline line) {
-		print line
-		if (line == "END LC_COLLATE") {
-			break
-		}
-	}
-}
+$1 == "comment_char" { print }
+$1 == "escape_char" { print }
+$1 == "LC_COLLATE" { doprint = 1 }
+doprint == 1 { print }
+$1 == "END" && $2 == "LC_COLLATE" { exit 0 }