diff options
author | Dimitri van Heesch <dimitri@stack.nl> | 2006-10-29 18:39:28 (GMT) |
---|---|---|
committer | Dimitri van Heesch <dimitri@stack.nl> | 2006-10-29 18:39:28 (GMT) |
commit | 7e81d44c98dbbb1bb30d623be52ca76bbd880038 (patch) | |
tree | 6386fc01aea029071bdcabdf150991c7632b5fd3 /src/pre.l | |
parent | 5e24df52170c1b19d8ef628f4e657bc35a7f300b (diff) | |
download | Doxygen-7e81d44c98dbbb1bb30d623be52ca76bbd880038.zip Doxygen-7e81d44c98dbbb1bb30d623be52ca76bbd880038.tar.gz Doxygen-7e81d44c98dbbb1bb30d623be52ca76bbd880038.tar.bz2 |
Release-1.5.1
Diffstat (limited to 'src/pre.l')
-rw-r--r-- | src/pre.l | 18 |
1 files changed, 17 insertions, 1 deletions
@@ -1222,6 +1222,7 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'")) %x CopyString %x Include %x IncludeID +%x EndImport %x DefName %x DefineArg %x DefineText @@ -1700,7 +1701,22 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'")) <Include>[^\">\n]+[\">] { g_incName+=yytext; readIncludeFile(g_incName); - BEGIN(Start); + if (g_isImported) + { + BEGIN(EndImport); + } + else + { + BEGIN(Start); + } + } +<EndImport>[^\\]*/\n { + BEGIN(Start); + } +<EndImport>\\[\r]?"\n" { + outputChar('\n'); + } +<EndImport>. { } <DefName>{ID}/"(" { //printf("Define() `%s'\n",yytext); |