Keep file name with Lexicon.

libwccl/lexicon/lexfilegrammar.g

@@ -53,10 +53,10 @@ private:
 ///////////////////////////////////////////////////////////////////////////////
 
 parse_lexicon_file
-	[const std::string& name]
+	[const std::string& name, const std::string& file_name]
 	returns [boost::shared_ptr<Lexicon> lex]
 {
-	lex.reset(new Lexicon(name));
+	lex.reset(new Lexicon(name, file_name));
 }
 	: (lexicon_entry [*lex])*
 	  EOF

libwccl/lexicon/lexicon.h

@@ -14,8 +14,9 @@ class Lexicon : boost::noncopyable
 public: 
 	typedef boost::unordered_map<UnicodeString, UnicodeString> map_t;
 
-	Lexicon(const std::string& name)
-		: name_(name)
+	Lexicon(const std::string& name, const std::string& file_name)
+		: name_(name),
+		  file_name_(file_name_)
 	{
 		BOOST_ASSERT(!name_.empty());
 	}
@@ -40,6 +41,10 @@ public:
 		return name_;
 	}
 
+	std::string file_name() const {
+		return file_name_;
+	}
+
 	bool has_key(const UnicodeString& key) const {
 		return map_.find(key) != map_.end();
 	}
@@ -55,6 +60,7 @@ public:
 private:
 	map_t map_;
 	const std::string name_;
+	const std::string file_name_;
 };
 
 } /* end ns Wccl */

libwccl/lexicon/lexiconparser.cpp

@@ -22,7 +22,7 @@ boost::shared_ptr<Lexicon> LexiconParser::parse_lexicon(
 
 	ANTLRLexiconLexer lexer(is);
 	ANTLRLexiconParser parser(lexer);
-	return parser.parse_lexicon_file(lexicon_name);
+	return parser.parse_lexicon_file(lexicon_name, filename);
 }
 
 } /* end ns Wccl */

libwccl/lexicon/lexicons.h

@@ -26,6 +26,10 @@ public:
 
 	void insert(const boost::shared_ptr<Lexicon>& lexicon);
 
+	const map_t& get_lexicons() const {
+		return lexicons_;
+	}
+
 private:
 	map_t lexicons_;
 };