tokenizer debug code is disabled by default

Change #ifdef DEBUG to #ifdef DEBUG_TOKENIZER, to assist with profiling using callgrind.
wesnoth · Jun 13, 2014 · d7c2675 · d7c2675
1 parent d2fe8d1
commit d7c2675
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/serialization/parser.cpp b/src/serialization/parser.cpp
@@ -382,7 +382,7 @@ void parser::error(const std::string& error_type, const std::string& pos_format)
 	std::stringstream ss;
 	ss << tok_.get_start_line() << " " << tok_.get_file();
 
-#ifdef DEBUG
+#ifdef DEBUG_TOKENIZER
 	i18n_symbols["value"] = tok_.current_token().value;
 	i18n_symbols["previous_value"] = tok_.previous_token().value;
 

diff --git a/src/serialization/tokenizer.cpp b/src/serialization/tokenizer.cpp
@@ -54,7 +54,7 @@ tokenizer::~tokenizer()
 
 const token &tokenizer::next_token()
 {
-#if DEBUG
+#if DEBUG_TOKENIZER
 	previous_token_ = token_;
 #endif
 	token_.value.clear();

diff --git a/src/serialization/tokenizer.hpp b/src/serialization/tokenizer.hpp
@@ -16,6 +16,8 @@
 #ifndef TOKENIZER_H_INCLUDED
 #define TOKENIZER_H_INCLUDED
 
+//#define DEBUG_TOKENIZER
+
 #include "buffered_istream.hpp"
 
 #include <istream>
@@ -66,7 +68,7 @@ class tokenizer
 		return token_;
 	}
 
-#ifdef DEBUG
+#ifdef DEBUG_TOKENIZER
 	const token &previous_token() const
 	{
 		return previous_token_;
@@ -169,7 +171,7 @@ class tokenizer
 	std::string textdomain_;
 	std::string file_;
 	token token_;
-#ifdef DEBUG
+#ifdef DEBUG_TOKENIZER
 	token previous_token_;
 #endif
 	buffered_istream in_;