From 5eaf49ad7feec1f2043ecb1b90c04c534ce29f46 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Thu, 14 Jan 2010 15:52:18 +0000
Subject: Allos the | character in define values.

---
 tools/mhmake/src/mhmakelexer.l | 6 +++---
 tools/mhmake/src/util.h        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'tools')

diff --git a/tools/mhmake/src/mhmakelexer.l b/tools/mhmake/src/mhmakelexer.l
index 00c9c3f9b..56b1dbc94 100644
--- a/tools/mhmake/src/mhmakelexer.l
+++ b/tools/mhmake/src/mhmakelexer.l
@@ -583,7 +583,7 @@ export {
 }
 
  /*---------------------------------------------------------------------------*/
-([a-zA-Z0-9\\\._\~\-\+%\@<&;/\*]|\\\ |\\#)+\\[ \t\r]*\n  {
+([a-zA-Z0-9\\\._\~\-\+%\@<&;/\*\|]|\\\ |\\#)+\\[ \t\r]*\n  {
   size_t EndIndex=::strlen((const char*)yytext);
   while (strchr(" \t\r\n\\",yytext[--EndIndex]));
   yyless(EndIndex+1);
@@ -593,7 +593,7 @@ export {
   return mhmakeparser::STRING;
 }
 
-([a-zA-Z0-9\\\._\~\-\+%\@<&;/\*]|\\\ |\\#)+\+=  {
+([a-zA-Z0-9\\\._\~\-\+%\@<&;/\*\|]|\\\ |\\#)+\+=  {
   size_t Len;
   PRINTF(("%s %d: STRING: %s\n",m_InputFileName.c_str(),m_Line,yytext));
   Len=strlen((const char *)yytext)-2;
@@ -602,7 +602,7 @@ export {
   return mhmakeparser::STRING;
 }
 
-([a-zA-Z0-9\\\._\~\-\+%\@<&;/\*]|\\\ |\\#)+  {
+([a-zA-Z0-9\\\._\~\-\+%\@<&;/\*\|]|\\\ |\\#)+  {
   PRINTF(("%s %d: STRING: %s\n",m_InputFileName.c_str(),m_Line,yytext));
   theValue.theString=(const char *)yytext;
   return mhmakeparser::STRING;
diff --git a/tools/mhmake/src/util.h b/tools/mhmake/src/util.h
index 25db10e48..23f26e0ad 100644
--- a/tools/mhmake/src/util.h
+++ b/tools/mhmake/src/util.h
@@ -50,7 +50,7 @@
 #define PLATFORM     "linux"
 #endif
 
-#define MHMAKEVER    "1.4.10"
+#define MHMAKEVER    "1.4.11"
 
 string SearchCommand(const string &Command, const string &Extension="");
 
-- 
cgit v1.2.3