From 86cf38bfef3d5e940e13a4b833c4040f5f4383d5 Mon Sep 17 00:00:00 2001
From: gwdwyy <wuyanyi09@gmail.com>
Date: Mon, 22 Jul 2013 13:06:19 +0800
Subject: [PATCH] add tools.cpp

---
 src/Segment.cpp            |  6 ++++++
 src/Trie.cpp               |  1 +
 src/Trie.h                 |  2 --
 src/cppcommon/Makefile     |  4 ++--
 src/cppcommon/encoding.cpp |  6 +++---
 src/cppcommon/encoding.h   |  7 ++++---
 src/tools.cpp              |  6 ++++++
 src/tools.h                | 13 +++++++++++++
 8 files changed, 35 insertions(+), 10 deletions(-)
 create mode 100644 src/tools.cpp
 create mode 100644 src/tools.h

diff --git a/src/Segment.cpp b/src/Segment.cpp
index 7836d9a..7e8f74b 100644
--- a/src/Segment.cpp
+++ b/src/Segment.cpp
@@ -181,8 +181,12 @@ using namespace CppJieba;
 
 int main()
 {
+	/*
+	cout<<__FILE__<<__LINE__<<endl;
 	Segment segment;
+	cout<<__FILE__<<__LINE__<<endl;
 	segment.init();
+	cout<<__FILE__<<__LINE__<<endl;
 	if(!segment.loadSegDict("../dicts/segdict.utf8.v2.1"))
 	{
 		cerr<<"1"<<endl;
@@ -195,12 +199,14 @@ int main()
 	while(getline(ifile, line))
 	{
 		res.clear();
+		cout<<__FILE__<<__LINE__<<endl;
 		segment.cutDAG(line, res);
 		PRINT_VECTOR(res);
 		getchar();
 	}
 
 	segment.dispose();
+	*/
 	return 0;
 }
 
diff --git a/src/Trie.cpp b/src/Trie.cpp
index 51149f6..a659f9f 100644
--- a/src/Trie.cpp
+++ b/src/Trie.cpp
@@ -398,6 +398,7 @@ namespace CppJieba
 using namespace CppJieba;
 int main()
 {
+	cout<<__FILE__<<__FILE__<<endl;
     Trie trie;
     trie.init();
 	trie.loadDict("../dicts/segdict.utf8.v2.1");
diff --git a/src/Trie.h b/src/Trie.h
index 23f940f..5d8a217 100644
--- a/src/Trie.h
+++ b/src/Trie.h
@@ -87,8 +87,6 @@ namespace CppJieba
 			bool _getInitFlag();
 
 		public:
-			//const TrieNodeInfo* find(const string& uniStr);
-			//const TrieNodeInfo* find(const ChUnicode* const chUniStr, size_t len);
 			const TrieNodeInfo* find(const string& str);
 			const TrieNodeInfo* findPrefix(const string& str);
 
diff --git a/src/cppcommon/Makefile b/src/cppcommon/Makefile
index af18990..7dafcc8 100644
--- a/src/cppcommon/Makefile
+++ b/src/cppcommon/Makefile
@@ -7,8 +7,8 @@ PACKOPT = rc
 SOURCES := $(wildcard *.cpp)
 OBJS := $(patsubst %.cpp,%.o,$(SOURCES))
 
-DOPACK = $(PACK) $(PACKOPT) $@ $?
-DOLINK = $(LINK) $(LINKOPT) -o $@ $?
+DOPACK = $(PACK) $(PACKOPT) $@ $^
+DOLINK = $(LINK) $(LINKOPT) -o $@ $^
 
 CMLIB = libcm.a
 
diff --git a/src/cppcommon/encoding.cpp b/src/cppcommon/encoding.cpp
index 467a117..b16045f 100644
--- a/src/cppcommon/encoding.cpp
+++ b/src/cppcommon/encoding.cpp
@@ -6,13 +6,13 @@
 
 namespace CPPCOMMON
 {
-	const string& UnicodeEncoding::UTF8ENC = "utf-8";
-	const string& UnicodeEncoding::GBKENC = "gbk";
 	
 	UnicodeEncoding::UnicodeEncoding(const string& enc)
 	{
+		
 		_encVec.push_back(UTF8ENC);
 		_encVec.push_back(GBKENC);
+		
 		if(!isInVec<string>(_encVec, enc))
 		{
 			//default
@@ -100,7 +100,7 @@ int main()
 	//}
 	ifile.close();
 	ifile.open("testdata/dict.gbk");
-	enc.setEncoding(UnicodeEncoding::GBKENC);
+	enc.setEncoding(GBKENC);
 	while(getline(ifile, line))
 	{
 		
diff --git a/src/cppcommon/encoding.h b/src/cppcommon/encoding.h
index 3503584..b2506e0 100644
--- a/src/cppcommon/encoding.h
+++ b/src/cppcommon/encoding.h
@@ -12,11 +12,12 @@
 namespace CPPCOMMON
 {
 	using namespace std;
+
+	const char* const  UTF8ENC = "utf-8";
+	const char* const  GBKENC = "gbk";
+
 	class UnicodeEncoding
 	{
-		public:
-			static const string& UTF8ENC;
-			static const string& GBKENC;
 		private:
 			string _encoding;
 			vector<string> _encVec;
diff --git a/src/tools.cpp b/src/tools.cpp
new file mode 100644
index 0000000..58d0415
--- /dev/null
+++ b/src/tools.cpp
@@ -0,0 +1,6 @@
+#include "tools.h"
+
+namespace CppJieba
+{
+	UnicodeEncoding gEncoding(UTF8ENC);
+}
diff --git a/src/tools.h b/src/tools.h
new file mode 100644
index 0000000..5114197
--- /dev/null
+++ b/src/tools.h
@@ -0,0 +1,13 @@
+#ifndef CPPJIEBA_TOOLS_H
+#define CPPJIEBA_TOOLS_H
+
+#include "cppcommon/encoding.h"
+
+namespace CppJieba
+{
+	using namespace CPPCOMMON;
+	//global singleton encoding class.
+	extern UnicodeEncoding gEncoding; 
+}
+
+#endif