libclucene: Fix -Wc++11-narrowing.

5 files changed, 73 insertions, 1 deletions

diff --git a/textproc/libclucene/distinfo b/textproc/libclucene/distinfo
index 5be04fbd855..d5c5cee1121 100644
--- a/textproc/libclucene/distinfo
+++ b/textproc/libclucene/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2015/11/04 01:59:38 agc Exp $
+$NetBSD: distinfo,v 1.9 2018/01/26 15:27:04 jperkin Exp $
 
 SHA1 (clucene-core-2.3.3.4.tar.gz) = 76d6788e747e78abb5abf8eaad78d3342da5f2a4
 RMD160 (clucene-core-2.3.3.4.tar.gz) = 5acfc9c8acd167b3684cfc731a60fd9c5465cc9b
@@ -6,5 +6,9 @@ SHA512 (clucene-core-2.3.3.4.tar.gz) = 1c9da9077edcebd46563bd9e47d330518e0b30061
 Size (clucene-core-2.3.3.4.tar.gz) = 2241498 bytes
 SHA1 (patch-CMakeLists.txt) = 1c127bdc90a9f7b3c0f3debe46a9681f3b85df9a
 SHA1 (patch-src_contribs-lib_CMakeLists.txt) = c4cf7505474368a7a7b4b826c5d0a7df1cbc2a63
+SHA1 (patch-src_core_CLucene_queryParser_QueryParser.cpp) = 32dc9691fce2c5dfc086d897feb9ee4b7cb381d8
+SHA1 (patch-src_core_CLucene_queryParser_QueryParser.h) = 28457f254ee1aa63362482d43c0f1868fb846eb1
+SHA1 (patch-src_core_CLucene_queryParser_QueryParserTokenManager.cpp) = 0ee63584fc8b60b20ec2275d4f68f0909793df5d
+SHA1 (patch-src_core_CLucene_queryParser_QueryParserTokenManager.h) = 6934ad5e1052850b2aed50d91260bd46801e6274
 SHA1 (patch-src_shared_CLucene_LuceneThreads.h) = a08f4ccc70150510650ba82c64b1dff8495b1f10
 SHA1 (patch-src_shared_CLucene_config_repl__tchar.h) = 465537d5ee226d9831df2da8d87f3dbc5e364d5f
