summaryrefslogtreecommitdiffstats
path: root/src/scanner.l
diff options
context:
space:
mode:
authordimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2002-12-24 19:52:54 (GMT)
committerdimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2002-12-24 19:52:54 (GMT)
commit76462e46e09cf3ed528e5d272562adadb05c8e08 (patch)
tree74b9c804cdbc689945d204f1c854e9bfa1ec5c01 /src/scanner.l
parentfb864720e5a808a6e9052b2cc5a1a942cb7665ab (diff)
downloadDoxygen-76462e46e09cf3ed528e5d272562adadb05c8e08.zip
Doxygen-76462e46e09cf3ed528e5d272562adadb05c8e08.tar.gz
Doxygen-76462e46e09cf3ed528e5d272562adadb05c8e08.tar.bz2
Release-1.3-rc2-20021224
Diffstat (limited to 'src/scanner.l')
-rw-r--r--src/scanner.l12
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();