From 1d609175757f758988c3322380a6270f58a65c37 Mon Sep 17 00:00:00 2001
From: Edouard DUPIN <yui.heero@gmail.com>
Date: Wed, 30 Jul 2014 23:24:26 +0200
Subject: [PATCH] [DEBUG] correct C regExp

---
 data/languages/c/highlight.xml    | 10 ++++------
 sources/appl/Highlight.cpp        | 10 +++++++---
 sources/appl/HighlightPattern.cpp |  3 +++
 sources/appl/HighlightPattern.h   |  1 +
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/data/languages/c/highlight.xml b/data/languages/c/highlight.xml
index 68bcaa5..ac5f85f 100644
--- a/data/languages/c/highlight.xml
+++ b/data/languages/c/highlight.xml
@@ -25,7 +25,7 @@
 		</rule>
 		<rule name="my preprocesseur">
 			<color>preprocesseur</color>
-			<regex>#(\\|\\n|.)*$</regex>
+			<regex>#(\\[\\\n]|.)*$</regex>
 		</rule>
 		<rule name="my comment doxygen">
 			<color>commentDoxygen</color>
@@ -37,19 +37,18 @@
 		</rule>
 		<rule name="my comment">
 			<color>comment</color>
-			<regex>//(\\|\\n|.)*$</regex>
+			<regex>//.*$</regex>
 		</rule>
 		<rule name="doubleQuteText">
 			<color>doubleQuoteText</color>
-			<regex>"(\\|"|.)*"</regex>
+			<regex>"(\\[\\"]|.)*"</regex>
 		</rule>
 		<rule name="simpleQuteText">
 			<color>doubleQuoteText</color>
-			<regex>'(\\|'|.)*'</regex>
+			<regex>'(\\[\\'])|.)*'</regex>
 		</rule>
 	</pass1>
 	<pass2> <!-- Parse on display data ==> nor regenerate every display but every time modification apear -->
-		<!--
 		<rule name="my keyword">
 			<color>keyword</color>
 			<regex>\@return|goto|if|else|case|default|switch|break|continue|while|do|for|sizeof\@</regex>
@@ -102,7 +101,6 @@
 			<color>boolean</color>
 			<regex>==|&lt;=|&gt;=|!=|&lt;{1,2}|&gt;{1,2}|&amp;&amp;|\{|\}|</regex>
 		</rule>
-		-->
 		<!-- With all elementes : 
 		<rule name="BIG LETTER">
 			<color>macro</color>
diff --git a/sources/appl/Highlight.cpp b/sources/appl/Highlight.cpp
index e825f78..5eb199d 100644
--- a/sources/appl/Highlight.cpp
+++ b/sources/appl/Highlight.cpp
@@ -177,7 +177,7 @@ void appl::Highlight::parse(int64_t _start,
 		//try to fond the HL in ALL of we have
 		for (int64_t jjj=0; jjj<(int64_t)m_listHighlightPass1.size(); jjj++){
 			enum resultFind ret = HLP_FIND_OK;
-			HL_DEBUG("Parse HL id=" << jjj << " position search: (" << elementStart << "," << _stop << ")" );
+			HL_DEBUG("Parse HL id=" << jjj << " position search: (" << elementStart << "," << _stop << ") input start='" << _buffer[elementStart] << "' " << m_listHighlightPass1[jjj]->getPaternString());
 			// Stop the search to the end (to get the end of the pattern)
 			ret = m_listHighlightPass1[jjj]->find(elementStart, _buffer.size(), resultat, _buffer);
 			if (HLP_FIND_ERROR != ret) {
@@ -234,15 +234,19 @@ void appl::Highlight::parse2(int64_t _start,
 	appl::HighlightInfo resultat;
 	
 	while (elementStart < elementStop) {
+		if (elementStart == 306) {
+			//etk::log::setLevel(etk::log::logLevelVerbose);
+		}
 		//HL2_DEBUG("Parse element in the buffer pos=" << elementStart << "," << _buffer.size() << ")" );
 		//try to fond the HL in ALL of we have
 		for (int64_t jjj=0; jjj<(int64_t)m_listHighlightPass2.size(); jjj++){
 			enum resultFind ret = HLP_FIND_OK;
 			HL2_DEBUG("Parse HL id=" << jjj << " position search: (" <<
-			          _start << "," << _buffer.size() << ")" );
+			          elementStart << "," << elementStop << ") in='"
+			          << _buffer[elementStart] << "' " << m_listHighlightPass2[jjj]->getPaternString());
 			// Stop the search to the end (to get the end of the pattern)
 			ret = m_listHighlightPass2[jjj]->find(elementStart, elementStop, resultat, _buffer);
-			if (HLP_FIND_ERROR != ret) {
+			if (ret != HLP_FIND_ERROR) {
 				HL2_DEBUG("Find Pattern in the Buffer : (" << resultat.start << "," << resultat.stop << ")" );
 				// add curent element in the list ...
 				_metaData.push_back(resultat);
diff --git a/sources/appl/HighlightPattern.cpp b/sources/appl/HighlightPattern.cpp
index ef64aad..f151b8f 100644
--- a/sources/appl/HighlightPattern.cpp
+++ b/sources/appl/HighlightPattern.cpp
@@ -32,6 +32,9 @@ void appl::HighlightPattern::setPatern(std::string& _regExp) {
 	}
 	m_regExp->compile(_regExp);
 }
+std::string appl::HighlightPattern::getPaternString() {
+	return m_regExp->getRegExDecorated();
+}
 
 void appl::HighlightPattern::setColorGlyph(std::string& _colorName) {
 	m_colorName = _colorName;
diff --git a/sources/appl/HighlightPattern.h b/sources/appl/HighlightPattern.h
index fd260d4..6e49263 100644
--- a/sources/appl/HighlightPattern.h
+++ b/sources/appl/HighlightPattern.h
@@ -47,6 +47,7 @@ namespace appl {
 			std::unique_ptr<etk::RegExp<etk::Buffer>> m_regExp; //!< Start of Regular expression
 		public:
 			void setPatern(std::string& _regExp);
+			std::string getPaternString();
 		private:
 			std::string m_colorName; //!< Current color name
 			int32_t m_colorId; //!< Id of the the glyph painting