diff --git a/textproc/libclucene/patches/patch-src_core_CLucene_queryParser_QueryParser.cpp b/textproc/libclucene/patches/patch-src_core_CLucene_queryParser_QueryParser.cpp
new file mode 100644
index 00000000000..48f59b61314
--- /dev/null
+++ b/textproc/libclucene/patches/patch-src_core_CLucene_queryParser_QueryParser.cpp
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_core_CLucene_queryParser_QueryParser.cpp,v 1.1 2018/01/26 15:27:04 jperkin Exp $
+
+Fix -Wc++11-narrowing.
+
+--- src/core/CLucene/queryParser/QueryParser.cpp.orig	2011-03-17 00:21:07.000000000 +0000
++++ src/core/CLucene/queryParser/QueryParser.cpp
+@@ -79,8 +79,8 @@ const TCHAR* QueryParserConstants::token
+     _T("<RANGEEX_GOOP>")
+ };
+ 
+-const int32_t QueryParser::jj_la1_0[] = {0x180,0x180,0xe00,0xe00,0x1f69f80,0x48000,0x10000,0x1f69000,0x1348000,0x80000,0x80000,0x10000,0x18000000,0x2000000,0x18000000,0x10000,0x80000000,0x20000000,0x80000000,0x10000,0x80000,0x10000,0x1f68000};
+-const int32_t QueryParser::jj_la1_1[] = {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1,0x0,0x0,0x0,0x0};
++const uint32_t QueryParser::jj_la1_0[] = {0x180,0x180,0xe00,0xe00,0x1f69f80,0x48000,0x10000,0x1f69000,0x1348000,0x80000,0x80000,0x10000,0x18000000,0x2000000,0x18000000,0x10000,0x80000000,0x20000000,0x80000000,0x10000,0x80000,0x10000,0x1f68000};
++const uint32_t QueryParser::jj_la1_1[] = {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1,0x0,0x0,0x0,0x0};
+ 
+ struct QueryParser::JJCalls {
+ public:
diff --git a/textproc/libclucene/patches/patch-src_core_CLucene_queryParser_QueryParser.h b/textproc/libclucene/patches/patch-src_core_CLucene_queryParser_QueryParser.h
new file mode 100644
index 00000000000..7d782ad5d0c
--- /dev/null
+++ b/textproc/libclucene/patches/patch-src_core_CLucene_queryParser_QueryParser.h
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_core_CLucene_queryParser_QueryParser.h,v 1.1 2018/01/26 15:27:04 jperkin Exp $
+
+Fix -Wc++11-narrowing.
+
+--- src/core/CLucene/queryParser/QueryParser.h.orig	2011-03-17 00:21:07.000000000 +0000
++++ src/core/CLucene/queryParser/QueryParser.h
+@@ -477,8 +477,8 @@ private:
+   bool jj_semLA;
+   int32_t jj_gen;
+   int32_t jj_la1[23];
+-  static const int32_t jj_la1_0[];
+-  static const int32_t jj_la1_1[];
++  static const uint32_t jj_la1_0[];
++  static const uint32_t jj_la1_1[];
+   JJCalls* jj_2_rtns;
+   bool jj_rescan;
+   int32_t jj_gc;
diff --git a/textproc/libclucene/patches/patch-src_core_CLucene_queryParser_QueryParserTokenManager.cpp b/textproc/libclucene/patches/patch-src_core_CLucene_queryParser_QueryParserTokenManager.cpp
new file mode 100644
index 00000000000..36da046fabe
--- /dev/null
+++ b/textproc/libclucene/patches/patch-src_core_CLucene_queryParser_QueryParserTokenManager.cpp
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_core_CLucene_queryParser_QueryParserTokenManager.cpp,v 1.1 2018/01/26 15:27:04 jperkin Exp $
+
+Fix -Wc++11-narrowing.
+
+--- src/core/CLucene/queryParser/QueryParserTokenManager.cpp.orig	2011-03-17 00:21:07.000000000 +0000
++++ src/core/CLucene/queryParser/QueryParserTokenManager.cpp
+@@ -15,8 +15,8 @@
+ 
+ CL_NS_DEF(queryParser)
+ 
+-const int64_t QueryParserTokenManager::jjbitVec2[]={0x0L, 0x0L, _ILONGLONG(0xffffffffffffffff), _ILONGLONG(0xffffffffffffffff)};
+-const int64_t QueryParserTokenManager::jjbitVec0[] = {
++const uint64_t QueryParserTokenManager::jjbitVec2[]={0x0L, 0x0L, _ILONGLONG(0xffffffffffffffff), _ILONGLONG(0xffffffffffffffff)};
++const uint64_t QueryParserTokenManager::jjbitVec0[] = {
+ 	_ILONGLONG(0xfffffffffffffffe), _ILONGLONG(0xffffffffffffffff), _ILONGLONG(0xffffffffffffffff), _ILONGLONG(0xffffffffffffffff)
+ };
+ const int32_t QueryParserTokenManager::jjnextStates[]={
diff --git a/textproc/libclucene/patches/patch-src_core_CLucene_queryParser_QueryParserTokenManager.h b/textproc/libclucene/patches/patch-src_core_CLucene_queryParser_QueryParserTokenManager.h
new file mode 100644
index 00000000000..9307c42cc75
--- /dev/null
+++ b/textproc/libclucene/patches/patch-src_core_CLucene_queryParser_QueryParserTokenManager.h
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_core_CLucene_queryParser_QueryParserTokenManager.h,v 1.1 2018/01/26 15:27:04 jperkin Exp $
+
+Fix -Wc++11-narrowing.
+
+--- src/core/CLucene/queryParser/QueryParserTokenManager.h.orig	2011-03-17 00:21:07.000000000 +0000
++++ src/core/CLucene/queryParser/QueryParserTokenManager.h
+@@ -35,8 +35,8 @@ private:
+ 	void jjCheckNAddStates(int32_t start, const int32_t end);
+ 	void jjCheckNAddStates(const int32_t start);
+ 
+-	static const int64_t jjbitVec0[];
+-	static const int64_t jjbitVec2[];
++	static const uint64_t jjbitVec0[];
++	static const uint64_t jjbitVec2[];
+ 
+ 	int32_t jjMoveNfa_3(const int32_t startState, int32_t curPos);
+