diff options
| author | marha <marha@users.sourceforge.net> | 2010-02-28 15:22:08 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-02-28 15:22:08 +0000 |
| commit | 61b8b4249d504d00ad88444e49dfb835737e7ed9 (patch) | |
| tree | 51eb82a3dbb52aea53f2fba574426a7fb04fa5d6 | |
| parent | 56389060042079a1d526e98c54a7f54b1a4853f7 (diff) | |
| download | vcxsrv-61b8b4249d504d00ad88444e49dfb835737e7ed9.tar.gz vcxsrv-61b8b4249d504d00ad88444e49dfb835737e7ed9.tar.bz2 vcxsrv-61b8b4249d504d00ad88444e49dfb835737e7ed9.zip | |
Solved problem of some tabs that were not parsed as white space
| -rw-r--r-- | tools/mhmake/src/mhmakelexer.l | 18 | ||||
| -rw-r--r-- | tools/mhmake/src/util.h | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/tools/mhmake/src/mhmakelexer.l b/tools/mhmake/src/mhmakelexer.l index 56b1dbc94..5e73dd812 100644 --- a/tools/mhmake/src/mhmakelexer.l +++ b/tools/mhmake/src/mhmakelexer.l @@ -202,27 +202,27 @@ load_makefile { }
/*---------------------------------------------------------------------------*/
-[\ \t]+ {
+[ \t]+ {
PRINTF(("%s %d: SPACE:\n",m_InputFileName.c_str(),m_Line));
return mhmakeparser::SPACE;
}
/*---------------------------------------------------------------------------*/
-[\ t]*=[ \t]*\\[ \t\r]*\n[ \t]* {
+[ \t]*=[ \t]*\\[ \t\r]*\n[ \t]* {
PRINTF(("%s %d: EQUAL: %s\n",m_InputFileName.c_str(),m_Line,yytext));
m_Line++;
theValue.theString=(const char *)yytext;
return mhmakeparser::EQUAL;
}
-[\ t]*=[ \t]* {
+[ \t]*=[ \t]* {
PRINTF(("%s %d: EQUAL: %s\n",m_InputFileName.c_str(),m_Line,yytext));
theValue.theString=(const char *)yytext;
return mhmakeparser::EQUAL;
}
/*---------------------------------------------------------------------------*/
-[\ t]*:=[ \t]*\\[ \t\r]*\n[ \t]* {
+[ \t]*:=[ \t]*\\[ \t\r]*\n[ \t]* {
m_Line++;
PRINTF(("%s %d: IMEQUAL: %s\n",m_InputFileName.c_str(),m_Line,yytext));
return mhmakeparser::IMEQUAL;
@@ -234,7 +234,7 @@ load_makefile { }
/*---------------------------------------------------------------------------*/
-[\ t]*\?=[ \t]*\\[ \t\r]*\n[ \t]* {
+[ \t]*\?=[ \t]*\\[ \t\r]*\n[ \t]* {
m_Line++;
PRINTF(("%s %d: IMEQUAL: %s\n",m_InputFileName.c_str(),m_Line,yytext));
return mhmakeparser::OPTEQUAL;
@@ -246,7 +246,7 @@ load_makefile { }
/*---------------------------------------------------------------------------*/
-[\ t]*\+=[ \t]*\\[ \t\r]*\n[ \t]* {
+[ \t]*\+=[ \t]*\\[ \t\r]*\n[ \t]* {
PRINTF(("%s %d: PEQUAL: %s\n",m_InputFileName.c_str(),m_Line,yytext));
m_Line++;
return mhmakeparser::PEQUAL;
@@ -258,7 +258,7 @@ load_makefile { }
/*---------------------------------------------------------------------------*/
-[\ t]*;[ \t]*\\[ \t\r]*\n[ \t]* {
+[ \t]*;[ \t]*\\[ \t\r]*\n[ \t]* {
PRINTF(("%s %d: -SEMICOLON (NEWLINE): %s\n",m_InputFileName.c_str(),m_Line,yytext));
m_curtoken=g_EmptyString;
m_Line++;
@@ -274,7 +274,7 @@ load_makefile { }
/*---------------------------------------------------------------------------*/
-[\ t]*::[ \t]*\\[ \t\r]*\n[ \t]* {
+[ \t]*::[ \t]*\\[ \t\r]*\n[ \t]* {
PRINTF(("%s %d: DOUBLECOLON: %s\n",m_InputFileName.c_str(),m_Line,yytext));
m_Line++;
theValue.theString=(const char *)yytext;
@@ -288,7 +288,7 @@ load_makefile { }
/*---------------------------------------------------------------------------*/
-[\ t]*:[ \t]*\\[ \t\r]*\n[ \t]* {
+[ \t]*:[ \t]*\\[ \t\r]*\n[ \t]* {
PRINTF(("%s %d: COLON: %s\n",m_InputFileName.c_str(),m_Line,yytext));
m_Line++;
theValue.theString=(const char *)yytext;
diff --git a/tools/mhmake/src/util.h b/tools/mhmake/src/util.h index 9deb700c7..fc39f9e84 100644 --- a/tools/mhmake/src/util.h +++ b/tools/mhmake/src/util.h @@ -50,7 +50,7 @@ #define PLATFORM "linux"
#endif
-#define MHMAKEVER "2.0.2"
+#define MHMAKEVER "2.0.3"
class makecommand
{
|