summaryrefslogtreecommitdiffstats
path: root/src/pre.l
diff options
context:
space:
mode:
authormueller <mueller@afe2bf4a-e733-0410-8a33-86f594647bc7>1999-12-15 19:37:58 (GMT)
committermueller <mueller@afe2bf4a-e733-0410-8a33-86f594647bc7>1999-12-15 19:37:58 (GMT)
commit5576fbf6d0a8baa16fa65a37a172543397ee950a (patch)
treeb859924ab8503fed25bbfbc7ea96b72b9dee34b0 /src/pre.l
parentd4bdeb54df648007d9a2b4a9ec5c2ef3b84f1a3b (diff)
downloadDoxygen-5576fbf6d0a8baa16fa65a37a172543397ee950a.zip
Doxygen-5576fbf6d0a8baa16fa65a37a172543397ee950a.tar.gz
Doxygen-5576fbf6d0a8baa16fa65a37a172543397ee950a.tar.bz2
mods for doxygen-0.49-991106
Diffstat (limited to 'src/pre.l')
-rw-r--r--src/pre.l13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/pre.l b/src/pre.l
index f8b6c18..6fe9a42 100644
--- a/src/pre.l
+++ b/src/pre.l
@@ -32,14 +32,16 @@
#include <qstrlist.h>
#include <qdict.h>
#include <qregexp.h>
+#include <qfileinfo.h>
#include "constexp.h"
#include "define.h"
#include "doxygen.h"
#include "message.h"
#include "util.h"
+#include "defargs.h"
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) || defined(__BORLANDC__)
#define popen _popen
#define pclose _pclose
#endif
@@ -743,10 +745,13 @@ void addDefine()
FileDef *fd=findFileDef(&inputNameDict,yyFileName,ambig);
MemberDef *md=new MemberDef("#define",defName,defArgsStr,0,
Public,Normal,FALSE,FALSE,MemberDef::Define,0,0);
+ ArgumentList *argList = new ArgumentList;
+ stringToArgumentList(defArgsStr,argList);
+ md->setArgumentList(argList);
md->setDefFile(yyFileName);
md->setDefLine(yyLineNr);
md->setFileDef(fd);
- md->setDefinition("#define "+defName+defArgsStr);
+ md->setDefinition("#define "+defName);
MemberName *mn=functionNameDict[defName];
if (mn==0)
@@ -1301,7 +1306,7 @@ BN [ \t\r\n]
//printf("Error: define %s is defined more than once!\n",defName.data());
}
}
- outputChar('\n');
+ //outputChar('\n');
lastGuardName.resize(0);
BEGIN(Start);
}
@@ -1464,6 +1469,8 @@ BN [ \t\r\n]
<DefineText>\' { defText += *yytext;
BEGIN(SkipSingleQuote);
}
+<SkipDoubleQuote>"//" { defText += yytext; }
+<SkipDoubleQuote>"/*" { defText += yytext; }
<SkipDoubleQuote>\" {
defText += *yytext;
BEGIN(DefineText);