Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Camelon2003-09-12 19:11:22 +0000
committerJohn Camelon2003-09-12 19:11:22 +0000
commitedd344b8af2bf6fd232273a76e2200de9c3953ae (patch)
treec7290df6adbb3995eff8c9d9ea862732be4f8715 /core/org.eclipse.cdt.core/parser
parent277cbf5b6837b4743138029593651803e37092ff (diff)
downloadorg.eclipse.cdt-edd344b8af2bf6fd232273a76e2200de9c3953ae.tar.gz
org.eclipse.cdt-edd344b8af2bf6fd232273a76e2200de9c3953ae.tar.xz
org.eclipse.cdt-edd344b8af2bf6fd232273a76e2200de9c3953ae.zip
CORE
Fixed Bug 42985 : Search: Qualified function call is treated as a declaration Fixed Bug 40419 : parser fails on heavily templated expressions TESTS Created QuickParseASTTests::testBug42985(). Moved LokiFailures::testBug40419() to QuickParseASTTests. Deleted LokiFailures as it was empty.
Diffstat (limited to 'core/org.eclipse.cdt.core/parser')
-rw-r--r--core/org.eclipse.cdt.core/parser/ChangeLog4
-rw-r--r--core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Parser.java6
2 files changed, 9 insertions, 1 deletions
diff --git a/core/org.eclipse.cdt.core/parser/ChangeLog b/core/org.eclipse.cdt.core/parser/ChangeLog
index 8cc522b9171..81ff90c66c1 100644
--- a/core/org.eclipse.cdt.core/parser/ChangeLog
+++ b/core/org.eclipse.cdt.core/parser/ChangeLog
@@ -1,4 +1,8 @@
2003-09-12 John Camelon
+ Fixed Bug 42985 : Search: Qualified function call is treated as a declaration
+ Fixed Bug 40419 : parser fails on heavily templated expressions
+
+2003-09-12 John Camelon
Fixed Bug 43013 : IASTParameterDeclaration does not derive from IASTOffsetableNamedElement
2003-09-12 Andrew Niefer
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Parser.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Parser.java
index ea87052132a..42a352404f3 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Parser.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Parser.java
@@ -936,7 +936,10 @@ public class Parser implements IParser
{
IASTDeclaration declaration = (IASTDeclaration)i.next();
declaration.enterScope( requestor );
-
+
+ if ( !( declaration instanceof IASTScope ) )
+ throw backtrack;
+
handleFunctionBody((IASTScope)declaration,
sdw.isInline() );
((IASTOffsetableElement)declaration).setEndingOffset(
@@ -4450,6 +4453,7 @@ public class Parser implements IParser
throw backtrack;
}
case IToken.tIDENTIFIER :
+ case IToken.tCOLONCOLON :
ITokenDuple duple = name();
//TODO should be an ID Expression really
try

Back to the top