diff options
author | Dimitri van Heesch <dimitri@stack.nl> | 2002-12-24 19:52:54 (GMT) |
---|---|---|
committer | Dimitri van Heesch <dimitri@stack.nl> | 2002-12-24 19:52:54 (GMT) |
commit | 04dd14e8f14f65481ef7ed7a29e79a30c5fe301d (patch) | |
tree | 74b9c804cdbc689945d204f1c854e9bfa1ec5c01 /src/scanner.l | |
parent | 1a8ff6f0e75b0db2a4ff1f5eb63631c94085b01e (diff) | |
download | Doxygen-04dd14e8f14f65481ef7ed7a29e79a30c5fe301d.zip Doxygen-04dd14e8f14f65481ef7ed7a29e79a30c5fe301d.tar.gz Doxygen-04dd14e8f14f65481ef7ed7a29e79a30c5fe301d.tar.bz2 |
Release-1.3-rc2-20021224
Diffstat (limited to 'src/scanner.l')
-rw-r--r-- | src/scanner.l | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/scanner.l b/src/scanner.l index 9f6d9fb..c6b4eaf 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -851,11 +851,6 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'")) <FindMembers>{BN}{1,80} { lineCount(); } -<FindMembers>{B}*"package"{BN}+ { // Java package - lineCount(); - BEGIN(PackageName); - - } <PackageName>{ID}("."{ID})* { //current->name = yytext; //current->fileName = yyFileName; @@ -1284,6 +1279,11 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'")) else // insideJava BEGIN(JavaImport); } + else if (insideJava && strcmp(yytext,"package")==0) + { + lineCount(); + BEGIN(PackageName); + } else if (insideIDL && strcmp(yytext,"case")==0) { BEGIN(IDLUnionCase); @@ -1913,7 +1913,7 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'")) current = new Entry(*current); if (current->section==Entry::NAMESPACE_SEC || current->section==Entry::INTERFACE_SEC || - insideJava + insideJava || insidePHP ) { // namespaces and interfaces and java classes ends with a closing bracket without semicolon current->reset(); |