summaryrefslogtreecommitdiffstats
path: root/src/scanner.l
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2005-11-09 21:17:04 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2005-11-09 21:17:04 (GMT)
commit188f7573ef12588a405ee8eed8289dce1a6eed08 (patch)
tree1fb5abcbf32aeccbd67ec595f3d19833380001c6 /src/scanner.l
parent32557464b53467b2819e3fb820a7bbc459eb3e30 (diff)
downloadDoxygen-188f7573ef12588a405ee8eed8289dce1a6eed08.zip
Doxygen-188f7573ef12588a405ee8eed8289dce1a6eed08.tar.gz
Doxygen-188f7573ef12588a405ee8eed8289dce1a6eed08.tar.bz2
Release-1.4.5-20051109
Diffstat (limited to 'src/scanner.l')
-rw-r--r--src/scanner.l17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/scanner.l b/src/scanner.l
index 4f05a10..b69690c 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -213,6 +213,7 @@ static void initEntry()
// current->groups->append(new Grouping(*autoGroupStack.top()));
//}
initGroupInfo(current);
+ isTypedef=FALSE;
}
@@ -314,15 +315,13 @@ static bool nameIsOperator(QCString &name)
static void setContext()
{
QCString fileName = yyFileName;
- insideIDL = fileName.right(4)==".idl" || fileName.right(5)==".pidl" ||
- fileName.right(4)==".odl";
- insideJava = fileName.right(5)==".java" || fileName.right(3)==".as";
- insideCS = fileName.right(3)==".cs"; // for normal keywords add colon
- insideD = fileName.right(2)==".d"; // for normal keywords add colon
- insidePHP = fileName.right(4)==".php" || fileName.right(5)==".php4" ||
- fileName.right(4)==".inc" || fileName.right(6)==".phtml";
- insideObjC = fileName.right(2)==".m" || fileName.right(2)==".M" ||
- fileName.right(3)==".mm";
+ SrcLangExt langExt = getLanguageFromFileName(fileName);
+ insideIDL = langExt==SrcLangExt_IDL;
+ insideJava = langExt==SrcLangExt_Java;
+ insideCS = langExt==SrcLangExt_CSharp;
+ insideD = langExt==SrcLangExt_D;
+ insidePHP = langExt==SrcLangExt_PHP;
+ insideObjC = langExt==SrcLangExt_ObjC;
if ( insidePHP )
{
useOverrideCommands = TRUE;