openSUSE Commits
Threads by month
- ----- 2024 -----
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
May 2018
- 1 participants
- 1987 discussions
Hello community,
here is the log from the commit of package ghc-unicode-transforms for openSUSE:Factory checked in at 2018-05-30 12:15:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-unicode-transforms (Old)
and /work/SRC/openSUSE:Factory/.ghc-unicode-transforms.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-unicode-transforms"
Wed May 30 12:15:12 2018 rev:3 rq:607913 version:0.3.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-unicode-transforms/ghc-unicode-transforms.changes 2017-08-31 21:01:16.542848721 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-unicode-transforms.new/ghc-unicode-transforms.changes 2018-05-30 12:27:44.597363891 +0200
@@ -1,0 +2,7 @@
+Mon May 14 17:02:11 UTC 2018 - psimons(a)suse.com
+
+- Update unicode-transforms to version 0.3.4.
+ * GHC 8.4.1 support
+ * GHC 8.2.1 support
+
+-------------------------------------------------------------------
Old:
----
unicode-transforms-0.3.2.tar.gz
New:
----
unicode-transforms-0.3.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-unicode-transforms.spec ++++++
--- /var/tmp/diff_new_pack.3PPvbW/_old 2018-05-30 12:27:45.377336529 +0200
+++ /var/tmp/diff_new_pack.3PPvbW/_new 2018-05-30 12:27:45.381336388 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ghc-unicode-transforms
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,19 +19,18 @@
%global pkg_name unicode-transforms
%bcond_with tests
Name: ghc-%{pkg_name}
-Version: 0.3.2
+Version: 0.3.4
Release: 0
Summary: Unicode normalization
License: BSD-3-Clause
-Group: Development/Languages/Other
-Url: https://hackage.haskell.org/package/%{pkg_name}
+Group: Development/Libraries/Haskell
+URL: https://hackage.haskell.org/package/%{pkg_name}
Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{ve…
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-bitarray-devel
BuildRequires: ghc-bytestring-devel
BuildRequires: ghc-rpm-macros
BuildRequires: ghc-text-devel
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %{with tests}
BuildRequires: ghc-QuickCheck-devel
BuildRequires: ghc-deepseq-devel
@@ -44,7 +43,7 @@
%package devel
Summary: Haskell %{pkg_name} library development files
-Group: Development/Libraries/Other
+Group: Development/Libraries/Haskell
Requires: %{name} = %{version}-%{release}
Requires: ghc-compiler = %{ghc_version}
Requires(post): ghc-compiler = %{ghc_version}
@@ -73,11 +72,9 @@
%ghc_pkg_recache
%files -f %{name}.files
-%defattr(-,root,root,-)
-%doc LICENSE
+%license LICENSE
%files devel -f %{name}-devel.files
-%defattr(-,root,root,-)
%doc Changelog.md README.md
%changelog
++++++ unicode-transforms-0.3.2.tar.gz -> unicode-transforms-0.3.4.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unicode-transforms-0.3.2/Changelog.md new/unicode-transforms-0.3.4/Changelog.md
--- old/unicode-transforms-0.3.2/Changelog.md 2017-07-23 08:32:30.000000000 +0200
+++ new/unicode-transforms-0.3.4/Changelog.md 2018-04-05 11:30:57.000000000 +0200
@@ -1,3 +1,11 @@
+## 0.3.4
+
+* GHC 8.4.1 support
+
+## 0.3.3
+
+* GHC 8.2.1 support
+
## 0.3.2
* Work around a GHC/LLVM issue for ARM
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unicode-transforms-0.3.2/Data/Unicode/Properties/CombiningClass.hs new/unicode-transforms-0.3.4/Data/Unicode/Properties/CombiningClass.hs
--- old/unicode-transforms-0.3.2/Data/Unicode/Properties/CombiningClass.hs 2017-02-05 23:26:01.000000000 +0100
+++ new/unicode-transforms-0.3.4/Data/Unicode/Properties/CombiningClass.hs 2017-12-01 06:31:18.000000000 +0100
@@ -830,9 +830,10 @@
isCombining :: Char -> Bool
isCombining c | (ord c) < 768 || (ord c) > 125258 = False
isCombining c = lookupBit combiningBitmap (ord c)
-bitList :: [Int]
-bitList = [768,769,770,771,772,773,774,775,776,777,778,779,780,781,782,783,784,785,786,787,788,789,790,791,792,793,794,795,796,797,798,799,800,801,802,803,804,805,806,807,808,809,810,811,812,813,814,815,816,817,818,819,820,821,822,823,824,825,826,827,828,829,830,831,832,833,834,835,836,837,838,839,840,841,842,843,844,845,846,848,849,850,851,852,853,854,855,856,857,858,859,860,861,862,863,864,865,866,867,868,869,870,871,872,873,874,875,876,877,878,879,1155,1156,1157,1158,1159,1425,1426,1427,1428,1429,1430,1431,1432,1433,1434,1435,1436,1437,1438,1439,1440,1441,1442,1443,1444,1445,1446,1447,1448,1449,1450,1451,1452,1453,1454,1455,1456,1457,1458,1459,1460,1461,1462,1463,1464,1465,1466,1467,1468,1469,1471,1473,1474,1476,1477,1479,1552,1553,1554,1555,1556,1557,1558,1559,1560,1561,1562,1611,1612,1613,1614,1615,1616,1617,1618,1619,1620,1621,1622,1623,1624,1625,1626,1627,1628,1629,1630,1631,1648,1750,1751,1752,1753,1754,1755,1756,1759,1760,1761,1762,1763,1764,1767,1768,1770,1771,1772,1773,1809,1840,1841,1842,1843,1844,1845,1846,1847,1848,1849,1850,1851,1852,1853,1854,1855,1856,1857,1858,1859,1860,1861,1862,1863,1864,1865,1866,2027,2028,2029,2030,2031,2032,2033,2034,2035,2070,2071,2072,2073,2075,2076,2077,2078,2079,2080,2081,2082,2083,2085,2086,2087,2089,2090,2091,2092,2093,2137,2138,2139,2260,2261,2262,2263,2264,2265,2266,2267,2268,2269,2270,2271,2272,2273,2275,2276,2277,2278,2279,2280,2281,2282,2283,2284,2285,2286,2287,2288,2289,2290,2291,2292,2293,2294,2295,2296,2297,2298,2299,2300,2301,2302,2303,2364,2381,2385,2386,2387,2388,2492,2509,2620,2637,2748,2765,2876,2893,3021,3149,3157,3158,3260,3277,3405,3530,3640,3641,3642,3656,3657,3658,3659,3768,3769,3784,3785,3786,3787,3864,3865,3893,3895,3897,3953,3954,3956,3962,3963,3964,3965,3968,3970,3971,3972,3974,3975,4038,4151,4153,4154,4237,4957,4958,4959,5908,5940,6098,6109,6313,6457,6458,6459,6679,6680,6752,6773,6774,6775,6776,6777,6778,6779,6780,6783,6832,6833,6834,6835,6836,6837,6838,6839,6840,6841,6842,6843,6844,6845,6964,6980,7019,7020,7021,7022,7023,7024,7025,7026,7027,7082,7083,7142,7154,7155,7223,7376,7377,7378,7380,7381,7382,7383,7384,7385,7386,7387,7388,7389,7390,7391,7392,7394,7395,7396,7397,7398,7399,7400,7405,7412,7416,7417,7616,7617,7618,7619,7620,7621,7622,7623,7624,7625,7626,7627,7628,7629,7630,7631,7632,7633,7634,7635,7636,7637,7638,7639,7640,7641,7642,7643,7644,7645,7646,7647,7648,7649,7650,7651,7652,7653,7654,7655,7656,7657,7658,7659,7660,7661,7662,7663,7664,7665,7666,7667,7668,7669,7675,7676,7677,7678,7679,8400,8401,8402,8403,8404,8405,8406,8407,8408,8409,8410,8411,8412,8417,8421,8422,8423,8424,8425,8426,8427,8428,8429,8430,8431,8432,11503,11504,11505,11647,11744,11745,11746,11747,11748,11749,11750,11751,11752,11753,11754,11755,11756,11757,11758,11759,11760,11761,11762,11763,11764,11765,11766,11767,11768,11769,11770,11771,11772,11773,11774,11775,12330,12331,12332,12333,12334,12335,12441,12442,42607,42612,42613,42614,42615,42616,42617,42618,42619,42620,42621,42654,42655,42736,42737,43014,43204,43232,43233,43234,43235,43236,43237,43238,43239,43240,43241,43242,43243,43244,43245,43246,43247,43248,43249,43307,43308,43309,43347,43443,43456,43696,43698,43699,43700,43703,43704,43710,43711,43713,43766,44013,64286,65056,65057,65058,65059,65060,65061,65062,65063,65064,65065,65066,65067,65068,65069,65070,65071,66045,66272,66422,66423,66424,66425,66426,68109,68111,68152,68153,68154,68159,68325,68326,69702,69759,69817,69818,69888,69889,69890,69939,69940,70003,70080,70090,70197,70198,70377,70378,70460,70477,70502,70503,70504,70505,70506,70507,70508,70512,70513,70514,70515,70516,70722,70726,70850,70851,71103,71104,71231,71350,71351,71467,72767,92912,92913,92914,92915,92916,92976,92977,92978,92979,92980,92981,92982,113822,119141,119142,119143,119144,119145,119149,119150,119151,119152,119153,119154,119163,119164,119165,119166,119167,119168,119169,119170,119173,119174,119175,119176,119177,119178,119179,119210,119211,119212,119213,119362,119363,119364,122880,122881,122882,122883,122884,122885,122886,122888,122889,122890,122891,122892,122893,122894,122895,122896,122897,122898,122899,122900,122901,122902,122903,122904,122907,122908,122909,122910,122911,122912,122913,122915,122916,122918,122919,122920,122921,122922,125136,125137,125138,125139,125140,125141,125142,125252,125253,125254,125255,125256,125257,125258]
+bitList1, bitList2 :: [Int]
+bitList1 = [768,769,770,771,772,773,774,775,776,777,778,779,780,781,782,783,784,785,786,787,788,789,790,791,792,793,794,795,796,797,798,799,800,801,802,803,804,805,806,807,808,809,810,811,812,813,814,815,816,817,818,819,820,821,822,823,824,825,826,827,828,829,830,831,832,833,834,835,836,837,838,839,840,841,842,843,844,845,846,848,849,850,851,852,853,854,855,856,857,858,859,860,861,862,863,864,865,866,867,868,869,870,871,872,873,874,875,876,877,878,879,1155,1156,1157,1158,1159,1425,1426,1427,1428,1429,1430,1431,1432,1433,1434,1435,1436,1437,1438,1439,1440,1441,1442,1443,1444,1445,1446,1447,1448,1449,1450,1451,1452,1453,1454,1455,1456,1457,1458,1459,1460,1461,1462,1463,1464,1465,1466,1467,1468,1469,1471,1473,1474,1476,1477,1479,1552,1553,1554,1555,1556,1557,1558,1559,1560,1561,1562,1611,1612,1613,1614,1615,1616,1617,1618,1619,1620,1621,1622,1623,1624,1625,1626,1627,1628,1629,1630,1631,1648,1750,1751,1752,1753,1754,1755,1756,1759,1760,1761,1762,1763,1764,1767,1768,1770,1771,1772,1773,1809,1840,1841,1842,1843,1844,1845,1846,1847,1848,1849,1850,1851,1852,1853,1854,1855,1856,1857,1858,1859,1860,1861,1862,1863,1864,1865,1866,2027,2028,2029,2030,2031,2032,2033,2034,2035,2070,2071,2072,2073,2075,2076,2077,2078,2079,2080,2081,2082,2083,2085,2086,2087,2089,2090,2091,2092,2093,2137,2138,2139,2260,2261,2262,2263,2264,2265,2266,2267,2268,2269,2270,2271,2272,2273,2275,2276,2277,2278,2279,2280,2281,2282,2283,2284,2285,2286,2287,2288,2289,2290,2291,2292,2293,2294,2295,2296,2297,2298,2299,2300,2301,2302,2303,2364,2381,2385,2386,2387,2388,2492,2509,2620,2637,2748,2765,2876,2893,3021,3149,3157,3158,3260,3277,3405,3530,3640,3641,3642,3656,3657,3658,3659,3768,3769,3784,3785,3786,3787,3864,3865,3893,3895,3897,3953,3954,3956,3962,3963,3964,3965,3968,3970,3971,3972,3974,3975,4038,4151,4153,4154,4237,4957,4958,4959,5908,5940,6098,6109,6313,6457,6458,6459,6679,6680,6752,6773,6774,6775,6776,6777,6778,6779,6780,6783,6832,6833,6834]
+bitList2 = [6835,6836,6837,6838,6839,6840,6841,6842,6843,6844,6845,6964,6980,7019,7020,7021,7022,7023,7024,7025,7026,7027,7082,7083,7142,7154,7155,7223,7376,7377,7378,7380,7381,7382,7383,7384,7385,7386,7387,7388,7389,7390,7391,7392,7394,7395,7396,7397,7398,7399,7400,7405,7412,7416,7417,7616,7617,7618,7619,7620,7621,7622,7623,7624,7625,7626,7627,7628,7629,7630,7631,7632,7633,7634,7635,7636,7637,7638,7639,7640,7641,7642,7643,7644,7645,7646,7647,7648,7649,7650,7651,7652,7653,7654,7655,7656,7657,7658,7659,7660,7661,7662,7663,7664,7665,7666,7667,7668,7669,7675,7676,7677,7678,7679,8400,8401,8402,8403,8404,8405,8406,8407,8408,8409,8410,8411,8412,8417,8421,8422,8423,8424,8425,8426,8427,8428,8429,8430,8431,8432,11503,11504,11505,11647,11744,11745,11746,11747,11748,11749,11750,11751,11752,11753,11754,11755,11756,11757,11758,11759,11760,11761,11762,11763,11764,11765,11766,11767,11768,11769,11770,11771,11772,11773,11774,11775,12330,12331,12332,12333,12334,12335,12441,12442,42607,42612,42613,42614,42615,42616,42617,42618,42619,42620,42621,42654,42655,42736,42737,43014,43204,43232,43233,43234,43235,43236,43237,43238,43239,43240,43241,43242,43243,43244,43245,43246,43247,43248,43249,43307,43308,43309,43347,43443,43456,43696,43698,43699,43700,43703,43704,43710,43711,43713,43766,44013,64286,65056,65057,65058,65059,65060,65061,65062,65063,65064,65065,65066,65067,65068,65069,65070,65071,66045,66272,66422,66423,66424,66425,66426,68109,68111,68152,68153,68154,68159,68325,68326,69702,69759,69817,69818,69888,69889,69890,69939,69940,70003,70080,70090,70197,70198,70377,70378,70460,70477,70502,70503,70504,70505,70506,70507,70508,70512,70513,70514,70515,70516,70722,70726,70850,70851,71103,71104,71231,71350,71351,71467,72767,92912,92913,92914,92915,92916,92976,92977,92978,92979,92980,92981,92982,113822,119141,119142,119143,119144,119145,119149,119150,119151,119152,119153,119154,119163,119164,119165,119166,119167,119168,119169,119170,119173,119174,119175,119176,119177,119178,119179,119210,119211,119212,119213,119362,119363,119364,122880,122881,122882,122883,122884,122885,122886,122888,122889,122890,122891,122892,122893,122894,122895,122896,122897,122898,122899,122900,122901,122902,122903,122904,122907,122908,122909,122910,122911,122912,122913,122915,122916,122918,122919,122920,122921,122922,125136,125137,125138,125139,125140,125141,125142,125252,125253,125254,125255,125256,125257,125258]
combiningBitmap :: BitArray
-combiningBitmap = bitArraySetBits (768,125258) bitList
+combiningBitmap = bitArraySetBits (768,125258) $ bitList1 ++ bitList2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unicode-transforms-0.3.2/Data/Unicode/Properties/Decomposable.hs new/unicode-transforms-0.3.4/Data/Unicode/Properties/Decomposable.hs
--- old/unicode-transforms-0.3.2/Data/Unicode/Properties/Decomposable.hs 2017-01-06 23:28:59.000000000 +0100
+++ new/unicode-transforms-0.3.4/Data/Unicode/Properties/Decomposable.hs 2017-12-01 06:31:18.000000000 +0100
@@ -11,9 +11,10 @@
decomposeMin = 192
decomposeMax = 195101
-bitList :: [Int]
-bitList = [192,193,194,195,196,197,199,200,201,202,203,204,205,206,207,209,210,211,212,213,214,217,218,219,220,221,224,225,226,227,228,229,231,232,233,234,235,236,237,238,239,241,242,243,244,245,246,249,250,251,252,253,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,296,297,298,299,300,301,302,303,304,308,309,310,311,313,314,315,316,317,318,323,324,325,326,327,328,332,333,334,335,336,337,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,360,361,362,363,364,365,366,367,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,416,417,431,432,461,462,463,464,465,466,467,468,469,470,471,472,473,474,475,476,478,479,480,481,482,483,486,487,488,489,490,491,492,493,494,495,496,500,501,504,505,506,507,508,509,510,511,512,513,514,515,516,517,518,519,520,521,522,523,524,525,526,527,528,529,530,531,532,533,534,535,536,537,538,539,542,543,550,551,552,553,554,555,556,557,558,559,560,561,562,563,832,833,835,836,884,894,901,902,903,904,905,906,908,910,911,912,938,939,940,941,942,943,944,970,971,972,973,974,979,980,1024,1025,1027,1031,1036,1037,1038,1049,1081,1104,1105,1107,1111,1116,1117,1118,1142,1143,1217,1218,1232,1233,1234,1235,1238,1239,1242,1243,1244,1245,1246,1247,1250,1251,1252,1253,1254,1255,1258,1259,1260,1261,1262,1263,1264,1265,1266,1267,1268,1269,1272,1273,1570,1571,1572,1573,1574,1728,1730,1747,2345,2353,2356,2392,2393,2394,2395,2396,2397,2398,2399,2507,2508,2524,2525,2527,2611,2614,2649,2650,2651,2654,2888,2891,2892,2908,2909,2964,3018,3019,3020,3144,3264,3271,3272,3274,3275,3402,3403,3404,3546,3548,3549,3550,3907,3917,3922,3927,3932,3945,3955,3957,3958,3960,3969,3987,3997,4002,4007,4012,4025,4134,6918,6920,6922,6924,6926,6930,6971,6973,6976,6977,6979,7680,7681,7682,7683,7684,7685,7686,7687,7688,7689,7690,7691,7692,7693,7694,7695,7696,7697,7698,7699,7700,7701,7702,7703,7704,7705,7706,7707,7708,7709,7710,7711,7712,7713,7714,7715,7716,7717,7718,7719,7720,7721,7722,7723,7724,7725,7726,7727,7728,7729,7730,7731,7732,7733,7734,7735,7736,7737,7738,7739,7740,7741,7742,7743,7744,7745,7746,7747,7748,7749,7750,7751,7752,7753,7754,7755,7756,7757,7758,7759,7760,7761,7762,7763,7764,7765,7766,7767,7768,7769,7770,7771,7772,7773,7774,7775,7776,7777,7778,7779,7780,7781,7782,7783,7784,7785,7786,7787,7788,7789,7790,7791,7792,7793,7794,7795,7796,7797,7798,7799,7800,7801,7802,7803,7804,7805,7806,7807,7808,7809,7810,7811,7812,7813,7814,7815,7816,7817,7818,7819,7820,7821,7822,7823,7824,7825,7826,7827,7828,7829,7830,7831,7832,7833,7835,7840,7841,7842,7843,7844,7845,7846,7847,7848,7849,7850,7851,7852,7853,7854,7855,7856,7857,7858,7859,7860,7861,7862,7863,7864,7865,7866,7867,7868,7869,7870,7871,7872,7873,7874,7875,7876,7877,7878,7879,7880,7881,7882,7883,7884,7885,7886,7887,7888,7889,7890,7891,7892,7893,7894,7895,7896,7897,7898,7899,7900,7901,7902,7903,7904,7905,7906,7907,7908,7909,7910,7911,7912,7913,7914,7915,7916,7917,7918,7919,7920,7921,7922,7923,7924,7925,7926,7927,7928,7929,7936,7937,7938,7939,7940,7941,7942,7943,7944,7945,7946,7947,7948,7949,7950,7951,7952,7953,7954,7955,7956,7957,7960,7961,7962,7963,7964,7965,7968,7969,7970,7971,7972,7973,7974,7975,7976,7977,7978,7979,7980,7981,7982,7983,7984,7985,7986,7987,7988,7989,7990,7991,7992,7993,7994,7995,7996,7997,7998,7999,8000,8001,8002,8003,8004,8005,8008,8009,8010,8011,8012,8013,8016,8017,8018,8019,8020,8021,8022,8023,8025,8027,8029,8031,8032,8033,8034,8035,8036,8037,8038,8039,8040,8041,8042,8043,8044,8045,8046,8047,8048,8049,8050,8051,8052,8053,8054,8055,8056,8057,8058,8059,8060,8061,8064,8065,8066,8067,8068,8069,8070,8071,8072,8073,8074,8075,8076,8077,8078,8079,8080,8081,8082,8083,8084,8085,8086,8087,8088,8089,8090,8091,8092,8093,8094,8095,8096,8097,8098,8099,8100,8101,8102,8103,8104,8105,8106,8107,8108,8109,8110,8111,8112,8113,8114,8115,8116,8118,8119,8120,8121,8122,8123,8124,8126,8129,8130,8131,8132,8134,8135,8136,8137,8138,8139,8140,8141,8142,8143,8144,8145,8146,8147,8150,8151,8152,8153,8154,8155,8157,8158,8159,8160,8161,8162,8163,8164,8165,8166,8167,8168,8169,8170,8171,8172,8173,8174,8175,8178,8179,8180,8182,8183,8184,8185,8186,8187,8188,8189,8192,8193,8486,8490,8491,8602,8603,8622,8653,8654,8655,8708,8713,8716,8740,8742,8769,8772,8775,8777,8800,8802,8813,8814,8815,8816,8817,8820,8821,8824,8825,8832,8833,8836,8837,8840,8841,8876,8877,8878,8879,8928,8929,8930,8931,8938,8939,8940,8941,9001,9002,10972,12364,12366,12368,12370,12372,12374,12376,12378,12380,12382,12384,12386,12389,12391,12393,12400,12401,12403,12404,12406,12407,12409,12410,12412,12413,12436,12446,12460,12462,12464,12466,12468,12470,12472,12474,12476,12478,12480,12482,12485,12487,12489,12496,12497,12499,12500,12502,12503,12505,12506,12508,12509,12532,12535,12536,12537,12538,12542,63744,63745,63746,63747,63748,63749,63750,63751,63752,63753,63754,63755,63756,63757,63758,63759,63760,63761,63762,63763,63764,63765,63766,63767,63768,63769,63770,63771,63772,63773,63774,63775,63776,63777,63778,63779,63780,63781,63782,63783,63784,63785,63786,63787,63788,63789,63790,63791,63792,63793,63794,63795,63796,63797,63798,63799,63800,63801,63802,63803,63804,63805,63806,63807,63808,63809,63810,63811,63812,63813,63814,63815,63816,63817,63818,63819,63820,63821,63822,63823,63824,63825,63826,63827,63828,63829,63830,63831,63832,63833,63834,63835,63836,63837,63838,63839,63840,63841,63842,63843,63844,63845,63846,63847,63848,63849,63850,63851,63852,63853,63854,63855,63856,63857,63858,63859,63860,63861,63862,63863,63864,63865,63866,63867,63868,63869,63870,63871,63872,63873,63874,63875,63876,63877,63878,63879,63880,63881,63882,63883,63884,63885,63886,63887,63888,63889,63890,63891,63892,63893,63894,63895,63896,63897,63898,63899,63900,63901,63902,63903,63904,63905,63906,63907,63908,63909,63910,63911,63912,63913,63914,63915,63916,63917,63918,63919,63920,63921,63922,63923,63924,63925,63926,63927,63928,63929,63930,63931,63932,63933,63934,63935,63936,63937,63938,63939,63940,63941,63942,63943,63944,63945,63946,63947,63948,63949,63950,63951,63952,63953,63954,63955,63956,63957,63958,63959,63960,63961,63962,63963,63964,63965,63966,63967,63968,63969,63970,63971,63972,63973,63974,63975,63976,63977,63978,63979,63980,63981,63982,63983,63984,63985,63986,63987,63988,63989,63990,63991,63992,63993,63994,63995,63996,63997,63998,63999,64000,64001,64002,64003,64004,64005,64006,64007,64008,64009,64010,64011,64012,64013,64016,64018,64021,64022,64023,64024,64025,64026,64027,64028,64029,64030,64032,64034,64037,64038,64042,64043,64044,64045,64046,64047,64048,64049,64050,64051,64052,64053,64054,64055,64056,64057,64058,64059,64060,64061,64062,64063,64064,64065,64066,64067,64068,64069,64070,64071,64072,64073,64074,64075,64076,64077,64078,64079,64080,64081,64082,64083,64084,64085,64086,64087,64088,64089,64090,64091,64092,64093,64094,64095,64096,64097,64098,64099,64100,64101,64102,64103,64104,64105,64106,64107,64108,64109,64112,64113,64114,64115,64116,64117,64118,64119,64120,64121,64122,64123,64124,64125,64126,64127,64128,64129,64130,64131,64132,64133,64134,64135,64136,64137,64138,64139,64140,64141,64142,64143,64144,64145,64146,64147,64148,64149,64150,64151,64152,64153,64154,64155,64156,64157,64158,64159,64160,64161,64162,64163,64164,64165,64166,64167,64168,64169,64170,64171,64172,64173,64174,64175,64176,64177,64178,64179,64180,64181,64182,64183,64184,64185,64186,64187,64188,64189,64190,64191,64192,64193,64194,64195,64196,64197,64198,64199,64200,64201,64202,64203,64204,64205,64206,64207,64208,64209,64210,64211,64212,64213,64214,64215,64216,64217,64285,64287,64298,64299,64300,64301,64302,64303,64304,64305,64306,64307,64308,64309,64310,64312,64313,64314,64315,64316,64318,64320,64321,64323,64324,64326,64327,64328,64329,64330,64331,64332,64333,64334,69786,69788,69803,69934,69935,70475,70476,70843,70844,70846,71098,71099,119134,119135,119136,119137,119138,119139,119140,119227,119228,119229,119230,119231,119232,194560,194561,194562,194563,194564,194565,194566,194567,194568,194569,194570,194571,194572,194573,194574,194575,194576,194577,194578,194579,194580,194581,194582,194583,194584,194585,194586,194587,194588,194589,194590,194591,194592,194593,194594,194595,194596,194597,194598,194599,194600,194601,194602,194603,194604,194605,194606,194607,194608,194609,194610,194611,194612,194613,194614,194615,194616,194617,194618,194619,194620,194621,194622,194623,194624,194625,194626,194627,194628,194629,194630,194631,194632,194633,194634,194635,194636,194637,194638,194639,194640,194641,194642,194643,194644,194645,194646,194647,194648,194649,194650,194651,194652,194653,194654,194655,194656,194657,194658,194659,194660,194661,194662,194663,194664,194665,194666,194667,194668,194669,194670,194671,194672,194673,194674,194675,194676,194677,194678,194679,194680,194681,194682,194683,194684,194685,194686,194687,194688,194689,194690,194691,194692,194693,194694,194695,194696,194697,194698,194699,194700,194701,194702,194703,194704,194705,194706,194707,194708,194709,194710,194711,194712,194713,194714,194715,194716,194717,194718,194719,194720,194721,194722,194723,194724,194725,194726,194727,194728,194729,194730,194731,194732,194733,194734,194735,194736,194737,194738,194739,194740,194741,194742,194743,194744,194745,194746,194747,194748,194749,194750,194751,194752,194753,194754,194755,194756,194757,194758,194759,194760,194761,194762,194763,194764,194765,194766,194767,194768,194769,194770,194771,194772,194773,194774,194775,194776,194777,194778,194779,194780,194781,194782,194783,194784,194785,194786,194787,194788,194789,194790,194791,194792,194793,194794,194795,194796,194797,194798,194799,194800,194801,194802,194803,194804,194805,194806,194807,194808,194809,194810,194811,194812,194813,194814,194815,194816,194817,194818,194819,194820,194821,194822,194823,194824,194825,194826,194827,194828,194829,194830,194831,194832,194833,194834,194835,194836,194837,194838,194839,194840,194841,194842,194843,194844,194845,194846,194847,194848,194849,194850,194851,194852,194853,194854,194855,194856,194857,194858,194859,194860,194861,194862,194863,194864,194865,194866,194867,194868,194869,194870,194871,194872,194873,194874,194875,194876,194877,194878,194879,194880,194881,194882,194883,194884,194885,194886,194887,194888,194889,194890,194891,194892,194893,194894,194895,194896,194897,194898,194899,194900,194901,194902,194903,194904,194905,194906,194907,194908,194909,194910,194911,194912,194913,194914,194915,194916,194917,194918,194919,194920,194921,194922,194923,194924,194925,194926,194927,194928,194929,194930,194931,194932,194933,194934,194935,194936,194937,194938,194939,194940,194941,194942,194943,194944,194945,194946,194947,194948,194949,194950,194951,194952,194953,194954,194955,194956,194957,194958,194959,194960,194961,194962,194963,194964,194965,194966,194967,194968,194969,194970,194971,194972,194973,194974,194975,194976,194977,194978,194979,194980,194981,194982,194983,194984,194985,194986,194987,194988,194989,194990,194991,194992,194993,194994,194995,194996,194997,194998,194999,195000,195001,195002,195003,195004,195005,195006,195007,195008,195009,195010,195011,195012,195013,195014,195015,195016,195017,195018,195019,195020,195021,195022,195023,195024,195025,195026,195027,195028,195029,195030,195031,195032,195033,195034,195035,195036,195037,195038,195039,195040,195041,195042,195043,195044,195045,195046,195047,195048,195049,195050,195051,195052,195053,195054,195055,195056,195057,195058,195059,195060,195061,195062,195063,195064,195065,195066,195067,195068,195069,195070,195071,195072,195073,195074,195075,195076,195077,195078,195079,195080,195081,195082,195083,195084,195085,195086,195087,195088,195089,195090,195091,195092,195093,195094,195095,195096,195097,195098,195099,195100,195101]
+bitList1, bitList2 :: [Int]
+bitList1 = [192,193,194,195,196,197,199,200,201,202,203,204,205,206,207,209,210,211,212,213,214,217,218,219,220,221,224,225,226,227,228,229,231,232,233,234,235,236,237,238,239,241,242,243,244,245,246,249,250,251,252,253,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,296,297,298,299,300,301,302,303,304,308,309,310,311,313,314,315,316,317,318,323,324,325,326,327,328,332,333,334,335,336,337,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,360,361,362,363,364,365,366,367,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,416,417,431,432,461,462,463,464,465,466,467,468,469,470,471,472,473,474,475,476,478,479,480,481,482,483,486,487,488,489,490,491,492,493,494,495,496,500,501,504,505,506,507,508,509,510,511,512,513,514,515,516,517,518,519,520,521,522,523,524,525,526,527,528,529,530,531,532,533,534,535,536,537,538,539,542,543,550,551,552,553,554,555,556,557,558,559,560,561,562,563,832,833,835,836,884,894,901,902,903,904,905,906,908,910,911,912,938,939,940,941,942,943,944,970,971,972,973,974,979,980,1024,1025,1027,1031,1036,1037,1038,1049,1081,1104,1105,1107,1111,1116,1117,1118,1142,1143,1217,1218,1232,1233,1234,1235,1238,1239,1242,1243,1244,1245,1246,1247,1250,1251,1252,1253,1254,1255,1258,1259,1260,1261,1262,1263,1264,1265,1266,1267,1268,1269,1272,1273,1570,1571,1572,1573,1574,1728,1730,1747,2345,2353,2356,2392,2393,2394,2395,2396,2397,2398,2399,2507,2508,2524,2525,2527,2611,2614,2649,2650,2651,2654,2888,2891,2892,2908,2909,2964,3018,3019,3020,3144,3264,3271,3272,3274,3275,3402,3403,3404,3546,3548,3549,3550,3907,3917,3922,3927,3932,3945,3955,3957,3958,3960,3969,3987,3997,4002,4007,4012,4025,4134,6918,6920,6922,6924,6926,6930,6971,6973,6976,6977,6979,7680,7681,7682,7683,7684,7685,7686,7687,7688,7689,7690,7691,7692,7693,7694,7695,7696,7697,7698,7699,7700,7701,7702,7703,7704,7705,7706,7707,7708,7709,7710,7711,7712,7713,7714,7715,7716,7717,7718,7719,7720,7721,7722,7723,7724,7725,7726,7727,7728,7729,7730,7731,7732,7733,7734,7735,7736,7737,7738,7739,7740,7741,7742,7743,7744,7745,7746,7747,7748,7749,7750,7751,7752,7753,7754,7755,7756,7757,7758,7759,7760,7761,7762,7763,7764,7765,7766,7767,7768,7769,7770,7771,7772,7773,7774,7775,7776,7777,7778,7779,7780,7781,7782,7783,7784,7785,7786,7787,7788,7789,7790,7791,7792,7793,7794,7795,7796,7797,7798,7799,7800,7801,7802,7803,7804,7805,7806,7807,7808,7809,7810,7811,7812,7813,7814,7815,7816,7817,7818,7819,7820,7821,7822,7823,7824,7825,7826,7827,7828,7829,7830,7831,7832,7833,7835,7840,7841,7842,7843,7844,7845,7846,7847,7848,7849,7850,7851,7852,7853,7854,7855,7856,7857,7858,7859,7860,7861,7862,7863,7864,7865,7866,7867,7868,7869,7870,7871,7872,7873,7874,7875,7876,7877,7878,7879,7880,7881,7882,7883,7884,7885,7886,7887,7888,7889,7890,7891,7892,7893,7894,7895,7896,7897,7898,7899,7900,7901,7902,7903,7904,7905,7906,7907,7908,7909,7910,7911,7912,7913,7914,7915,7916,7917,7918,7919,7920,7921,7922,7923,7924,7925,7926,7927,7928,7929,7936,7937,7938,7939,7940,7941,7942,7943,7944,7945,7946,7947,7948,7949,7950,7951,7952,7953,7954,7955,7956,7957,7960,7961,7962,7963,7964,7965,7968,7969,7970,7971,7972,7973,7974,7975,7976,7977,7978,7979,7980,7981,7982,7983,7984,7985,7986,7987,7988,7989,7990,7991,7992,7993,7994,7995,7996,7997,7998,7999,8000,8001,8002,8003,8004,8005,8008,8009,8010,8011,8012,8013,8016,8017,8018,8019,8020,8021,8022,8023,8025,8027,8029,8031,8032,8033,8034,8035,8036,8037,8038,8039,8040,8041,8042,8043,8044,8045,8046,8047,8048,8049,8050,8051,8052,8053,8054,8055,8056,8057,8058,8059,8060,8061,8064,8065,8066,8067,8068,8069,8070,8071,8072,8073,8074,8075,8076,8077,8078,8079,8080,8081,8082,8083,8084,8085,8086,8087,8088,8089,8090,8091,8092,8093,8094,8095,8096,8097,8098,8099,8100,8101,8102,8103,8104,8105,8106,8107,8108,8109,8110,8111,8112,8113,8114,8115,8116,8118,8119,8120,8121,8122,8123,8124,8126,8129,8130,8131,8132,8134,8135,8136,8137,8138,8139,8140,8141,8142,8143,8144,8145,8146,8147,8150,8151,8152,8153,8154,8155,8157,8158,8159,8160,8161,8162,8163,8164,8165,8166,8167,8168,8169,8170,8171,8172,8173,8174,8175,8178,8179,8180,8182,8183,8184,8185,8186,8187,8188,8189,8192,8193,8486,8490,8491,8602,8603,8622,8653,8654,8655,8708,8713,8716,8740,8742,8769,8772,8775,8777,8800,8802,8813,8814,8815,8816,8817,8820,8821,8824,8825,8832,8833,8836,8837,8840,8841,8876,8877,8878,8879,8928,8929,8930,8931,8938,8939,8940,8941,9001,9002,10972,12364,12366,12368,12370,12372,12374,12376,12378,12380,12382,12384,12386,12389,12391,12393,12400,12401,12403,12404,12406,12407,12409,12410,12412,12413,12436,12446,12460,12462,12464,12466,12468,12470,12472,12474,12476,12478,12480,12482,12485,12487,12489,12496,12497,12499,12500,12502,12503,12505,12506,12508,12509,12532,12535,12536,12537,12538,12542,63744,63745,63746,63747,63748,63749,63750,63751,63752,63753,63754,63755,63756,63757,63758,63759,63760,63761,63762,63763,63764,63765,63766,63767,63768,63769,63770,63771,63772,63773,63774]
+bitList2 = [63775,63776,63777,63778,63779,63780,63781,63782,63783,63784,63785,63786,63787,63788,63789,63790,63791,63792,63793,63794,63795,63796,63797,63798,63799,63800,63801,63802,63803,63804,63805,63806,63807,63808,63809,63810,63811,63812,63813,63814,63815,63816,63817,63818,63819,63820,63821,63822,63823,63824,63825,63826,63827,63828,63829,63830,63831,63832,63833,63834,63835,63836,63837,63838,63839,63840,63841,63842,63843,63844,63845,63846,63847,63848,63849,63850,63851,63852,63853,63854,63855,63856,63857,63858,63859,63860,63861,63862,63863,63864,63865,63866,63867,63868,63869,63870,63871,63872,63873,63874,63875,63876,63877,63878,63879,63880,63881,63882,63883,63884,63885,63886,63887,63888,63889,63890,63891,63892,63893,63894,63895,63896,63897,63898,63899,63900,63901,63902,63903,63904,63905,63906,63907,63908,63909,63910,63911,63912,63913,63914,63915,63916,63917,63918,63919,63920,63921,63922,63923,63924,63925,63926,63927,63928,63929,63930,63931,63932,63933,63934,63935,63936,63937,63938,63939,63940,63941,63942,63943,63944,63945,63946,63947,63948,63949,63950,63951,63952,63953,63954,63955,63956,63957,63958,63959,63960,63961,63962,63963,63964,63965,63966,63967,63968,63969,63970,63971,63972,63973,63974,63975,63976,63977,63978,63979,63980,63981,63982,63983,63984,63985,63986,63987,63988,63989,63990,63991,63992,63993,63994,63995,63996,63997,63998,63999,64000,64001,64002,64003,64004,64005,64006,64007,64008,64009,64010,64011,64012,64013,64016,64018,64021,64022,64023,64024,64025,64026,64027,64028,64029,64030,64032,64034,64037,64038,64042,64043,64044,64045,64046,64047,64048,64049,64050,64051,64052,64053,64054,64055,64056,64057,64058,64059,64060,64061,64062,64063,64064,64065,64066,64067,64068,64069,64070,64071,64072,64073,64074,64075,64076,64077,64078,64079,64080,64081,64082,64083,64084,64085,64086,64087,64088,64089,64090,64091,64092,64093,64094,64095,64096,64097,64098,64099,64100,64101,64102,64103,64104,64105,64106,64107,64108,64109,64112,64113,64114,64115,64116,64117,64118,64119,64120,64121,64122,64123,64124,64125,64126,64127,64128,64129,64130,64131,64132,64133,64134,64135,64136,64137,64138,64139,64140,64141,64142,64143,64144,64145,64146,64147,64148,64149,64150,64151,64152,64153,64154,64155,64156,64157,64158,64159,64160,64161,64162,64163,64164,64165,64166,64167,64168,64169,64170,64171,64172,64173,64174,64175,64176,64177,64178,64179,64180,64181,64182,64183,64184,64185,64186,64187,64188,64189,64190,64191,64192,64193,64194,64195,64196,64197,64198,64199,64200,64201,64202,64203,64204,64205,64206,64207,64208,64209,64210,64211,64212,64213,64214,64215,64216,64217,64285,64287,64298,64299,64300,64301,64302,64303,64304,64305,64306,64307,64308,64309,64310,64312,64313,64314,64315,64316,64318,64320,64321,64323,64324,64326,64327,64328,64329,64330,64331,64332,64333,64334,69786,69788,69803,69934,69935,70475,70476,70843,70844,70846,71098,71099,119134,119135,119136,119137,119138,119139,119140,119227,119228,119229,119230,119231,119232,194560,194561,194562,194563,194564,194565,194566,194567,194568,194569,194570,194571,194572,194573,194574,194575,194576,194577,194578,194579,194580,194581,194582,194583,194584,194585,194586,194587,194588,194589,194590,194591,194592,194593,194594,194595,194596,194597,194598,194599,194600,194601,194602,194603,194604,194605,194606,194607,194608,194609,194610,194611,194612,194613,194614,194615,194616,194617,194618,194619,194620,194621,194622,194623,194624,194625,194626,194627,194628,194629,194630,194631,194632,194633,194634,194635,194636,194637,194638,194639,194640,194641,194642,194643,194644,194645,194646,194647,194648,194649,194650,194651,194652,194653,194654,194655,194656,194657,194658,194659,194660,194661,194662,194663,194664,194665,194666,194667,194668,194669,194670,194671,194672,194673,194674,194675,194676,194677,194678,194679,194680,194681,194682,194683,194684,194685,194686,194687,194688,194689,194690,194691,194692,194693,194694,194695,194696,194697,194698,194699,194700,194701,194702,194703,194704,194705,194706,194707,194708,194709,194710,194711,194712,194713,194714,194715,194716,194717,194718,194719,194720,194721,194722,194723,194724,194725,194726,194727,194728,194729,194730,194731,194732,194733,194734,194735,194736,194737,194738,194739,194740,194741,194742,194743,194744,194745,194746,194747,194748,194749,194750,194751,194752,194753,194754,194755,194756,194757,194758,194759,194760,194761,194762,194763,194764,194765,194766,194767,194768,194769,194770,194771,194772,194773,194774,194775,194776,194777,194778,194779,194780,194781,194782,194783,194784,194785,194786,194787,194788,194789,194790,194791,194792,194793,194794,194795,194796,194797,194798,194799,194800,194801,194802,194803,194804,194805,194806,194807,194808,194809,194810,194811,194812,194813,194814,194815,194816,194817,194818,194819,194820,194821,194822,194823,194824,194825,194826,194827,194828,194829,194830,194831,194832,194833,194834,194835,194836,194837,194838,194839,194840,194841,194842,194843,194844,194845,194846,194847,194848,194849,194850,194851,194852,194853,194854,194855,194856,194857,194858,194859,194860,194861,194862,194863,194864,194865,194866,194867,194868,194869,194870,194871,194872,194873,194874,194875,194876,194877,194878,194879,194880,194881,194882,194883,194884,194885,194886,194887,194888,194889,194890,194891,194892,194893,194894,194895,194896,194897,194898,194899,194900,194901,194902,194903,194904,194905,194906,194907,194908,194909,194910,194911,194912,194913,194914,194915,194916,194917,194918,194919,194920,194921,194922,194923,194924,194925,194926,194927,194928,194929,194930,194931,194932,194933,194934,194935,194936,194937,194938,194939,194940,194941,194942,194943,194944,194945,194946,194947,194948,194949,194950,194951,194952,194953,194954,194955,194956,194957,194958,194959,194960,194961,194962,194963,194964,194965,194966,194967,194968,194969,194970,194971,194972,194973,194974,194975,194976,194977,194978,194979,194980,194981,194982,194983,194984,194985,194986,194987,194988,194989,194990,194991,194992,194993,194994,194995,194996,194997,194998,194999,195000,195001,195002,195003,195004,195005,195006,195007,195008,195009,195010,195011,195012,195013,195014,195015,195016,195017,195018,195019,195020,195021,195022,195023,195024,195025,195026,195027,195028,195029,195030,195031,195032,195033,195034,195035,195036,195037,195038,195039,195040,195041,195042,195043,195044,195045,195046,195047,195048,195049,195050,195051,195052,195053,195054,195055,195056,195057,195058,195059,195060,195061,195062,195063,195064,195065,195066,195067,195068,195069,195070,195071,195072,195073,195074,195075,195076,195077,195078,195079,195080,195081,195082,195083,195084,195085,195086,195087,195088,195089,195090,195091,195092,195093,195094,195095,195096,195097,195098,195099,195100,195101]
decomposeBitmap :: BitArray
-decomposeBitmap = bitArraySetBits (192,195101) bitList
+decomposeBitmap = bitArraySetBits (192,195101) $ bitList1 ++ bitList2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unicode-transforms-0.3.2/Data/Unicode/Properties/DecomposableK.hs new/unicode-transforms-0.3.4/Data/Unicode/Properties/DecomposableK.hs
--- old/unicode-transforms-0.3.2/Data/Unicode/Properties/DecomposableK.hs 2017-07-23 08:32:30.000000000 +0200
+++ new/unicode-transforms-0.3.4/Data/Unicode/Properties/DecomposableK.hs 2017-12-01 06:31:18.000000000 +0100
@@ -11,13 +11,9 @@
decomposeMin = 160
decomposeMax = 195101
-bitList1 :: [Int]
-{-# NOINLINE bitList1 #-}
-bitList1 = [160,168,170,175,178,179,180,181,184,185,186,188,189,190,192,193,194,195,196,197,199,200,201,202,203,204,205,206,207,209,210,211,212,213,214,217,218,219,220,221,224,225,226,227,228,229,231,232,233,234,235,236,237,238,239,241,242,243,244,245,246,249,250,251,252,253,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,296,297,298,299,300,301,302,303,304,306,307,308,309,310,311,313,314,315,316,317,318,319,320,323,324,325,326,327,328,329,332,333,334,335,336,337,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,360,361,362,363,364,365,366,367,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,416,417,431,432,452,453,454,455,456,457,458,459,460,461,462,463,464,465,466,467,468,469,470,471,472,473,474,475,476,478,479,480,481,482,483,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,504,505,506,507,508,509,510,511,512,513,514,515,516,517,518,519,520,521,522,523,524,525,526,527,528,529,530,531,532,533,534,535,536,537,538,539,542,543,550,551,552,553,554,555,556,557,558,559,560,561,562,563,688,689,690,691,692,693,694,695,696,728,729,730,731,732,733,736,737,738,739,740,832,833,835,836,884,890,894,900,901,902,903,904,905,906,908,910,911,912,938,939,940,941,942,943,944,970,971,972,973,974,976,977,978,979,980,981,982,1008,1009,1010,1012,1013,1017,1024,1025,1027,1031,1036,1037,1038,1049,1081,1104,1105,1107,1111,1116,1117,1118,1142,1143,1217,1218,1232,1233,1234,1235,1238,1239,1242,1243,1244,1245,1246,1247,1250,1251,1252,1253,1254,1255,1258,1259,1260,1261,1262,1263,1264,1265,1266,1267,1268,1269,1272,1273,1415,1570,1571,1572,1573,1574,1653,1654,1655,1656,1728,1730,1747,2345,2353,2356,2392,2393,2394,2395,2396,2397,2398,2399,2507,2508,2524,2525,2527,2611,2614,2649,2650,2651,2654,2888,2891,2892,2908,2909,2964,3018,3019,3020,3144,3264,3271,3272,3274,3275,3402,3403,3404,3546,3548,3549,3550,3635,3763,3804,3805,3852,3907,3917,3922,3927,3932,3945,3955,3957,3958,3959,3960,3961,3969,3987,3997,4002,4007,4012,4025,4134,4348,6918,6920,6922,6924,6926,6930,6971,6973,6976,6977,6979,7468,7469,7470,7472,7473,7474,7475,7476,7477,7478,7479,7480,7481,7482,7484,7485,7486,7487,7488,7489,7490,7491,7492,7493,7494,7495,7496,7497,7498,7499,7500,7501,7503,7504,7505,7506,7507,7508,7509,7510,7511,7512,7513,7514,7515,7516,7517,7518,7519,7520,7521,7522,7523,7524,7525,7526,7527,7528,7529,7530,7544,7579,7580,7581,7582,7583,7584,7585,7586,7587,7588,7589,7590,7591,7592,7593,7594,7595,7596,7597,7598,7599,7600,7601,7602,7603,7604,7605,7606,7607,7608,7609,7610,7611,7612,7613,7614,7615,7680,7681,7682,7683,7684,7685,7686,7687,7688,7689,7690,7691,7692,7693,7694,7695,7696,7697,7698,7699,7700,7701,7702,7703,7704,7705,7706,7707,7708,7709,7710,7711,7712,7713,7714,7715,7716,7717,7718,7719,7720,7721,7722,7723,7724,7725,7726,7727,7728,7729,7730,7731,7732,7733,7734,7735,7736,7737,7738,7739,7740,7741,7742,7743,7744,7745,7746,7747,7748,7749,7750,7751,7752,7753,7754,7755,7756,7757,7758,7759,7760,7761,7762,7763,7764,7765,7766,7767,7768,7769,7770,7771,7772,7773,7774,7775,7776,7777,7778,7779,7780,7781,7782,7783,7784,7785,7786,7787,7788,7789,7790,7791,7792,7793,7794,7795,7796,7797,7798,7799,7800,7801,7802,7803,7804,7805,7806,7807,7808,7809,7810,7811,7812,7813,7814,7815,7816,7817,7818,7819,7820,7821,7822,7823,7824,7825,7826,7827,7828,7829,7830,7831,7832,7833,7834,7835,7840,7841,7842,7843,7844,7845,7846,7847,7848,7849,7850,7851,7852,7853,7854,7855,7856,7857,7858,7859,7860,7861,7862,7863,7864,7865,7866,7867,7868,7869,7870,7871,7872,7873,7874,7875,7876,7877,7878,7879,7880,7881,7882,7883,7884,7885,7886,7887,7888,7889,7890,7891,7892,7893,7894,7895,7896,7897,7898,7899,7900,7901,7902,7903,7904,7905,7906,7907,7908,7909,7910,7911,7912,7913,7914,7915,7916,7917,7918,7919,7920,7921,7922,7923,7924,7925,7926,7927,7928,7929,7936,7937,7938,7939,7940,7941,7942,7943,7944,7945,7946,7947,7948,7949,7950,7951,7952,7953,7954,7955,7956,7957,7960,7961,7962,7963,7964,7965,7968,7969,7970,7971,7972,7973,7974,7975,7976,7977,7978,7979,7980,7981,7982,7983,7984,7985,7986,7987,7988,7989,7990,7991,7992,7993,7994,7995,7996,7997,7998,7999,8000,8001,8002,8003,8004,8005,8008,8009,8010,8011,8012,8013,8016,8017,8018,8019,8020,8021,8022,8023,8025,8027,8029,8031,8032,8033,8034,8035,8036,8037,8038,8039,8040,8041,8042,8043,8044,8045,8046,8047,8048,8049,8050,8051,8052,8053,8054,8055,8056,8057,8058,8059,8060,8061,8064,8065,8066,8067,8068,8069,8070,8071,8072,8073,8074,8075,8076,8077,8078,8079,8080,8081,8082,8083,8084,8085,8086,8087,8088,8089,8090,8091,8092,8093,8094,8095,8096,8097,8098,8099,8100,8101,8102,8103,8104,8105,8106,8107,8108,8109,8110,8111,8112,8113,8114,8115,8116,8118,8119,8120,8121,8122,8123,8124,8125,8126,8127,8128,8129,8130,8131,8132,8134,8135,8136,8137,8138,8139,8140,8141,8142,8143,8144,8145,8146,8147,8150,8151,8152,8153,8154,8155,8157,8158,8159,8160,8161,8162,8163,8164,8165,8166,8167,8168,8169,8170,8171,8172,8173,8174,8175,8178,8179,8180,8182,8183,8184,8185,8186,8187,8188,8189,8190,8192,8193,8194,8195,8196,8197,8198,8199,8200,8201,8202,8209,8215,8228,8229,8230,8239,8243,8244,8246,8247,8252,8254,8263,8264,8265,8279,8287,8304,8305,8308,8309,8310,8311,8312,8313,8314,8315,8316,8317,8318,8319,8320,8321,8322,8323,8324,8325,8326,8327,8328,8329,8330,8331,8332,8333,8334,8336,8337,8338,8339,8340,8341,8342,8343,8344,8345,8346,8347,8348,8360,8448,8449,8450,8451,8453,8454,8455,8457,8458,8459,8460,8461,8462,8463,8464,8465,8466,8467,8469,8470,8473,8474,8475,8476,8477,8480,8481,8482,8484,8486,8488,8490,8491,8492,8493,8495,8496,8497,8499,8500,8501,8502,8503,8504,8505,8507,8508,8509,8510,8511,8512,8517,8518,8519,8520,8521,8528,8529,8530,8531,8532,8533,8534,8535,8536,8537,8538,8539,8540,8541,8542,8543,8544,8545,8546,8547,8548,8549,8550,8551,8552,8553,8554,8555,8556,8557,8558,8559,8560,8561,8562,8563,8564,8565,8566,8567,8568,8569,8570,8571,8572,8573,8574,8575,8585,8602,8603,8622,8653,8654,8655,8708,8713,8716,8740,8742,8748,8749,8751,8752,8769,8772,8775,8777,8800,8802,8813,8814,8815,8816,8817,8820,8821,8824,8825,8832,8833,8836,8837,8840,8841,8876,8877,8878,8879,8928,8929,8930,8931,8938,8939,8940,8941,9001,9002,9312,9313,9314,9315,9316,9317,9318,9319,9320,9321,9322,9323,9324,9325,9326,9327,9328,9329,9330,9331,9332,9333,9334,9335,9336,9337,9338,9339,9340,9341,9342,9343,9344,9345,9346,9347,9348,9349,9350,9351,9352,9353,9354,9355,9356,9357,9358,9359,9360,9361,9362,9363,9364,9365,9366,9367,9368,9369,9370,9371,9372,9373,9374,9375,9376,9377,9378,9379,9380,9381,9382,9383,9384,9385,9386,9387,9388,9389,9390,9391,9392,9393,9394,9395,9396,9397,9398,9399,9400,9401,9402,9403,9404,9405,9406,9407,9408,9409,9410,9411,9412,9413,9414,9415,9416,9417,9418,9419,9420,9421,9422,9423,9424,9425,9426,9427,9428,9429,9430,9431,9432,9433,9434,9435,9436,9437,9438,9439,9440,9441,9442,9443,9444,9445,9446,9447,9448,9449,9450,10764,10868,10869,10870,10972,11388,11389,11631,11935,12019,12032,12033,12034,12035,12036,12037,12038,12039,12040,12041,12042,12043,12044,12045,12046,12047,12048,12049,12050,12051,12052,12053,12054,12055,12056,12057,12058,12059,12060,12061,12062,12063,12064,12065,12066,12067,12068,12069,12070,12071,12072,12073,12074,12075,12076,12077,12078,12079,12080,12081,12082,12083,12084,12085,12086,12087,12088,12089,12090,12091,12092,12093,12094,12095,12096,12097,12098,12099,12100,12101,12102,12103,12104,12105,12106,12107,12108,12109,12110,12111,12112,12113,12114,12115,12116,12117,12118,12119,12120,12121,12122,12123,12124,12125,12126,12127,12128,12129,12130,12131,12132,12133,12134,12135,12136,12137,12138,12139,12140,12141,12142,12143,12144,12145,12146,12147,12148,12149,12150,12151,12152,12153,12154,12155,12156,12157,12158,12159,12160,12161,12162,12163,12164,12165,12166,12167,12168,12169,12170,12171,12172,12173,12174,12175,12176,12177,12178,12179,12180,12181,12182,12183,12184,12185,12186,12187,12188,12189,12190,12191,12192,12193,12194,12195,12196,12197,12198,12199,12200,12201,12202,12203,12204,12205,12206,12207,12208,12209,12210,12211,12212,12213,12214,12215,12216,12217,12218,12219,12220,12221,12222,12223,12224,12225,12226,12227,12228,12229,12230,12231,12232,12233,12234,12235,12236,12237,12238,12239,12240,12241,12242,12243,12244,12245,12288,12342,12344,12345,12346,12364,12366,12368,12370,12372,12374,12376,12378,12380,12382,12384,12386,12389,12391,12393,12400,12401,12403,12404,12406,12407,12409,12410,12412,12413,12436,12443,12444,12446,12447,12460,12462,12464,12466,12468,12470,12472,12474,12476,12478,12480,12482,12485,12487,12489,12496,12497,12499,12500,12502,12503,12505,12506,12508,12509,12532,12535,12536,12537,12538,12542,12543,12593,12594,12595,12596,12597,12598,12599,12600,12601,12602,12603,12604,12605,12606,12607,12608,12609,12610,12611,12612,12613,12614,12615,12616,12617,12618,12619,12620,12621,12622,12623,12624,12625,12626,12627,12628,12629,12630,12631,12632,12633,12634,12635,12636,12637,12638,12639,12640,12641,12642,12643,12644,12645,12646,12647,12648,12649,12650,12651,12652,12653,12654,12655,12656,12657,12658,12659,12660,12661,12662,12663,12664,12665,12666,12667,12668,12669,12670,12671,12672,12673,12674,12675,12676,12677,12678,12679,12680,12681,12682,12683,12684,12685,12686,12690,12691,12692,12693,12694,12695,12696,12697,12698,12699,12700,12701,12702,12703,12800,12801,12802,12803,12804,12805,12806,12807,12808,12809,12810,12811,12812,12813,12814,12815,12816,12817,12818,12819,12820,12821,12822,12823,12824,12825,12826,12827,12828,12829,12830,12832,12833,12834,12835,12836,12837,12838,12839,12840,12841,12842,12843,12844,12845,12846,12847,12848,12849,12850,12851,12852,12853,12854,12855,12856,12857,12858,12859,12860,12861,12862,12863,12864,12865,12866,12867,12868,12869,12870,12871,12880,12881,12882,12883,12884,12885,12886,12887,12888,12889,12890,12891,12892,12893,12894,12895,12896,12897,12898,12899,12900,12901,12902,12903,12904,12905,12906,12907,12908,12909,12910,12911,12912,12913,12914,12915,12916,12917,12918,12919,12920,12921,12922,12923,12924,12925,12926,12928,12929,12930,12931,12932,12933,12934,12935,12936,12937,12938,12939,12940,12941,12942,12943,12944,12945,12946,12947,12948,12949,12950,12951,12952,12953,12954,12955,12956,12957,12958,12959,12960,12961,12962,12963,12964,12965,12966,12967,12968,12969,12970,12971,12972,12973,12974,12975,12976,12977,12978,12979,12980,12981,12982,12983,12984,12985,12986,12987,12988,12989,12990,12991,12992,12993,12994,12995,12996,12997,12998,12999,13000,13001,13002,13003,13004,13005,13006,13007,13008,13009,13010,13011,13012,13013,13014,13015,13016,13017,13018,13019,13020,13021,13022,13023,13024,13025,13026,13027,13028,13029,13030,13031,13032,13033,13034,13035,13036,13037,13038,13039,13040,13041,13042,13043,13044,13045,13046,13047,13048,13049,13050,13051,13052,13053,13054,13056,13057,13058,13059,13060,13061,13062,13063,13064,13065,13066,13067,13068,13069,13070,13071,13072,13073,13074,13075,13076,13077,13078,13079,13080,13081,13082,13083,13084,13085,13086,13087,13088,13089,13090,13091,13092,13093,13094,13095,13096,13097,13098,13099,13100,13101,13102,13103,13104,13105,13106,13107,13108,13109,13110,13111,13112,13113,13114,13115,13116,13117,13118,13119,13120,13121,13122,13123,13124,13125,13126,13127,13128,13129,13130,13131,13132,13133,13134,13135,13136,13137,13138,13139,13140,13141,13142,13143,13144,13145,13146,13147,13148,13149,13150,13151,13152,13153,13154,13155,13156,13157,13158,13159,13160,13161,13162,13163,13164,13165,13166,13167,13168,13169,13170,13171,13172,13173,13174,13175,13176,13177,13178,13179,13180,13181,13182,13183,13184,13185,13186,13187,13188,13189,13190,13191,13192,13193,13194,13195,13196,13197,13198,13199,13200,13201,13202,13203,13204,13205,13206,13207,13208,13209,13210,13211,13212,13213,13214,13215,13216,13217,13218,13219,13220,13221,13222,13223,13224,13225,13226,13227,13228,13229,13230,13231,13232,13233,13234,13235,13236,13237,13238,13239,13240,13241,13242,13243,13244,13245,13246,13247,13248,13249,13250,13251,13252,13253,13254,13255,13256,13257,13258,13259,13260,13261,13262,13263,13264,13265,13266,13267,13268,13269,13270,13271,13272,13273,13274,13275,13276,13277,13278,13279,13280,13281,13282,13283,13284,13285,13286,13287,13288,13289,13290,13291,13292,13293,13294,13295,13296,13297,13298,13299,13300,13301,13302,13303,13304,13305,13306,13307,13308,13309,13310,13311,42652,42653,42864,43000,43001,43868,43869,43870,43871,63744,63745,63746,63747,63748,63749,63750,63751,63752,63753,63754,63755,63756,63757,63758,63759,63760,63761,63762,63763,63764,63765,63766,63767,63768,63769,63770,63771,63772,63773,63774,63775,63776,63777,63778,63779,63780,63781,63782,63783,63784,63785,63786,63787,63788,63789,63790,63791,63792,63793,63794,63795,63796,63797,63798,63799,63800,63801,63802,63803,63804,63805,63806,63807,63808,63809,63810,63811,63812,63813,63814,63815,63816,63817,63818,63819,63820,63821,63822,63823,63824,63825,63826,63827,63828,63829,63830,63831,63832,63833,63834,63835,63836,63837,63838,63839,63840,63841,63842,63843,63844,63845,63846,63847,63848,63849,63850,63851,63852,63853,63854,63855,63856,63857,63858,63859,63860,63861,63862,63863,63864,63865,63866,63867,63868,63869,63870,63871,63872,63873,63874,63875,63876,63877,63878,63879,63880,63881,63882,63883,63884,63885,63886,63887,63888,63889,63890,63891,63892,63893,63894,63895,63896,63897,63898,63899,63900,63901,63902,63903,63904,63905,63906,63907,63908,63909,63910,63911,63912,63913,63914,63915,63916,63917,63918,63919,63920,63921,63922,63923,63924,63925,63926,63927,63928,63929,63930,63931,63932,63933,63934,63935,63936,63937,63938,63939,63940,63941,63942,63943,63944,63945,63946,63947,63948,63949,63950,63951,63952,63953,63954,63955,63956,63957,63958,63959,63960,63961,63962,63963,63964,63965,63966,63967,63968,63969,63970,63971,63972,63973,63974,63975,63976,63977,63978,63979,63980,63981,63982,63983,63984,63985,63986,63987,63988,63989,63990,63991,63992,63993,63994,63995,63996,63997,63998,63999,64000,64001,64002,64003,64004,64005,64006,64007,64008,64009,64010,64011,64012,64013,64016,64018,64021,64022,64023,64024,64025,64026,64027,64028,64029,64030,64032,64034,64037,64038,64042,64043,64044,64045,64046,64047,64048,64049,64050,64051,64052,64053,64054,64055,64056,64057,64058,64059,64060,64061,64062,64063,64064,64065,64066,64067,64068,64069,64070,64071,64072,64073,64074,64075,64076,64077,64078,64079,64080,64081,64082,64083,64084,64085,64086,64087,64088,64089,64090,64091,64092,64093,64094,64095,64096,64097,64098,64099,64100,64101,64102,64103,64104,64105,64106,64107,64108,64109,64112,64113,64114,64115,64116,64117,64118,64119,64120,64121,64122,64123,64124,64125,64126,64127,64128,64129,64130,64131,64132,64133,64134,64135,64136,64137,64138,64139,64140,64141,64142,64143,64144,64145,64146,64147,64148,64149,64150,64151,64152,64153,64154,64155,64156,64157,64158,64159,64160,64161,64162,64163,64164,64165,64166,64167,64168,64169,64170,64171,64172,64173,64174,64175,64176,64177,64178,64179,64180,64181,64182,64183,64184,64185,64186,64187,64188,64189,64190,64191,64192,64193,64194,64195,64196,64197,64198,64199,64200,64201,64202,64203,64204,64205,64206,64207,64208,64209,64210,64211,64212,64213,64214,64215,64216,64217,64256,64257,64258,64259,64260,64261,64262,64275,64276,64277,64278,64279,64285,64287,64288,64289,64290,64291,64292,64293,64294,64295,64296,64297,64298,64299,64300,64301,64302,64303,64304,64305,64306,64307,64308,64309,64310,64312,64313,64314,64315,64316,64318,64320,64321,64323,64324,64326,64327,64328,64329,64330,64331,64332,64333,64334,64335,64336,64337,64338,64339,64340,64341,64342,64343,64344,64345,64346,64347,64348,64349,64350,64351,64352,64353,64354,64355,64356,64357,64358,64359,64360,64361,64362,64363,64364,64365,64366,64367,64368,64369,64370,64371,64372,64373,64374,64375,64376,64377,64378,64379,64380,64381,64382,64383,64384,64385,64386,64387,64388,64389,64390,64391,64392,64393,64394,64395,64396,64397,64398,64399,64400,64401,64402,64403,64404,64405,64406,64407,64408,64409,64410,64411,64412,64413,64414,64415,64416,64417,64418,64419,64420,64421,64422,64423,64424,64425,64426,64427,64428,64429,64430,64431,64432,64433,64467,64468,64469,64470,64471,64472,64473,64474,64475,64476,64477,64478,64479,64480,64481,64482,64483,64484,64485,64486,64487,64488,64489,64490,64491,64492,64493,64494,64495,64496,64497,64498,64499,64500,64501,64502,64503,64504,64505,64506,64507,64508,64509,64510,64511,64512,64513,64514,64515,64516,64517,64518,64519,64520,64521,64522,64523,64524,64525,64526,64527,64528,64529,64530,64531,64532,64533,64534,64535,64536,64537,64538,64539,64540,64541,64542,64543,64544,64545,64546,64547,64548,64549,64550,64551,64552,64553,64554,64555,64556,64557,64558,64559,64560,64561,64562,64563,64564,64565,64566,64567,64568,64569,64570,64571,64572,64573,64574,64575,64576,64577,64578,64579,64580,64581,64582,64583,64584,64585,64586,64587,64588,64589,64590,64591,64592,64593,64594,64595,64596,64597,64598,64599,64600,64601,64602,64603,64604,64605,64606,64607,64608,64609,64610,64611,64612,64613,64614,64615,64616,64617,64618,64619,64620,64621,64622,64623]
-
-bitList2 :: [Int]
-{-# NOINLINE bitList2 #-}
-bitList2 = [64624,64625,64626,64627,64628,64629,64630,64631,64632,64633,64634,64635,64636,64637,64638,64639,64640,64641,64642,64643,64644,64645,64646,64647,64648,64649,64650,64651,64652,64653,64654,64655,64656,64657,64658,64659,64660,64661,64662,64663,64664,64665,64666,64667,64668,64669,64670,64671,64672,64673,64674,64675,64676,64677,64678,64679,64680,64681,64682,64683,64684,64685,64686,64687,64688,64689,64690,64691,64692,64693,64694,64695,64696,64697,64698,64699,64700,64701,64702,64703,64704,64705,64706,64707,64708,64709,64710,64711,64712,64713,64714,64715,64716,64717,64718,64719,64720,64721,64722,64723,64724,64725,64726,64727,64728,64729,64730,64731,64732,64733,64734,64735,64736,64737,64738,64739,64740,64741,64742,64743,64744,64745,64746,64747,64748,64749,64750,64751,64752,64753,64754,64755,64756,64757,64758,64759,64760,64761,64762,64763,64764,64765,64766,64767,64768,64769,64770,64771,64772,64773,64774,64775,64776,64777,64778,64779,64780,64781,64782,64783,64784,64785,64786,64787,64788,64789,64790,64791,64792,64793,64794,64795,64796,64797,64798,64799,64800,64801,64802,64803,64804,64805,64806,64807,64808,64809,64810,64811,64812,64813,64814,64815,64816,64817,64818,64819,64820,64821,64822,64823,64824,64825,64826,64827,64828,64829,64848,64849,64850,64851,64852,64853,64854,64855,64856,64857,64858,64859,64860,64861,64862,64863,64864,64865,64866,64867,64868,64869,64870,64871,64872,64873,64874,64875,64876,64877,64878,64879,64880,64881,64882,64883,64884,64885,64886,64887,64888,64889,64890,64891,64892,64893,64894,64895,64896,64897,64898,64899,64900,64901,64902,64903,64904,64905,64906,64907,64908,64909,64910,64911,64914,64915,64916,64917,64918,64919,64920,64921,64922,64923,64924,64925,64926,64927,64928,64929,64930,64931,64932,64933,64934,64935,64936,64937,64938,64939,64940,64941,64942,64943,64944,64945,64946,64947,64948,64949,64950,64951,64952,64953,64954,64955,64956,64957,64958,64959,64960,64961,64962,64963,64964,64965,64966,64967,65008,65009,65010,65011,65012,65013,65014,65015,65016,65017,65018,65019,65020,65040,65041,65042,65043,65044,65045,65046,65047,65048,65049,65072,65073,65074,65075,65076,65077,65078,65079,65080,65081,65082,65083,65084,65085,65086,65087,65088,65089,65090,65091,65092,65095,65096,65097,65098,65099,65100,65101,65102,65103,65104,65105,65106,65108,65109,65110,65111,65112,65113,65114,65115,65116,65117,65118,65119,65120,65121,65122,65123,65124,65125,65126,65128,65129,65130,65131,65136,65137,65138,65140,65142,65143,65144,65145,65146,65147,65148,65149,65150,65151,65152,65153,65154,65155,65156,65157,65158,65159,65160,65161,65162,65163,65164,65165,65166,65167,65168,65169,65170,65171,65172,65173,65174,65175,65176,65177,65178,65179,65180,65181,65182,65183,65184,65185,65186,65187,65188,65189,65190,65191,65192,65193,65194,65195,65196,65197,65198,65199,65200,65201,65202,65203,65204,65205,65206,65207,65208,65209,65210,65211,65212,65213,65214,65215,65216,65217,65218,65219,65220,65221,65222,65223,65224,65225,65226,65227,65228,65229,65230,65231,65232,65233,65234,65235,65236,65237,65238,65239,65240,65241,65242,65243,65244,65245,65246,65247,65248,65249,65250,65251,65252,65253,65254,65255,65256,65257,65258,65259,65260,65261,65262,65263,65264,65265,65266,65267,65268,65269,65270,65271,65272,65273,65274,65275,65276,65281,65282,65283,65284,65285,65286,65287,65288,65289,65290,65291,65292,65293,65294,65295,65296,65297,65298,65299,65300,65301,65302,65303,65304,65305,65306,65307,65308,65309,65310,65311,65312,65313,65314,65315,65316,65317,65318,65319,65320,65321,65322,65323,65324,65325,65326,65327,65328,65329,65330,65331,65332,65333,65334,65335,65336,65337,65338,65339,65340,65341,65342,65343,65344,65345,65346,65347,65348,65349,65350,65351,65352,65353,65354,65355,65356,65357,65358,65359,65360,65361,65362,65363,65364,65365,65366,65367,65368,65369,65370,65371,65372,65373,65374,65375,65376,65377,65378,65379,65380,65381,65382,65383,65384,65385,65386,65387,65388,65389,65390,65391,65392,65393,65394,65395,65396,65397,65398,65399,65400,65401,65402,65403,65404,65405,65406,65407,65408,65409,65410,65411,65412,65413,65414,65415,65416,65417,65418,65419,65420,65421,65422,65423,65424,65425,65426,65427,65428,65429,65430,65431,65432,65433,65434,65435,65436,65437,65438,65439,65440,65441,65442,65443,65444,65445,65446,65447,65448,65449,65450,65451,65452,65453,65454,65455,65456,65457,65458,65459,65460,65461,65462,65463,65464,65465,65466,65467,65468,65469,65470,65474,65475,65476,65477,65478,65479,65482,65483,65484,65485,65486,65487,65490,65491,65492,65493,65494,65495,65498,65499,65500,65504,65505,65506,65507,65508,65509,65510,65512,65513,65514,65515,65516,65517,65518,69786,69788,69803,69934,69935,70475,70476,70843,70844,70846,71098,71099,119134,119135,119136,119137,119138,119139,119140,119227,119228,119229,119230,119231,119232,119808,119809,119810,119811,119812,119813,119814,119815,119816,119817,119818,119819,119820,119821,119822,119823,119824,119825,119826,119827,119828,119829,119830,119831,119832,119833,119834,119835,119836,119837,119838,119839,119840,119841,119842,119843,119844,119845,119846,119847,119848,119849,119850,119851,119852,119853,119854,119855,119856,119857,119858,119859,119860,119861,119862,119863,119864,119865,119866,119867,119868,119869,119870,119871,119872,119873,119874,119875,119876,119877,119878,119879,119880,119881,119882,119883,119884,119885,119886,119887,119888,119889,119890,119891,119892,119894,119895,119896,119897,119898,119899,119900,119901,119902,119903,119904,119905,119906,119907,119908,119909,119910,119911,119912,119913,119914,119915,119916,119917,119918,119919,119920,119921,119922,119923,119924,119925,119926,119927,119928,119929,119930,119931,119932,119933,119934,119935,119936,119937,119938,119939,119940,119941,119942,119943,119944,119945,119946,119947,119948,119949,119950,119951,119952,119953,119954,119955,119956,119957,119958,119959,119960,119961,119962,119963,119964,119966,119967,119970,119973,119974,119977,119978,119979,119980,119982,119983,119984,119985,119986,119987,119988,119989,119990,119991,119992,119993,119995,119997,119998,119999,120000,120001,120002,120003,120005,120006,120007,120008,120009,120010,120011,120012,120013,120014,120015,120016,120017,120018,120019,120020,120021,120022,120023,120024,120025,120026,120027,120028,120029,120030,120031,120032,120033,120034,120035,120036,120037,120038,120039,120040,120041,120042,120043,120044,120045,120046,120047,120048,120049,120050,120051,120052,120053,120054,120055,120056,120057,120058,120059,120060,120061,120062,120063,120064,120065,120066,120067,120068,120069,120071,120072,120073,120074,120077,120078,120079,120080,120081,120082,120083,120084,120086,120087,120088,120089,120090,120091,120092,120094,120095,120096,120097,120098,120099,120100,120101,120102,120103,120104,120105,120106,120107,120108,120109,120110,120111,120112,120113,120114,120115,120116,120117,120118,120119,120120,120121,120123,120124,120125,120126,120128,120129,120130,120131,120132,120134,120138,120139,120140,120141,120142,120143,120144,120146,120147,120148,120149,120150,120151,120152,120153,120154,120155,120156,120157,120158,120159,120160,120161,120162,120163,120164,120165,120166,120167,120168,120169,120170,120171,120172,120173,120174,120175,120176,120177,120178,120179,120180,120181,120182,120183,120184,120185,120186,120187,120188,120189,120190,120191,120192,120193,120194,120195,120196,120197,120198,120199,120200,120201,120202,120203,120204,120205,120206,120207,120208,120209,120210,120211,120212,120213,120214,120215,120216,120217,120218,120219,120220,120221,120222,120223,120224,120225,120226,120227,120228,120229,120230,120231,120232,120233,120234,120235,120236,120237,120238,120239,120240,120241,120242,120243,120244,120245,120246,120247,120248,120249,120250,120251,120252,120253,120254,120255,120256,120257,120258,120259,120260,120261,120262,120263,120264,120265,120266,120267,120268,120269,120270,120271,120272,120273,120274,120275,120276,120277,120278,120279,120280,120281,120282,120283,120284,120285,120286,120287,120288,120289,120290,120291,120292,120293,120294,120295,120296,120297,120298,120299,120300,120301,120302,120303,120304,120305,120306,120307,120308,120309,120310,120311,120312,120313,120314,120315,120316,120317,120318,120319,120320,120321,120322,120323,120324,120325,120326,120327,120328,120329,120330,120331,120332,120333,120334,120335,120336,120337,120338,120339,120340,120341,120342,120343,120344,120345,120346,120347,120348,120349,120350,120351,120352,120353,120354,120355,120356,120357,120358,120359,120360,120361,120362,120363,120364,120365,120366,120367,120368,120369,120370,120371,120372,120373,120374,120375,120376,120377,120378,120379,120380,120381,120382,120383,120384,120385,120386,120387,120388,120389,120390,120391,120392,120393,120394,120395,120396,120397,120398,120399,120400,120401,120402,120403,120404,120405,120406,120407,120408,120409,120410,120411,120412,120413,120414,120415,120416,120417,120418,120419,120420,120421,120422,120423,120424,120425,120426,120427,120428,120429,120430,120431,120432,120433,120434,120435,120436,120437,120438,120439,120440,120441,120442,120443,120444,120445,120446,120447,120448,120449,120450,120451,120452,120453,120454,120455,120456,120457,120458,120459,120460,120461,120462,120463,120464,120465,120466,120467,120468,120469,120470,120471,120472,120473,120474,120475,120476,120477,120478,120479,120480,120481,120482,120483,120484,120485,120488,120489,120490,120491,120492,120493,120494,120495,120496,120497,120498,120499,120500,120501,120502,120503,120504,120505,120506,120507,120508,120509,120510,120511,120512,120513,120514,120515,120516,120517,120518,120519,120520,120521,120522,120523,120524,120525,120526,120527,120528,120529,120530,120531,120532,120533,120534,120535,120536,120537,120538,120539,120540,120541,120542,120543,120544,120545,120546,120547,120548,120549,120550,120551,120552,120553,120554,120555,120556,120557,120558,120559,120560,120561,120562,120563,120564,120565,120566,120567,120568,120569,120570,120571,120572,120573,120574,120575,120576,120577,120578,120579,120580,120581,120582,120583,120584,120585,120586,120587,120588,120589,120590,120591,120592,120593,120594,120595,120596,120597,120598,120599,120600,120601,120602,120603,120604,120605,120606,120607,120608,120609,120610,120611,120612,120613,120614,120615,120616,120617,120618,120619,120620,120621,120622,120623,120624,120625,120626,120627,120628,120629,120630,120631,120632,120633,120634,120635,120636,120637,120638,120639,120640,120641,120642,120643,120644,120645,120646,120647,120648,120649,120650,120651,120652,120653,120654,120655,120656,120657,120658,120659,120660,120661,120662,120663,120664,120665,120666,120667,120668,120669,120670,120671,120672,120673,120674,120675,120676,120677,120678,120679,120680,120681,120682,120683,120684,120685,120686,120687,120688,120689,120690,120691,120692,120693,120694,120695,120696,120697,120698,120699,120700,120701,120702,120703,120704,120705,120706,120707,120708,120709,120710,120711,120712,120713,120714,120715,120716,120717,120718,120719,120720,120721,120722,120723,120724,120725,120726,120727,120728,120729,120730,120731,120732,120733,120734,120735,120736,120737,120738,120739,120740,120741,120742,120743,120744,120745,120746,120747,120748,120749,120750,120751,120752,120753,120754,120755,120756,120757,120758,120759,120760,120761,120762,120763,120764,120765,120766,120767,120768,120769,120770,120771,120772,120773,120774,120775,120776,120777,120778,120779,120782,120783,120784,120785,120786,120787,120788,120789,120790,120791,120792,120793,120794,120795,120796,120797,120798,120799,120800,120801,120802,120803,120804,120805,120806,120807,120808,120809,120810,120811,120812,120813,120814,120815,120816,120817,120818,120819,120820,120821,120822,120823,120824,120825,120826,120827,120828,120829,120830,120831,126464,126465,126466,126467,126469,126470,126471,126472,126473,126474,126475,126476,126477,126478,126479,126480,126481,126482,126483,126484,126485,126486,126487,126488,126489,126490,126491,126492,126493,126494,126495,126497,126498,126500,126503,126505,126506,126507,126508,126509,126510,126511,126512,126513,126514,126516,126517,126518,126519,126521,126523,126530,126535,126537,126539,126541,126542,126543,126545,126546,126548,126551,126553,126555,126557,126559,126561,126562,126564,126567,126568,126569,126570,126572,126573,126574,126575,126576,126577,126578,126580,126581,126582,126583,126585,126586,126587,126588,126590,126592,126593,126594,126595,126596,126597,126598,126599,126600,126601,126603,126604,126605,126606,126607,126608,126609,126610,126611,126612,126613,126614,126615,126616,126617,126618,126619,126625,126626,126627,126629,126630,126631,126632,126633,126635,126636,126637,126638,126639,126640,126641,126642,126643,126644,126645,126646,126647,126648,126649,126650,126651,127232,127233,127234,127235,127236,127237,127238,127239,127240,127241,127242,127248,127249,127250,127251,127252,127253,127254,127255,127256,127257,127258,127259,127260,127261,127262,127263,127264,127265,127266,127267,127268,127269,127270,127271,127272,127273,127274,127275,127276,127277,127278,127280,127281,127282,127283,127284,127285,127286,127287,127288,127289,127290,127291,127292,127293,127294,127295,127296,127297,127298,127299,127300,127301,127302,127303,127304,127305,127306,127307,127308,127309,127310,127311,127338,127339,127376,127488,127489,127490,127504,127505,127506,127507,127508,127509,127510,127511,127512,127513,127514,127515,127516,127517,127518,127519,127520,127521,127522,127523,127524,127525,127526,127527,127528,127529,127530,127531,127532,127533,127534,127535,127536,127537,127538,127539,127540,127541,127542,127543,127544,127545,127546,127547,127552,127553,127554,127555,127556,127557,127558,127559,127560,127568,127569,194560,194561,194562,194563,194564,194565,194566,194567,194568,194569,194570,194571,194572,194573,194574,194575,194576,194577,194578,194579,194580,194581,194582,194583,194584,194585,194586,194587,194588,194589,194590,194591,194592,194593,194594,194595,194596,194597,194598,194599,194600,194601,194602,194603,194604,194605,194606,194607,194608,194609,194610,194611,194612,194613,194614,194615,194616,194617,194618,194619,194620,194621,194622,194623,194624,194625,194626,194627,194628,194629,194630,194631,194632,194633,194634,194635,194636,194637,194638,194639,194640,194641,194642,194643,194644,194645,194646,194647,194648,194649,194650,194651,194652,194653,194654,194655,194656,194657,194658,194659,194660,194661,194662,194663,194664,194665,194666,194667,194668,194669,194670,194671,194672,194673,194674,194675,194676,194677,194678,194679,194680,194681,194682,194683,194684,194685,194686,194687,194688,194689,194690,194691,194692,194693,194694,194695,194696,194697,194698,194699,194700,194701,194702,194703,194704,194705,194706,194707,194708,194709,194710,194711,194712,194713,194714,194715,194716,194717,194718,194719,194720,194721,194722,194723,194724,194725,194726,194727,194728,194729,194730,194731,194732,194733,194734,194735,194736,194737,194738,194739,194740,194741,194742,194743,194744,194745,194746,194747,194748,194749,194750,194751,194752,194753,194754,194755,194756,194757,194758,194759,194760,194761,194762,194763,194764,194765,194766,194767,194768,194769,194770,194771,194772,194773,194774,194775,194776,194777,194778,194779,194780,194781,194782,194783,194784,194785,194786,194787,194788,194789,194790,194791,194792,194793,194794,194795,194796,194797,194798,194799,194800,194801,194802,194803,194804,194805,194806,194807,194808,194809,194810,194811,194812,194813,194814,194815,194816,194817,194818,194819,194820,194821,194822,194823,194824,194825,194826,194827,194828,194829,194830,194831,194832,194833,194834,194835,194836,194837,194838,194839,194840,194841,194842,194843,194844,194845,194846,194847,194848,194849,194850,194851,194852,194853,194854,194855,194856,194857,194858,194859,194860,194861,194862,194863,194864,194865,194866,194867,194868,194869,194870,194871,194872,194873,194874,194875,194876,194877,194878,194879,194880,194881,194882,194883,194884,194885,194886,194887,194888,194889,194890,194891,194892,194893,194894,194895,194896,194897,194898,194899,194900,194901,194902,194903,194904,194905,194906,194907,194908,194909,194910,194911,194912,194913,194914,194915,194916,194917,194918,194919,194920,194921,194922,194923,194924,194925,194926,194927,194928,194929,194930,194931,194932,194933,194934,194935,194936,194937,194938,194939,194940,194941,194942,194943,194944,194945,194946,194947,194948,194949,194950,194951,194952,194953,194954,194955,194956,194957,194958,194959,194960,194961,194962,194963,194964,194965,194966,194967,194968,194969,194970,194971,194972,194973,194974,194975,194976,194977,194978,194979,194980,194981,194982,194983,194984,194985,194986,194987,194988,194989,194990,194991,194992,194993,194994,194995,194996,194997,194998,194999,195000,195001,195002,195003,195004,195005,195006,195007,195008,195009,195010,195011,195012,195013,195014,195015,195016,195017,195018,195019,195020,195021,195022,195023,195024,195025,195026,195027,195028,195029,195030,195031,195032,195033,195034,195035,195036,195037,195038,195039,195040,195041,195042,195043,195044,195045,195046,195047,195048,195049,195050,195051,195052,195053,195054,195055,195056,195057,195058,195059,195060,195061,195062,195063,195064,195065,195066,195067,195068,195069,195070,195071,195072,195073,195074,195075,195076,195077,195078,195079,195080,195081,195082,195083,195084,195085,195086,195087,195088,195089,195090,195091,195092,195093,195094,195095,195096,195097,195098,195099,195100,195101]
+bitList1, bitList2 :: [Int]
+bitList1 = [160,168,170,175,178,179,180,181,184,185,186,188,189,190,192,193,194,195,196,197,199,200,201,202,203,204,205,206,207,209,210,211,212,213,214,217,218,219,220,221,224,225,226,227,228,229,231,232,233,234,235,236,237,238,239,241,242,243,244,245,246,249,250,251,252,253,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,296,297,298,299,300,301,302,303,304,306,307,308,309,310,311,313,314,315,316,317,318,319,320,323,324,325,326,327,328,329,332,333,334,335,336,337,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,360,361,362,363,364,365,366,367,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,416,417,431,432,452,453,454,455,456,457,458,459,460,461,462,463,464,465,466,467,468,469,470,471,472,473,474,475,476,478,479,480,481,482,483,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,504,505,506,507,508,509,510,511,512,513,514,515,516,517,518,519,520,521,522,523,524,525,526,527,528,529,530,531,532,533,534,535,536,537,538,539,542,543,550,551,552,553,554,555,556,557,558,559,560,561,562,563,688,689,690,691,692,693,694,695,696,728,729,730,731,732,733,736,737,738,739,740,832,833,835,836,884,890,894,900,901,902,903,904,905,906,908,910,911,912,938,939,940,941,942,943,944,970,971,972,973,974,976,977,978,979,980,981,982,1008,1009,1010,1012,1013,1017,1024,1025,1027,1031,1036,1037,1038,1049,1081,1104,1105,1107,1111,1116,1117,1118,1142,1143,1217,1218,1232,1233,1234,1235,1238,1239,1242,1243,1244,1245,1246,1247,1250,1251,1252,1253,1254,1255,1258,1259,1260,1261,1262,1263,1264,1265,1266,1267,1268,1269,1272,1273,1415,1570,1571,1572,1573,1574,1653,1654,1655,1656,1728,1730,1747,2345,2353,2356,2392,2393,2394,2395,2396,2397,2398,2399,2507,2508,2524,2525,2527,2611,2614,2649,2650,2651,2654,2888,2891,2892,2908,2909,2964,3018,3019,3020,3144,3264,3271,3272,3274,3275,3402,3403,3404,3546,3548,3549,3550,3635,3763,3804,3805,3852,3907,3917,3922,3927,3932,3945,3955,3957,3958,3959,3960,3961,3969,3987,3997,4002,4007,4012,4025,4134,4348,6918,6920,6922,6924,6926,6930,6971,6973,6976,6977,6979,7468,7469,7470,7472,7473,7474,7475,7476,7477,7478,7479,7480,7481,7482,7484,7485,7486,7487,7488,7489,7490,7491,7492,7493,7494,7495,7496,7497,7498,7499,7500,7501,7503,7504,7505,7506,7507,7508,7509,7510,7511,7512,7513,7514,7515,7516,7517,7518,7519,7520,7521,7522,7523,7524,7525,7526,7527,7528,7529,7530,7544,7579,7580,7581,7582,7583,7584,7585,7586,7587,7588,7589,7590,7591,7592,7593,7594,7595,7596,7597,7598,7599,7600,7601,7602,7603,7604,7605,7606,7607,7608,7609,7610,7611,7612,7613,7614,7615,7680,7681,7682,7683,7684,7685,7686,7687,7688,7689,7690,7691,7692,7693,7694,7695,7696,7697,7698,7699,7700,7701,7702,7703,7704,7705,7706,7707,7708,7709,7710,7711,7712,7713,7714,7715,7716,7717,7718,7719,7720,7721,7722,7723,7724,7725,7726,7727,7728,7729,7730,7731,7732,7733,7734,7735,7736,7737,7738,7739,7740,7741,7742,7743,7744,7745,7746,7747,7748,7749,7750,7751,7752,7753,7754,7755,7756,7757,7758,7759,7760,7761,7762,7763,7764,7765,7766,7767,7768,7769,7770,7771,7772,7773,7774,7775,7776,7777,7778,7779,7780,7781,7782,7783,7784,7785,7786,7787,7788,7789,7790,7791,7792,7793,7794,7795,7796,7797,7798,7799,7800,7801,7802,7803,7804,7805,7806,7807,7808,7809,7810,7811,7812,7813,7814,7815,7816,7817,7818,7819,7820,7821,7822,7823,7824,7825,7826,7827,7828,7829,7830,7831,7832,7833,7834,7835,7840,7841,7842,7843,7844,7845,7846,7847,7848,7849,7850,7851,7852,7853,7854,7855,7856,7857,7858,7859,7860,7861,7862,7863,7864,7865,7866,7867,7868,7869,7870,7871,7872,7873,7874,7875,7876,7877,7878,7879,7880,7881,7882,7883,7884,7885,7886,7887,7888,7889,7890,7891,7892,7893,7894,7895,7896,7897,7898,7899,7900,7901,7902,7903,7904,7905,7906,7907,7908,7909,7910,7911,7912,7913,7914,7915,7916,7917,7918,7919,7920,7921,7922,7923,7924,7925,7926,7927,7928,7929,7936,7937,7938,7939,7940,7941,7942,7943,7944,7945,7946,7947,7948,7949,7950,7951,7952,7953,7954,7955,7956,7957,7960,7961,7962,7963,7964,7965,7968,7969,7970,7971,7972,7973,7974,7975,7976,7977,7978,7979,7980,7981,7982,7983,7984,7985,7986,7987,7988,7989,7990,7991,7992,7993,7994,7995,7996,7997,7998,7999,8000,8001,8002,8003,8004,8005,8008,8009,8010,8011,8012,8013,8016,8017,8018,8019,8020,8021,8022,8023,8025,8027,8029,8031,8032,8033,8034,8035,8036,8037,8038,8039,8040,8041,8042,8043,8044,8045,8046,8047,8048,8049,8050,8051,8052,8053,8054,8055,8056,8057,8058,8059,8060,8061,8064,8065,8066,8067,8068,8069,8070,8071,8072,8073,8074,8075,8076,8077,8078,8079,8080,8081,8082,8083,8084,8085,8086,8087,8088,8089,8090,8091,8092,8093,8094,8095,8096,8097,8098,8099,8100,8101,8102,8103,8104,8105,8106,8107,8108,8109,8110,8111,8112,8113,8114,8115,8116,8118,8119,8120,8121,8122,8123,8124,8125,8126,8127,8128,8129,8130,8131,8132,8134,8135,8136,8137,8138,8139,8140,8141,8142,8143,8144,8145,8146,8147,8150,8151,8152,8153,8154,8155,8157,8158,8159,8160,8161,8162,8163,8164,8165,8166,8167,8168,8169,8170,8171,8172,8173,8174,8175,8178,8179,8180,8182,8183,8184,8185,8186,8187,8188,8189,8190,8192,8193,8194,8195,8196,8197,8198,8199,8200,8201,8202,8209,8215,8228,8229,8230,8239,8243,8244,8246,8247,8252,8254,8263,8264,8265,8279,8287,8304,8305,8308,8309,8310,8311,8312,8313,8314,8315,8316,8317,8318,8319,8320,8321,8322,8323,8324,8325,8326,8327,8328,8329,8330,8331,8332,8333,8334,8336,8337,8338,8339,8340,8341,8342,8343,8344,8345,8346,8347,8348,8360,8448,8449,8450,8451,8453,8454,8455,8457,8458,8459,8460,8461,8462,8463,8464,8465,8466,8467,8469,8470,8473,8474,8475,8476,8477,8480,8481,8482,8484,8486,8488,8490,8491,8492,8493,8495,8496,8497,8499,8500,8501,8502,8503,8504,8505,8507,8508,8509,8510,8511,8512,8517,8518,8519,8520,8521,8528,8529,8530,8531,8532,8533,8534,8535,8536,8537,8538,8539,8540,8541,8542,8543,8544,8545,8546,8547,8548,8549,8550,8551,8552,8553,8554,8555,8556,8557,8558,8559,8560,8561,8562,8563,8564,8565,8566,8567,8568,8569,8570,8571,8572,8573,8574,8575,8585,8602,8603,8622,8653,8654,8655,8708,8713,8716,8740,8742,8748,8749,8751,8752,8769,8772,8775,8777,8800,8802,8813,8814,8815,8816,8817,8820,8821,8824,8825,8832,8833,8836,8837,8840,8841,8876,8877,8878,8879,8928,8929,8930,8931,8938,8939,8940,8941,9001,9002,9312,9313,9314,9315,9316,9317,9318,9319,9320,9321,9322,9323,9324,9325,9326,9327,9328,9329,9330,9331,9332,9333,9334,9335,9336,9337,9338,9339,9340,9341,9342,9343,9344,9345,9346,9347,9348,9349,9350,9351,9352,9353,9354,9355,9356,9357,9358,9359,9360,9361,9362,9363,9364,9365,9366,9367,9368,9369,9370,9371,9372,9373,9374,9375,9376,9377,9378,9379,9380,9381,9382,9383,9384,9385,9386,9387,9388,9389,9390,9391,9392,9393,9394,9395,9396,9397,9398,9399,9400,9401,9402,9403,9404,9405,9406,9407,9408,9409,9410,9411,9412,9413,9414,9415,9416,9417,9418,9419,9420,9421,9422,9423,9424,9425,9426,9427,9428,9429,9430,9431,9432,9433,9434,9435,9436,9437,9438,9439,9440,9441,9442,9443,9444,9445,9446,9447,9448,9449,9450,10764,10868,10869,10870,10972,11388,11389,11631,11935,12019,12032,12033,12034,12035,12036,12037,12038,12039,12040,12041,12042,12043,12044,12045,12046,12047,12048,12049,12050,12051,12052,12053,12054,12055,12056,12057,12058,12059,12060,12061,12062,12063,12064,12065,12066,12067,12068,12069,12070,12071,12072,12073,12074,12075,12076,12077,12078,12079,12080,12081,12082,12083,12084,12085,12086,12087,12088,12089,12090,12091,12092,12093,12094,12095,12096,12097,12098,12099,12100,12101,12102,12103,12104,12105,12106,12107,12108,12109,12110,12111,12112,12113,12114,12115,12116,12117,12118,12119,12120,12121,12122,12123,12124,12125,12126,12127,12128,12129,12130,12131,12132,12133,12134,12135,12136,12137,12138,12139,12140,12141,12142,12143,12144,12145,12146,12147,12148,12149,12150,12151,12152,12153,12154,12155,12156,12157,12158,12159,12160,12161,12162,12163,12164,12165,12166,12167,12168,12169,12170,12171,12172,12173,12174,12175,12176,12177,12178,12179,12180,12181,12182,12183,12184,12185,12186,12187,12188,12189,12190,12191,12192,12193,12194,12195,12196,12197,12198,12199,12200,12201,12202,12203,12204,12205,12206,12207,12208,12209,12210,12211,12212,12213,12214,12215,12216,12217,12218,12219,12220,12221,12222,12223,12224,12225,12226,12227,12228,12229,12230,12231,12232,12233,12234,12235,12236,12237,12238,12239,12240,12241,12242,12243,12244,12245,12288,12342,12344,12345,12346,12364,12366,12368,12370,12372,12374,12376,12378,12380,12382,12384,12386,12389,12391,12393,12400,12401,12403,12404,12406,12407,12409,12410,12412,12413,12436,12443,12444,12446,12447,12460,12462,12464,12466,12468,12470,12472,12474,12476,12478,12480,12482,12485,12487,12489,12496,12497,12499,12500,12502,12503,12505,12506,12508,12509,12532,12535,12536,12537,12538,12542,12543,12593,12594,12595,12596,12597,12598,12599,12600,12601,12602,12603,12604,12605,12606,12607,12608,12609,12610,12611,12612,12613,12614,12615,12616,12617,12618,12619,12620,12621,12622,12623,12624,12625,12626,12627,12628,12629,12630,12631,12632,12633,12634,12635,12636,12637,12638,12639,12640,12641,12642,12643,12644,12645,12646,12647,12648,12649,12650,12651,12652,12653,12654,12655,12656,12657,12658,12659,12660,12661,12662,12663,12664,12665,12666,12667,12668,12669,12670,12671,12672,12673,12674,12675,12676,12677,12678,12679,12680,12681,12682,12683,12684,12685,12686,12690,12691,12692,12693,12694,12695,12696,12697,12698,12699,12700,12701,12702,12703,12800,12801,12802,12803,12804,12805,12806,12807,12808,12809,12810,12811,12812,12813,12814,12815,12816,12817,12818,12819,12820,12821,12822,12823,12824,12825,12826,12827,12828,12829,12830,12832,12833,12834,12835,12836,12837,12838,12839,12840,12841,12842,12843,12844,12845,12846,12847,12848,12849,12850,12851,12852,12853,12854,12855,12856,12857,12858,12859,12860,12861,12862,12863,12864,12865,12866,12867,12868,12869,12870,12871,12880,12881,12882,12883,12884,12885,12886,12887,12888,12889,12890,12891,12892,12893,12894,12895,12896,12897,12898,12899,12900,12901,12902,12903,12904,12905,12906,12907,12908,12909,12910,12911,12912,12913,12914,12915,12916,12917,12918,12919,12920,12921,12922,12923,12924,12925,12926,12928,12929,12930,12931,12932,12933,12934,12935,12936,12937,12938,12939,12940,12941,12942,12943,12944,12945,12946,12947,12948,12949,12950,12951,12952,12953,12954,12955,12956,12957,12958,12959,12960,12961,12962,12963,12964,12965,12966,12967,12968,12969,12970,12971,12972,12973,12974,12975,12976,12977,12978,12979,12980,12981,12982,12983,12984,12985,12986,12987,12988,12989,12990,12991,12992,12993,12994,12995,12996,12997,12998,12999,13000,13001,13002,13003,13004,13005,13006,13007,13008,13009,13010,13011,13012,13013,13014,13015,13016,13017,13018,13019,13020,13021,13022,13023,13024,13025,13026,13027,13028,13029,13030,13031,13032,13033,13034,13035,13036,13037,13038,13039,13040,13041,13042,13043,13044,13045,13046,13047,13048,13049,13050,13051,13052,13053,13054,13056,13057,13058,13059,13060,13061,13062,13063,13064,13065,13066,13067,13068,13069,13070,13071,13072,13073,13074,13075,13076,13077,13078,13079,13080,13081,13082,13083,13084,13085,13086,13087,13088,13089,13090,13091,13092,13093,13094,13095,13096,13097,13098,13099,13100,13101,13102,13103,13104,13105,13106,13107,13108,13109,13110,13111,13112,13113,13114,13115,13116,13117,13118,13119,13120,13121,13122,13123,13124,13125,13126,13127,13128,13129,13130,13131,13132,13133,13134,13135,13136,13137,13138,13139,13140,13141,13142,13143,13144,13145,13146,13147,13148,13149,13150,13151,13152,13153,13154,13155,13156,13157,13158,13159,13160,13161,13162,13163,13164,13165,13166,13167,13168,13169,13170,13171,13172,13173,13174,13175,13176,13177,13178,13179,13180,13181,13182,13183,13184,13185,13186,13187,13188,13189,13190,13191,13192,13193,13194,13195,13196,13197,13198,13199,13200,13201,13202,13203,13204,13205,13206,13207,13208,13209,13210,13211,13212,13213,13214,13215,13216,13217,13218,13219,13220,13221,13222,13223,13224,13225,13226,13227,13228,13229,13230,13231,13232,13233,13234,13235,13236,13237,13238,13239,13240,13241,13242,13243,13244,13245,13246,13247,13248,13249,13250,13251,13252,13253,13254,13255,13256,13257,13258,13259,13260,13261,13262,13263,13264,13265,13266,13267,13268,13269,13270,13271,13272,13273,13274,13275,13276,13277,13278,13279,13280,13281,13282,13283,13284,13285,13286,13287,13288,13289,13290,13291,13292,13293,13294,13295,13296,13297,13298,13299,13300,13301,13302,13303,13304,13305,13306,13307,13308,13309,13310,13311,42652,42653,42864,43000,43001,43868,43869,43870,43871,63744,63745,63746,63747,63748,63749,63750,63751,63752,63753,63754,63755,63756,63757,63758,63759,63760,63761,63762,63763,63764,63765,63766,63767,63768,63769,63770,63771,63772,63773,63774,63775,63776,63777,63778,63779,63780,63781,63782,63783,63784,63785,63786,63787,63788,63789,63790,63791,63792,63793,63794,63795,63796,63797,63798,63799,63800,63801,63802,63803,63804,63805,63806,63807,63808,63809,63810,63811,63812,63813,63814,63815,63816,63817,63818,63819,63820,63821,63822,63823,63824,63825,63826,63827,63828,63829,63830,63831,63832,63833,63834,63835,63836,63837,63838,63839,63840,63841,63842,63843,63844,63845,63846,63847,63848,63849,63850,63851,63852,63853,63854,63855,63856,63857,63858,63859,63860,63861,63862,63863,63864,63865,63866,63867,63868,63869,63870,63871,63872,63873,63874,63875,63876,63877,63878,63879,63880,63881,63882,63883,63884,63885,63886,63887,63888,63889,63890,63891,63892,63893,63894,63895,63896,63897,63898,63899,63900,63901,63902,63903,63904,63905,63906,63907,63908,63909,63910,63911,63912,63913,63914,63915,63916,63917,63918,63919,63920,63921,63922,63923,63924,63925,63926,63927,63928,63929,63930,63931,63932,63933,63934,63935,63936,63937,63938,63939,63940,63941,63942,63943,63944,63945,63946,63947,63948,63949,63950,63951,63952,63953,63954,63955,63956,63957,63958,63959,63960,63961,63962,63963,63964,63965,63966,63967,63968,63969,63970,63971,63972,63973,63974,63975,63976,63977,63978,63979,63980,63981,63982,63983,63984,63985,63986,63987,63988,63989,63990,63991,63992,63993,63994,63995,63996,63997,63998,63999,64000,64001,64002,64003,64004,64005,64006,64007,64008,64009,64010,64011,64012,64013,64016,64018,64021,64022,64023,64024,64025,64026,64027,64028,64029,64030,64032,64034,64037,64038,64042,64043,64044,64045,64046,64047,64048,64049,64050,64051,64052,64053,64054,64055,64056,64057,64058,64059,64060,64061,64062,64063,64064,64065,64066,64067,64068,64069,64070,64071,64072,64073,64074,64075,64076,64077,64078,64079,64080,64081,64082,64083,64084,64085,64086,64087,64088,64089,64090,64091,64092,64093,64094,64095,64096,64097,64098,64099,64100,64101,64102,64103,64104,64105,64106,64107,64108,64109,64112,64113,64114,64115,64116,64117,64118,64119,64120,64121,64122,64123,64124,64125,64126,64127,64128,64129,64130,64131,64132,64133,64134,64135,64136,64137,64138,64139,64140,64141,64142,64143,64144,64145,64146,64147,64148,64149,64150,64151,64152,64153,64154,64155,64156,64157,64158,64159,64160,64161,64162,64163,64164,64165,64166,64167,64168,64169,64170,64171,64172,64173,64174,64175,64176,64177,64178,64179,64180,64181,64182,64183,64184,64185,64186,64187,64188,64189,64190,64191,64192,64193,64194,64195,64196,64197,64198,64199,64200,64201,64202,64203,64204,64205,64206,64207,64208,64209,64210,64211,64212,64213,64214,64215,64216,64217,64256,64257,64258,64259,64260,64261,64262,64275,64276,64277,64278,64279,64285,64287,64288,64289,64290,64291,64292,64293,64294,64295,64296,64297,64298,64299,64300,64301,64302,64303,64304,64305,64306,64307,64308,64309,64310,64312,64313,64314,64315,64316,64318,64320,64321,64323,64324,64326,64327,64328,64329,64330,64331,64332,64333,64334,64335]
+bitList2 = [64336,64337,64338,64339,64340,64341,64342,64343,64344,64345,64346,64347,64348,64349,64350,64351,64352,64353,64354,64355,64356,64357,64358,64359,64360,64361,64362,64363,64364,64365,64366,64367,64368,64369,64370,64371,64372,64373,64374,64375,64376,64377,64378,64379,64380,64381,64382,64383,64384,64385,64386,64387,64388,64389,64390,64391,64392,64393,64394,64395,64396,64397,64398,64399,64400,64401,64402,64403,64404,64405,64406,64407,64408,64409,64410,64411,64412,64413,64414,64415,64416,64417,64418,64419,64420,64421,64422,64423,64424,64425,64426,64427,64428,64429,64430,64431,64432,64433,64467,64468,64469,64470,64471,64472,64473,64474,64475,64476,64477,64478,64479,64480,64481,64482,64483,64484,64485,64486,64487,64488,64489,64490,64491,64492,64493,64494,64495,64496,64497,64498,64499,64500,64501,64502,64503,64504,64505,64506,64507,64508,64509,64510,64511,64512,64513,64514,64515,64516,64517,64518,64519,64520,64521,64522,64523,64524,64525,64526,64527,64528,64529,64530,64531,64532,64533,64534,64535,64536,64537,64538,64539,64540,64541,64542,64543,64544,64545,64546,64547,64548,64549,64550,64551,64552,64553,64554,64555,64556,64557,64558,64559,64560,64561,64562,64563,64564,64565,64566,64567,64568,64569,64570,64571,64572,64573,64574,64575,64576,64577,64578,64579,64580,64581,64582,64583,64584,64585,64586,64587,64588,64589,64590,64591,64592,64593,64594,64595,64596,64597,64598,64599,64600,64601,64602,64603,64604,64605,64606,64607,64608,64609,64610,64611,64612,64613,64614,64615,64616,64617,64618,64619,64620,64621,64622,64623,64624,64625,64626,64627,64628,64629,64630,64631,64632,64633,64634,64635,64636,64637,64638,64639,64640,64641,64642,64643,64644,64645,64646,64647,64648,64649,64650,64651,64652,64653,64654,64655,64656,64657,64658,64659,64660,64661,64662,64663,64664,64665,64666,64667,64668,64669,64670,64671,64672,64673,64674,64675,64676,64677,64678,64679,64680,64681,64682,64683,64684,64685,64686,64687,64688,64689,64690,64691,64692,64693,64694,64695,64696,64697,64698,64699,64700,64701,64702,64703,64704,64705,64706,64707,64708,64709,64710,64711,64712,64713,64714,64715,64716,64717,64718,64719,64720,64721,64722,64723,64724,64725,64726,64727,64728,64729,64730,64731,64732,64733,64734,64735,64736,64737,64738,64739,64740,64741,64742,64743,64744,64745,64746,64747,64748,64749,64750,64751,64752,64753,64754,64755,64756,64757,64758,64759,64760,64761,64762,64763,64764,64765,64766,64767,64768,64769,64770,64771,64772,64773,64774,64775,64776,64777,64778,64779,64780,64781,64782,64783,64784,64785,64786,64787,64788,64789,64790,64791,64792,64793,64794,64795,64796,64797,64798,64799,64800,64801,64802,64803,64804,64805,64806,64807,64808,64809,64810,64811,64812,64813,64814,64815,64816,64817,64818,64819,64820,64821,64822,64823,64824,64825,64826,64827,64828,64829,64848,64849,64850,64851,64852,64853,64854,64855,64856,64857,64858,64859,64860,64861,64862,64863,64864,64865,64866,64867,64868,64869,64870,64871,64872,64873,64874,64875,64876,64877,64878,64879,64880,64881,64882,64883,64884,64885,64886,64887,64888,64889,64890,64891,64892,64893,64894,64895,64896,64897,64898,64899,64900,64901,64902,64903,64904,64905,64906,64907,64908,64909,64910,64911,64914,64915,64916,64917,64918,64919,64920,64921,64922,64923,64924,64925,64926,64927,64928,64929,64930,64931,64932,64933,64934,64935,64936,64937,64938,64939,64940,64941,64942,64943,64944,64945,64946,64947,64948,64949,64950,64951,64952,64953,64954,64955,64956,64957,64958,64959,64960,64961,64962,64963,64964,64965,64966,64967,65008,65009,65010,65011,65012,65013,65014,65015,65016,65017,65018,65019,65020,65040,65041,65042,65043,65044,65045,65046,65047,65048,65049,65072,65073,65074,65075,65076,65077,65078,65079,65080,65081,65082,65083,65084,65085,65086,65087,65088,65089,65090,65091,65092,65095,65096,65097,65098,65099,65100,65101,65102,65103,65104,65105,65106,65108,65109,65110,65111,65112,65113,65114,65115,65116,65117,65118,65119,65120,65121,65122,65123,65124,65125,65126,65128,65129,65130,65131,65136,65137,65138,65140,65142,65143,65144,65145,65146,65147,65148,65149,65150,65151,65152,65153,65154,65155,65156,65157,65158,65159,65160,65161,65162,65163,65164,65165,65166,65167,65168,65169,65170,65171,65172,65173,65174,65175,65176,65177,65178,65179,65180,65181,65182,65183,65184,65185,65186,65187,65188,65189,65190,65191,65192,65193,65194,65195,65196,65197,65198,65199,65200,65201,65202,65203,65204,65205,65206,65207,65208,65209,65210,65211,65212,65213,65214,65215,65216,65217,65218,65219,65220,65221,65222,65223,65224,65225,65226,65227,65228,65229,65230,65231,65232,65233,65234,65235,65236,65237,65238,65239,65240,65241,65242,65243,65244,65245,65246,65247,65248,65249,65250,65251,65252,65253,65254,65255,65256,65257,65258,65259,65260,65261,65262,65263,65264,65265,65266,65267,65268,65269,65270,65271,65272,65273,65274,65275,65276,65281,65282,65283,65284,65285,65286,65287,65288,65289,65290,65291,65292,65293,65294,65295,65296,65297,65298,65299,65300,65301,65302,65303,65304,65305,65306,65307,65308,65309,65310,65311,65312,65313,65314,65315,65316,65317,65318,65319,65320,65321,65322,65323,65324,65325,65326,65327,65328,65329,65330,65331,65332,65333,65334,65335,65336,65337,65338,65339,65340,65341,65342,65343,65344,65345,65346,65347,65348,65349,65350,65351,65352,65353,65354,65355,65356,65357,65358,65359,65360,65361,65362,65363,65364,65365,65366,65367,65368,65369,65370,65371,65372,65373,65374,65375,65376,65377,65378,65379,65380,65381,65382,65383,65384,65385,65386,65387,65388,65389,65390,65391,65392,65393,65394,65395,65396,65397,65398,65399,65400,65401,65402,65403,65404,65405,65406,65407,65408,65409,65410,65411,65412,65413,65414,65415,65416,65417,65418,65419,65420,65421,65422,65423,65424,65425,65426,65427,65428,65429,65430,65431,65432,65433,65434,65435,65436,65437,65438,65439,65440,65441,65442,65443,65444,65445,65446,65447,65448,65449,65450,65451,65452,65453,65454,65455,65456,65457,65458,65459,65460,65461,65462,65463,65464,65465,65466,65467,65468,65469,65470,65474,65475,65476,65477,65478,65479,65482,65483,65484,65485,65486,65487,65490,65491,65492,65493,65494,65495,65498,65499,65500,65504,65505,65506,65507,65508,65509,65510,65512,65513,65514,65515,65516,65517,65518,69786,69788,69803,69934,69935,70475,70476,70843,70844,70846,71098,71099,119134,119135,119136,119137,119138,119139,119140,119227,119228,119229,119230,119231,119232,119808,119809,119810,119811,119812,119813,119814,119815,119816,119817,119818,119819,119820,119821,119822,119823,119824,119825,119826,119827,119828,119829,119830,119831,119832,119833,119834,119835,119836,119837,119838,119839,119840,119841,119842,119843,119844,119845,119846,119847,119848,119849,119850,119851,119852,119853,119854,119855,119856,119857,119858,119859,119860,119861,119862,119863,119864,119865,119866,119867,119868,119869,119870,119871,119872,119873,119874,119875,119876,119877,119878,119879,119880,119881,119882,119883,119884,119885,119886,119887,119888,119889,119890,119891,119892,119894,119895,119896,119897,119898,119899,119900,119901,119902,119903,119904,119905,119906,119907,119908,119909,119910,119911,119912,119913,119914,119915,119916,119917,119918,119919,119920,119921,119922,119923,119924,119925,119926,119927,119928,119929,119930,119931,119932,119933,119934,119935,119936,119937,119938,119939,119940,119941,119942,119943,119944,119945,119946,119947,119948,119949,119950,119951,119952,119953,119954,119955,119956,119957,119958,119959,119960,119961,119962,119963,119964,119966,119967,119970,119973,119974,119977,119978,119979,119980,119982,119983,119984,119985,119986,119987,119988,119989,119990,119991,119992,119993,119995,119997,119998,119999,120000,120001,120002,120003,120005,120006,120007,120008,120009,120010,120011,120012,120013,120014,120015,120016,120017,120018,120019,120020,120021,120022,120023,120024,120025,120026,120027,120028,120029,120030,120031,120032,120033,120034,120035,120036,120037,120038,120039,120040,120041,120042,120043,120044,120045,120046,120047,120048,120049,120050,120051,120052,120053,120054,120055,120056,120057,120058,120059,120060,120061,120062,120063,120064,120065,120066,120067,120068,120069,120071,120072,120073,120074,120077,120078,120079,120080,120081,120082,120083,120084,120086,120087,120088,120089,120090,120091,120092,120094,120095,120096,120097,120098,120099,120100,120101,120102,120103,120104,120105,120106,120107,120108,120109,120110,120111,120112,120113,120114,120115,120116,120117,120118,120119,120120,120121,120123,120124,120125,120126,120128,120129,120130,120131,120132,120134,120138,120139,120140,120141,120142,120143,120144,120146,120147,120148,120149,120150,120151,120152,120153,120154,120155,120156,120157,120158,120159,120160,120161,120162,120163,120164,120165,120166,120167,120168,120169,120170,120171,120172,120173,120174,120175,120176,120177,120178,120179,120180,120181,120182,120183,120184,120185,120186,120187,120188,120189,120190,120191,120192,120193,120194,120195,120196,120197,120198,120199,120200,120201,120202,120203,120204,120205,120206,120207,120208,120209,120210,120211,120212,120213,120214,120215,120216,120217,120218,120219,120220,120221,120222,120223,120224,120225,120226,120227,120228,120229,120230,120231,120232,120233,120234,120235,120236,120237,120238,120239,120240,120241,120242,120243,120244,120245,120246,120247,120248,120249,120250,120251,120252,120253,120254,120255,120256,120257,120258,120259,120260,120261,120262,120263,120264,120265,120266,120267,120268,120269,120270,120271,120272,120273,120274,120275,120276,120277,120278,120279,120280,120281,120282,120283,120284,120285,120286,120287,120288,120289,120290,120291,120292,120293,120294,120295,120296,120297,120298,120299,120300,120301,120302,120303,120304,120305,120306,120307,120308,120309,120310,120311,120312,120313,120314,120315,120316,120317,120318,120319,120320,120321,120322,120323,120324,120325,120326,120327,120328,120329,120330,120331,120332,120333,120334,120335,120336,120337,120338,120339,120340,120341,120342,120343,120344,120345,120346,120347,120348,120349,120350,120351,120352,120353,120354,120355,120356,120357,120358,120359,120360,120361,120362,120363,120364,120365,120366,120367,120368,120369,120370,120371,120372,120373,120374,120375,120376,120377,120378,120379,120380,120381,120382,120383,120384,120385,120386,120387,120388,120389,120390,120391,120392,120393,120394,120395,120396,120397,120398,120399,120400,120401,120402,120403,120404,120405,120406,120407,120408,120409,120410,120411,120412,120413,120414,120415,120416,120417,120418,120419,120420,120421,120422,120423,120424,120425,120426,120427,120428,120429,120430,120431,120432,120433,120434,120435,120436,120437,120438,120439,120440,120441,120442,120443,120444,120445,120446,120447,120448,120449,120450,120451,120452,120453,120454,120455,120456,120457,120458,120459,120460,120461,120462,120463,120464,120465,120466,120467,120468,120469,120470,120471,120472,120473,120474,120475,120476,120477,120478,120479,120480,120481,120482,120483,120484,120485,120488,120489,120490,120491,120492,120493,120494,120495,120496,120497,120498,120499,120500,120501,120502,120503,120504,120505,120506,120507,120508,120509,120510,120511,120512,120513,120514,120515,120516,120517,120518,120519,120520,120521,120522,120523,120524,120525,120526,120527,120528,120529,120530,120531,120532,120533,120534,120535,120536,120537,120538,120539,120540,120541,120542,120543,120544,120545,120546,120547,120548,120549,120550,120551,120552,120553,120554,120555,120556,120557,120558,120559,120560,120561,120562,120563,120564,120565,120566,120567,120568,120569,120570,120571,120572,120573,120574,120575,120576,120577,120578,120579,120580,120581,120582,120583,120584,120585,120586,120587,120588,120589,120590,120591,120592,120593,120594,120595,120596,120597,120598,120599,120600,120601,120602,120603,120604,120605,120606,120607,120608,120609,120610,120611,120612,120613,120614,120615,120616,120617,120618,120619,120620,120621,120622,120623,120624,120625,120626,120627,120628,120629,120630,120631,120632,120633,120634,120635,120636,120637,120638,120639,120640,120641,120642,120643,120644,120645,120646,120647,120648,120649,120650,120651,120652,120653,120654,120655,120656,120657,120658,120659,120660,120661,120662,120663,120664,120665,120666,120667,120668,120669,120670,120671,120672,120673,120674,120675,120676,120677,120678,120679,120680,120681,120682,120683,120684,120685,120686,120687,120688,120689,120690,120691,120692,120693,120694,120695,120696,120697,120698,120699,120700,120701,120702,120703,120704,120705,120706,120707,120708,120709,120710,120711,120712,120713,120714,120715,120716,120717,120718,120719,120720,120721,120722,120723,120724,120725,120726,120727,120728,120729,120730,120731,120732,120733,120734,120735,120736,120737,120738,120739,120740,120741,120742,120743,120744,120745,120746,120747,120748,120749,120750,120751,120752,120753,120754,120755,120756,120757,120758,120759,120760,120761,120762,120763,120764,120765,120766,120767,120768,120769,120770,120771,120772,120773,120774,120775,120776,120777,120778,120779,120782,120783,120784,120785,120786,120787,120788,120789,120790,120791,120792,120793,120794,120795,120796,120797,120798,120799,120800,120801,120802,120803,120804,120805,120806,120807,120808,120809,120810,120811,120812,120813,120814,120815,120816,120817,120818,120819,120820,120821,120822,120823,120824,120825,120826,120827,120828,120829,120830,120831,126464,126465,126466,126467,126469,126470,126471,126472,126473,126474,126475,126476,126477,126478,126479,126480,126481,126482,126483,126484,126485,126486,126487,126488,126489,126490,126491,126492,126493,126494,126495,126497,126498,126500,126503,126505,126506,126507,126508,126509,126510,126511,126512,126513,126514,126516,126517,126518,126519,126521,126523,126530,126535,126537,126539,126541,126542,126543,126545,126546,126548,126551,126553,126555,126557,126559,126561,126562,126564,126567,126568,126569,126570,126572,126573,126574,126575,126576,126577,126578,126580,126581,126582,126583,126585,126586,126587,126588,126590,126592,126593,126594,126595,126596,126597,126598,126599,126600,126601,126603,126604,126605,126606,126607,126608,126609,126610,126611,126612,126613,126614,126615,126616,126617,126618,126619,126625,126626,126627,126629,126630,126631,126632,126633,126635,126636,126637,126638,126639,126640,126641,126642,126643,126644,126645,126646,126647,126648,126649,126650,126651,127232,127233,127234,127235,127236,127237,127238,127239,127240,127241,127242,127248,127249,127250,127251,127252,127253,127254,127255,127256,127257,127258,127259,127260,127261,127262,127263,127264,127265,127266,127267,127268,127269,127270,127271,127272,127273,127274,127275,127276,127277,127278,127280,127281,127282,127283,127284,127285,127286,127287,127288,127289,127290,127291,127292,127293,127294,127295,127296,127297,127298,127299,127300,127301,127302,127303,127304,127305,127306,127307,127308,127309,127310,127311,127338,127339,127376,127488,127489,127490,127504,127505,127506,127507,127508,127509,127510,127511,127512,127513,127514,127515,127516,127517,127518,127519,127520,127521,127522,127523,127524,127525,127526,127527,127528,127529,127530,127531,127532,127533,127534,127535,127536,127537,127538,127539,127540,127541,127542,127543,127544,127545,127546,127547,127552,127553,127554,127555,127556,127557,127558,127559,127560,127568,127569,194560,194561,194562,194563,194564,194565,194566,194567,194568,194569,194570,194571,194572,194573,194574,194575,194576,194577,194578,194579,194580,194581,194582,194583,194584,194585,194586,194587,194588,194589,194590,194591,194592,194593,194594,194595,194596,194597,194598,194599,194600,194601,194602,194603,194604,194605,194606,194607,194608,194609,194610,194611,194612,194613,194614,194615,194616,194617,194618,194619,194620,194621,194622,194623,194624,194625,194626,194627,194628,194629,194630,194631,194632,194633,194634,194635,194636,194637,194638,194639,194640,194641,194642,194643,194644,194645,194646,194647,194648,194649,194650,194651,194652,194653,194654,194655,194656,194657,194658,194659,194660,194661,194662,194663,194664,194665,194666,194667,194668,194669,194670,194671,194672,194673,194674,194675,194676,194677,194678,194679,194680,194681,194682,194683,194684,194685,194686,194687,194688,194689,194690,194691,194692,194693,194694,194695,194696,194697,194698,194699,194700,194701,194702,194703,194704,194705,194706,194707,194708,194709,194710,194711,194712,194713,194714,194715,194716,194717,194718,194719,194720,194721,194722,194723,194724,194725,194726,194727,194728,194729,194730,194731,194732,194733,194734,194735,194736,194737,194738,194739,194740,194741,194742,194743,194744,194745,194746,194747,194748,194749,194750,194751,194752,194753,194754,194755,194756,194757,194758,194759,194760,194761,194762,194763,194764,194765,194766,194767,194768,194769,194770,194771,194772,194773,194774,194775,194776,194777,194778,194779,194780,194781,194782,194783,194784,194785,194786,194787,194788,194789,194790,194791,194792,194793,194794,194795,194796,194797,194798,194799,194800,194801,194802,194803,194804,194805,194806,194807,194808,194809,194810,194811,194812,194813,194814,194815,194816,194817,194818,194819,194820,194821,194822,194823,194824,194825,194826,194827,194828,194829,194830,194831,194832,194833,194834,194835,194836,194837,194838,194839,194840,194841,194842,194843,194844,194845,194846,194847,194848,194849,194850,194851,194852,194853,194854,194855,194856,194857,194858,194859,194860,194861,194862,194863,194864,194865,194866,194867,194868,194869,194870,194871,194872,194873,194874,194875,194876,194877,194878,194879,194880,194881,194882,194883,194884,194885,194886,194887,194888,194889,194890,194891,194892,194893,194894,194895,194896,194897,194898,194899,194900,194901,194902,194903,194904,194905,194906,194907,194908,194909,194910,194911,194912,194913,194914,194915,194916,194917,194918,194919,194920,194921,194922,194923,194924,194925,194926,194927,194928,194929,194930,194931,194932,194933,194934,194935,194936,194937,194938,194939,194940,194941,194942,194943,194944,194945,194946,194947,194948,194949,194950,194951,194952,194953,194954,194955,194956,194957,194958,194959,194960,194961,194962,194963,194964,194965,194966,194967,194968,194969,194970,194971,194972,194973,194974,194975,194976,194977,194978,194979,194980,194981,194982,194983,194984,194985,194986,194987,194988,194989,194990,194991,194992,194993,194994,194995,194996,194997,194998,194999,195000,195001,195002,195003,195004,195005,195006,195007,195008,195009,195010,195011,195012,195013,195014,195015,195016,195017,195018,195019,195020,195021,195022,195023,195024,195025,195026,195027,195028,195029,195030,195031,195032,195033,195034,195035,195036,195037,195038,195039,195040,195041,195042,195043,195044,195045,195046,195047,195048,195049,195050,195051,195052,195053,195054,195055,195056,195057,195058,195059,195060,195061,195062,195063,195064,195065,195066,195067,195068,195069,195070,195071,195072,195073,195074,195075,195076,195077,195078,195079,195080,195081,195082,195083,195084,195085,195086,195087,195088,195089,195090,195091,195092,195093,195094,195095,195096,195097,195098,195099,195100,195101]
decomposeBitmap :: BitArray
decomposeBitmap = bitArraySetBits (160,195101) $ bitList1 ++ bitList2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unicode-transforms-0.3.2/README.md new/unicode-transforms-0.3.4/README.md
--- old/unicode-transforms-0.3.2/README.md 2017-02-05 23:26:01.000000000 +0100
+++ new/unicode-transforms-0.3.4/README.md 2018-04-05 12:16:09.000000000 +0200
@@ -1,10 +1,5 @@
# Unicode Transforms
-[![Hackage](https://img.shields.io/hackage/v/unicode-transforms.svg?style=flat)](https://hackage.haskell.org/package/unicode-transforms)
-[![Build Status](https://travis-ci.org/harendra-kumar/unicode-transforms.svg?branch=…
-[![Windows Build status](https://ci.appveyor.com/api/projects/status/5wov8m1m0asvbv32?svg=tr…
-[![Coverage Status](https://coveralls.io/repos/harendra-kumar/unicode-transforms/badge.svg?branch=master&service=github)](https://coveralls.io/github/harendra-kumar/unicode-transforms?branch=master)
-
Fast Unicode 9.0 normalization in Haskell (NFC, NFKC, NFD, NFKD).
## What is normalization?
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unicode-transforms-0.3.2/benchmark/Benchmark.hs new/unicode-transforms-0.3.4/benchmark/Benchmark.hs
--- old/unicode-transforms-0.3.2/benchmark/Benchmark.hs 2017-01-02 21:49:51.000000000 +0100
+++ new/unicode-transforms-0.3.4/benchmark/Benchmark.hs 2018-03-18 23:12:59.000000000 +0100
@@ -11,20 +11,19 @@
--
#if !MIN_VERSION_base(4,8,0)
-import Control.Applicative ((<$>), (<*>))
+import Control.Applicative ((<$>), (<*>))
#endif
-import Control.DeepSeq (NFData)
-import Criterion.Main (Benchmark, bench, bgroup,
- defaultConfig, env, nf, runMode)
-import Criterion.Main.Options (describe)
-import Data.Text (Text)
-import qualified Data.Text as T
-import qualified Data.Text.Normalize as UTText
-import Options.Applicative.Extra (execParser)
-import Path (Dir, Path, Rel, mkRelDir,
- toFilePath, (</>))
-import Path.IO (listDir)
-import System.FilePath (dropExtensions, takeFileName)
+import Control.DeepSeq (NFData)
+import Data.Text (Text)
+import Gauge.Main (Benchmark, bench, bgroup, env, nf, runMode)
+import Gauge.Main.Options (defaultConfig, Config(..), parseWith)
+import Path (Dir, Path, Rel, mkRelDir, toFilePath, (</>))
+import Path.IO (listDir)
+import System.Environment (getArgs)
+import System.FilePath (dropExtensions, takeFileName)
+
+import qualified Data.Text as T
+import qualified Data.Text.Normalize as UTText
#ifdef BENCH_ICU
import qualified Data.Text.ICU as TI
@@ -70,9 +69,10 @@
main :: IO ()
main = do
- mode <- execParser (describe defaultConfig)
+ args <- getArgs
+ let (cfg, xs) = parseWith defaultConfig args
dataFiles <- fmap (map toFilePath . snd) (listDir dataDir)
- runMode mode
+ runMode (mode cfg) cfg xs
[
#ifdef BENCH_ICU
bgroup "text-icu"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unicode-transforms-0.3.2/benchmark/NormalizeFile.hs new/unicode-transforms-0.3.4/benchmark/NormalizeFile.hs
--- old/unicode-transforms-0.3.2/benchmark/NormalizeFile.hs 2017-01-02 21:49:51.000000000 +0100
+++ new/unicode-transforms-0.3.4/benchmark/NormalizeFile.hs 1970-01-01 01:00:00.000000000 +0100
@@ -1,31 +0,0 @@
-{-# LANGUAGE TemplateHaskell #-}
-
--- |
--- Copyright : (c) 2016 Harendra Kumar
---
--- License : BSD-style
--- Maintainer : harendra.kumar(a)gmail.com
--- Stability : experimental
--- Portability : GHC
---
-
-import Control.DeepSeq (deepseq)
-import System.Environment (getArgs)
-
-import qualified Data.Text.Normalize as UT
-import Data.Text (pack, Text)
-
--- Truncate or expand all datasets to this size to provide a normalized
--- measurement view across all datasets and to reduce the effect of noise
--- because of the datasets being too small.
-dataSetSize :: Int
-dataSetSize = 1000000
-
-txtInput :: FilePath -> IO Text
-txtInput file = fmap (pack . take dataSetSize . cycle) (readFile file)
-
-main :: IO ()
-main = do
- [file] <- getArgs
- input <- txtInput file
- UT.normalize UT.NFD input `deepseq` return ()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unicode-transforms-0.3.2/stack-7.10.yaml new/unicode-transforms-0.3.4/stack-7.10.yaml
--- old/unicode-transforms-0.3.2/stack-7.10.yaml 2017-07-02 00:35:28.000000000 +0200
+++ new/unicode-transforms-0.3.4/stack-7.10.yaml 2018-03-18 23:12:59.000000000 +0100
@@ -1,5 +1,7 @@
packages:
- '.'
-resolver: lts-6.16
+resolver: lts-6.35
extra-deps:
- bitarray-0.0.1.1
+- gauge-0.2.1
+- basement-0.0.7
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unicode-transforms-0.3.2/stack-7.8.yaml new/unicode-transforms-0.3.4/stack-7.8.yaml
--- old/unicode-transforms-0.3.2/stack-7.8.yaml 2017-01-02 21:49:51.000000000 +0100
+++ new/unicode-transforms-0.3.4/stack-7.8.yaml 1970-01-01 01:00:00.000000000 +0100
@@ -1,16 +0,0 @@
-flags: {}
-packages:
-- '.'
-extra-deps:
-- base-compat-0.9.1
-- base-orphans-0.5.4
-- bitarray-0.0.1.1
-- criterion-1.1.1.0
-- directory-1.2.7.0
-- getopt-generics-0.13
-- path-0.5.7
-- path-io-1.1.0
-- primitive-0.6.1.0
-- vector-binary-instances-0.2.3.2
-- vector-th-unbox-0.2.1.6
-resolver: lts-2.22
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unicode-transforms-0.3.2/stack.yaml new/unicode-transforms-0.3.4/stack.yaml
--- old/unicode-transforms-0.3.2/stack.yaml 2017-07-02 01:11:50.000000000 +0200
+++ new/unicode-transforms-0.3.4/stack.yaml 2018-04-05 11:39:04.000000000 +0200
@@ -1,12 +1,8 @@
packages:
- '.'
-resolver: lts-8.21
+resolver: lts-11.3
extra-deps:
-- QuickCheck-2.10.0.1
-- optparse-applicative-0.14.0.0
-- criterion-1.2.1.0
-- microstache-1
-- statistics-0.14.0.2
-- base-orphans-0.6
-- path-0.6.1
-- path-io-1.3.1
+- bitarray-0.0.1.1
+- gauge-0.2.1
+- basement-0.0.7
+- getopt-generics-0.13.0.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unicode-transforms-0.3.2/test/QuickCheckUtils.hs new/unicode-transforms-0.3.4/test/QuickCheckUtils.hs
--- old/unicode-transforms-0.3.2/test/QuickCheckUtils.hs 2017-01-02 21:49:51.000000000 +0100
+++ new/unicode-transforms-0.3.4/test/QuickCheckUtils.hs 2017-12-01 06:31:18.000000000 +0100
@@ -3,14 +3,10 @@
module QuickCheckUtils () where
-import Control.DeepSeq (NFData(rnf))
import qualified Data.Text as T
import Data.Text.Normalize (NormalizationMode(NFD, NFKD, NFC, NFKC))
import Test.QuickCheck (Arbitrary(arbitrary, shrink), elements)
-instance NFData Ordering where
- rnf !_ = ()
-
instance Arbitrary T.Text where
arbitrary = T.pack `fmap` arbitrary
shrink = map T.pack . shrink . T.unpack
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unicode-transforms-0.3.2/unicode-data/UCD2Haskell.hs new/unicode-transforms-0.3.4/unicode-data/UCD2Haskell.hs
--- old/unicode-transforms-0.3.2/unicode-data/UCD2Haskell.hs 2017-01-08 15:48:22.000000000 +0100
+++ new/unicode-transforms-0.3.4/unicode-data/UCD2Haskell.hs 2017-12-01 06:31:18.000000000 +0100
@@ -103,14 +103,22 @@
]
genBitmap :: String -> [Int] -> String
-genBitmap prefix ordList = unlines
- [ "bitList :: [Int]"
- , "bitList = " ++ show ordList
+genBitmap prefix ordList =
+ -- On ARM, compilation fails with llvm optimizer crashing when one big list
+ -- is used. Split it into two to avoid the problem.
+ let l = length ordList
+ mn = minimum ordList
+ mx = maximum ordList
+ (ordList1, ordList2) = splitAt (div l 2) ordList
+ in unlines
+ [ "bitList1, bitList2 :: [Int]"
+ , "bitList1 = " ++ show ordList1
+ , "bitList2 = " ++ show ordList2
, ""
, prefix <> "Bitmap :: BitArray"
, prefix <> "Bitmap = bitArraySetBits "
- ++ (show (minimum ordList, maximum ordList))
- ++ " bitList"
+ ++ (show (mn, mx))
+ ++ " $ bitList1 ++ bitList2"
]
genCombiningClass :: PropertiesDB -> String -> String
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unicode-transforms-0.3.2/unicode-data/stack.yaml new/unicode-transforms-0.3.4/unicode-data/stack.yaml
--- old/unicode-transforms-0.3.2/unicode-data/stack.yaml 2017-01-02 21:49:51.000000000 +0100
+++ new/unicode-transforms-0.3.4/unicode-data/stack.yaml 2018-03-18 23:12:59.000000000 +0100
@@ -1,3 +1,5 @@
# This stack.yaml is to independently build
# the utility using its own cabal file
-resolver: lts-6.16
+resolver: lts-11.0
+extra-deps:
+- getopt-generics-0.13.0.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unicode-transforms-0.3.2/unicode-transforms.cabal new/unicode-transforms-0.3.4/unicode-transforms.cabal
--- old/unicode-transforms-0.3.2/unicode-transforms.cabal 2017-07-23 08:32:30.000000000 +0200
+++ new/unicode-transforms-0.3.4/unicode-transforms.cabal 2018-04-05 11:42:05.000000000 +0200
@@ -1,24 +1,26 @@
--- This file has been generated from package.yaml by hpack version 0.17.0.
+-- This file has been generated from package.yaml by hpack version 0.20.0.
--
-- see: https://github.com/sol/hpack
+--
+-- hash: 7a7d4e648121c309b0a878afd840b76eabfb6e00860059d926fea7fc97430651
-name: unicode-transforms
-version: 0.3.2
-synopsis: Unicode normalization
-description: Fast Unicode 9.0 normalization in Haskell (NFC, NFKC, NFD, NFKD).
-homepage: http://github.com/harendra-kumar/unicode-transforms
-bug-reports: https://github.com/harendra-kumar/unicode-transforms/issues
-license: BSD3
-license-file: LICENSE
-tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.1
-author: Harendra Kumar
-maintainer: harendra.kumar(a)gmail.com
-copyright: 2016-2017 Harendra Kumar,
- 2014–2015 Antonio Nikishaev
-category: Data,Text,Unicode
-stability: Experimental
-build-type: Simple
-cabal-version: >= 1.10
+name: unicode-transforms
+version: 0.3.4
+synopsis: Unicode normalization
+description: Fast Unicode 9.0 normalization in Haskell (NFC, NFKC, NFD, NFKD).
+category: Data,Text,Unicode
+stability: Experimental
+homepage: http://github.com/harendra-kumar/unicode-transforms
+bug-reports: https://github.com/harendra-kumar/unicode-transforms/issues
+author: Harendra Kumar
+maintainer: harendra.kumar(a)gmail.com
+copyright: 2016-2017 Harendra Kumar,
+ 2014–2015 Antonio Nikishaev
+license: BSD3
+license-file: LICENSE
+tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.1
+build-type: Simple
+cabal-version: >= 1.10
extra-source-files:
benchmark/data/AllChars.txt
@@ -32,7 +34,6 @@
NOTES.md
README.md
stack-7.10.yaml
- stack-7.8.yaml
stack.yaml
unicode-data/extra/NormalizationTest.txt
unicode-data/README.md
@@ -63,8 +64,18 @@
library
hs-source-dirs:
./.
- default-language: Haskell2010
ghc-options: -Wall -fwarn-identities -fwarn-incomplete-record-updates -fwarn-incomplete-uni-patterns -fwarn-tabs
+ build-depends:
+ base >=4.7 && <5
+ , bitarray >=0.0.1 && <0.1
+ , bytestring >=0.9 && <0.11
+ , text >=1.1.1 && <1.3
+ if flag(dev)
+ ghc-options: -O0
+ else
+ ghc-options: -O2 -funbox-strict-fields
+ if flag(has-llvm)
+ ghc-options: -fllvm
exposed-modules:
Data.ByteString.UTF8.Normalize
Data.Text.Normalize
@@ -81,17 +92,7 @@
Data.Unicode.Properties.Decompositions
Data.Unicode.Properties.DecompositionsK
Data.Unicode.Properties.DecompositionsK2
- build-depends:
- base >= 4.7 && < 5
- , bitarray >= 0.0.1 && < 0.1
- , bytestring >= 0.9 && < 0.11
- , text >= 1.1.1 && < 1.3
- if flag(dev)
- ghc-options: -O0
- else
- ghc-options: -O2 -funbox-strict-fields
- if flag(has-llvm)
- ghc-options: -fllvm
+ default-language: Haskell2010
test-suite extras
type: exitcode-stdio-1.0
@@ -100,10 +101,10 @@
test
ghc-options: -Wall -fwarn-identities -fwarn-incomplete-record-updates -fwarn-incomplete-uni-patterns -fwarn-tabs
build-depends:
- base >= 4.7 && < 5
- , deepseq >= 1.1 && < 1.5
- , QuickCheck >= 2.1 && < 2.11
- , text >= 1.1.1 && < 1.3
+ QuickCheck >=2.1 && <2.12
+ , base >=4.7 && <5
+ , deepseq >=1.1 && <1.5
+ , text >=1.1.1 && <1.3
, unicode-transforms
if flag(dev)
ghc-options: -O0
@@ -122,10 +123,10 @@
test
ghc-options: -Wall -fwarn-identities -fwarn-incomplete-record-updates -fwarn-incomplete-uni-patterns -fwarn-tabs
build-depends:
- base >= 4.7 && < 5
- , deepseq >= 1.1 && < 1.5
- , QuickCheck >= 2.1 && < 2.11
- , text >= 1.1.1 && < 1.3
+ QuickCheck >=2.1 && <2.12
+ , base >=4.7 && <5
+ , deepseq >=1.1 && <1.5
+ , text >=1.1.1 && <1.3
, unicode-transforms
if flag(dev)
ghc-options: -O0
@@ -136,7 +137,7 @@
if flag(has-icu)
cpp-options: -DHAS_ICU
build-depends:
- text-icu >= 0.6.2.1
+ text-icu >=0.6.2.1
other-modules:
QuickCheckUtils
default-language: Haskell2010
@@ -148,10 +149,10 @@
test
ghc-options: -Wall -fwarn-identities -fwarn-incomplete-record-updates -fwarn-incomplete-uni-patterns -fwarn-tabs
build-depends:
- base >= 4.7 && < 5
- , getopt-generics >= 0.11 && < 0.14
- , split >= 0.1 && < 0.3
- , text >= 1.1.1 && < 1.3
+ base >=4.7 && <5
+ , getopt-generics >=0.11 && <0.14
+ , split >=0.1 && <0.3
+ , text >=1.1.1 && <1.3
, unicode-transforms
if flag(dev)
ghc-options: -O0
@@ -168,14 +169,14 @@
benchmark
ghc-options: -Wall -fwarn-identities -fwarn-incomplete-record-updates -fwarn-incomplete-uni-patterns -fwarn-tabs
build-depends:
- base >= 4.7 && < 5
- , criterion >= 1.1.1 && < 1.3
- , deepseq >= 1.1.0 && < 1.5
- , filepath >= 1.0 && < 2
- , optparse-applicative >= 0.0.1 && < 0.15
- , path >= 0.0.0 && < 0.7
- , path-io >= 0.1.0 && < 1.4
- , text >= 1.1.1 && < 1.3
+ base >=4.7 && <5
+ , deepseq >=1.1.0 && <1.5
+ , filepath >=1.0 && <2
+ , gauge >=0.2.0 && <0.3
+ , optparse-applicative >=0.0.1 && <0.15
+ , path >=0.0.0 && <0.7
+ , path-io >=0.1.0 && <1.4
+ , text >=1.1.1 && <1.3
, unicode-transforms
if flag(dev)
ghc-options: -O0
@@ -186,10 +187,8 @@
if flag(has-icu)
cpp-options: -DBENCH_ICU
build-depends:
- text-icu >= 0.6.2.1 && < 0.8
+ text-icu >=0.6.2.1 && <0.8
if impl(ghc < 7.10)
build-depends:
- path (< 0.5.12 || > 0.5.12)
- other-modules:
- NormalizeFile
+ path (<0.5.12 || >0.5.12)
default-language: Haskell2010
1
0
Hello community,
here is the log from the commit of package ghc-typed-process for openSUSE:Factory checked in at 2018-05-30 12:15:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-typed-process (Old)
and /work/SRC/openSUSE:Factory/.ghc-typed-process.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-typed-process"
Wed May 30 12:15:07 2018 rev:3 rq:607912 version:0.2.2.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-typed-process/ghc-typed-process.changes 2017-04-12 18:09:43.333053508 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-typed-process.new/ghc-typed-process.changes 2018-05-30 12:27:43.233411722 +0200
@@ -1,0 +2,13 @@
+Mon May 14 17:02:11 UTC 2018 - psimons(a)suse.com
+
+- Update typed-process to version 0.2.2.0.
+ * Add inherit versions of setter functions
+ * Add `readProcessStdout`, `readProcessStdout_`, `readProcessStderr`, and `readProcessStderr_`
+ * Do not show modified environment information in exceptions
+ * Remove dependency on `conduit` and `conduit-extra`. Relevant code added to
+ `Data.Conduit.Process.Typed` in `conduit-extra-1.2.1`.
+ * Introduce 'unsafeProcessHandle' function
+ * Fix bug in `waitForProcess` that caused exit code to be lost
+ * Minor doc improvements
+
+-------------------------------------------------------------------
Old:
----
typed-process-0.1.0.0.tar.gz
New:
----
typed-process-0.2.2.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-typed-process.spec ++++++
--- /var/tmp/diff_new_pack.ezncdX/_old 2018-05-30 12:27:44.097381429 +0200
+++ /var/tmp/diff_new_pack.ezncdX/_new 2018-05-30 12:27:44.097381429 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ghc-typed-process
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,37 +19,32 @@
%global pkg_name typed-process
%bcond_with tests
Name: ghc-%{pkg_name}
-Version: 0.1.0.0
+Version: 0.2.2.0
Release: 0
Summary: Run external processes, with strong typing of streams
License: MIT
-Group: Development/Languages/Other
-Url: https://hackage.haskell.org/package/%{pkg_name}
+Group: Development/Libraries/Haskell
+URL: https://hackage.haskell.org/package/%{pkg_name}
Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{ve…
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-async-devel
BuildRequires: ghc-bytestring-devel
-BuildRequires: ghc-conduit-devel
-BuildRequires: ghc-conduit-extra-devel
-BuildRequires: ghc-exceptions-devel
BuildRequires: ghc-process-devel
BuildRequires: ghc-rpm-macros
BuildRequires: ghc-stm-devel
BuildRequires: ghc-transformers-devel
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %{with tests}
BuildRequires: ghc-base64-bytestring-devel
BuildRequires: ghc-hspec-devel
-BuildRequires: ghc-http-conduit-devel
BuildRequires: ghc-temporary-devel
%endif
%description
-Run external processes, with strong typing of streams.
+Please see the tutorial at <https://haskell-lang.org/library/typed-process>.
%package devel
Summary: Haskell %{pkg_name} library development files
-Group: Development/Libraries/Other
+Group: Development/Libraries/Haskell
Requires: %{name} = %{version}-%{release}
Requires: ghc-compiler = %{ghc_version}
Requires(post): ghc-compiler = %{ghc_version}
@@ -77,11 +72,9 @@
%ghc_pkg_recache
%files -f %{name}.files
-%defattr(-,root,root,-)
-%doc LICENSE
+%license LICENSE
%files devel -f %{name}-devel.files
-%defattr(-,root,root,-)
%doc ChangeLog.md README.md
%changelog
++++++ typed-process-0.1.0.0.tar.gz -> typed-process-0.2.2.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/typed-process-0.1.0.0/ChangeLog.md new/typed-process-0.2.2.0/ChangeLog.md
--- old/typed-process-0.1.0.0/ChangeLog.md 2016-10-21 07:46:42.000000000 +0200
+++ new/typed-process-0.2.2.0/ChangeLog.md 2018-03-19 13:38:53.000000000 +0100
@@ -1,3 +1,26 @@
+## 0.2.2.0
+
+* Add inherit versions of setter functions
+
+## 0.2.1.0
+
+* Add `readProcessStdout`, `readProcessStdout_`, `readProcessStderr`, and `readProcessStderr_`
+* Do not show modified environment information in exceptions
+
+## 0.2.0.0
+
+* Remove dependency on `conduit` and `conduit-extra`. Relevant code added to
+ `Data.Conduit.Process.Typed` in `conduit-extra-1.2.1`.
+
+## 0.1.1
+
+* Introduce 'unsafeProcessHandle' function
+
+## 0.1.0.1
+
+* Fix bug in `waitForProcess` that caused exit code to be lost
+* Minor doc improvements
+
## 0.1.0.0
* Initial commit
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/typed-process-0.1.0.0/README.md new/typed-process-0.2.2.0/README.md
--- old/typed-process-0.1.0.0/README.md 2016-10-21 07:46:42.000000000 +0200
+++ new/typed-process-0.2.2.0/README.md 2018-03-19 13:34:42.000000000 +0100
@@ -2,6 +2,9 @@
[![Build Status](https://travis-ci.org/fpco/typed-process.svg?branch=master)](https:… [![Build status](https://ci.appveyor.com/api/projects/status/bhh7aekbgeqp7g5j/branch…
+API level documentation (Haddocks) may be [found on
+Stackage](https://www.stackage.org/package/typed-process).
+
This library provides the ability to launch and interact with external
processes. It wraps around the
[process library](https://haskell-lang.org/library/process), and
@@ -20,7 +23,7 @@
```haskell
#!/usr/bin/env stack
--- stack --resolver lts-7.3 --install-ghc runghc --package typed-process
+-- stack --resolver lts-10.2 script
{-# LANGUAGE OverloadedStrings #-}
import System.IO (hPutStr, hClose)
import System.Process.Typed
@@ -76,7 +79,7 @@
```haskell
#!/usr/bin/env stack
--- stack --resolver lts-7.3 --install-ghc runghc --package typed-process
+-- stack --resolver lts-10.2 script
{-# LANGUAGE OverloadedStrings #-}
import System.Process.Typed
@@ -104,7 +107,7 @@
```haskell
#!/usr/bin/env stack
--- stack --resolver lts-7.3 --install-ghc runghc --package typed-process
+-- stack --resolver lts-10.2 script
{-# LANGUAGE OverloadedStrings #-}
import System.Process.Typed
@@ -120,7 +123,7 @@
```haskell
#!/usr/bin/env stack
--- stack --resolver lts-7.3 --install-ghc runghc --package typed-process
+-- stack --resolver lts-10.2 script
{-# LANGUAGE OverloadedStrings #-}
import System.Process.Typed
@@ -135,8 +138,8 @@
## Type parameters
-Both `ProcessConfig` and `Process` each take three type parameters,
-with the type of the standard input, output, and error streams for the
+Both `ProcessConfig` and `Process` take three type parameters:
+the types of the standard input, output, and error streams for the
process. As you saw above, our default is `()` for each, and our
default behavior is to inherit the streams from the parent
process. This is why, when you run the previous programs, the `date`
@@ -148,7 +151,7 @@
```haskell
#!/usr/bin/env stack
--- stack --resolver lts-7.3 --install-ghc runghc --package typed-process
+-- stack --resolver lts-10.2 script
{-# LANGUAGE OverloadedStrings #-}
import System.Process.Typed
@@ -180,7 +183,7 @@
```haskell
#!/usr/bin/env stack
--- stack --resolver lts-7.3 --install-ghc runghc --package typed-process
+-- stack --resolver lts-10.2 script
{-# LANGUAGE OverloadedStrings #-}
import System.Process.Typed
@@ -211,7 +214,7 @@
```haskell
#!/usr/bin/env stack
--- stack --resolver lts-7.3 --install-ghc runghc --package typed-process
+-- stack --resolver lts-10.2 script
{-# LANGUAGE OverloadedStrings #-}
import System.Process.Typed
@@ -225,7 +228,7 @@
```haskell
#!/usr/bin/env stack
--- stack --resolver lts-7.3 --install-ghc runghc --package typed-process
+-- stack --resolver lts-10.2 script
{-# LANGUAGE OverloadedStrings #-}
import System.Process.Typed
@@ -238,7 +241,7 @@
```haskell
#!/usr/bin/env stack
--- stack --resolver lts-7.3 --install-ghc runghc --package typed-process
+-- stack --resolver lts-10.2 script
{-# LANGUAGE OverloadedStrings #-}
import System.Process.Typed
@@ -256,7 +259,7 @@
```haskell
#!/usr/bin/env stack
--- stack --resolver lts-7.3 --install-ghc runghc --package typed-process
+-- stack --resolver lts-10.2 script
{-# LANGUAGE OverloadedStrings #-}
import System.Process.Typed
import System.Exit (ExitCode)
@@ -282,7 +285,7 @@
```haskell
#!/usr/bin/env stack
--- stack --resolver lts-7.3 --install-ghc runghc --package typed-process
+-- stack --resolver lts-10.2 script
{-# LANGUAGE OverloadedStrings #-}
import System.Process.Typed
import Data.ByteString.Lazy (ByteString)
@@ -303,15 +306,15 @@
from a process to a file. This is superior to the memory approach as
it does not have the risk of using large amounts of memory, though it
is more inconvenient. Together with the
-[temporary library](https://www.stackage.org/package/temporary), we
+[`UnliftIO.Temporary`](https://www.stackage.org/haddock/lts-10.2/unliftio-0.2.2.0/UnliftIO-Temporary.html), we
can do some nice things:
```haskell
#!/usr/bin/env stack
--- stack --resolver lts-7.3 --install-ghc runghc --package typed-process --package temporary
+-- stack --resolver lts-10.2 script
{-# LANGUAGE OverloadedStrings #-}
import System.Process.Typed
-import System.IO.Temp (withSystemTempFile)
+import UnliftIO.Temporary (withSystemTempFile)
main :: IO ()
main = withSystemTempFile "date" $ \fp h -> do
@@ -332,11 +335,11 @@
```haskell
#!/usr/bin/env stack
--- stack --resolver lts-7.3 --install-ghc runghc --package typed-process --package temporary
+-- stack --resolver lts-10.2 script
{-# LANGUAGE OverloadedStrings #-}
import System.Process.Typed
import System.IO (hClose)
-import System.IO.Temp (withSystemTempFile)
+import UnliftIO.Temporary (withSystemTempFile)
import Control.Monad (replicateM_)
main :: IO ()
@@ -362,7 +365,7 @@
```haskell
#!/usr/bin/env stack
--- stack --resolver lts-7.3 --install-ghc runghc --package typed-process --package temporary
+-- stack --resolver lts-10.2 script
{-# LANGUAGE OverloadedStrings #-}
import System.Process.Typed
@@ -374,7 +377,7 @@
```haskell
#!/usr/bin/env stack
--- stack --resolver lts-7.3 --install-ghc runghc --package typed-process --package temporary
+-- stack --resolver lts-10.2 script
{-# LANGUAGE OverloadedStrings #-}
import System.Process.Typed
@@ -387,11 +390,11 @@
```haskell
#!/usr/bin/env stack
--- stack --resolver lts-7.3 --install-ghc runghc --package typed-process --package temporary
+-- stack --resolver lts-10.2 script
{-# LANGUAGE OverloadedStrings #-}
import System.Process.Typed
import System.IO
-import System.IO.Temp (withSystemTempFile)
+import UnliftIO.Temporary (withSystemTempFile)
main :: IO ()
main = withSystemTempFile "input" $ \fp h -> do
@@ -413,7 +416,7 @@
```haskell
#!/usr/bin/env stack
--- stack --resolver lts-7.3 --install-ghc runghc --package typed-process
+-- stack --resolver lts-10.2 script
{-# LANGUAGE OverloadedStrings #-}
import System.Process.Typed
import System.IO
@@ -440,13 +443,14 @@
## Other settings
We've so far only played with modifying streams, but there are a
-number of other settings you can tweak. It's best to just look at the
-API docs for all available functions. We'll give examples of the two
-most common settings: the working directory and environment variables.
+number of other settings you can tweak. It's best to just
+[look at the API docs](https://www.stackage.org/package/typed-process)
+for all available functions. We'll give examples of the two most
+common settings: the working directory and environment variables.
```haskell
#!/usr/bin/env stack
--- stack --resolver lts-7.3 --install-ghc runghc --package typed-process
+-- stack --resolver lts-10.2 script
{-# LANGUAGE OverloadedStrings #-}
import System.Process.Typed
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/typed-process-0.1.0.0/src/System/Process/Typed.hs new/typed-process-0.2.2.0/src/System/Process/Typed.hs
--- old/typed-process-0.1.0.0/src/System/Process/Typed.hs 2016-10-21 07:46:42.000000000 +0200
+++ new/typed-process-0.2.2.0/src/System/Process/Typed.hs 2018-03-19 13:40:44.000000000 +0100
@@ -6,7 +6,15 @@
{-# LANGUAGE KindSignatures #-}
{-# LANGUAGE DeriveFunctor #-}
{-# LANGUAGE ScopedTypeVariables #-}
--- | Please see the README.md file for examples of using this API.
+{-|
+Please see the README.md file for examples of using this API.
+
+__Applications using this library MUST use @-threaded@__ to link with the
+threaded version of the RTS. 'spawnProcess' and the others spawn a Haskell
+thread that blocks until the process exits. Without @-threaded@ this will block
+/all/ the Haskell threads in your program until the spawned process exits.
+
+-}
module System.Process.Typed
( -- * Types
ProcessConfig
@@ -24,7 +32,9 @@
, setStdout
, setStderr
, setWorkingDir
+ , setWorkingDirInherit
, setEnv
+ , setEnvInherit
, setCloseFds
, setCreateGroup
, setDelegateCtlc
@@ -35,7 +45,9 @@
#endif
#if MIN_VERSION_process(1, 4, 0) && !WINDOWS
, setChildGroup
+ , setChildGroupInherit
, setChildUser
+ , setChildUserInherit
#endif
-- * Stream specs
@@ -48,10 +60,6 @@
, useHandleOpen
, useHandleClose
- -- ** Conduit
- , createSink
- , createSource
-
-- * Launch a process
, startProcess
, stopProcess
@@ -61,6 +69,10 @@
, readProcess_
, runProcess
, runProcess_
+ , readProcessStdout
+ , readProcessStdout_
+ , readProcessStderr
+ , readProcessStderr_
-- * Interact with a process
@@ -80,15 +92,16 @@
-- * Exceptions
, ExitCodeException (..)
, ByteStringOutputException (..)
+ -- * Unsafe functions
+ , unsafeProcessHandle
) where
import qualified Data.ByteString as S
import Data.ByteString.Lazy.Internal (defaultChunkSize)
-import Control.Exception (throwIO)
+import Control.Exception (assert, evaluate, throwIO, Exception, SomeException, finally, bracket, onException, catch)
import Control.Monad (void)
import Control.Monad.IO.Class
import qualified System.Process as P
-import Control.Monad.Catch as C
import Data.Typeable (Typeable)
import System.IO (Handle, hClose)
import Control.Concurrent.Async (async, cancel, waitCatch)
@@ -97,9 +110,6 @@
import qualified Data.ByteString.Lazy as L
import qualified Data.ByteString.Lazy.Char8 as L8
import Data.String (IsString (fromString))
-import Data.Conduit (ConduitM)
-import qualified Data.Conduit as C
-import qualified Data.Conduit.Binary as CB
#if MIN_VERSION_process(1, 4, 0) && !WINDOWS
import System.Posix.Types (GroupID, UserID)
@@ -330,6 +340,14 @@
-> ProcessConfig stdin stdout stderr
setWorkingDir dir pc = pc { pcWorkingDir = Just dir }
+-- | Inherit the working directory from the parent process.
+--
+-- @since 0.2.2.0
+setWorkingDirInherit
+ :: ProcessConfig stdin stdout stderr
+ -> ProcessConfig stdin stdout stderr
+setWorkingDirInherit pc = pc { pcWorkingDir = Nothing }
+
-- | Set the environment variables of the child process.
--
-- Default: current process's environment.
@@ -340,6 +358,14 @@
-> ProcessConfig stdin stdout stderr
setEnv env pc = pc { pcEnv = Just env }
+-- | Inherit the environment variables from the parent process.
+--
+-- @since 0.2.2.0
+setEnvInherit
+ :: ProcessConfig stdin stdout stderr
+ -> ProcessConfig stdin stdout stderr
+setEnvInherit pc = pc { pcEnv = Nothing }
+
-- | Should we close all file descriptors besides stdin, stdout, and
-- stderr? See 'P.close_fds' for more information.
--
@@ -425,6 +451,14 @@
-> ProcessConfig stdin stdout stderr
setChildGroup x pc = pc { pcChildGroup = Just x }
+-- | Inherit the group from the parent process.
+--
+-- @since 0.2.2.0
+setChildGroupInherit
+ :: ProcessConfig stdin stdout stderr
+ -> ProcessConfig stdin stdout stderr
+setChildGroupInherit pc = pc { pcChildGroup = Nothing }
+
-- | Set the child process's user ID with the POSIX @setuid@ syscall,
-- does nothing on non-POSIX. See 'P.child_user'.
--
@@ -436,6 +470,14 @@
-> ProcessConfig stdin stdout stderr
-> ProcessConfig stdin stdout stderr
setChildUser x pc = pc { pcChildUser = Just x }
+
+-- | Inherit the user from the parent process.
+--
+-- @since 0.2.2.0
+setChildUserInherit
+ :: ProcessConfig stdin stdout stderr
+ -> ProcessConfig stdin stdout stderr
+setChildUserInherit pc = pc { pcChildUser = Nothing }
#endif
-- | Create a new 'StreamSpec' from the given 'P.StdStream' and a
@@ -536,22 +578,6 @@
useHandleClose :: Handle -> StreamSpec anyStreamType ()
useHandleClose h = mkStreamSpec (P.UseHandle h) $ \_ Nothing -> return ((), hClose h)
--- | Provide input to a process by writing to a conduit.
---
--- @since 0.1.0.0
-createSink :: MonadIO m => StreamSpec 'STInput (ConduitM S.ByteString o m ())
-createSink =
- (\h -> C.addCleanup (\_ -> liftIO $ hClose h) (CB.sinkHandle h))
- <$> createPipe
-
--- | Read output from a process by read from a conduit.
---
--- @since 0.1.0.0
-createSource :: MonadIO m => StreamSpec 'STOutput (ConduitM i S.ByteString m ())
-createSource =
- (\h -> C.addCleanup (\_ -> liftIO $ hClose h) (CB.sourceHandle h))
- <$> createPipe
-
-- | Launch a process based on the given 'ProcessConfig'. You should
-- ensure that you close 'stopProcess' on the result. It's usually
-- better to use one of the functions in this module which ensures
@@ -620,7 +646,9 @@
-- then call waitForProcess ourselves
Left _ -> do
P.terminateProcess pHandle
- void $ P.waitForProcess pHandle
+ ec <- P.waitForProcess pHandle
+ success <- atomically $ tryPutTMVar pExitCode ec
+ evaluate $ assert success ()
return Process {..}
where
@@ -638,24 +666,28 @@
-> m ()
stopProcess = liftIO . pCleanup
--- | Use the bracket pattern to call 'startProcess' and ensure
+-- | Uses the bracket pattern to call 'startProcess' and ensures that
-- 'stopProcess' is called.
--
+-- In version 0.2.0.0, this function was monomorphized to @IO@ to
+-- avoid a dependency on the exceptions package.
+--
-- @since 0.1.0.0
-withProcess :: (MonadIO m, C.MonadMask m)
- => ProcessConfig stdin stdout stderr
- -> (Process stdin stdout stderr -> m a)
- -> m a
-withProcess config = C.bracket (startProcess config) stopProcess
+withProcess :: ProcessConfig stdin stdout stderr
+ -> (Process stdin stdout stderr -> IO a)
+ -> IO a
+withProcess config = bracket (startProcess config) stopProcess
-- | Same as 'withProcess', but also calls 'checkExitCode'
--
+-- In version 0.2.0.0, this function was monomorphized to @IO@ to
+-- avoid a dependency on the exceptions package.
+--
-- @since 0.1.0.0
-withProcess_ :: (MonadIO m, C.MonadMask m)
- => ProcessConfig stdin stdout stderr
- -> (Process stdin stdout stderr -> m a)
- -> m a
-withProcess_ config = C.bracket
+withProcess_ :: ProcessConfig stdin stdout stderr
+ -> (Process stdin stdout stderr -> IO a)
+ -> IO a
+withProcess_ config = bracket
(startProcess config)
(\p -> stopProcess p `finally` checkExitCode p)
@@ -699,6 +731,70 @@
pc' = setStdout byteStringOutput
$ setStderr byteStringOutput pc
+-- | Same as 'readProcess', but only read the stdout of the process. Original settings for stderr remain.
+--
+-- @since 0.2.1.0
+readProcessStdout
+ :: MonadIO m
+ => ProcessConfig stdin stdoutIgnored stderr
+ -> m (ExitCode, L.ByteString)
+readProcessStdout pc =
+ liftIO $ withProcess pc' $ \p -> atomically $ (,)
+ <$> waitExitCodeSTM p
+ <*> getStdout p
+ where
+ pc' = setStdout byteStringOutput pc
+
+-- | Same as 'readProcessStdout', but instead of returning the
+-- 'ExitCode', checks it with 'checkExitCode'.
+--
+-- @since 0.2.1.0
+readProcessStdout_
+ :: MonadIO m
+ => ProcessConfig stdin stdoutIgnored stderr
+ -> m L.ByteString
+readProcessStdout_ pc =
+ liftIO $ withProcess pc' $ \p -> atomically $ do
+ stdout <- getStdout p
+ checkExitCodeSTM p `catchSTM` \ece -> throwSTM ece
+ { eceStdout = stdout
+ }
+ return stdout
+ where
+ pc' = setStdout byteStringOutput pc
+
+-- | Same as 'readProcess', but only read the stderr of the process. Original settings for stderr remain.
+--
+-- @since 0.2.1.0
+readProcessStderr
+ :: MonadIO m
+ => ProcessConfig stdin stderrIgnored stderr
+ -> m (ExitCode, L.ByteString)
+readProcessStderr pc =
+ liftIO $ withProcess pc' $ \p -> atomically $ (,)
+ <$> waitExitCodeSTM p
+ <*> getStderr p
+ where
+ pc' = setStderr byteStringOutput pc
+
+-- | Same as 'readProcessStderr', but instead of returning the
+-- 'ExitCode', checks it with 'checkExitCode'.
+--
+-- @since 0.2.1.0
+readProcessStderr_
+ :: MonadIO m
+ => ProcessConfig stdin stderrIgnored stderr
+ -> m L.ByteString
+readProcessStderr_ pc =
+ liftIO $ withProcess pc' $ \p -> atomically $ do
+ stderr <- getStderr p
+ checkExitCodeSTM p `catchSTM` \ece -> throwSTM ece
+ { eceStderr = stderr
+ }
+ return stderr
+ where
+ pc' = setStderr byteStringOutput pc
+
-- | Run the given process, wait for it to exit, and returns its
-- 'ExitCode'.
--
@@ -708,7 +804,8 @@
-> m ExitCode
runProcess pc = liftIO $ withProcess pc waitExitCode
--- | Same as 'runProcess', but ignores the 'ExitCode'.
+-- | Same as 'runProcess', but instead of returning the
+-- 'ExitCode', checks it with 'checkExitCode'.
--
-- @since 0.1.0.0
runProcess_ :: MonadIO m
@@ -806,7 +903,9 @@
[ "Received "
, show (eceExitCode ece)
, " when running\n"
- , show (eceProcessConfig ece)
+ -- Too much output for an exception if we show the modified
+ -- environment, so hide it
+ , show (eceProcessConfig ece) { pcEnv = Nothing }
, if L.null (eceStdout ece)
then ""
else "Standard output:\n\n" ++ L8.unpack (eceStdout ece)
@@ -822,3 +921,25 @@
data ByteStringOutputException = ByteStringOutputException SomeException (ProcessConfig () () ())
deriving (Show, Typeable)
instance Exception ByteStringOutputException
+
+-- | Take 'System.Process.ProcessHandle' out of the 'Process'.
+-- This method is needed in cases one need to use low level functions
+-- from the @process@ package. Use cases for this method are:
+--
+-- 1. Send a special signal to the process.
+-- 2. Terminate the process group instead of terminating single process.
+-- 3. Use platform specific API on the underlying process.
+--
+-- This method is considered unsafe because the actions it performs on
+-- the underlying process may overlap with the functionality that
+-- @typed-process@ provides. For example the user should not call
+-- 'System.Process.waitForProcess' on the process handle as eiter
+-- 'System.Process.waitForProcess' or 'stopProcess' will lock.
+-- Additionally, even if process was terminated by the
+-- 'System.Process.terminateProcess' or by sending signal,
+-- 'stopProcess' should be called either way in order to cleanup resources
+-- allocated by the @typed-process@.
+--
+-- @since 0.1.1
+unsafeProcessHandle :: Process stdin stdout stderr -> P.ProcessHandle
+unsafeProcessHandle = pHandle
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/typed-process-0.1.0.0/test/System/Process/TypedSpec.hs new/typed-process-0.2.2.0/test/System/Process/TypedSpec.hs
--- old/typed-process-0.1.0.0/test/System/Process/TypedSpec.hs 2016-10-21 07:46:42.000000000 +0200
+++ new/typed-process-0.2.2.0/test/System/Process/TypedSpec.hs 2018-03-19 13:34:42.000000000 +0100
@@ -4,17 +4,15 @@
import System.Process.Typed
import System.IO
-import Data.Conduit
-import qualified Data.Conduit.Binary as CB
-import Network.HTTP.Simple
import Control.Concurrent.Async (Concurrently (..))
+import Control.Concurrent.STM (atomically)
import Test.Hspec
import System.Exit
import System.IO.Temp
import qualified Data.ByteString as S
+import qualified Data.ByteString.Lazy as L
import Data.String (IsString)
import Data.Monoid ((<>))
-import qualified Data.Conduit.List as CL
import qualified Data.ByteString.Base64 as B64
#if !MIN_VERSION_base(4, 8, 0)
@@ -76,16 +74,15 @@
runProcess_ "false" `shouldThrow` \ExitCodeException{} -> True
it "async" $ withSystemTempFile "httpbin" $ \fp h -> do
- bss <- withProcess (setStdin createSink $ setStdout createSource "base64") $ \p ->
+ lbs <- withProcess (setStdin createPipe $ setStdout byteStringOutput "base64") $ \p ->
runConcurrently $
- Concurrently
- ( httpSink "https://raw.githubusercontent.com/fpco/typed-process/master/README.md" $ \_res ->
- CB.conduitHandle h .| getStdin p) *>
- Concurrently
- ( runConduit
- $ getStdout p
- .| CL.consume)
+ Concurrently (do
+ bs <- S.readFile "README.md"
+ S.hPut h bs
+ S.hPut (getStdin p) bs
+ hClose (getStdin p)) *>
+ Concurrently (atomically $ getStdout p)
hClose h
- let encoded = S.filter (/= 10) $ S.concat bss
+ let encoded = S.filter (/= 10) $ L.toStrict lbs
raw <- S.readFile fp
encoded `shouldBe` B64.encode raw
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/typed-process-0.1.0.0/typed-process.cabal new/typed-process-0.2.2.0/typed-process.cabal
--- old/typed-process-0.1.0.0/typed-process.cabal 2016-10-21 07:46:42.000000000 +0200
+++ new/typed-process-0.2.2.0/typed-process.cabal 2018-03-19 13:39:31.000000000 +0100
@@ -1,51 +1,67 @@
-name: typed-process
-version: 0.1.0.0
-synopsis: Run external processes, with strong typing of streams
-description: Please see README.md
-homepage: https://github.com/fpco/typed-process#readme
-license: MIT
-license-file: LICENSE
-author: Michael Snoyman
-maintainer: michael(a)snoyman.com
-category: System
-build-type: Simple
-extra-source-files: README.md ChangeLog.md
-cabal-version: >=1.10
+-- This file has been generated from package.yaml by hpack version 0.21.2.
+--
+-- see: https://github.com/sol/hpack
+--
+-- hash: 11068332a1f3de188a488a22fdb0b1bc49f70ccc1dd04c322123278d6d6124e3
-library
- hs-source-dirs: src
- exposed-modules: System.Process.Typed
- build-depends: base >= 4.7 && < 5
- , async
- , bytestring
- , conduit
- , conduit-extra
- , exceptions
- , process >= 1.2
- , stm
- , transformers
- if os(windows)
- cpp-options: -DWINDOWS
- default-language: Haskell2010
+name: typed-process
+version: 0.2.2.0
+synopsis: Run external processes, with strong typing of streams
+description: Please see the tutorial at <https://haskell-lang.org/library/typed-process>
+category: System
+homepage: https://haskell-lang.org/library/typed-process
+bug-reports: https://github.com/fpco/typed-process/issues
+author: Michael Snoyman
+maintainer: michael(a)snoyman.com
+license: MIT
+license-file: LICENSE
+build-type: Simple
+cabal-version: >= 1.10
-test-suite typed-process-test
- type: exitcode-stdio-1.0
- hs-source-dirs: test
- main-is: Spec.hs
- other-modules: System.Process.TypedSpec
- build-depends: base
- , async
- , base64-bytestring
- , bytestring
- , conduit
- , conduit-extra
- , hspec
- , http-conduit >= 2.1.10
- , temporary
- , typed-process
- ghc-options: -threaded -rtsopts -with-rtsopts=-N
- default-language: Haskell2010
+extra-source-files:
+ ChangeLog.md
+ README.md
source-repository head
- type: git
+ type: git
location: https://github.com/fpco/typed-process
+
+library
+ exposed-modules:
+ System.Process.Typed
+ other-modules:
+ Paths_typed_process
+ hs-source-dirs:
+ src
+ build-depends:
+ async
+ , base >=4.7 && <5
+ , bytestring
+ , process >=1.2
+ , stm
+ , transformers
+ if os(windows)
+ cpp-options: -DWINDOWS
+ default-language: Haskell2010
+
+test-suite typed-process-test
+ type: exitcode-stdio-1.0
+ main-is: Spec.hs
+ other-modules:
+ System.Process.TypedSpec
+ Paths_typed_process
+ hs-source-dirs:
+ test
+ ghc-options: -threaded -rtsopts -with-rtsopts=-N
+ build-depends:
+ async
+ , base >=4.7 && <5
+ , base64-bytestring
+ , bytestring
+ , hspec
+ , process >=1.2
+ , stm
+ , temporary
+ , transformers
+ , typed-process
+ default-language: Haskell2010
1
0
Hello community,
here is the log from the commit of package ghc-transformers-compat for openSUSE:Factory checked in at 2018-05-30 12:15:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-transformers-compat (Old)
and /work/SRC/openSUSE:Factory/.ghc-transformers-compat.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-transformers-compat"
Wed May 30 12:15:04 2018 rev:6 rq:607911 version:0.6.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-transformers-compat/ghc-transformers-compat.changes 2017-09-15 22:20:00.475005784 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-transformers-compat.new/ghc-transformers-compat.changes 2018-05-30 12:27:42.313443967 +0200
@@ -1,0 +2,38 @@
+Mon May 14 17:02:11 UTC 2018 - psimons(a)suse.com
+
+- Update transformers-compat to version 0.6.2.
+ * `transformers-compat` now uses automatic flags instead of manual ones.
+ This has a number of benefits:
+
+ * There is no need for making several simultaneous releases to support each
+ flag combination.
+ * As a result, the `cabal-install` constraint solver should have a much
+ easier time figuring out install-plans involving `transformers-compat`.
+
+ Due to old `cabal-install` bugs, `cabal-install-1.16` and older may have a
+ harder time installing this package, so it is recommended that you use
+ `cabal-install-1.18` or later. (Or, if you must use `cabal-install-1.16` or
+ older, installing `transformers-compat` with the appropriate flags should
+ help.)
+ * Fix an oversight in which the `Control.Monad.Trans.Accum` and
+ `Control.Monad.Trans.Select` modules were not backported when built with the
+ `-ffour` flag.
+ * Introduce the `Data.Functor.Classes.Generic` module, which provides functions that can generically implement methods in the `Eq1`, `Ord1`, `Read1`, and `Show1` classes (without the usual boilerplate involved).
+ * Introduce the `generic-deriving` flag. When enabled, `transformers-compat` will depend on the `generic-deriving` library on older versions of GHC to backport `GHC.Generics` support for `Generic` instances and the machinery in `Data.Functor.Classes.Generic`.
+ * Some instances were present in `Data.Functor.Sum` but not in `Control.Monad.Trans.Instances` (e.g., the `Generic`, `Typeable`, and `Data` instances for `Sum`). This has been fixed.
+ * Backport changes from `transformers-0.5.5`:
+ * Backport the `Semigroup` instance for `Constant`
+ * Add `mapSelect` and `mapSelectT`
+ * Define `selectToContT` (and deprecate `selectToCont` in favor of that)
+ * Define some explicit `(*>)` definitions to avoid space leaks
+ * Backport changes from `transformers-0.5.4` (i.e., add `Bifoldable` and `Bitraversable` instances for `Data.Functor.Constant`)
+ * Backport changes from `transformers-0.5.3`:
+ * Backport the `Control.Monad.Trans.Accum` and `Control.Monad.Trans.Select` modules
+ * Backport the `eitherToErrors` and `elimLift` functions to `Control.Applicative.Lift`
+ * Backport `Bits`, `FiniteBits`, `IsString`, `Num`, `Real`, `Integral`, `Fractional`, `Floating`, `RealFrac`, and `RealFloat` instances for `Data.Functor.Identity`
+ * Backport `Monad`, `MonadFail`, and `MonadPlus` instances for `Data.Functor.Reverse`
+ * Backport `Eq1`, `Ord1`, `Read1`, and `Show1` instances for `Data.Proxy`
+ * Backport changes from `transformers-0.5.2` (i.e., add more `INLINE` annotations)
+ * Backport changes from `transformers-0.5.1` (i.e., add `Bounded`, `Enum`, `Ix`, and `Storable` instances for `Identity`)
+
+-------------------------------------------------------------------
Old:
----
transformers-compat-0.5.1.4.tar.gz
New:
----
transformers-compat-0.6.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-transformers-compat.spec ++++++
--- /var/tmp/diff_new_pack.6WwpJi/_old 2018-05-30 12:27:43.045418313 +0200
+++ /var/tmp/diff_new_pack.6WwpJi/_new 2018-05-30 12:27:43.045418313 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ghc-transformers-compat
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,9 +18,9 @@
%global pkg_name transformers-compat
Name: ghc-%{pkg_name}
-Version: 0.5.1.4
+Version: 0.6.2
Release: 0
-Summary: A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms
+Summary: A small compatibility shim for the transformers library
License: BSD-3-Clause
Group: Development/Libraries/Haskell
URL: https://hackage.haskell.org/package/%{pkg_name}
@@ -69,7 +69,7 @@
%ghc_pkg_recache
%files -f %{name}.files
-%doc LICENSE
+%license LICENSE
%files devel -f %{name}-devel.files
%doc CHANGELOG.markdown README.markdown
++++++ transformers-compat-0.5.1.4.tar.gz -> transformers-compat-0.6.2.tar.gz ++++++
++++ 3422 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package ghc-transformers-base for openSUSE:Factory checked in at 2018-05-30 12:14:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-transformers-base (Old)
and /work/SRC/openSUSE:Factory/.ghc-transformers-base.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-transformers-base"
Wed May 30 12:14:57 2018 rev:6 rq:607910 version:0.4.5.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-transformers-base/ghc-transformers-base.changes 2017-09-15 21:10:10.917168338 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-transformers-base.new/ghc-transformers-base.changes 2018-05-30 12:27:41.445474379 +0200
@@ -1,0 +2,6 @@
+Mon May 14 17:02:11 UTC 2018 - psimons(a)suse.com
+
+- Update transformers-base to version 0.4.5.2.
+ Upstream does not provide a changelog.
+
+-------------------------------------------------------------------
Old:
----
transformers-base-0.4.4.tar.gz
transformers-base.cabal
New:
----
transformers-base-0.4.5.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-transformers-base.spec ++++++
--- /var/tmp/diff_new_pack.k3Gpsd/_old 2018-05-30 12:27:42.121450696 +0200
+++ /var/tmp/diff_new_pack.k3Gpsd/_new 2018-05-30 12:27:42.121450696 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ghc-transformers-base
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,15 +18,15 @@
%global pkg_name transformers-base
Name: ghc-%{pkg_name}
-Version: 0.4.4
+Version: 0.4.5.2
Release: 0
Summary: Lift computations from the bottom of a transformer stack
License: BSD-3-Clause
Group: Development/Libraries/Haskell
URL: https://hackage.haskell.org/package/%{pkg_name}
Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{ve…
-Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal…
BuildRequires: ghc-Cabal-devel
+BuildRequires: ghc-base-orphans-devel
BuildRequires: ghc-rpm-macros
BuildRequires: ghc-stm-devel
BuildRequires: ghc-transformers-compat-devel
@@ -50,7 +50,6 @@
%prep
%setup -q -n %{pkg_name}-%{version}
-cp -p %{SOURCE1} %{pkg_name}.cabal
%build
%ghc_lib_build
@@ -65,8 +64,9 @@
%ghc_pkg_recache
%files -f %{name}.files
-%doc LICENSE
+%license LICENSE
%files devel -f %{name}-devel.files
+%doc README.md
%changelog
++++++ transformers-base-0.4.4.tar.gz -> transformers-base-0.4.5.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transformers-base-0.4.4/README.md new/transformers-base-0.4.5.2/README.md
--- old/transformers-base-0.4.4/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/transformers-base-0.4.5.2/README.md 2018-03-31 23:49:49.000000000 +0200
@@ -0,0 +1,17 @@
+Transformers-Base
+=================
+
+[![Travis](https://img.shields.io/travis/mvv/transformers-base/master.svg)](https://travis-ci.org/mvv/transformers-base) [![Hackage](https://img.shields.io/hackage/v/transformers-base.svg)](http://hackage.haskell.org/package/transformers-base)
+
+This package provides a straightforward port of [monadLib][monadLib]'s BaseM
+typeclass to [transformers][transformers].
+
+[monadLib]: http://hackage.haskell.org/package/monadLib
+[transformers]: http://hackage.haskell.org/package/transformers
+
+Installation
+------------
+The usual:
+
+ $ cabal install
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transformers-base-0.4.4/src/Control/Monad/Base.hs new/transformers-base-0.4.5.2/src/Control/Monad/Base.hs
--- old/transformers-base-0.4.4/src/Control/Monad/Base.hs 2015-02-11 20:40:38.000000000 +0100
+++ new/transformers-base-0.4.5.2/src/Control/Monad/Base.hs 2018-03-31 23:49:49.000000000 +0200
@@ -19,9 +19,7 @@
, liftBaseDefault
) where
-import Data.Monoid
import Data.Functor.Identity
-import Control.Applicative (Applicative(..))
import Control.Monad.Trans.Class
import Control.Monad.Trans.Identity
import Control.Monad.Trans.Maybe
@@ -36,10 +34,16 @@
import Control.Monad.Trans.Error
import Control.Monad.Trans.Cont
import Control.Monad.Trans.Except
+import Control.Monad.Trans.Accum
+import Control.Monad.Trans.Select
+#if !MIN_VERSION_base(4,8,0)
+import Data.Monoid
+import Control.Applicative (Applicative(..))
+#endif
#if !MIN_VERSION_base(4,4,0) && HS_TRANSFORMERS_BASE__ORPHANS
-import Control.Monad (ap)
import qualified Control.Monad.ST.Lazy as L
import qualified Control.Monad.ST.Strict as S
+import Data.Orphans ()
#endif
#if MIN_VERSION_base(4,4,0)
import qualified Control.Monad.ST.Lazy.Safe as L
@@ -65,14 +69,6 @@
BASE(STM)
#if !MIN_VERSION_base(4,4,0) && HS_TRANSFORMERS_BASE__ORPHANS
-instance Applicative (L.ST s) where
- pure = return
- (<*>) = ap
-
-instance Applicative (S.ST s) where
- pure = return
- (<*>) = ap
-
BASE(L.ST s)
BASE(S.ST s)
#endif
@@ -101,6 +97,7 @@
TRANS(S.StateT s)
TRANS(ContT r)
TRANS(ExceptT e)
+TRANS(SelectT r)
#undef TRANS
#define TRANS_CTX(CTX, T) \
@@ -111,4 +108,5 @@
TRANS_CTX(Monoid w, L.RWST r w s)
TRANS_CTX(Monoid w, S.RWST r w s)
TRANS_CTX(Error e, ErrorT e)
+TRANS_CTX(Monoid w, AccumT w)
#undef TRANS_CTX
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transformers-base-0.4.4/transformers-base.cabal new/transformers-base-0.4.5.2/transformers-base.cabal
--- old/transformers-base-0.4.4/transformers-base.cabal 2015-02-11 20:40:38.000000000 +0100
+++ new/transformers-base-0.4.5.2/transformers-base.cabal 2018-03-31 23:49:49.000000000 +0200
@@ -1,5 +1,5 @@
Name: transformers-base
-Version: 0.4.4
+Version: 0.4.5.2
Category: Control
Stability: experimental
Synopsis: Lift computations from the bottom of a transformer stack
@@ -20,7 +20,13 @@
License: BSD3
License-File: LICENSE
-Cabal-Version: >= 1.6.0
+Extra-Source-Files:
+ README.md
+
+Tested-With: GHC==7.0.4, GHC==7.4.2, GHC==7.6.3, GHC==7.8.4,
+ GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.1
+
+Cabal-Version: >= 1.8
Build-Type: Simple
Source-Repository head
@@ -29,18 +35,20 @@
Flag OrphanInstances
Description:
- Declare orphan Applicative instances for lazy and strict ST if needed
+ Import orphan Applicative instances for lazy and strict ST if needed
Default: True
Library
Build-Depends:
- base >= 3 && < 5,
+ base >= 3 && < 5 && (< 4.4 || >= 4.5),
stm >= 2.3,
transformers >= 0.2,
- transformers-compat >= 0.2
+ transformers-compat >= 0.6.1
Hs-Source-Dirs: src
GHC-Options: -Wall
if flag(OrphanInstances)
+ Build-Depends:
+ base-orphans >= 0.3
CPP-Options: -DHS_TRANSFORMERS_BASE__ORPHANS=1
else
CPP-Options: -DHS_TRANSFORMERS_BASE__ORPHANS=0
1
0
Hello community,
here is the log from the commit of package ghc-tls for openSUSE:Factory checked in at 2018-05-30 12:14:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-tls (Old)
and /work/SRC/openSUSE:Factory/.ghc-tls.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-tls"
Wed May 30 12:14:54 2018 rev:15 rq:607909 version:1.4.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-tls/ghc-tls.changes 2017-09-15 22:19:45.777076093 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-tls.new/ghc-tls.changes 2018-05-30 12:27:40.701500439 +0200
@@ -1,0 +2,39 @@
+Mon May 14 17:02:11 UTC 2018 - psimons(a)suse.com
+
+- Update tls to version 1.4.1.
+ - Enable X25519 in default parameters [#265](https://github.com/vincenthz/hs-tls/pull/265)
+ - Checking EOF in bye [#262] (https://github.com/vincenthz/hs-tls/pull/262)
+ - Improving validation in DH key exchange [#256](https://github.com/vincenthz/hs-tls/pull/256)
+ - Handle TCP reset during handshake [#251](https://github.com/vincenthz/hs-tls/pull/251)
+ - Accepting hlint suggestions.
+ - Wrap renegotiation failures with HandshakeFailed [#237](https://github.com/vincenthz/hs-tls/pull/237)
+ - Improve selection of server certificate and use "signature_algorithms" extension [#236](https://github.com/vincenthz/hs-tls/pull/236)
+ - Change Bytes to ByteString and deprecate the Bytes type alias [#230](https://github.com/vincenthz/hs-tls/pull/230)
+ - Session compression and SNI [#223](https://github.com/vincenthz/hs-tls/pull/223)
+ - Deprecating ciphersuite_medium. Putting WARNING to ciphersuite_all since this includes RC4 [#153](https://github.com/vincenthz/hs-tls/pull/153) [#222](https://github.com/vincenthz/hs-tls/pull/222)
+ - Removing NPN [#214](https://github.com/vincenthz/hs-tls/pull/214)
+ - Supporting RSAPSS defined in TLS 1.3 [#207](https://github.com/vincenthz/hs-tls/pull/207)
+ - Supporting X25519 and X448 in the IES style. [#205](https://github.com/vincenthz/hs-tls/pull/205)
+ - Strip leading zeros in DHE premaster secret [#201](https://github.com/vincenthz/hs-tls/pull/201)
+ - RSASSA-PSS signatures can be enabled with `supportedHashSignatures`. This
+ uses assignments from TLS 1.3, for example `(HashIntrinsic, SignatureRSApssSHA256)`.
+ - Diffie-Hellman with elliptic curves X25519 and X448: This can be enabled with
+ `supportedGroups`, which also gives control over curve preference.
+ - ECDH with curve P-256 now uses optimized C implementation from package `cryptonite`.
+
+ API CHANGES:
+
+ - Cipher list `ciphersuite_medium` is now deprecated, users are advised to use
+ `ciphersuite_default` or `ciphersuite_strong`. List `ciphersuite_all` is kept
+ for compatibility with old servers but this is discouraged and generates a
+ warning (this includes RC4 ciphers, see [#153](https://github.com/vincenthz/hs-tls/pull/153)
+ for reference).
+ - Support for NPN (Next Protocol Negotiation) has been removed. The replacement
+ is ALPN (Application-Layer Protocol Negotiation).
+ - Data type `SessionData` now contains fields for compression algorithm and
+ client SNI. A `SessionManager` implementation that serializes/deserializes
+ `SessionData` values must deal with the new fields.
+ - Module `Network.TLS` exports a type alias named `Bytes` which is now deprecated.
+ The replacement is to use strict `ByteString` directly.
+
+-------------------------------------------------------------------
Old:
----
tls-1.3.11.tar.gz
New:
----
tls-1.4.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-tls.spec ++++++
--- /var/tmp/diff_new_pack.0O6SAG/_old 2018-05-30 12:27:41.221482226 +0200
+++ /var/tmp/diff_new_pack.0O6SAG/_new 2018-05-30 12:27:41.225482086 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ghc-tls
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
%global pkg_name tls
%bcond_with tests
Name: ghc-%{pkg_name}
-Version: 1.3.11
+Version: 1.4.1
Release: 0
Summary: TLS/SSL protocol native implementation (Server and Client)
License: BSD-3-Clause
@@ -93,7 +93,7 @@
%ghc_pkg_recache
%files -f %{name}.files
-%doc LICENSE
+%license LICENSE
%files devel -f %{name}-devel.files
%doc CHANGELOG.md
++++++ tls-1.3.11.tar.gz -> tls-1.4.1.tar.gz ++++++
++++ 6332 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package ghc-time-locale-compat for openSUSE:Factory checked in at 2018-05-30 12:14:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-time-locale-compat (Old)
and /work/SRC/openSUSE:Factory/.ghc-time-locale-compat.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-time-locale-compat"
Wed May 30 12:14:47 2018 rev:6 rq:607908 version:0.1.1.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-time-locale-compat/ghc-time-locale-compat.changes 2017-09-15 22:19:22.316380719 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-time-locale-compat.new/ghc-time-locale-compat.changes 2018-05-30 12:27:39.617538392 +0200
@@ -1,0 +2,6 @@
+Mon May 14 17:02:11 UTC 2018 - psimons(a)suse.com
+
+- Update time-locale-compat to version 0.1.1.4.
+ Upstream does not provide a changelog.
+
+-------------------------------------------------------------------
Old:
----
time-locale-compat-0.1.1.3.tar.gz
New:
----
time-locale-compat-0.1.1.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-time-locale-compat.spec ++++++
--- /var/tmp/diff_new_pack.7ILVdM/_old 2018-05-30 12:27:40.509507162 +0200
+++ /var/tmp/diff_new_pack.7ILVdM/_new 2018-05-30 12:27:40.513507021 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ghc-time-locale-compat
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,9 +18,9 @@
%global pkg_name time-locale-compat
Name: ghc-%{pkg_name}
-Version: 0.1.1.3
+Version: 0.1.1.4
Release: 0
-Summary: Compatibility of TimeLocale between old-locale and time-1.5
+Summary: Compatibile module for time-format locale
License: BSD-3-Clause
Group: Development/Libraries/Haskell
URL: https://hackage.haskell.org/package/%{pkg_name}
@@ -31,7 +31,8 @@
BuildRequires: ghc-time-devel
%description
-This package contains wrapped name module for TimeLocale.
+This package contains wrapped name module for time-format locale between
+old-locale and time-1.5.
%package devel
Summary: Haskell %{pkg_name} library development files
@@ -61,7 +62,7 @@
%ghc_pkg_recache
%files -f %{name}.files
-%doc LICENSE
+%license LICENSE
%files devel -f %{name}-devel.files
++++++ time-locale-compat-0.1.1.3.tar.gz -> time-locale-compat-0.1.1.4.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/time-locale-compat-0.1.1.3/src/Data/Time/Locale/Compat.hs new/time-locale-compat-0.1.1.4/src/Data/Time/Locale/Compat.hs
--- old/time-locale-compat-0.1.1.3/src/Data/Time/Locale/Compat.hs 2016-06-24 02:41:44.000000000 +0200
+++ new/time-locale-compat-0.1.1.4/src/Data/Time/Locale/Compat.hs 2018-04-07 12:44:30.000000000 +0200
@@ -2,7 +2,7 @@
-- |
-- Module : Data.Time.Locale.Compat
--- Copyright : 2014 Kei Hibino
+-- Copyright : 2014-2018 Kei Hibino
-- License : BSD3
--
-- Maintainer : ex8k.hibino(a)gmail.com
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/time-locale-compat-0.1.1.3/time-locale-compat.cabal new/time-locale-compat-0.1.1.4/time-locale-compat.cabal
--- old/time-locale-compat-0.1.1.3/time-locale-compat.cabal 2016-06-24 02:41:44.000000000 +0200
+++ new/time-locale-compat-0.1.1.4/time-locale-compat.cabal 2018-04-07 12:44:30.000000000 +0200
@@ -1,17 +1,19 @@
name: time-locale-compat
-version: 0.1.1.3
-synopsis: Compatibility of TimeLocale between old-locale and time-1.5
-description: This package contains wrapped name module for TimeLocale.
+version: 0.1.1.4
+synopsis: Compatibile module for time-format locale
+description: This package contains wrapped name module for time-format locale between old-locale and time-1.5.
homepage: https://github.com/khibino/haskell-time-locale-compat
license: BSD3
license-file: LICENSE
author: Kei Hibino
maintainer: ex8k.hibino(a)gmail.com
-copyright: Copyright (c) 2014-2016 Kei Hibino
+copyright: Copyright (c) 2014-2018 Kei Hibino
category: System
build-type: Simple
cabal-version: >=1.10
-tested-with: GHC == 8.0.1
+tested-with: GHC == 8.4.1, GHC == 8.4.2
+ , GHC == 8.2.1, GHC == 8.2.2
+ , GHC == 8.0.1, GHC == 8.0.2
, GHC == 7.10.1, GHC == 7.10.2, GHC == 7.10.3
, GHC == 7.8.1, GHC == 7.8.2, GHC == 7.8.3, GHC == 7.8.4
, GHC == 7.6.1, GHC == 7.6.2, GHC == 7.6.3
1
0
Hello community,
here is the log from the commit of package ghc-th-utilities for openSUSE:Factory checked in at 2018-05-30 12:21:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-th-utilities (Old)
and /work/SRC/openSUSE:Factory/.ghc-th-utilities.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-th-utilities"
Wed May 30 12:21:08 2018 rev:3 rq:609826 version:0.2.0.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-th-utilities/ghc-th-utilities.changes 2017-09-15 22:18:54.432308446 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-th-utilities.new/ghc-th-utilities.changes 2018-05-30 12:27:38.805566812 +0200
@@ -1,0 +2,5 @@
+Wed May 16 14:36:29 UTC 2018 - psimons(a)suse.com
+
+- Prefer the new %license attribute over %doc.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-th-utilities.spec ++++++
--- /var/tmp/diff_new_pack.Rt0t6s/_old 2018-05-30 12:27:39.449544272 +0200
+++ /var/tmp/diff_new_pack.Rt0t6s/_new 2018-05-30 12:27:39.457543993 +0200
@@ -75,7 +75,7 @@
%ghc_pkg_recache
%files -f %{name}.files
-%doc LICENSE
+%license LICENSE
%files devel -f %{name}-devel.files
%doc ChangeLog.md README.md
1
0
Hello community,
here is the log from the commit of package ghc-th-reify-many for openSUSE:Factory checked in at 2018-05-30 12:14:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-th-reify-many (Old)
and /work/SRC/openSUSE:Factory/.ghc-th-reify-many.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-th-reify-many"
Wed May 30 12:14:44 2018 rev:4 rq:607906 version:0.1.8
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-th-reify-many/ghc-th-reify-many.changes 2017-07-05 23:59:50.072431943 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-th-reify-many.new/ghc-th-reify-many.changes 2018-05-30 12:27:37.593609213 +0200
@@ -1,0 +2,6 @@
+Mon May 14 17:02:11 UTC 2018 - psimons(a)suse.com
+
+- Update th-reify-many to version 0.1.8.
+ Upstream does not provide a changelog.
+
+-------------------------------------------------------------------
Old:
----
th-reify-many-0.1.7.tar.gz
New:
----
th-reify-many-0.1.8.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-th-reify-many.spec ++++++
--- /var/tmp/diff_new_pack.OHuqhd/_old 2018-05-30 12:27:38.609573670 +0200
+++ /var/tmp/diff_new_pack.OHuqhd/_new 2018-05-30 12:27:38.613573531 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ghc-th-reify-many
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,12 +19,12 @@
%global pkg_name th-reify-many
%bcond_with tests
Name: ghc-%{pkg_name}
-Version: 0.1.7
+Version: 0.1.8
Release: 0
Summary: Recurseively reify template haskell datatype info
License: BSD-3-Clause
-Group: Development/Languages/Other
-Url: https://hackage.haskell.org/package/%{pkg_name}
+Group: Development/Libraries/Haskell
+URL: https://hackage.haskell.org/package/%{pkg_name}
Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{ve…
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-containers-devel
@@ -33,7 +33,6 @@
BuildRequires: ghc-safe-devel
BuildRequires: ghc-template-haskell-devel
BuildRequires: ghc-th-expand-syns-devel
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
'th-reify-many' provides functions for recursively reifying top level
@@ -43,7 +42,7 @@
%package devel
Summary: Haskell %{pkg_name} library development files
-Group: Development/Libraries/Other
+Group: Development/Libraries/Haskell
Requires: %{name} = %{version}-%{release}
Requires: ghc-compiler = %{ghc_version}
Requires(post): ghc-compiler = %{ghc_version}
@@ -71,10 +70,8 @@
%ghc_pkg_recache
%files -f %{name}.files
-%defattr(-,root,root,-)
-%doc LICENSE
+%license LICENSE
%files devel -f %{name}-devel.files
-%defattr(-,root,root,-)
%changelog
++++++ th-reify-many-0.1.7.tar.gz -> th-reify-many-0.1.8.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/th-reify-many-0.1.7/src/Language/Haskell/TH/ReifyMany.hs new/th-reify-many-0.1.8/src/Language/Haskell/TH/ReifyMany.hs
--- old/th-reify-many-0.1.7/src/Language/Haskell/TH/ReifyMany.hs 2017-06-13 05:40:58.000000000 +0200
+++ new/th-reify-many-0.1.8/src/Language/Haskell/TH/ReifyMany.hs 2017-07-26 22:20:09.000000000 +0200
@@ -111,6 +111,9 @@
#if MIN_VERSION_template_haskell(2,7,0)
FamilyI{} -> skip "type or data family"
#endif
+#if MIN_VERSION_template_haskell(2,12,0)
+ PatSynI{} -> skip "pattern synonym"
+#endif
-- | Starting from a set of initial top level declarations, specified
-- by @[Name]@, recursively enumerate other related declarations. The
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/th-reify-many-0.1.7/th-reify-many.cabal new/th-reify-many-0.1.8/th-reify-many.cabal
--- old/th-reify-many-0.1.7/th-reify-many.cabal 2017-06-13 05:40:58.000000000 +0200
+++ new/th-reify-many-0.1.8/th-reify-many.cabal 2017-07-26 22:22:30.000000000 +0200
@@ -1,5 +1,5 @@
name: th-reify-many
-version: 0.1.7
+version: 0.1.8
synopsis: Recurseively reify template haskell datatype info
description: @th-reify-many@ provides functions for recursively reifying top
1
0
Hello community,
here is the log from the commit of package ghc-th-orphans for openSUSE:Factory checked in at 2018-05-30 12:14:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-th-orphans (Old)
and /work/SRC/openSUSE:Factory/.ghc-th-orphans.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-th-orphans"
Wed May 30 12:14:41 2018 rev:3 rq:607905 version:0.13.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-th-orphans/ghc-th-orphans.changes 2017-05-10 20:49:10.470218061 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-th-orphans.new/ghc-th-orphans.changes 2018-05-30 12:27:36.225657049 +0200
@@ -1,0 +2,7 @@
+Mon May 14 17:02:11 UTC 2018 - psimons(a)suse.com
+
+- Update th-orphans to version 0.13.5 revision 1.
+ * Implement `qAddCorePlugin` for `Quasi` instances
+ * Implement `qAddForeignFile` for `Quasi` instances
+
+-------------------------------------------------------------------
Old:
----
th-orphans-0.13.3.tar.gz
New:
----
th-orphans-0.13.5.tar.gz
th-orphans.cabal
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-th-orphans.spec ++++++
--- /var/tmp/diff_new_pack.vo9yqL/_old 2018-05-30 12:27:37.361617328 +0200
+++ /var/tmp/diff_new_pack.vo9yqL/_new 2018-05-30 12:27:37.361617328 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ghc-th-orphans
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,13 +19,14 @@
%global pkg_name th-orphans
%bcond_with tests
Name: ghc-%{pkg_name}
-Version: 0.13.3
+Version: 0.13.5
Release: 0
Summary: Orphan instances for TH datatypes
License: BSD-3-Clause
-Group: Development/Languages/Other
-Url: https://hackage.haskell.org/package/%{pkg_name}
+Group: Development/Libraries/Haskell
+URL: https://hackage.haskell.org/package/%{pkg_name}
Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{ve…
+Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal…
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-mtl-devel
BuildRequires: ghc-rpm-macros
@@ -33,7 +34,6 @@
BuildRequires: ghc-th-lift-devel
BuildRequires: ghc-th-lift-instances-devel
BuildRequires: ghc-th-reify-many-devel
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %{with tests}
BuildRequires: ghc-hspec-devel
%endif
@@ -45,7 +45,7 @@
%package devel
Summary: Haskell %{pkg_name} library development files
-Group: Development/Libraries/Other
+Group: Development/Libraries/Haskell
Requires: %{name} = %{version}-%{release}
Requires: ghc-compiler = %{ghc_version}
Requires(post): ghc-compiler = %{ghc_version}
@@ -56,6 +56,7 @@
%prep
%setup -q -n %{pkg_name}-%{version}
+cp -p %{SOURCE1} %{pkg_name}.cabal
%build
%ghc_lib_build
@@ -73,11 +74,9 @@
%ghc_pkg_recache
%files -f %{name}.files
-%defattr(-,root,root,-)
-%doc LICENSE
+%license LICENSE
%files devel -f %{name}-devel.files
-%defattr(-,root,root,-)
%doc CHANGELOG.md README.md
%changelog
++++++ th-orphans-0.13.3.tar.gz -> th-orphans-0.13.5.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/th-orphans-0.13.3/CHANGELOG.md new/th-orphans-0.13.5/CHANGELOG.md
--- old/th-orphans-0.13.3/CHANGELOG.md 2016-11-10 00:22:37.000000000 +0100
+++ new/th-orphans-0.13.5/CHANGELOG.md 2018-01-18 19:05:27.000000000 +0100
@@ -1,2 +1,8 @@
+### 0.13.5 [2018.01.18]
+* Implement `qAddCorePlugin` for `Quasi` instances
+
+### 0.13.4 [2017.07.26]
+* Implement `qAddForeignFile` for `Quasi` instances
+
### 0.13.3 [2016.11.09]
* Backport `Generic NameFlavour` instance
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/th-orphans-0.13.3/src/Language/Haskell/TH/Instances.hs new/th-orphans-0.13.5/src/Language/Haskell/TH/Instances.hs
--- old/th-orphans-0.13.3/src/Language/Haskell/TH/Instances.hs 2016-11-10 00:22:37.000000000 +0100
+++ new/th-orphans-0.13.5/src/Language/Haskell/TH/Instances.hs 2018-01-18 19:05:27.000000000 +0100
@@ -384,6 +384,12 @@
#elif MIN_VERSION_template_haskell(2,5,0)
qClassInstances a b = MTL.lift $ qClassInstances a b
#endif
+#if MIN_VERSION_template_haskell(2,12,0)
+ qAddForeignFile a b = MTL.lift $ qAddForeignFile a b
+#endif
+#if MIN_VERSION_template_haskell(2,13,0)
+ qAddCorePlugin = MTL.lift . qAddCorePlugin
+#endif
instance (Quasi m, Monoid w) => Quasi (WriterT w m) where
qNewName = MTL.lift . qNewName
@@ -414,6 +420,12 @@
#elif MIN_VERSION_template_haskell(2,5,0)
qClassInstances a b = MTL.lift $ qClassInstances a b
#endif
+#if MIN_VERSION_template_haskell(2,12,0)
+ qAddForeignFile a b = MTL.lift $ qAddForeignFile a b
+#endif
+#if MIN_VERSION_template_haskell(2,13,0)
+ qAddCorePlugin = MTL.lift . qAddCorePlugin
+#endif
instance Quasi m => Quasi (StateT s m) where
qNewName = MTL.lift . qNewName
@@ -444,6 +456,12 @@
#elif MIN_VERSION_template_haskell(2,5,0)
qClassInstances a b = MTL.lift $ qClassInstances a b
#endif
+#if MIN_VERSION_template_haskell(2,12,0)
+ qAddForeignFile a b = MTL.lift $ qAddForeignFile a b
+#endif
+#if MIN_VERSION_template_haskell(2,13,0)
+ qAddCorePlugin = MTL.lift . qAddCorePlugin
+#endif
instance (Quasi m, Monoid w) => Quasi (RWST r w s m) where
qNewName = MTL.lift . qNewName
@@ -474,6 +492,12 @@
#elif MIN_VERSION_template_haskell(2,5,0)
qClassInstances a b = MTL.lift $ qClassInstances a b
#endif
+#if MIN_VERSION_template_haskell(2,12,0)
+ qAddForeignFile a b = MTL.lift $ qAddForeignFile a b
+#endif
+#if MIN_VERSION_template_haskell(2,13,0)
+ qAddCorePlugin = MTL.lift . qAddCorePlugin
+#endif
#if MIN_VERSION_base(4,7,0) && defined(LANGUAGE_DeriveDataTypeable) && __GLASGOW_HASKELL__ < 710
deriving instance Typeable Lift
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/th-orphans-0.13.3/th-orphans.cabal new/th-orphans-0.13.5/th-orphans.cabal
--- old/th-orphans-0.13.3/th-orphans.cabal 2016-11-10 00:22:37.000000000 +0100
+++ new/th-orphans-0.13.5/th-orphans.cabal 2018-01-18 19:05:27.000000000 +0100
@@ -1,5 +1,5 @@
name: th-orphans
-version: 0.13.3
+version: 0.13.5
cabal-version: >= 1.10
build-type: Simple
license: BSD3
@@ -16,7 +16,9 @@
, GHC == 7.6.3
, GHC == 7.8.4
, GHC == 7.10.3
- , GHC == 8.0.1
+ , GHC == 8.0.2
+ , GHC == 8.2.2
+ , GHC == 8.4.1
synopsis: Orphan instances for TH datatypes
description: Orphan instances for TH datatypes. In particular, instances
for Ord and Lift, as well as a few missing Show / Eq. These
@@ -25,36 +27,37 @@
extra-source-files: CHANGELOG.md, README.md
library
- build-depends: base >= 4.3 && < 5,
- template-haskell,
- -- https://github.com/mboes/th-lift/issues/14
- th-lift >= 0.7.1,
- th-reify-many >= 0.1 && < 0.2,
- th-lift-instances,
- mtl
+ build-depends: base >= 4.3 && < 5,
+ template-haskell,
+ -- https://github.com/mboes/th-lift/issues/14
+ th-lift >= 0.7.1,
+ th-reify-many >= 0.1 && < 0.2,
+ th-lift-instances,
+ mtl
-- Use TH to derive Generics instances instead of DeriveGeneric, for < 7.10
if impl(ghc < 7.10)
- build-depends: generic-deriving >= 1.9
+ build-depends: generic-deriving >= 1.9
-- Prior to GHC 7.6, GHC generics lived in ghc-prim
if impl(ghc >= 7.2) && impl(ghc < 7.6)
- build-depends: ghc-prim
+ build-depends: ghc-prim
- hs-source-dirs: src
- ghc-options: -Wall
- exposed-modules: Language.Haskell.TH.Instances
- default-language: Haskell2010
+ hs-source-dirs: src
+ ghc-options: -Wall
+ exposed-modules: Language.Haskell.TH.Instances
+ default-language: Haskell2010
test-suite test
- type: exitcode-stdio-1.0
- hs-source-dirs: test
- main-is: Spec.hs
- build-depends: base,
- th-orphans,
- hspec,
- template-haskell
- default-language: Haskell2010
+ type: exitcode-stdio-1.0
+ hs-source-dirs: test
+ main-is: Spec.hs
+ build-depends: base,
+ th-orphans,
+ hspec,
+ template-haskell
+ build-tool-depends: hspec-discover:hspec-discover
+ default-language: Haskell2010
source-repository head
type: git
++++++ th-orphans.cabal ++++++
name: th-orphans
version: 0.13.5
x-revision: 1
cabal-version: >= 1.10
build-type: Simple
license: BSD3
license-file: LICENSE
category: Template Haskell
author: Matt Morrow
copyright: (c) Matt Morrow
maintainer: Michael Sloan <mgsloan at gmail>
bug-reports: https://github.com/mgsloan/th-orphans/issues
stability: experimental
tested-with: GHC == 7.0.4
, GHC == 7.2.2
, GHC == 7.4.2
, GHC == 7.6.3
, GHC == 7.8.4
, GHC == 7.10.3
, GHC == 8.0.2
, GHC == 8.2.2
, GHC == 8.4.1
synopsis: Orphan instances for TH datatypes
description: Orphan instances for TH datatypes. In particular, instances
for Ord and Lift, as well as a few missing Show / Eq. These
instances used to live in haskell-src-meta, and that's where
the version number started.
extra-source-files: CHANGELOG.md, README.md
library
build-depends: base >= 4.3 && < 5,
template-haskell < 2.14,
-- https://github.com/mboes/th-lift/issues/14
th-lift >= 0.7.1,
th-reify-many >= 0.1 && < 0.2,
th-lift-instances,
mtl
-- Use TH to derive Generics instances instead of DeriveGeneric, for < 7.10
if impl(ghc < 7.10)
build-depends: generic-deriving >= 1.9
-- Prior to GHC 7.6, GHC generics lived in ghc-prim
if impl(ghc >= 7.2) && impl(ghc < 7.6)
build-depends: ghc-prim
hs-source-dirs: src
ghc-options: -Wall
exposed-modules: Language.Haskell.TH.Instances
default-language: Haskell2010
test-suite test
type: exitcode-stdio-1.0
hs-source-dirs: test
main-is: Spec.hs
build-depends: base,
th-orphans,
hspec,
template-haskell
build-tool-depends: hspec-discover:hspec-discover
default-language: Haskell2010
source-repository head
type: git
location: https://github.com/mgsloan/th-orphans
1
0
Hello community,
here is the log from the commit of package ghc-th-lift-instances for openSUSE:Factory checked in at 2018-05-30 12:21:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-th-lift-instances (Old)
and /work/SRC/openSUSE:Factory/.ghc-th-lift-instances.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-th-lift-instances"
Wed May 30 12:21:02 2018 rev:4 rq:609825 version:0.1.11
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-th-lift-instances/ghc-th-lift-instances.changes 2017-09-15 22:18:48.381160809 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-th-lift-instances.new/ghc-th-lift-instances.changes 2018-05-30 12:27:35.089696752 +0200
@@ -1,0 +2,5 @@
+Wed May 16 14:36:29 UTC 2018 - psimons(a)suse.com
+
+- Prefer the new %license attribute over %doc.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-th-lift-instances.spec ++++++
--- /var/tmp/diff_new_pack.IZKVc8/_old 2018-05-30 12:27:36.089661803 +0200
+++ /var/tmp/diff_new_pack.IZKVc8/_new 2018-05-30 12:27:36.093661664 +0200
@@ -73,7 +73,7 @@
%ghc_pkg_recache
%files -f %{name}.files
-%doc LICENSE
+%license LICENSE
%files devel -f %{name}-devel.files
%doc README.md
1
0