[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
[cdt-patch] Applied [HEAD] Parser partial fixes
|
CORE
Continued work on Bug 43062 : Outline is confused on operator
methods containing spaces
Partial fix for Bug 43680 : Fix Parser Error Handling
TEST
Added testErrorHandling_1() to CompleteParseASTTest.java.
JohnC
Index: parser/ChangeLog
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/ChangeLog,v
retrieving revision 1.140
diff -u -r1.140 ChangeLog
--- parser/ChangeLog 26 Sep 2003 19:21:12 -0000 1.140
+++ parser/ChangeLog 29 Sep 2003 19:17:37 -0000
@@ -1,3 +1,7 @@
+2003-09-29 John Camelon
+ Continued work on Bug 43062 : Outline is confused on operator methods containing spaces
+ Partial fix for Bug 43680 : Fix Parser Error Handling
+
2003-09-26 John Camelon
Fixed Bug 43644 : 6 triangle icons appearing in outline viewer when typing an error
Fixed Bug 43062 : Outline is confused on operator methods containing spaces
Index: parser/org/eclipse/cdt/core/parser/IParser.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/IParser.java,v
retrieving revision 1.9
diff -u -r1.9 IParser.java
--- parser/org/eclipse/cdt/core/parser/IParser.java 8 Sep 2003 18:10:48 -0000 1.9
+++ parser/org/eclipse/cdt/core/parser/IParser.java 29 Sep 2003 19:17:37 -0000
@@ -44,20 +44,6 @@
public IASTExpression expression(IASTScope scope) throws Backtrack;
/**
- * Is the parser configured for ANSI C or ANSI C++?
- *
- * @return true for C++, false for C
- */
- public ParserLanguage getLanguage();
-
- /**
- * Set the Parser explicitly to be a C or C++ parser.
- *
- * @param l CPP or C
- */
- public void setLanguage( ParserLanguage l);
-
- /**
* If an error was encountered, give us the offset of the token that caused the error.
*
* @return -1 for no error, otherwise the character offset where we encountered
Index: parser/org/eclipse/cdt/core/parser/ast/IASTFactory.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/ast/IASTFactory.java,v
retrieving revision 1.35
diff -u -r1.35 IASTFactory.java
--- parser/org/eclipse/cdt/core/parser/ast/IASTFactory.java 24 Sep 2003 17:26:45 -0000 1.35
+++ parser/org/eclipse/cdt/core/parser/ast/IASTFactory.java 29 Sep 2003 19:17:37 -0000
@@ -23,15 +23,15 @@
public IASTMacro createMacro(
String name,
int startingOffset,
- int endingOffset,
- int nameOffset);
+ int nameOffset,
+ int nameEndOffset, int endingOffset);
public IASTInclusion createInclusion(
String name,
String fileName,
boolean local,
int startingOffset,
- int endingOffset,
- int nameOffset);
+ int nameOffset,
+ int nameEndOffset, int endingOffset);
public IASTUsingDirective createUsingDirective(
IASTScope scope,
ITokenDuple duple, int startingOffset, int endingOffset)
@@ -49,7 +49,7 @@
IASTScope scope,
String identifier,
int startingOffset,
- int nameOffset) throws ASTSemanticException;
+ int nameOffset, int nameEndOffset) throws ASTSemanticException;
public IASTNamespaceAlias createNamespaceAlias(
IASTScope scope,
@@ -57,7 +57,7 @@
ITokenDuple alias,
int startingOffset,
int nameOffset,
- int endOffset ) throws ASTSemanticException;
+ int nameEndOffset, int endOffset ) throws ASTSemanticException;
public IASTCompilationUnit createCompilationUnit();
public IASTLinkageSpecification createLinkageSpecification(
@@ -70,7 +70,7 @@
ClassNameType type,
ASTAccessVisibility access,
int startingOffset,
- int nameOffset) throws ASTSemanticException;
+ int nameOffset, int nameEndOffset) throws ASTSemanticException;
/**
* @param astClassSpec
* @param isVirtual
@@ -90,12 +90,12 @@
public IASTEnumerationSpecifier createEnumerationSpecifier(
IASTScope scope,
String name,
- int startingOffset, int nameOffset) throws ASTSemanticException;
+ int startingOffset, int nameOffset, int nameEndOffset) throws ASTSemanticException;
public void addEnumerator(
IASTEnumerationSpecifier enumeration,
String string,
int startingOffset,
- int endingOffset, IASTExpression initialValue)throws ASTSemanticException;
+ int nameOffset, int nameEndOffset, int endingOffset, IASTExpression initialValue)throws ASTSemanticException;
public IASTExpression createExpression(
IASTScope scope,
IASTExpression.Kind kind,
@@ -133,7 +133,6 @@
public IASTFunction createFunction(
IASTScope scope,
String name,
- int nameEndOffset,
List parameters,
IASTAbstractDeclaration returnType,
IASTExceptionSpecification exception,
@@ -142,6 +141,7 @@
boolean isStatic,
int startOffset,
int nameOffset,
+ int nameEndOffset,
IASTTemplate ownerTemplate,
boolean isConst,
boolean isVolatile,
@@ -156,7 +156,6 @@
public IASTMethod createMethod(
IASTScope scope,
String name,
- int nameEndOffset,
List parameters,
IASTAbstractDeclaration returnType,
IASTExceptionSpecification exception,
@@ -165,6 +164,7 @@
boolean isStatic,
int startOffset,
int nameOffset,
+ int nameEndOffset,
IASTTemplate ownerTemplate,
boolean isConst,
boolean isVolatile,
@@ -173,11 +173,11 @@
boolean isPureVirtual, ASTAccessVisibility visibility, List constructorChain, boolean isDefinition) throws ASTSemanticException;
public IASTVariable createVariable(IASTScope scope, String name, boolean isAuto, IASTInitializerClause initializerClause, IASTExpression bitfieldExpression,
- IASTAbstractDeclaration abstractDeclaration, boolean isMutable, boolean isExtern, boolean isRegister, boolean isStatic, int startingOffset, int nameOffset, IASTExpression constructorExpression ) throws ASTSemanticException;
+ IASTAbstractDeclaration abstractDeclaration, boolean isMutable, boolean isExtern, boolean isRegister, boolean isStatic, int startingOffset, int nameOffset, int nameEndOffset, IASTExpression constructorExpression ) throws ASTSemanticException;
- public IASTField createField( IASTScope scope, String name, boolean isAuto, IASTInitializerClause initializerClause, IASTExpression bitfieldExpression, IASTAbstractDeclaration abstractDeclaration, boolean isMutable, boolean isExtern, boolean isRegister, boolean isStatic, int startingOffset, int nameOffset, IASTExpression constructorExpression, ASTAccessVisibility visibility) throws ASTSemanticException;
+ public IASTField createField( IASTScope scope, String name, boolean isAuto, IASTInitializerClause initializerClause, IASTExpression bitfieldExpression, IASTAbstractDeclaration abstractDeclaration, boolean isMutable, boolean isExtern, boolean isRegister, boolean isStatic, int startingOffset, int nameOffset, int nameEndOffset, IASTExpression constructorExpression, ASTAccessVisibility visibility) throws ASTSemanticException;
- public IASTParameterDeclaration createParameterDeclaration( boolean isConst, boolean isVolatile, IASTTypeSpecifier getTypeSpecifier, List pointerOperators, List arrayModifiers, List parameters, ASTPointerOperator pointerOp, String parameterName, IASTInitializerClause initializerClause, int startingOffset, int endingOffset, int nameOffset );
+ public IASTParameterDeclaration createParameterDeclaration( boolean isConst, boolean isVolatile, IASTTypeSpecifier getTypeSpecifier, List pointerOperators, List arrayModifiers, List parameters, ASTPointerOperator pointerOp, String parameterName, IASTInitializerClause initializerClause, int startingOffset, int nameOffset, int nameEndOffset, int endingOffset );
public IASTTemplateDeclaration createTemplateDeclaration( IASTScope scope, List templateParameters, boolean exported, int startingOffset );
@@ -187,7 +187,7 @@
public IASTTemplateSpecialization createTemplateSpecialization(IASTScope scope, int startingOffset);
- public IASTTypedefDeclaration createTypedef( IASTScope scope, String name, IASTAbstractDeclaration mapping, int startingOffset, int nameOffset ) throws ASTSemanticException;
+ public IASTTypedefDeclaration createTypedef( IASTScope scope, String name, IASTAbstractDeclaration mapping, int startingOffset, int nameOffset, int nameEndOffset ) throws ASTSemanticException;
public IASTAbstractTypeSpecifierDeclaration createTypeSpecDeclaration( IASTScope scope, IASTTypeSpecifier typeSpecifier, IASTTemplate template, int startingOffset, int endingOffset);
Index: parser/org/eclipse/cdt/core/parser/ast/IASTFunction.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/ast/IASTFunction.java,v
retrieving revision 1.9
diff -u -r1.9 IASTFunction.java
--- parser/org/eclipse/cdt/core/parser/ast/IASTFunction.java 15 Sep 2003 22:50:25 -0000 1.9
+++ parser/org/eclipse/cdt/core/parser/ast/IASTFunction.java 29 Sep 2003 19:17:37 -0000
@@ -35,5 +35,4 @@
public boolean previouslyDeclared();
- public int getNameEndOffset(); // necessary for operator new, etc. which are > 1 token
}
Index: parser/org/eclipse/cdt/core/parser/ast/IASTOffsetableNamedElement.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/ast/IASTOffsetableNamedElement.java,v
retrieving revision 1.4
diff -u -r1.4 IASTOffsetableNamedElement.java
--- parser/org/eclipse/cdt/core/parser/ast/IASTOffsetableNamedElement.java 21 Jul 2003 17:29:54 -0000 1.4
+++ parser/org/eclipse/cdt/core/parser/ast/IASTOffsetableNamedElement.java 29 Sep 2003 19:17:37 -0000
@@ -20,4 +20,6 @@
public String getName();
public int getNameOffset();
public void setNameOffset( int o );
+ public int getNameEndOffset();
+ public void setNameEndOffset( int o );
}
Index: parser/org/eclipse/cdt/internal/core/parser/DeclarationWrapper.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/DeclarationWrapper.java,v
retrieving revision 1.22
diff -u -r1.22 DeclarationWrapper.java
--- parser/org/eclipse/cdt/internal/core/parser/DeclarationWrapper.java 24 Sep 2003 17:26:45 -0000 1.22
+++ parser/org/eclipse/cdt/internal/core/parser/DeclarationWrapper.java 29 Sep 2003 19:17:37 -0000
@@ -381,9 +381,9 @@
return astFactory.createTypedef(
scope,
name,
- abs, getStartingOffset(), d.getNameStartOffset() );
+ abs, getStartingOffset(), d.getNameStartOffset(), d.getNameEndOffset() );
else
- return astFactory.createVariable( scope, name, auto, d.getInitializerClause(), d.getBitFieldExpression(), abs, mutable, extern, register, staticc, getStartingOffset(), d.getNameStartOffset(), d.getConstructorExpression() );
+ return astFactory.createVariable( scope, name, auto, d.getInitializerClause(), d.getBitFieldExpression(), abs, mutable, extern, register, staticc, getStartingOffset(), d.getNameStartOffset(), d.getNameEndOffset(), d.getConstructorExpression() );
}
else
@@ -406,7 +406,7 @@
constt,
volatil,
getTypeSpecifier(),
- declarator.getPointerOperators(), declarator.getArrayModifiers(), null, null), startingOffset, declarator.getNameStartOffset());
+ declarator.getPointerOperators(), declarator.getArrayModifiers(), null, null), startingOffset, declarator.getNameStartOffset(), declarator.getNameEndOffset());
}
/**
* @param declarator
@@ -418,8 +418,7 @@
.createMethod(
scope,
nested ? declarator.getOwnedDeclarator().getName() : declarator.getName(),
- declarator.getNameEndOffset(),
- createParameterList(declarator.getParameters()),
+ createParameterList(declarator.getParameters()),
astFactory.createAbstractDeclaration(
constt,
volatil,
@@ -431,6 +430,7 @@
staticc,
startingOffset,
declarator.getNameStartOffset(),
+ declarator.getNameEndOffset(),
templateDeclaration,
declarator.isConst(),
declarator.isVolatile(),
@@ -448,7 +448,6 @@
return astFactory.createFunction(
scope,
nested ? declarator.getOwnedDeclarator().getName() : declarator.getName(),
- declarator.getNameEndOffset(),
createParameterList(declarator.getParameters()),
astFactory.createAbstractDeclaration(
constt,
@@ -461,6 +460,7 @@
staticc,
startingOffset,
declarator.getNameStartOffset(),
+ declarator.getNameEndOffset(),
templateDeclaration,
declarator.isConst(),
declarator.isVolatile(),
@@ -492,7 +492,7 @@
staticc,
startingOffset,
declarator.getNameStartOffset(),
- declarator.getConstructorExpression(), ((IASTClassSpecifier)scope).getCurrentVisibilityMode());
+ declarator.getNameEndOffset(), declarator.getConstructorExpression(), ((IASTClassSpecifier)scope).getCurrentVisibilityMode());
}
private List createParameterList(List currentParameters)
{
@@ -514,7 +514,7 @@
declarator.getArrayModifiers(),
null, null, declarator.getName() == null
? ""
- : declarator.getName(), declarator.getInitializerClause(), wrapper.getStartingOffset(), wrapper.getEndOffset(), declarator.getNameStartOffset()));
+ : declarator.getName(), declarator.getInitializerClause(), wrapper.getStartingOffset(), declarator.getNameStartOffset(), declarator.getNameEndOffset(), wrapper.getEndOffset()));
}
}
return result;
@@ -541,7 +541,7 @@
register,
staticc,
getStartingOffset(),
- declarator.getNameStartOffset(), declarator.getConstructorExpression());
+ declarator.getNameStartOffset(), declarator.getNameEndOffset(), declarator.getConstructorExpression());
}
/* (non-Javadoc)
Index: parser/org/eclipse/cdt/internal/core/parser/Parser.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Parser.java,v
retrieving revision 1.115
diff -u -r1.115 Parser.java
--- parser/org/eclipse/cdt/internal/core/parser/Parser.java 26 Sep 2003 19:21:12 -0000 1.115
+++ parser/org/eclipse/cdt/internal/core/parser/Parser.java 29 Sep 2003 19:17:40 -0000
@@ -128,7 +128,7 @@
requestor = callback;
this.mode = mode;
this.language = language;
- astFactory = ParserFactory.createASTFactory(mode, language);
+ astFactory = ParserFactory.createASTFactory( mode, language);
scanner.setASTFactory(astFactory);
}
// counter that keeps track of the number of times Parser.parse() is called
@@ -606,7 +606,7 @@
declarator.getArrayModifiers(),
null, null, declarator.getName() == null
? ""
- : declarator.getName(), declarator.getInitializerClause(), wrapper.getStartingOffset(), wrapper.getEndOffset(), declarator.getNameStartOffset()),
+ : declarator.getName(), declarator.getInitializerClause(), wrapper.getStartingOffset(), declarator.getNameStartOffset(), declarator.getNameEndOffset(), wrapper.getEndOffset()),
null));
}
}
@@ -757,7 +757,8 @@
scope,
(identifier == null ? "" : identifier.getImage()),
first.getOffset(),
- (identifier == null ? first.getOffset() : identifier.getOffset()));
+ (identifier == null ? first.getOffset() : identifier.getOffset()),
+ (identifier == null ? first.getEndOffset() : identifier.getEndOffset() ));
}
catch (ASTSemanticException e)
{
@@ -808,7 +809,7 @@
{
astFactory.createNamespaceAlias(
scope, identifier.toString(), duple, first.getOffset(),
- identifier.getOffset(), duple.getLastToken().getEndOffset() );
+ identifier.getOffset(), identifier.getEndOffset(), duple.getLastToken().getEndOffset() );
}
catch (ASTSemanticException e)
{
@@ -2315,7 +2316,9 @@
mark.getOffset(),
((identifier == null)
? mark.getOffset()
- : identifier.getOffset()));
+ : identifier.getOffset()),
+ ((identifier == null)? mark.getEndOffset()
+ : identifier.getEndOffset()));
}
catch (ASTSemanticException e)
{
@@ -2349,8 +2352,8 @@
enumeration,
enumeratorIdentifier.getImage(),
enumeratorIdentifier.getOffset(),
- enumeratorIdentifier.getEndOffset(),
- initialValue);
+ enumeratorIdentifier.getOffset(),
+ enumeratorIdentifier.getEndOffset(), enumeratorIdentifier.getEndOffset(), initialValue);
}
catch (ASTSemanticException e1)
{
@@ -2369,8 +2372,8 @@
enumeration,
enumeratorIdentifier.getImage(),
enumeratorIdentifier.getOffset(),
- enumeratorIdentifier.getEndOffset(),
- initialValue);
+ enumeratorIdentifier.getOffset(),
+ enumeratorIdentifier.getEndOffset(), enumeratorIdentifier.getEndOffset(), initialValue);
}
catch (ASTSemanticException e1)
{
@@ -2452,7 +2455,8 @@
nameType,
access,
classKey.getOffset(),
- duple == null ? classKey.getOffset() : duple.getFirstToken().getOffset());
+ duple == null ? classKey.getOffset() : duple.getFirstToken().getOffset(),
+ duple == null ? classKey.getEndOffset() : duple.getFirstToken().getEndOffset() );
}
catch (ASTSemanticException e)
{
Index: parser/org/eclipse/cdt/internal/core/parser/Scanner.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Scanner.java,v
retrieving revision 1.55
diff -u -r1.55 Scanner.java
--- parser/org/eclipse/cdt/internal/core/parser/Scanner.java 18 Sep 2003 15:15:09 -0000 1.55
+++ parser/org/eclipse/cdt/internal/core/parser/Scanner.java 29 Sep 2003 19:17:40 -0000
@@ -344,7 +344,7 @@
}
}
if (inclusionReader != null) {
- IASTInclusion inclusion = astFactory.createInclusion( fileName, newPath, !useIncludePaths, beginOffset, endOffset, nameOffset );
+ IASTInclusion inclusion = astFactory.createInclusion( fileName, newPath, !useIncludePaths, beginOffset, nameOffset, nameOffset + fileName.length(), endOffset );
contextStack.updateContext(inclusionReader, newPath, ScannerContext.INCLUSION, inclusion, requestor );
}
}
@@ -2011,7 +2011,7 @@
if( requestor != null )
{
IASTInclusion i = astFactory.createInclusion( f, "", !useIncludePath, beginningOffset,
- endOffset, startOffset );
+ startOffset, startOffset + f.length(), endOffset );
i.enterScope( requestor );
i.exitScope( requestor );
}
@@ -2168,7 +2168,7 @@
throw new ScannerException( ScannerException.ErrorCode.INVALID_PREPROCESSOR_DIRECTIVE, getCurrentFile(), getCurrentOffset() );
}
- astFactory.createMacro( key, beginning, contextStack.getCurrentContext().getOffset(), offset ).acceptElement( requestor );
+ astFactory.createMacro( key, beginning, offset, offset + key.length(), contextStack.getCurrentContext().getOffset() ).acceptElement( requestor );
}
protected Vector getMacroParameters (String params, boolean forStringizing) throws ScannerException {
Index: parser/org/eclipse/cdt/internal/core/parser/ast/ASTInclusion.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/ASTInclusion.java,v
retrieving revision 1.5
diff -u -r1.5 ASTInclusion.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/ASTInclusion.java 21 Jul 2003 17:29:54 -0000 1.5
+++ parser/org/eclipse/cdt/internal/core/parser/ast/ASTInclusion.java 29 Sep 2003 19:17:41 -0000
@@ -19,14 +19,19 @@
*/
public class ASTInclusion implements IASTInclusion {
- public ASTInclusion( String name, String fileName, boolean local )
+ public ASTInclusion( String name, String fileName, boolean local, int startingOffset, int nameOffset, int nameEndOffset, int endOffset )
{
this.name = name;
this.fileName = fileName;
this.local = local;
+ setStartingOffset(startingOffset);
+ setNameOffset(nameOffset);
+ setNameEndOffset(nameEndOffset);
+ setEndingOffset(endOffset);
}
- private final String name, fileName;
+ private int nameEndOffset;
+ private final String name, fileName;
private final boolean local;
/* (non-Javadoc)
* @see org.eclipse.cdt.core.parser.ast.IASTInclusion#getName()
@@ -109,7 +114,14 @@
*/
public void enterScope(ISourceElementRequestor requestor)
{
- requestor.enterInclusion(this);
+ try
+ {
+ requestor.enterInclusion(this);
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
/* (non-Javadoc)
@@ -117,7 +129,28 @@
*/
public void exitScope(ISourceElementRequestor requestor)
{
- requestor.exitInclusion(this);
+ try
+ {
+ requestor.exitInclusion(this);
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
+ /* (non-Javadoc)
+ * @see org.eclipse.cdt.core.parser.ast.IASTOffsetableNamedElement#getNameEndOffset()
+ */
+ public int getNameEndOffset()
+ {
+ return nameEndOffset;
+ }
+ /* (non-Javadoc)
+ * @see org.eclipse.cdt.core.parser.ast.IASTOffsetableNamedElement#setNameEndOffset(int)
+ */
+ public void setNameEndOffset(int o)
+ {
+ nameEndOffset = o;
+ }
}
Index: parser/org/eclipse/cdt/internal/core/parser/ast/ASTMacro.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/ASTMacro.java,v
retrieving revision 1.5
diff -u -r1.5 ASTMacro.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/ASTMacro.java 21 Jul 2003 17:29:54 -0000 1.5
+++ parser/org/eclipse/cdt/internal/core/parser/ast/ASTMacro.java 29 Sep 2003 19:17:41 -0000
@@ -19,10 +19,15 @@
*/
public class ASTMacro implements IASTMacro {
- private final String name;
- public ASTMacro( String name )
+ private int nameEndOffset = 0;
+ private final String name;
+ public ASTMacro( String name, int start, int end, int nameBeg, int nameEnd )
{
this.name =name;
+ setStartingOffset(start);
+ setNameOffset(nameBeg);
+ setNameEndOffset(nameEnd);
+ setEndingOffset(end);
}
private int startingOffset = 0, endingOffset = 0, nameOffset = 0;
@@ -74,7 +79,14 @@
*/
public void acceptElement(ISourceElementRequestor requestor)
{
- requestor.acceptMacro( this );
+ try
+ {
+ requestor.acceptMacro( this );
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.parser.ISourceElementCallbackDelegate#enterScope(org.eclipse.cdt.core.parser.ISourceElementRequestor)
@@ -89,4 +101,18 @@
{
}
+ /* (non-Javadoc)
+ * @see org.eclipse.cdt.core.parser.ast.IASTOffsetableNamedElement#getNameEndOffset()
+ */
+ public int getNameEndOffset()
+ {
+ return nameEndOffset;
+ }
+ /* (non-Javadoc)
+ * @see org.eclipse.cdt.core.parser.ast.IASTOffsetableNamedElement#setNameEndOffset(int)
+ */
+ public void setNameEndOffset(int o)
+ {
+ nameEndOffset = o;
+ }
}
Index: parser/org/eclipse/cdt/internal/core/parser/ast/BaseASTFactory.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/BaseASTFactory.java,v
retrieving revision 1.10
diff -u -r1.10 BaseASTFactory.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/BaseASTFactory.java 11 Sep 2003 18:05:55 -0000 1.10
+++ parser/org/eclipse/cdt/internal/core/parser/ast/BaseASTFactory.java 29 Sep 2003 19:17:41 -0000
@@ -31,22 +31,16 @@
/* (non-Javadoc)
* @see org.eclipse.cdt.internal.core.parser.ast.IASTFactory#createMacro(java.lang.String, int, int, int)
*/
- public IASTMacro createMacro(String name, int startingOffset, int endingOffset, int nameOffset) {
- IASTMacro m = new ASTMacro( name );
- m.setStartingOffset( startingOffset );
- m.setEndingOffset( endingOffset );
- m.setNameOffset( nameOffset );
+ public IASTMacro createMacro(String name, int startingOffset, int nameOffset, int nameEndOffset, int endingOffset) {
+ IASTMacro m = new ASTMacro( name, startingOffset, endingOffset, nameOffset, nameEndOffset );
return m;
}
/* (non-Javadoc)
* @see org.eclipse.cdt.internal.core.parser.ast.IASTFactory#createInclusion(java.lang.String, java.lang.String, boolean)
*/
- public IASTInclusion createInclusion(String name, String fileName, boolean local, int startingOffset, int endingOffset, int nameOffset) {
- IASTInclusion inclusion = new ASTInclusion( name, fileName, local );
- inclusion.setStartingOffset( startingOffset );
- inclusion.setEndingOffset( endingOffset );
- inclusion.setNameOffset( nameOffset );
+ public IASTInclusion createInclusion(String name, String fileName, boolean local, int startingOffset, int nameOffset, int nameEndOffset, int endingOffset) {
+ IASTInclusion inclusion = new ASTInclusion( name, fileName, local, startingOffset, nameOffset, nameEndOffset, endingOffset );
return inclusion;
}
Index: parser/org/eclipse/cdt/internal/core/parser/ast/NamedOffsets.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/NamedOffsets.java,v
retrieving revision 1.3
diff -u -r1.3 NamedOffsets.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/NamedOffsets.java 21 Jul 2003 17:29:54 -0000 1.3
+++ parser/org/eclipse/cdt/internal/core/parser/ast/NamedOffsets.java 29 Sep 2003 19:17:41 -0000
@@ -17,7 +17,8 @@
*/
public class NamedOffsets extends Offsets {
- private int nameOffset = 0;
+ private int nameEndOffset = 0;
+ private int nameOffset = 0;
/* (non-Javadoc)
* @see org.eclipse.cdt.core.parser.ast.IASTOffsetableNamedElement#getElementNameOffset()
@@ -32,6 +33,15 @@
public void setNameOffset(int o) {
nameOffset = o;
}
+
+ public int getNameEndOffset()
+ {
+ return nameEndOffset;
+ }
+ public void setNameEndOffset( int offset )
+ {
+ nameEndOffset = offset;
+ }
}
Index: parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTASMDefinition.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTASMDefinition.java,v
retrieving revision 1.2
diff -u -r1.2 ASTASMDefinition.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTASMDefinition.java 12 Aug 2003 18:19:39 -0000 1.2
+++ parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTASMDefinition.java 29 Sep 2003 19:17:41 -0000
@@ -74,7 +74,14 @@
*/
public void acceptElement(ISourceElementRequestor requestor)
{
- requestor.acceptASMDefinition(this);
+ try
+ {
+ requestor.acceptASMDefinition(this);
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.parser.ISourceElementCallbackDelegate#enterScope(org.eclipse.cdt.core.parser.ISourceElementRequestor)
Index: parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTAbstractTypeSpecifierDeclaration.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTAbstractTypeSpecifierDeclaration.java,v
retrieving revision 1.1
diff -u -r1.1 ASTAbstractTypeSpecifierDeclaration.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTAbstractTypeSpecifierDeclaration.java 21 Jul 2003 17:29:54 -0000 1.1
+++ parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTAbstractTypeSpecifierDeclaration.java 29 Sep 2003 19:17:41 -0000
@@ -46,7 +46,14 @@
*/
public void acceptElement(ISourceElementRequestor requestor)
{
- requestor.acceptAbstractTypeSpecDeclaration(this);
+ try
+ {
+ requestor.acceptAbstractTypeSpecDeclaration(this);
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
/* (non-Javadoc)
Index: parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTClassReference.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTClassReference.java,v
retrieving revision 1.3
diff -u -r1.3 ASTClassReference.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTClassReference.java 12 Aug 2003 20:40:04 -0000 1.3
+++ parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTClassReference.java 29 Sep 2003 19:17:41 -0000
@@ -47,7 +47,14 @@
*/
public void acceptElement(ISourceElementRequestor requestor)
{
- requestor.acceptClassReference( this );
+ try
+ {
+ requestor.acceptClassReference( this );
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.parser.ISourceElementCallbackDelegate#enterScope(org.eclipse.cdt.core.parser.ISourceElementRequestor)
Index: parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTClassSpecifier.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTClassSpecifier.java,v
retrieving revision 1.3
diff -u -r1.3 ASTClassSpecifier.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTClassSpecifier.java 12 Aug 2003 18:19:38 -0000 1.3
+++ parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTClassSpecifier.java 29 Sep 2003 19:17:41 -0000
@@ -91,7 +91,7 @@
/**
* @param symbol
*/
- public ASTClassSpecifier(ISymbol symbol, ASTClassKind kind, ClassNameType type, ASTAccessVisibility access, int startingOffset, int nameOffset, List references )
+ public ASTClassSpecifier(ISymbol symbol, ASTClassKind kind, ClassNameType type, ASTAccessVisibility access, int startingOffset, int nameOffset, int nameEndOffset, List references )
{
super(symbol);
classKind = kind;
@@ -99,6 +99,7 @@
currentVisibility = access;
setStartingOffset(startingOffset);
setNameOffset(nameOffset);
+ setNameEndOffset(nameEndOffset);
qualifiedName = new ASTQualifiedNamedElement( getOwnerScope(), symbol.getName() );
this.references = new ASTReferenceStore( references );
}
@@ -171,7 +172,14 @@
public void enterScope(ISourceElementRequestor requestor)
{
references.processReferences( requestor );
- requestor.enterClassSpecifier(this);
+ try
+ {
+ requestor.enterClassSpecifier(this);
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
Iterator i = getBaseClauses();
while( i.hasNext() )
{
@@ -184,7 +192,14 @@
*/
public void exitScope(ISourceElementRequestor requestor)
{
- requestor.exitClassSpecifier(this);
+ try
+ {
+ requestor.exitClassSpecifier(this);
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.parser.ast.IASTOffsetableElement#setStartingOffset(int)
@@ -227,5 +242,19 @@
public IASTScope getOwnerScope()
{
return (IASTScope)symbol.getContainingSymbol().getASTExtension().getPrimaryDeclaration();
+ }
+ /* (non-Javadoc)
+ * @see org.eclipse.cdt.core.parser.ast.IASTOffsetableNamedElement#getNameEndOffset()
+ */
+ public int getNameEndOffset()
+ {
+ return offsets.getNameEndOffset();
+ }
+ /* (non-Javadoc)
+ * @see org.eclipse.cdt.core.parser.ast.IASTOffsetableNamedElement#setNameEndOffset(int)
+ */
+ public void setNameEndOffset(int o)
+ {
+ offsets.setNameEndOffset(o);
}
}
Index: parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTCodeScope.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTCodeScope.java,v
retrieving revision 1.2
diff -u -r1.2 ASTCodeScope.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTCodeScope.java 8 Sep 2003 19:17:53 -0000 1.2
+++ parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTCodeScope.java 29 Sep 2003 19:17:41 -0000
@@ -40,14 +40,28 @@
* @see org.eclipse.cdt.core.parser.ISourceElementCallbackDelegate#enterScope(org.eclipse.cdt.core.parser.ISourceElementRequestor)
*/
public void enterScope(ISourceElementRequestor requestor) {
- requestor.enterCodeBlock( this );
+ try
+ {
+ requestor.enterCodeBlock( this );
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.parser.ISourceElementCallbackDelegate#exitScope(org.eclipse.cdt.core.parser.ISourceElementRequestor)
*/
public void exitScope(ISourceElementRequestor requestor) {
- requestor.exitCodeBlock( this );
+ try
+ {
+ requestor.exitCodeBlock( this );
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
/* (non-Javadoc)
Index: parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTCompilationUnit.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTCompilationUnit.java,v
retrieving revision 1.1
diff -u -r1.1 ASTCompilationUnit.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTCompilationUnit.java 21 Jul 2003 17:29:55 -0000 1.1
+++ parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTCompilationUnit.java 29 Sep 2003 19:17:41 -0000
@@ -41,13 +41,27 @@
*/
public void enterScope(ISourceElementRequestor requestor)
{
- requestor.enterCompilationUnit( this );
+ try
+ {
+ requestor.enterCompilationUnit( this );
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.parser.ISourceElementCallbackDelegate#exitScope(org.eclipse.cdt.core.parser.ISourceElementRequestor)
*/
public void exitScope(ISourceElementRequestor requestor)
{
- requestor.exitCompilationUnit( this );
+ try
+ {
+ requestor.exitCompilationUnit( this );
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
}
Index: parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTElaboratedTypeSpecifier.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTElaboratedTypeSpecifier.java,v
retrieving revision 1.5
diff -u -r1.5 ASTElaboratedTypeSpecifier.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTElaboratedTypeSpecifier.java 15 Sep 2003 19:04:43 -0000 1.5
+++ parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTElaboratedTypeSpecifier.java 29 Sep 2003 19:17:41 -0000
@@ -39,12 +39,13 @@
* @param startingOffset
* @param endOffset
*/
- public ASTElaboratedTypeSpecifier(ISymbol checkSymbol, ASTClassKind kind, int startingOffset, int nameOffset, int endOffset, List references, boolean isDecl )
+ public ASTElaboratedTypeSpecifier(ISymbol checkSymbol, ASTClassKind kind, int startingOffset, int nameOffset, int nameEndOffset, int endOffset, List references, boolean isDecl )
{
super( checkSymbol );
this.kind = kind;
setStartingOffset( startingOffset );
setNameOffset( nameOffset );
+ setNameEndOffset(nameEndOffset);
setEndingOffset( endOffset );
qualifiedName = new ASTQualifiedNamedElement( getOwnerScope(), checkSymbol.getName() );
store = new ASTReferenceStore( references );
@@ -106,7 +107,14 @@
public void acceptElement(ISourceElementRequestor requestor)
{
if( isForwardDeclaration )
- requestor.acceptElaboratedForewardDeclaration(this);
+ try
+ {
+ requestor.acceptElaboratedForewardDeclaration(this);
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
store.processReferences(requestor);
}
/* (non-Javadoc)
@@ -144,5 +152,20 @@
public List getReferences()
{
return references;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.cdt.core.parser.ast.IASTOffsetableNamedElement#getNameEndOffset()
+ */
+ public int getNameEndOffset()
+ {
+ return offsets.getNameEndOffset();
+ }
+ /* (non-Javadoc)
+ * @see org.eclipse.cdt.core.parser.ast.IASTOffsetableNamedElement#setNameEndOffset(int)
+ */
+ public void setNameEndOffset(int o)
+ {
+ offsets.setNameEndOffset(o);
}
}
Index: parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTEnumerationReference.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTEnumerationReference.java,v
retrieving revision 1.1
diff -u -r1.1 ASTEnumerationReference.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTEnumerationReference.java 24 Jul 2003 13:47:18 -0000 1.1
+++ parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTEnumerationReference.java 29 Sep 2003 19:17:41 -0000
@@ -47,7 +47,14 @@
*/
public void acceptElement(ISourceElementRequestor requestor)
{
- requestor.acceptEnumerationReference( this );
+ try
+ {
+ requestor.acceptEnumerationReference( this );
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.parser.ISourceElementCallbackDelegate#enterScope(org.eclipse.cdt.core.parser.ISourceElementRequestor)
Index: parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTEnumerationSpecifier.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTEnumerationSpecifier.java,v
retrieving revision 1.2
diff -u -r1.2 ASTEnumerationSpecifier.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTEnumerationSpecifier.java 25 Jul 2003 16:45:49 -0000 1.2
+++ parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTEnumerationSpecifier.java 29 Sep 2003 19:17:41 -0000
@@ -34,11 +34,12 @@
/**
* @param symbol
*/
- public ASTEnumerationSpecifier(ISymbol symbol, int startingOffset, int nameOffset )
+ public ASTEnumerationSpecifier(ISymbol symbol, int startingOffset, int nameOffset, int nameEndOffset )
{
super(symbol);
setStartingOffset(startingOffset);
setNameOffset( nameOffset );
+ setNameEndOffset(nameEndOffset);
qualifiedName = new ASTQualifiedNamedElement( getOwnerScope(), symbol.getName() );
}
@@ -62,7 +63,14 @@
*/
public void acceptElement(ISourceElementRequestor requestor)
{
- requestor.acceptEnumerationSpecifier(this);
+ try
+ {
+ requestor.acceptEnumerationSpecifier(this);
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.parser.ISourceElementCallbackDelegate#enterScope(org.eclipse.cdt.core.parser.ISourceElementRequestor)
@@ -132,4 +140,19 @@
{
return offsets.getEndingOffset();
}
+
+ /* (non-Javadoc)
+ * @see org.eclipse.cdt.core.parser.ast.IASTOffsetableNamedElement#getNameEndOffset()
+ */
+ public int getNameEndOffset()
+ {
+ return offsets.getNameEndOffset();
+ }
+ /* (non-Javadoc)
+ * @see org.eclipse.cdt.core.parser.ast.IASTOffsetableNamedElement#setNameEndOffset(int)
+ */
+ public void setNameEndOffset(int o)
+ {
+ offsets.setNameEndOffset(o);
+ }
}
Index: parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTEnumerator.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTEnumerator.java,v
retrieving revision 1.2
diff -u -r1.2 ASTEnumerator.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTEnumerator.java 25 Jul 2003 14:30:09 -0000 1.2
+++ parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTEnumerator.java 29 Sep 2003 19:17:41 -0000
@@ -14,7 +14,7 @@
import org.eclipse.cdt.core.parser.ast.IASTEnumerationSpecifier;
import org.eclipse.cdt.core.parser.ast.IASTEnumerator;
import org.eclipse.cdt.core.parser.ast.IASTExpression;
-import org.eclipse.cdt.internal.core.parser.ast.Offsets;
+import org.eclipse.cdt.internal.core.parser.ast.NamedOffsets;
import org.eclipse.cdt.internal.core.parser.pst.ISymbol;
/**
@@ -23,7 +23,7 @@
*/
public class ASTEnumerator extends ASTSymbol implements IASTEnumerator
{
- private Offsets offsets = new Offsets();
+ private NamedOffsets offsets = new NamedOffsets();
private final IASTExpression initialValue;
private final IASTEnumerationSpecifier owner;
/**
@@ -32,10 +32,12 @@
* @param endingOffset
* @param initialValue
*/
- public ASTEnumerator(ISymbol enumeratorSymbol, IASTEnumerationSpecifier owner, int startingOffset, int endingOffset, IASTExpression initialValue)
+ public ASTEnumerator(ISymbol enumeratorSymbol, IASTEnumerationSpecifier owner, int startingOffset, int nameOffset, int nameEndOffset, int endingOffset, IASTExpression initialValue)
{
super( enumeratorSymbol );
setStartingOffset(startingOffset);
+ setNameOffset( nameOffset );
+ setNameEndOffset( nameEndOffset );
setEndingOffset( endingOffset );
this.initialValue = initialValue;
this.owner = owner;
@@ -121,4 +123,19 @@
{
return offsets.getEndingOffset();
}
+
+ /* (non-Javadoc)
+ * @see org.eclipse.cdt.core.parser.ast.IASTOffsetableNamedElement#getNameEndOffset()
+ */
+ public int getNameEndOffset()
+ {
+ return offsets.getNameEndOffset();
+ }
+ /* (non-Javadoc)
+ * @see org.eclipse.cdt.core.parser.ast.IASTOffsetableNamedElement#setNameEndOffset(int)
+ */
+ public void setNameEndOffset(int o)
+ {
+ offsets.setNameEndOffset(o);
+ }
}
Index: parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTEnumeratorReference.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTEnumeratorReference.java,v
retrieving revision 1.1
diff -u -r1.1 ASTEnumeratorReference.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTEnumeratorReference.java 8 Sep 2003 19:17:53 -0000 1.1
+++ parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTEnumeratorReference.java 29 Sep 2003 19:17:41 -0000
@@ -46,7 +46,14 @@
*/
public void acceptElement(ISourceElementRequestor requestor)
{
- requestor.acceptEnumeratorReference( this );
+ try
+ {
+ requestor.acceptEnumeratorReference( this );
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.parser.ISourceElementCallbackDelegate#enterScope(org.eclipse.cdt.core.parser.ISourceElementRequestor)
Index: parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTField.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTField.java,v
retrieving revision 1.5
diff -u -r1.5 ASTField.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTField.java 23 Sep 2003 20:46:17 -0000 1.5
+++ parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTField.java 29 Sep 2003 19:17:41 -0000
@@ -37,9 +37,9 @@
* @param references
* @param visibility
*/
- public ASTField(ISymbol newSymbol, IASTAbstractDeclaration abstractDeclaration, IASTInitializerClause initializerClause, IASTExpression bitfieldExpression, int startingOffset, int nameOffset, List references, boolean previouslyDeclared, IASTExpression constructorExpression, ASTAccessVisibility visibility)
+ public ASTField(ISymbol newSymbol, IASTAbstractDeclaration abstractDeclaration, IASTInitializerClause initializerClause, IASTExpression bitfieldExpression, int startingOffset, int nameOffset, int nameEndOffset, List references, boolean previouslyDeclared, IASTExpression constructorExpression, ASTAccessVisibility visibility)
{
- super( newSymbol, abstractDeclaration, initializerClause, bitfieldExpression, startingOffset, nameOffset, references, constructorExpression, previouslyDeclared );
+ super( newSymbol, abstractDeclaration, initializerClause, bitfieldExpression, startingOffset, nameOffset, nameEndOffset, references, constructorExpression, previouslyDeclared );
this.visibility = visibility;
}
@@ -53,7 +53,14 @@
public void acceptElement(ISourceElementRequestor requestor)
{
- requestor.acceptField(this);
+ try
+ {
+ requestor.acceptField(this);
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
referenceDelegate.processReferences(requestor);
if( getInitializerClause() != null )
getInitializerClause().acceptElement(requestor);
Index: parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTFieldReference.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTFieldReference.java,v
retrieving revision 1.1
diff -u -r1.1 ASTFieldReference.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTFieldReference.java 24 Jul 2003 13:47:18 -0000 1.1
+++ parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTFieldReference.java 29 Sep 2003 19:17:41 -0000
@@ -47,7 +47,14 @@
*/
public void acceptElement(ISourceElementRequestor requestor)
{
- requestor.acceptFieldReference(this);
+ try
+ {
+ requestor.acceptFieldReference(this);
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.parser.ISourceElementCallbackDelegate#enterScope(org.eclipse.cdt.core.parser.ISourceElementRequestor)
Index: parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTFunction.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTFunction.java,v
retrieving revision 1.7
diff -u -r1.7 ASTFunction.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTFunction.java 15 Sep 2003 22:50:25 -0000 1.7
+++ parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTFunction.java 29 Sep 2003 19:17:41 -0000
@@ -62,6 +62,7 @@
this.exception = exception;
setStartingOffset(startOffset);
setNameOffset(nameOffset);
+ setNameEndOffset(nameEndOffset);
this.ownerTemplate = ownerTemplate;
this.references = new ASTReferenceStore( references );
qualifiedName = new ASTQualifiedNamedElement( getOwnerScope(), symbol.getName() );
@@ -195,7 +196,14 @@
*/
public void acceptElement(ISourceElementRequestor requestor)
{
- requestor.acceptFunctionDeclaration(this);
+ try
+ {
+ requestor.acceptFunctionDeclaration(this);
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
functionCallbacks(requestor);
}
@@ -233,7 +241,14 @@
*/
public void enterScope(ISourceElementRequestor requestor)
{
- requestor.enterFunctionBody( this );
+ try
+ {
+ requestor.enterFunctionBody( this );
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
functionCallbacks( requestor );
}
/* (non-Javadoc)
@@ -241,7 +256,14 @@
*/
public void exitScope(ISourceElementRequestor requestor)
{
- requestor.exitFunctionBody( this );
+ try
+ {
+ requestor.exitFunctionBody( this );
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
@@ -263,13 +285,18 @@
return previouslyDeclared;
}
-
- /* (non-Javadoc)
- * @see org.eclipse.cdt.core.parser.ast.IASTFunction#getNameEndOffset()
- */
- public int getNameEndOffset()
- {
- // TODO Auto-generated method stub
- return 0;
- }
+ /* (non-Javadoc)
+ * @see org.eclipse.cdt.core.parser.ast.IASTOffsetableNamedElement#getNameEndOffset()
+ */
+ public int getNameEndOffset()
+ {
+ return offsets.getNameEndOffset();
+ }
+ /* (non-Javadoc)
+ * @see org.eclipse.cdt.core.parser.ast.IASTOffsetableNamedElement#setNameEndOffset(int)
+ */
+ public void setNameEndOffset(int o)
+ {
+ offsets.setNameEndOffset(o);
+ }
}
Index: parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTFunctionReference.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTFunctionReference.java,v
retrieving revision 1.1
diff -u -r1.1 ASTFunctionReference.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTFunctionReference.java 25 Jul 2003 00:35:40 -0000 1.1
+++ parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTFunctionReference.java 29 Sep 2003 19:17:41 -0000
@@ -46,7 +46,14 @@
*/
public void acceptElement(ISourceElementRequestor requestor)
{
- requestor.acceptFunctionReference( this );
+ try
+ {
+ requestor.acceptFunctionReference( this );
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.parser.ISourceElementCallbackDelegate#enterScope(org.eclipse.cdt.core.parser.ISourceElementRequestor)
Index: parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTLinkageSpecification.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTLinkageSpecification.java,v
retrieving revision 1.2
diff -u -r1.2 ASTLinkageSpecification.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTLinkageSpecification.java 25 Jul 2003 00:35:40 -0000 1.2
+++ parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTLinkageSpecification.java 29 Sep 2003 19:17:41 -0000
@@ -89,13 +89,27 @@
*/
public void enterScope(ISourceElementRequestor requestor)
{
- requestor.enterLinkageSpecification(this);
+ try
+ {
+ requestor.enterLinkageSpecification(this);
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.parser.ISourceElementCallbackDelegate#exitScope(org.eclipse.cdt.core.parser.ISourceElementRequestor)
*/
public void exitScope(ISourceElementRequestor requestor)
{
- requestor.exitLinkageSpecification(this);
+ try
+ {
+ requestor.exitLinkageSpecification(this);
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
}
Index: parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTMethod.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTMethod.java,v
retrieving revision 1.7
diff -u -r1.7 ASTMethod.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTMethod.java 15 Sep 2003 22:50:25 -0000 1.7
+++ parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTMethod.java 29 Sep 2003 19:17:41 -0000
@@ -126,7 +126,14 @@
*/
public void acceptElement(ISourceElementRequestor requestor)
{
- requestor.acceptMethodDeclaration(this);
+ try
+ {
+ requestor.acceptMethodDeclaration(this);
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
methodCallbacks(requestor);
}
protected void methodCallbacks(ISourceElementRequestor requestor)
@@ -152,7 +159,14 @@
*/
public void enterScope(ISourceElementRequestor requestor)
{
- requestor.enterMethodBody(this);
+ try
+ {
+ requestor.enterMethodBody(this);
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
methodCallbacks( requestor );
}
/* (non-Javadoc)
@@ -160,7 +174,14 @@
*/
public void exitScope(ISourceElementRequestor requestor)
{
- requestor.exitMethodBody( this );
+ try
+ {
+ requestor.exitMethodBody( this );
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.parser.ast.IASTMethod#getConstructorChainInitializers()
Index: parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTMethodReference.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTMethodReference.java,v
retrieving revision 1.1
diff -u -r1.1 ASTMethodReference.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTMethodReference.java 25 Jul 2003 00:35:40 -0000 1.1
+++ parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTMethodReference.java 29 Sep 2003 19:17:41 -0000
@@ -45,7 +45,14 @@
*/
public void acceptElement(ISourceElementRequestor requestor)
{
- requestor.acceptMethodReference( this );
+ try
+ {
+ requestor.acceptMethodReference( this );
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.parser.ISourceElementCallbackDelegate#enterScope(org.eclipse.cdt.core.parser.ISourceElementRequestor)
Index: parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTNamespaceAlias.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTNamespaceAlias.java,v
retrieving revision 1.1
diff -u -r1.1 ASTNamespaceAlias.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTNamespaceAlias.java 28 Aug 2003 15:02:52 -0000 1.1
+++ parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTNamespaceAlias.java 29 Sep 2003 19:17:41 -0000
@@ -36,7 +36,7 @@
* @param nameOffset
* @param endOffset
*/
- public ASTNamespaceAlias(ISymbol s, String alias, IASTNamespaceDefinition namespaceDefinition, int startingOffset, int nameOffset, int endOffset, List references)
+ public ASTNamespaceAlias(ISymbol s, String alias, IASTNamespaceDefinition namespaceDefinition, int startingOffset, int nameOffset, int nameEndOffset, int endOffset, List references)
{
super( s );
this.alias = alias;
@@ -44,6 +44,7 @@
setStartingOffset(startingOffset);
setEndingOffset(endOffset);
setNameOffset(nameOffset);
+ setNameEndOffset(nameEndOffset);
store = new ASTReferenceStore( references);
}
/* (non-Javadoc)
@@ -131,4 +132,19 @@
{
return offsets.getEndingOffset();
}
+
+ /* (non-Javadoc)
+ * @see org.eclipse.cdt.core.parser.ast.IASTOffsetableNamedElement#getNameEndOffset()
+ */
+ public int getNameEndOffset()
+ {
+ return offsets.getNameEndOffset();
+ }
+ /* (non-Javadoc)
+ * @see org.eclipse.cdt.core.parser.ast.IASTOffsetableNamedElement#setNameEndOffset(int)
+ */
+ public void setNameEndOffset(int o)
+ {
+ offsets.setNameEndOffset(o);
+ }
}
Index: parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTNamespaceDefinition.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTNamespaceDefinition.java,v
retrieving revision 1.1
diff -u -r1.1 ASTNamespaceDefinition.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTNamespaceDefinition.java 21 Jul 2003 17:29:55 -0000 1.1
+++ parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTNamespaceDefinition.java 29 Sep 2003 19:17:41 -0000
@@ -33,11 +33,12 @@
* @param startingOffset
* @param nameOffset
*/
- public ASTNamespaceDefinition(ISymbol namespaceSymbol, int startingOffset, int nameOffset)
+ public ASTNamespaceDefinition(ISymbol namespaceSymbol, int startingOffset, int nameOffset, int nameEndOffset )
{
super( namespaceSymbol );
setStartingOffset( startingOffset );
setNameOffset( nameOffset );
+ setNameEndOffset( nameEndOffset );
qualifiedName = new ASTQualifiedNamedElement( getOwnerScope(), namespaceSymbol.getName() );
}
@@ -109,7 +110,14 @@
*/
public void enterScope(ISourceElementRequestor requestor)
{
- requestor.enterNamespaceDefinition( this );
+ try
+ {
+ requestor.enterNamespaceDefinition( this );
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
@@ -118,7 +126,14 @@
*/
public void exitScope(ISourceElementRequestor requestor)
{
- requestor.exitNamespaceDefinition( this );
+ try
+ {
+ requestor.exitNamespaceDefinition( this );
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
/* (non-Javadoc)
@@ -128,4 +143,19 @@
{
return qualifiedName.getFullyQualifiedName();
}
+
+ /* (non-Javadoc)
+ * @see org.eclipse.cdt.core.parser.ast.IASTOffsetableNamedElement#getNameEndOffset()
+ */
+ public int getNameEndOffset()
+ {
+ return namedOffsets.getNameEndOffset();
+ }
+ /* (non-Javadoc)
+ * @see org.eclipse.cdt.core.parser.ast.IASTOffsetableNamedElement#setNameEndOffset(int)
+ */
+ public void setNameEndOffset(int o)
+ {
+ namedOffsets.setNameEndOffset(o);
+ }
}
Index: parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTNamespaceReference.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTNamespaceReference.java,v
retrieving revision 1.2
diff -u -r1.2 ASTNamespaceReference.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTNamespaceReference.java 22 Jul 2003 22:02:20 -0000 1.2
+++ parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTNamespaceReference.java 29 Sep 2003 19:17:41 -0000
@@ -48,7 +48,14 @@
*/
public void acceptElement(ISourceElementRequestor requestor)
{
- requestor.acceptNamespaceReference( this );
+ try
+ {
+ requestor.acceptNamespaceReference( this );
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.parser.ISourceElementCallbackDelegate#enterScope(org.eclipse.cdt.core.parser.ISourceElementRequestor)
Index: parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTParameterDeclaration.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTParameterDeclaration.java,v
retrieving revision 1.5
diff -u -r1.5 ASTParameterDeclaration.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTParameterDeclaration.java 15 Sep 2003 22:50:25 -0000 1.5
+++ parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTParameterDeclaration.java 29 Sep 2003 19:17:41 -0000
@@ -40,7 +40,7 @@
* @param parameterName
* @param initializerClause
*/
- public ASTParameterDeclaration(ISymbol symbol, boolean isConst, boolean isVolatile, IASTTypeSpecifier typeSpecifier, List pointerOperators, List arrayModifiers, List parameters, ASTPointerOperator pointerOp, String parameterName, IASTInitializerClause initializerClause, int startingOffset, int endingOffset, int nameOffset)
+ public ASTParameterDeclaration(ISymbol symbol, boolean isConst, boolean isVolatile, IASTTypeSpecifier typeSpecifier, List pointerOperators, List arrayModifiers, List parameters, ASTPointerOperator pointerOp, String parameterName, IASTInitializerClause initializerClause, int startingOffset, int endingOffset, int nameOffset, int nameEndOffset )
{
super( symbol );
abstractDeclaration = new ASTAbstractDeclaration( isConst, isVolatile, typeSpecifier, pointerOperators, arrayModifiers, parameters, pointerOp );
@@ -49,6 +49,7 @@
setStartingOffset(startingOffset);
setEndingOffset(endingOffset);
setNameOffset(nameOffset);
+ setNameEndOffset( nameEndOffset );
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.parser.ast.IASTParameterDeclaration#getName()
@@ -177,5 +178,20 @@
{
return offsets.getEndingOffset();
}
+
+ /* (non-Javadoc)
+ * @see org.eclipse.cdt.core.parser.ast.IASTOffsetableNamedElement#getNameEndOffset()
+ */
+ public int getNameEndOffset()
+ {
+ return offsets.getNameEndOffset();
+ }
+ /* (non-Javadoc)
+ * @see org.eclipse.cdt.core.parser.ast.IASTOffsetableNamedElement#setNameEndOffset(int)
+ */
+ public void setNameEndOffset(int o)
+ {
+ offsets.setNameEndOffset(o);
+ }
}
Index: parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTParameterReference.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTParameterReference.java,v
retrieving revision 1.1
diff -u -r1.1 ASTParameterReference.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTParameterReference.java 11 Sep 2003 18:05:55 -0000 1.1
+++ parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTParameterReference.java 29 Sep 2003 19:17:41 -0000
@@ -46,7 +46,14 @@
*/
public void acceptElement(ISourceElementRequestor requestor)
{
- requestor.acceptParameterReference( this );
+ try
+ {
+ requestor.acceptParameterReference( this );
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.parser.ISourceElementCallbackDelegate#enterScope(org.eclipse.cdt.core.parser.ISourceElementRequestor)
Index: parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTTypedef.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTTypedef.java,v
retrieving revision 1.3
diff -u -r1.3 ASTTypedef.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTTypedef.java 14 Aug 2003 15:33:27 -0000 1.3
+++ parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTTypedef.java 29 Sep 2003 19:17:41 -0000
@@ -38,7 +38,7 @@
* @param nameOffset
* @param references
*/
- public ASTTypedef(ISymbol newSymbol, IASTAbstractDeclaration mapping, int startingOffset, int nameOffset, List references)
+ public ASTTypedef(ISymbol newSymbol, IASTAbstractDeclaration mapping, int startingOffset, int nameOffset, int nameEndOffset, List references)
{
super( newSymbol );
this.mapping = mapping;
@@ -46,6 +46,7 @@
this.qualifiedName = new ASTQualifiedNamedElement( getOwnerScope(), newSymbol.getName());
setStartingOffset(startingOffset);
setNameOffset(nameOffset);
+ setNameEndOffset( nameEndOffset );
}
/* (non-Javadoc)
@@ -69,7 +70,14 @@
*/
public void acceptElement(ISourceElementRequestor requestor)
{
- requestor.acceptTypedefDeclaration(this);
+ try
+ {
+ requestor.acceptTypedefDeclaration(this);
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
referenceStore.processReferences(requestor);
getAbstractDeclarator().acceptElement( requestor );
}
@@ -143,5 +151,20 @@
{
return qualifiedName.getFullyQualifiedName();
}
+
+ /* (non-Javadoc)
+ * @see org.eclipse.cdt.core.parser.ast.IASTOffsetableNamedElement#getNameEndOffset()
+ */
+ public int getNameEndOffset()
+ {
+ return offsets.getNameEndOffset();
+ }
+ /* (non-Javadoc)
+ * @see org.eclipse.cdt.core.parser.ast.IASTOffsetableNamedElement#setNameEndOffset(int)
+ */
+ public void setNameEndOffset(int o)
+ {
+ offsets.setNameEndOffset(o);
+ }
}
Index: parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTTypedefReference.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTTypedefReference.java,v
retrieving revision 1.1
diff -u -r1.1 ASTTypedefReference.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTTypedefReference.java 30 Jul 2003 01:31:14 -0000 1.1
+++ parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTTypedefReference.java 29 Sep 2003 19:17:41 -0000
@@ -45,7 +45,14 @@
*/
public void acceptElement(ISourceElementRequestor requestor)
{
- requestor.acceptTypedefReference(this);
+ try
+ {
+ requestor.acceptTypedefReference(this);
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.parser.ISourceElementCallbackDelegate#enterScope(org.eclipse.cdt.core.parser.ISourceElementRequestor)
Index: parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTUsingDeclaration.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTUsingDeclaration.java,v
retrieving revision 1.1
diff -u -r1.1 ASTUsingDeclaration.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTUsingDeclaration.java 24 Jul 2003 13:47:18 -0000 1.1
+++ parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTUsingDeclaration.java 29 Sep 2003 19:17:41 -0000
@@ -98,7 +98,14 @@
*/
public void acceptElement(ISourceElementRequestor requestor)
{
- requestor.acceptUsingDeclaration( this );
+ try
+ {
+ requestor.acceptUsingDeclaration( this );
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
delegate.processReferences(requestor);
}
/* (non-Javadoc)
Index: parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTUsingDirective.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTUsingDirective.java,v
retrieving revision 1.2
diff -u -r1.2 ASTUsingDirective.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTUsingDirective.java 22 Jul 2003 00:23:56 -0000 1.2
+++ parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTUsingDirective.java 29 Sep 2003 19:17:41 -0000
@@ -91,7 +91,14 @@
*/
public void acceptElement(ISourceElementRequestor requestor)
{
- requestor.acceptUsingDirective( this );
+ try
+ {
+ requestor.acceptUsingDirective( this );
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
referenceDelegate.processReferences(requestor);
}
/* (non-Javadoc)
Index: parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTVariable.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTVariable.java,v
retrieving revision 1.5
diff -u -r1.5 ASTVariable.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTVariable.java 23 Sep 2003 20:46:17 -0000 1.5
+++ parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTVariable.java 29 Sep 2003 19:17:42 -0000
@@ -46,7 +46,7 @@
* @param nameOffset
* @param references
*/
- public ASTVariable(ISymbol newSymbol, IASTAbstractDeclaration abstractDeclaration, IASTInitializerClause initializerClause, IASTExpression bitfieldExpression, int startingOffset, int nameOffset, List references, IASTExpression constructorExpression, boolean previouslyDeclared )
+ public ASTVariable(ISymbol newSymbol, IASTAbstractDeclaration abstractDeclaration, IASTInitializerClause initializerClause, IASTExpression bitfieldExpression, int startingOffset, int nameOffset, int nameEndOffset, List references, IASTExpression constructorExpression, boolean previouslyDeclared )
{
super( newSymbol );
this.abstractDeclaration = abstractDeclaration;
@@ -55,6 +55,7 @@
this.constructorExpression = constructorExpression;
setStartingOffset( startingOffset );
setNameOffset( nameOffset );
+ setNameEndOffset(nameEndOffset);
referenceDelegate = new ASTReferenceStore( references );
qualifiedName = new ASTQualifiedNamedElement( getOwnerScope(), newSymbol.getName() );
this.previouslyDeclared =previouslyDeclared;
@@ -162,7 +163,14 @@
*/
public void acceptElement(ISourceElementRequestor requestor)
{
- requestor.acceptVariable(this);
+ try
+ {
+ requestor.acceptVariable(this);
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
referenceDelegate.processReferences(requestor);
if( initializerClause != null )
initializerClause.acceptElement(requestor);
@@ -205,6 +213,7 @@
{
return offsets.getStartingOffset();
}
+
/* (non-Javadoc)
* @see org.eclipse.cdt.core.parser.ast.IASTOffsetableElement#getEndingOffset()
*/
@@ -212,6 +221,20 @@
{
return offsets.getEndingOffset();
}
+ /* (non-Javadoc)
+ * @see org.eclipse.cdt.core.parser.ast.IASTOffsetableNamedElement#getNameEndOffset()
+ */
+ public int getNameEndOffset()
+ {
+ return offsets.getNameEndOffset();
+ }
+ /* (non-Javadoc)
+ * @see org.eclipse.cdt.core.parser.ast.IASTOffsetableNamedElement#setNameEndOffset(int)
+ */
+ public void setNameEndOffset(int o)
+ {
+ offsets.setNameEndOffset(o);
+ }
/* (non-Javadoc)
* @see org.eclipse.cdt.core.parser.ast.IASTVariable#getConstructorExpression()
*/
Index: parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTVariableReference.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTVariableReference.java,v
retrieving revision 1.1
diff -u -r1.1 ASTVariableReference.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTVariableReference.java 24 Jul 2003 13:47:18 -0000 1.1
+++ parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTVariableReference.java 29 Sep 2003 19:17:42 -0000
@@ -48,7 +48,14 @@
*/
public void acceptElement(ISourceElementRequestor requestor)
{
- requestor.acceptVariableReference( this );
+ try
+ {
+ requestor.acceptVariableReference( this );
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.parser.ISourceElementCallbackDelegate#enterScope(org.eclipse.cdt.core.parser.ISourceElementRequestor)
Index: parser/org/eclipse/cdt/internal/core/parser/ast/complete/CompleteParseASTFactory.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/complete/CompleteParseASTFactory.java,v
retrieving revision 1.48
diff -u -r1.48 CompleteParseASTFactory.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/complete/CompleteParseASTFactory.java 25 Sep 2003 19:40:35 -0000 1.48
+++ parser/org/eclipse/cdt/internal/core/parser/ast/complete/CompleteParseASTFactory.java 29 Sep 2003 19:17:43 -0000
@@ -368,7 +368,7 @@
IASTScope scope,
String identifier,
int startingOffset,
- int nameOffset) throws ASTSemanticException
+ int nameOffset, int nameEndOffset) throws ASTSemanticException
{
IContainerSymbol pstScope = scopeToSymbol(scope);
@@ -411,7 +411,7 @@
}
}
- ASTNamespaceDefinition namespaceDef = new ASTNamespaceDefinition( namespaceSymbol, startingOffset, nameOffset );
+ ASTNamespaceDefinition namespaceDef = new ASTNamespaceDefinition( namespaceSymbol, startingOffset, nameOffset, nameEndOffset );
try
{
attachSymbolExtension( namespaceSymbol, namespaceDef );
@@ -490,7 +490,7 @@
ClassNameType type,
ASTAccessVisibility access,
int startingOffset,
- int nameOffset) throws ASTSemanticException
+ int nameOffset, int nameEndOffset) throws ASTSemanticException
{
IContainerSymbol currentScopeSymbol = scopeToSymbol(scope);
TypeInfo.eType pstType = classKindToTypeInfo(kind);
@@ -544,7 +544,7 @@
throw new ASTSemanticException();
}
- ASTClassSpecifier classSpecifier = new ASTClassSpecifier( newSymbol, kind, type, access, startingOffset, nameOffset, references );
+ ASTClassSpecifier classSpecifier = new ASTClassSpecifier( newSymbol, kind, type, access, startingOffset, nameOffset, nameEndOffset, references );
try
{
attachSymbolExtension(newSymbol, classSpecifier );
@@ -691,7 +691,7 @@
IASTScope scope,
String name,
int startingOffset,
- int nameOffset) throws ASTSemanticException
+ int nameOffset, int nameEndOffset) throws ASTSemanticException
{
IContainerSymbol containerSymbol = scopeToSymbol(scope);
TypeInfo.eType pstType = TypeInfo.t_enumeration;
@@ -706,7 +706,7 @@
throw new ASTSemanticException();
}
- ASTEnumerationSpecifier enumSpecifier = new ASTEnumerationSpecifier( classSymbol, startingOffset, nameOffset );
+ ASTEnumerationSpecifier enumSpecifier = new ASTEnumerationSpecifier( classSymbol, startingOffset, nameOffset, nameEndOffset );
try
{
@@ -725,8 +725,8 @@
IASTEnumerationSpecifier enumeration,
String string,
int startingOffset,
- int endingOffset,
- IASTExpression initialValue) throws ASTSemanticException
+ int nameOffset,
+ int nameEndOffset, int endingOffset, IASTExpression initialValue) throws ASTSemanticException
{
IContainerSymbol enumerationSymbol = (IContainerSymbol)((ISymbolOwner)enumeration).getSymbol();
@@ -739,7 +739,7 @@
{
throw new ASTSemanticException();
}
- ASTEnumerator enumerator = new ASTEnumerator( enumeratorSymbol, enumeration, startingOffset, endingOffset, initialValue );
+ ASTEnumerator enumerator = new ASTEnumerator( enumeratorSymbol, enumeration, startingOffset, nameOffset, nameEndOffset, endingOffset, initialValue );
((ASTEnumerationSpecifier)enumeration).addEnumerator( enumerator );
try
{
@@ -1413,7 +1413,6 @@
public IASTFunction createFunction(
IASTScope scope,
String name,
- int nameEndOffset,
List parameters,
IASTAbstractDeclaration returnType,
IASTExceptionSpecification exception,
@@ -1422,6 +1421,7 @@
boolean isStatic,
int startOffset,
int nameOffset,
+ int nameEndOffset,
IASTTemplate ownerTemplate,
boolean isConst,
boolean isVolatile,
@@ -1718,7 +1718,6 @@
public IASTMethod createMethod(
IASTScope scope,
String name,
- int nameEndOffset,
List parameters,
IASTAbstractDeclaration returnType,
IASTExceptionSpecification exception,
@@ -1727,6 +1726,7 @@
boolean isStatic,
int startOffset,
int nameOffset,
+ int nameEndOffset,
IASTTemplate ownerTemplate,
boolean isConst,
boolean isVolatile,
@@ -1881,7 +1881,7 @@
boolean isRegister,
boolean isStatic,
int startingOffset,
- int nameOffset, IASTExpression constructorExpression) throws ASTSemanticException
+ int nameOffset, int nameEndOffset, IASTExpression constructorExpression) throws ASTSemanticException
{
List references = new ArrayList();
IContainerSymbol ownerScope = scopeToSymbol( scope );
@@ -1933,7 +1933,7 @@
){
IASTScope fieldParentScope = (IASTScope)parentScope.getASTExtension().getPrimaryDeclaration();
return createField(fieldParentScope, fieldName,isAuto, initializerClause, bitfieldExpression, abstractDeclaration, isMutable, isExtern,
- isRegister, isStatic, startingOffset, offset, constructorExpression, ASTAccessVisibility.PRIVATE, references);
+ isRegister, isStatic, startingOffset, offset, nameEndOffset, constructorExpression, ASTAccessVisibility.PRIVATE, references);
}
}
@@ -1968,7 +1968,7 @@
// TODO Auto-generated catch block
}
- ASTVariable variable = new ASTVariable( newSymbol, abstractDeclaration, initializerClause, bitfieldExpression, startingOffset, nameOffset, references, constructorExpression, previouslyDeclared );
+ ASTVariable variable = new ASTVariable( newSymbol, abstractDeclaration, initializerClause, bitfieldExpression, startingOffset, nameOffset, nameEndOffset, references, constructorExpression, previouslyDeclared );
try
{
attachSymbolExtension(newSymbol, variable );
@@ -2041,10 +2041,10 @@
boolean isStatic,
int startingOffset,
int nameOffset,
- IASTExpression constructorExpression, ASTAccessVisibility visibility) throws ASTSemanticException
+ int nameEndOffset, IASTExpression constructorExpression, ASTAccessVisibility visibility) throws ASTSemanticException
{
return createField(scope, name,isAuto, initializerClause, bitfieldExpression, abstractDeclaration, isMutable, isExtern,
- isRegister, isStatic, startingOffset, nameOffset, constructorExpression, visibility, null);
+ isRegister, isStatic, startingOffset, nameOffset, nameEndOffset, constructorExpression, visibility, null);
}
public IASTField createField(
@@ -2060,6 +2060,7 @@
boolean isStatic,
int startingOffset,
int nameOffset,
+ int nameEndOffset,
IASTExpression constructorExpression,
ASTAccessVisibility visibility,
List references) throws ASTSemanticException
@@ -2104,7 +2105,7 @@
throw new ASTSemanticException();
}
- ASTField field = new ASTField( newSymbol, abstractDeclaration, initializerClause, bitfieldExpression, startingOffset, nameOffset, references, previouslyDeclared, constructorExpression, visibility );
+ ASTField field = new ASTField( newSymbol, abstractDeclaration, initializerClause, bitfieldExpression, startingOffset, nameOffset, nameEndOffset, references, previouslyDeclared, constructorExpression, visibility );
try
{
attachSymbolExtension(newSymbol, field );
@@ -2171,7 +2172,7 @@
String name,
IASTAbstractDeclaration mapping,
int startingOffset,
- int nameOffset) throws ASTSemanticException
+ int nameOffset, int nameEndOffset) throws ASTSemanticException
{
IContainerSymbol containerSymbol = scopeToSymbol(scope);
ISymbol newSymbol = pst.newSymbol( name, TypeInfo.t_type);
@@ -2192,7 +2193,7 @@
{
throw new ASTSemanticException();
}
- ASTTypedef d = new ASTTypedef( newSymbol, mapping, startingOffset, nameOffset, references );
+ ASTTypedef d = new ASTTypedef( newSymbol, mapping, startingOffset, nameOffset, nameEndOffset, references );
try
{
attachSymbolExtension(newSymbol, d );
@@ -2260,7 +2261,7 @@
}
ASTElaboratedTypeSpecifier elab =
- new ASTElaboratedTypeSpecifier( checkSymbol, kind, startingOffset, name.getFirstToken().getOffset(), endOffset, references, isForewardDecl );
+ new ASTElaboratedTypeSpecifier( checkSymbol, kind, startingOffset, name.getFirstToken().getOffset(), name.getLastToken().getEndOffset(), endOffset, references, isForewardDecl );
try
{
@@ -2279,7 +2280,7 @@
checkSymbol.getASTExtension().getPrimaryDeclaration() instanceof IASTEnumerationSpecifier
)
{
- ASTElaboratedTypeSpecifier elab = new ASTElaboratedTypeSpecifier( checkSymbol, kind, startingOffset, name.getFirstToken().getOffset(), endOffset, references, isForewardDecl );
+ ASTElaboratedTypeSpecifier elab = new ASTElaboratedTypeSpecifier( checkSymbol, kind, startingOffset, name.getFirstToken().getOffset(), name.getLastToken().getEndOffset(), endOffset, references, isForewardDecl );
try
{
attachSymbolExtension( checkSymbol, elab );
@@ -2304,7 +2305,7 @@
/* (non-Javadoc)
* @see org.eclipse.cdt.core.parser.ast.IASTFactory#createNamespaceAlias(org.eclipse.cdt.core.parser.ast.IASTScope, java.lang.String, org.eclipse.cdt.core.parser.ITokenDuple, int, int, int)
*/
- public IASTNamespaceAlias createNamespaceAlias(IASTScope scope, String identifier, ITokenDuple alias, int startingOffset, int nameOffset, int endOffset) throws ASTSemanticException
+ public IASTNamespaceAlias createNamespaceAlias(IASTScope scope, String identifier, ITokenDuple alias, int startingOffset, int nameOffset, int nameEndOffset, int endOffset) throws ASTSemanticException
{
IContainerSymbol startingSymbol = scopeToSymbol(scope);
List references = new ArrayList();
@@ -2328,7 +2329,7 @@
ASTNamespaceAlias astAlias = new ASTNamespaceAlias(
newSymbol, alias.toString(), (IASTNamespaceDefinition)namespaceSymbol.getASTExtension().getPrimaryDeclaration(),
- startingOffset, nameOffset, endOffset, references );
+ startingOffset, nameOffset, nameEndOffset, endOffset, references );
try
{
attachSymbolExtension( newSymbol, astAlias );
@@ -2380,9 +2381,9 @@
return false;
}
- public IASTParameterDeclaration createParameterDeclaration(boolean isConst, boolean isVolatile, IASTTypeSpecifier typeSpecifier, List pointerOperators, List arrayModifiers, List parameters, ASTPointerOperator pointerOp, String parameterName, IASTInitializerClause initializerClause, int startingOffset, int endingOffset, int nameOffset)
+ public IASTParameterDeclaration createParameterDeclaration(boolean isConst, boolean isVolatile, IASTTypeSpecifier typeSpecifier, List pointerOperators, List arrayModifiers, List parameters, ASTPointerOperator pointerOp, String parameterName, IASTInitializerClause initializerClause, int startingOffset, int nameOffset, int nameEndOffset, int endingOffset)
{
- return new ASTParameterDeclaration( null, isConst, isVolatile, typeSpecifier, pointerOperators, arrayModifiers, parameters, pointerOp, parameterName, initializerClause, startingOffset, endingOffset, nameOffset );
+ return new ASTParameterDeclaration( null, isConst, isVolatile, typeSpecifier, pointerOperators, arrayModifiers, parameters, pointerOp, parameterName, initializerClause, startingOffset, endingOffset, nameOffset, nameEndOffset );
}
/* (non-Javadoc)
Index: parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTASMDefinition.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTASMDefinition.java,v
retrieving revision 1.4
diff -u -r1.4 ASTASMDefinition.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTASMDefinition.java 21 Jul 2003 17:29:54 -0000 1.4
+++ parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTASMDefinition.java 29 Sep 2003 19:17:43 -0000
@@ -73,7 +73,14 @@
*/
public void acceptElement(ISourceElementRequestor requestor)
{
- requestor.acceptASMDefinition(this);
+ try
+ {
+ requestor.acceptASMDefinition(this);
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
/* (non-Javadoc)
Index: parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTAbstractTypeSpecifierDeclaration.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTAbstractTypeSpecifierDeclaration.java,v
retrieving revision 1.3
diff -u -r1.3 ASTAbstractTypeSpecifierDeclaration.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTAbstractTypeSpecifierDeclaration.java 21 Jul 2003 17:29:54 -0000 1.3
+++ parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTAbstractTypeSpecifierDeclaration.java 29 Sep 2003 19:17:43 -0000
@@ -91,7 +91,14 @@
*/
public void acceptElement(ISourceElementRequestor requestor)
{
- requestor.acceptAbstractTypeSpecDeclaration(this);
+ try
+ {
+ requestor.acceptAbstractTypeSpecDeclaration(this);
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
/* (non-Javadoc)
Index: parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTClassSpecifier.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTClassSpecifier.java,v
retrieving revision 1.11
diff -u -r1.11 ASTClassSpecifier.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTClassSpecifier.java 21 Jul 2003 17:29:54 -0000 1.11
+++ parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTClassSpecifier.java 29 Sep 2003 19:17:43 -0000
@@ -34,6 +34,9 @@
String name,
ASTClassKind kind,
ClassNameType type,
+ int startingOffset,
+ int nameOffset,
+ int nameEndOffset,
ASTAccessVisibility access)
{
super( scope, name );
@@ -41,6 +44,9 @@
qualifiedNameElement = new ASTQualifiedNamedElement( scope, name );
classNameType = type;
classKind = kind;
+ offsets.setStartingOffset(startingOffset);
+ offsets.setNameOffset(nameOffset);
+ offsets.setNameEndOffset(nameEndOffset);
this.access = access;
this.name = name;
}
@@ -171,14 +177,42 @@
*/
public void enterScope(ISourceElementRequestor requestor)
{
- requestor.enterClassSpecifier(this);
+ try
+ {
+ requestor.enterClassSpecifier(this);
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.parser.ISourceElementCallbackDelegate#exit(org.eclipse.cdt.core.parser.ISourceElementRequestor)
*/
public void exitScope(ISourceElementRequestor requestor)
{
- requestor.exitClassSpecifier(this);
+ try
+ {
+ requestor.exitClassSpecifier(this);
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
+ /* (non-Javadoc)
+ * @see org.eclipse.cdt.core.parser.ast.IASTOffsetableNamedElement#getNameEndOffset()
+ */
+ public int getNameEndOffset()
+ {
+ return offsets.getNameEndOffset();
+ }
+ /* (non-Javadoc)
+ * @see org.eclipse.cdt.core.parser.ast.IASTOffsetableNamedElement#setNameEndOffset(int)
+ */
+ public void setNameEndOffset(int o)
+ {
+ offsets.setNameEndOffset(o);
+ }
}
Index: parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTCompilationUnit.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTCompilationUnit.java,v
retrieving revision 1.3
diff -u -r1.3 ASTCompilationUnit.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTCompilationUnit.java 18 Jul 2003 16:39:22 -0000 1.3
+++ parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTCompilationUnit.java 29 Sep 2003 19:17:43 -0000
@@ -49,7 +49,14 @@
*/
public void enterScope(ISourceElementRequestor requestor)
{
- requestor.enterCompilationUnit(this);
+ try
+ {
+ requestor.enterCompilationUnit(this);
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
/* (non-Javadoc)
@@ -57,7 +64,14 @@
*/
public void exitScope(ISourceElementRequestor requestor)
{
- requestor.exitCompilationUnit(this);
+ try
+ {
+ requestor.exitCompilationUnit(this);
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
}
Index: parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTElaboratedTypeSpecifier.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTElaboratedTypeSpecifier.java,v
retrieving revision 1.7
diff -u -r1.7 ASTElaboratedTypeSpecifier.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTElaboratedTypeSpecifier.java 14 Aug 2003 19:49:44 -0000 1.7
+++ parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTElaboratedTypeSpecifier.java 29 Sep 2003 19:17:43 -0000
@@ -35,12 +35,13 @@
* @param startingOffset
* @param endOffset
*/
- public ASTElaboratedTypeSpecifier(IASTScope scope, ASTClassKind elaboratedClassKind, String typeName, int startingOffset, int nameOffset, int endOffset)
+ public ASTElaboratedTypeSpecifier(IASTScope scope, ASTClassKind elaboratedClassKind, String typeName, int startingOffset, int nameOffset, int nameEndOffset, int endOffset)
{
classKind = elaboratedClassKind;
this.typeName = typeName;
setStartingOffset( startingOffset );
setNameOffset( nameOffset );
+ setNameEndOffset( nameEndOffset );
setEndingOffset( endOffset );
qualifiedName = new ASTQualifiedNamedElement( scope, typeName );
}
@@ -106,7 +107,14 @@
*/
public void acceptElement(ISourceElementRequestor requestor)
{
- requestor.acceptElaboratedForewardDeclaration(this);
+ try
+ {
+ requestor.acceptElaboratedForewardDeclaration(this);
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.parser.ISourceElementCallbackDelegate#enterScope(org.eclipse.cdt.core.parser.ISourceElementRequestor)
@@ -131,5 +139,20 @@
*/
public void setNameOffset(int o) {
offsets.setNameOffset(o);
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.cdt.core.parser.ast.IASTOffsetableNamedElement#getNameEndOffset()
+ */
+ public int getNameEndOffset()
+ {
+ return offsets.getNameEndOffset();
+ }
+ /* (non-Javadoc)
+ * @see org.eclipse.cdt.core.parser.ast.IASTOffsetableNamedElement#setNameEndOffset(int)
+ */
+ public void setNameEndOffset(int o)
+ {
+ offsets.setNameEndOffset(o);
}
}
Index: parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTEnumerationSpecifier.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTEnumerationSpecifier.java,v
retrieving revision 1.6
diff -u -r1.6 ASTEnumerationSpecifier.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTEnumerationSpecifier.java 24 Jul 2003 13:47:18 -0000 1.6
+++ parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTEnumerationSpecifier.java 29 Sep 2003 19:17:43 -0000
@@ -36,12 +36,13 @@
* @param name
* @param startingOffset
*/
- public ASTEnumerationSpecifier(IASTScope scope, String name, int startingOffset, int nameOffset)
+ public ASTEnumerationSpecifier(IASTScope scope, String name, int startingOffset, int nameOffset, int nameEndOffset )
{
super( scope, name );
this.name = name;
offsets.setNameOffset( nameOffset );
offsets.setStartingOffset( startingOffset);
+ setNameEndOffset(nameEndOffset);
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.parser.ast.IASTOffsetableNamedElement#getName()
@@ -111,7 +112,14 @@
*/
public void acceptElement(ISourceElementRequestor requestor)
{
- requestor.acceptEnumerationSpecifier(this);
+ try
+ {
+ requestor.acceptEnumerationSpecifier(this);
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.parser.ISourceElementCallbackDelegate#enter(org.eclipse.cdt.core.parser.ISourceElementRequestor)
@@ -125,4 +133,19 @@
public void exitScope(ISourceElementRequestor requestor)
{
}
+
+ /* (non-Javadoc)
+ * @see org.eclipse.cdt.core.parser.ast.IASTOffsetableNamedElement#getNameEndOffset()
+ */
+ public int getNameEndOffset()
+ {
+ return offsets.getNameEndOffset();
+ }
+ /* (non-Javadoc)
+ * @see org.eclipse.cdt.core.parser.ast.IASTOffsetableNamedElement#setNameEndOffset(int)
+ */
+ public void setNameEndOffset(int o)
+ {
+ offsets.setNameEndOffset(o);
+ }
}
Index: parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTEnumerator.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTEnumerator.java,v
retrieving revision 1.7
diff -u -r1.7 ASTEnumerator.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTEnumerator.java 24 Jul 2003 13:47:18 -0000 1.7
+++ parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTEnumerator.java 29 Sep 2003 19:17:43 -0000
@@ -35,12 +35,13 @@
* @param startingOffset
* @param endingOffset
*/
- public ASTEnumerator(IASTEnumerationSpecifier enumeration, String string, int startingOffset, int endingOffset, IASTExpression initialValue)
+ public ASTEnumerator(IASTEnumerationSpecifier enumeration, String string, int startingOffset, int nameOffset, int nameEndOffset, int endingOffset, IASTExpression initialValue)
{
this.enumeration = enumeration;
name = string;
offsets.setStartingOffset( startingOffset );
- offsets.setNameOffset( startingOffset );
+ offsets.setNameOffset( nameOffset );
+ offsets.setNameEndOffset( nameEndOffset );
offsets.setEndingOffset( endingOffset );
this.initialValue = initialValue;
}
@@ -125,4 +126,20 @@
public void exitScope(ISourceElementRequestor requestor)
{
}
+
+ /* (non-Javadoc)
+ * @see org.eclipse.cdt.core.parser.ast.IASTOffsetableNamedElement#getNameEndOffset()
+ */
+ public int getNameEndOffset()
+ {
+ return offsets.getNameEndOffset();
+ }
+ /* (non-Javadoc)
+ * @see org.eclipse.cdt.core.parser.ast.IASTOffsetableNamedElement#setNameEndOffset(int)
+ */
+ public void setNameEndOffset(int o)
+ {
+ offsets.setNameEndOffset(o);
+ }
+
}
Index: parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTField.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTField.java,v
retrieving revision 1.4
diff -u -r1.4 ASTField.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTField.java 13 Aug 2003 23:54:05 -0000 1.4
+++ parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTField.java 29 Sep 2003 19:17:43 -0000
@@ -38,7 +38,7 @@
* @param isRegister
* @param isStatic
*/
- public ASTField(IASTScope scope, String name, boolean isAuto, IASTInitializerClause initializerClause, IASTExpression bitfieldExpression, IASTAbstractDeclaration abstractDeclaration, boolean isMutable, boolean isExtern, boolean isRegister, boolean isStatic, int startingOffset, int nameOffset, IASTExpression constructorExpression, ASTAccessVisibility visibility)
+ public ASTField(IASTScope scope, String name, boolean isAuto, IASTInitializerClause initializerClause, IASTExpression bitfieldExpression, IASTAbstractDeclaration abstractDeclaration, boolean isMutable, boolean isExtern, boolean isRegister, boolean isStatic, int startingOffset, int nameOffset, int nameEndOffset, IASTExpression constructorExpression, ASTAccessVisibility visibility)
{
super(
scope,
@@ -50,7 +50,7 @@
isMutable,
isExtern,
isRegister,
- isStatic, startingOffset, nameOffset, constructorExpression );
+ isStatic, startingOffset, nameOffset, nameEndOffset, constructorExpression );
this.visibility = visibility;
}
@@ -64,7 +64,14 @@
public void acceptElement( ISourceElementRequestor requestor )
{
- requestor.acceptField( this );
+ try
+ {
+ requestor.acceptField( this );
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
public void enterScope( ISourceElementRequestor requestor )
Index: parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTFunction.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTFunction.java,v
retrieving revision 1.11
diff -u -r1.11 ASTFunction.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTFunction.java 15 Sep 2003 22:50:25 -0000 1.11
+++ parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTFunction.java 29 Sep 2003 19:17:43 -0000
@@ -51,10 +51,10 @@
offsets.setStartingOffset( startOffset );
offsets.setNameOffset( nameOffset );
qualifiedName = new ASTQualifiedNamedElement( scope, name );
- this.nameEndOffset = nameEndOffset;
+ setNameEndOffset(nameEndOffset);
}
- private final int nameEndOffset;
+ private boolean previouslyDeclared;
private boolean hasFunctionBody = false;
private final IASTQualifiedNameElement qualifiedName;
private final IASTTemplate ownerTemplateDeclaration;
@@ -184,14 +184,28 @@
*/
public void acceptElement(ISourceElementRequestor requestor)
{
- requestor.acceptFunctionDeclaration(this);
+ try
+ {
+ requestor.acceptFunctionDeclaration(this);
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.parser.ISourceElementCallbackDelegate#enter(org.eclipse.cdt.core.parser.ISourceElementRequestor)
*/
public void enterScope(ISourceElementRequestor requestor)
{
- requestor.enterFunctionBody( this );
+ try
+ {
+ requestor.enterFunctionBody( this );
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
/* (non-Javadoc)
@@ -199,7 +213,14 @@
*/
public void exitScope(ISourceElementRequestor requestor)
{
- requestor.exitFunctionBody( this );
+ try
+ {
+ requestor.exitFunctionBody( this );
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.parser.ast.IASTFunction#setHasFunctionBody(boolean)
@@ -225,14 +246,19 @@
*/
public boolean previouslyDeclared()
{
- // TODO Auto-generated method stub
- return false;
+ return previouslyDeclared;
}
- /* (non-Javadoc)
- * @see org.eclipse.cdt.core.parser.ast.IASTFunction#getNameEndOffset()
- */
- public int getNameEndOffset()
- {
- return nameEndOffset;
- }
-}
+ /* (non-Javadoc)
+ * @see org.eclipse.cdt.core.parser.ast.IASTOffsetableNamedElement#getNameEndOffset()
+ */
+ public int getNameEndOffset()
+ {
+ return offsets.getNameEndOffset();
+ }
+ /* (non-Javadoc)
+ * @see org.eclipse.cdt.core.parser.ast.IASTOffsetableNamedElement#setNameEndOffset(int)
+ */
+ public void setNameEndOffset(int o)
+ {
+ offsets.setNameEndOffset(o);
+ }}
Index: parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTLinkageSpecification.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTLinkageSpecification.java,v
retrieving revision 1.5
diff -u -r1.5 ASTLinkageSpecification.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTLinkageSpecification.java 21 Jul 2003 17:29:54 -0000 1.5
+++ parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTLinkageSpecification.java 29 Sep 2003 19:17:43 -0000
@@ -101,7 +101,14 @@
*/
public void enterScope(ISourceElementRequestor requestor)
{
- requestor.enterLinkageSpecification(this);
+ try
+ {
+ requestor.enterLinkageSpecification(this);
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
/* (non-Javadoc)
@@ -109,7 +116,14 @@
*/
public void exitScope(ISourceElementRequestor requestor)
{
- requestor.exitLinkageSpecification(this);
+ try
+ {
+ requestor.exitLinkageSpecification(this);
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
}
Index: parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTMethod.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTMethod.java,v
retrieving revision 1.6
diff -u -r1.6 ASTMethod.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTMethod.java 15 Sep 2003 22:50:25 -0000 1.6
+++ parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTMethod.java 29 Sep 2003 19:17:43 -0000
@@ -167,17 +167,38 @@
public void acceptElement( ISourceElementRequestor requestor )
{
- requestor.acceptMethodDeclaration( this );
+ try
+ {
+ requestor.acceptMethodDeclaration( this );
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
public void enterScope( ISourceElementRequestor requestor )
{
- requestor.enterMethodBody(this);
+ try
+ {
+ requestor.enterMethodBody(this);
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
public void exitScope( ISourceElementRequestor requestor )
{
- requestor.exitMethodBody(this);
+ try
+ {
+ requestor.exitMethodBody(this);
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.parser.ast.IASTMethod#getConstructorChainInitializers()
Index: parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTNamespaceAlias.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTNamespaceAlias.java,v
retrieving revision 1.1
diff -u -r1.1 ASTNamespaceAlias.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTNamespaceAlias.java 28 Aug 2003 15:02:52 -0000 1.1
+++ parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTNamespaceAlias.java 29 Sep 2003 19:17:43 -0000
@@ -35,11 +35,12 @@
* @param nameOffset
* @param endOffset
*/
- public ASTNamespaceAlias(IASTScope scope, String identifier, String string, int startingOffset, int nameOffset, int endOffset)
+ public ASTNamespaceAlias(IASTScope scope, String identifier, String string, int startingOffset, int nameOffset, int nameEndOffset, int endOffset)
{
super( scope );
setStartingOffset(startingOffset);
setNameOffset(nameOffset);
+ setNameEndOffset( nameEndOffset );
setEndingOffset(endOffset);
this.identifier = identifier;
this.alias = string;
@@ -129,4 +130,19 @@
{
return offsets.getEndingOffset();
}
+
+ /* (non-Javadoc)
+ * @see org.eclipse.cdt.core.parser.ast.IASTOffsetableNamedElement#getNameEndOffset()
+ */
+ public int getNameEndOffset()
+ {
+ return offsets.getNameEndOffset();
+ }
+ /* (non-Javadoc)
+ * @see org.eclipse.cdt.core.parser.ast.IASTOffsetableNamedElement#setNameEndOffset(int)
+ */
+ public void setNameEndOffset(int o)
+ {
+ offsets.setNameEndOffset(o);
+ }
}
Index: parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTNamespaceDefinition.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTNamespaceDefinition.java,v
retrieving revision 1.6
diff -u -r1.6 ASTNamespaceDefinition.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTNamespaceDefinition.java 21 Jul 2003 17:29:54 -0000 1.6
+++ parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTNamespaceDefinition.java 29 Sep 2003 19:17:43 -0000
@@ -31,11 +31,14 @@
private NamedOffsets offsets = new NamedOffsets();
private final ASTQualifiedNamedElement qualifiedNameElement;
- public ASTNamespaceDefinition( IASTScope scope, String name )
+ public ASTNamespaceDefinition( IASTScope scope, String name, int startOffset, int nameOffset, int nameEndOffset )
{
super( scope );
qualifiedNameElement = new ASTQualifiedNamedElement( scope, name );
this.name = name;
+ setStartingOffset(startOffset);
+ setNameOffset(nameOffset);
+ setNameEndOffset(nameEndOffset);
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.parser.ast.IASTOffsetableNamedElement#getName()
@@ -118,13 +121,42 @@
*/
public void enterScope(ISourceElementRequestor requestor)
{
- requestor.enterNamespaceDefinition(this);
+ try
+ {
+ requestor.enterNamespaceDefinition(this);
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.parser.ISourceElementCallbackDelegate#exit(org.eclipse.cdt.core.parser.ISourceElementRequestor)
*/
public void exitScope(ISourceElementRequestor requestor)
{
- requestor.exitNamespaceDefinition(this);
+ try
+ {
+ requestor.exitNamespaceDefinition(this);
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
+
+ /* (non-Javadoc)
+ * @see org.eclipse.cdt.core.parser.ast.IASTOffsetableNamedElement#getNameEndOffset()
+ */
+ public int getNameEndOffset()
+ {
+ return offsets.getNameEndOffset();
+ }
+ /* (non-Javadoc)
+ * @see org.eclipse.cdt.core.parser.ast.IASTOffsetableNamedElement#setNameEndOffset(int)
+ */
+ public void setNameEndOffset(int o)
+ {
+ offsets.setNameEndOffset(o);
+ }
}
Index: parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTParameterDeclaration.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTParameterDeclaration.java,v
retrieving revision 1.4
diff -u -r1.4 ASTParameterDeclaration.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTParameterDeclaration.java 12 Sep 2003 18:36:36 -0000 1.4
+++ parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTParameterDeclaration.java 29 Sep 2003 19:17:43 -0000
@@ -36,7 +36,7 @@
* @param parameterName
* @param initializerClause
*/
- public ASTParameterDeclaration(boolean isConst, boolean isVolatile, IASTTypeSpecifier typeSpecifier, List pointerOperators, List arrayModifiers, List parameters, ASTPointerOperator pointerOp, String parameterName, IASTInitializerClause initializerClause, int startingOffset, int endingOffset, int nameOffset)
+ public ASTParameterDeclaration(boolean isConst, boolean isVolatile, IASTTypeSpecifier typeSpecifier, List pointerOperators, List arrayModifiers, List parameters, ASTPointerOperator pointerOp, String parameterName, IASTInitializerClause initializerClause, int startingOffset, int endingOffset, int nameOffset, int nameEndOffset )
{
super( isConst, isVolatile, typeSpecifier, pointerOperators, arrayModifiers, parameters, pointerOp );
this.parameterName = parameterName;
@@ -44,6 +44,7 @@
setStartingOffset( startingOffset );
setEndingOffset( endingOffset );
setNameOffset( nameOffset );
+ setNameEndOffset(nameEndOffset);
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.parser.ast.IASTParameterDeclaration#getName()
@@ -101,5 +102,20 @@
public int getEndingOffset()
{
return offsets.getEndingOffset();
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.cdt.core.parser.ast.IASTOffsetableNamedElement#getNameEndOffset()
+ */
+ public int getNameEndOffset()
+ {
+ return offsets.getNameEndOffset();
+ }
+ /* (non-Javadoc)
+ * @see org.eclipse.cdt.core.parser.ast.IASTOffsetableNamedElement#setNameEndOffset(int)
+ */
+ public void setNameEndOffset(int o)
+ {
+ offsets.setNameEndOffset(o);
}
}
Index: parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTTemplateDeclaration.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTTemplateDeclaration.java,v
retrieving revision 1.4
diff -u -r1.4 ASTTemplateDeclaration.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTTemplateDeclaration.java 21 Jul 2003 17:29:54 -0000 1.4
+++ parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTTemplateDeclaration.java 29 Sep 2003 19:17:43 -0000
@@ -112,7 +112,14 @@
*/
public void enterScope(ISourceElementRequestor requestor)
{
- requestor.enterTemplateDeclaration(this);
+ try
+ {
+ requestor.enterTemplateDeclaration(this);
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
/* (non-Javadoc)
@@ -120,6 +127,13 @@
*/
public void exitScope(ISourceElementRequestor requestor)
{
- requestor.exitTemplateDeclaration(this);
+ try
+ {
+ requestor.exitTemplateDeclaration(this);
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
}
Index: parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTTemplateInstantiation.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTTemplateInstantiation.java,v
retrieving revision 1.3
diff -u -r1.3 ASTTemplateInstantiation.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTTemplateInstantiation.java 21 Jul 2003 17:29:54 -0000 1.3
+++ parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTTemplateInstantiation.java 29 Sep 2003 19:17:43 -0000
@@ -94,7 +94,14 @@
*/
public void enterScope(ISourceElementRequestor requestor)
{
- requestor.enterTemplateInstantiation(this);
+ try
+ {
+ requestor.enterTemplateInstantiation(this);
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
@@ -103,6 +110,13 @@
*/
public void exitScope(ISourceElementRequestor requestor)
{
- requestor.exitTemplateExplicitInstantiation(this);
+ try
+ {
+ requestor.exitTemplateExplicitInstantiation(this);
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
}
Index: parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTTemplateSpecialization.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTTemplateSpecialization.java,v
retrieving revision 1.3
diff -u -r1.3 ASTTemplateSpecialization.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTTemplateSpecialization.java 21 Jul 2003 17:29:54 -0000 1.3
+++ parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTTemplateSpecialization.java 29 Sep 2003 19:17:43 -0000
@@ -89,7 +89,14 @@
*/
public void enterScope(ISourceElementRequestor requestor)
{
- requestor.enterTemplateSpecialization(this);
+ try
+ {
+ requestor.enterTemplateSpecialization(this);
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
/* (non-Javadoc)
@@ -97,6 +104,13 @@
*/
public void exitScope(ISourceElementRequestor requestor)
{
- requestor.exitTemplateSpecialization(this);
+ try
+ {
+ requestor.exitTemplateSpecialization(this);
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
}
Index: parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTTypedefDeclaration.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTTypedefDeclaration.java,v
retrieving revision 1.3
diff -u -r1.3 ASTTypedefDeclaration.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTTypedefDeclaration.java 21 Jul 2003 17:29:54 -0000 1.3
+++ parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTTypedefDeclaration.java 29 Sep 2003 19:17:43 -0000
@@ -32,13 +32,14 @@
* @param name
* @param mapping
*/
- public ASTTypedefDeclaration(IASTScope scope, String name, IASTAbstractDeclaration mapping, int startingOffset, int nameOffset)
+ public ASTTypedefDeclaration(IASTScope scope, String name, IASTAbstractDeclaration mapping, int startingOffset, int nameOffset, int nameEndOffset )
{
super( scope );
this.name = name;
this.mapping = mapping;
setStartingOffset(startingOffset);
setNameOffset(nameOffset);
+ setNameEndOffset(nameEndOffset);
qualifiedName = new ASTQualifiedNamedElement( scope, name );
}
/* (non-Javadoc)
@@ -110,7 +111,14 @@
*/
public void acceptElement(ISourceElementRequestor requestor)
{
- requestor.acceptTypedefDeclaration(this);
+ try
+ {
+ requestor.acceptTypedefDeclaration(this);
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.parser.ISourceElementCallbackDelegate#enter(org.eclipse.cdt.core.parser.ISourceElementRequestor)
@@ -124,5 +132,20 @@
public void exitScope(ISourceElementRequestor requestor)
{
}
+
+ /* (non-Javadoc)
+ * @see org.eclipse.cdt.core.parser.ast.IASTOffsetableNamedElement#getNameEndOffset()
+ */
+ public int getNameEndOffset()
+ {
+ return offsets.getNameEndOffset();
+ }
+ /* (non-Javadoc)
+ * @see org.eclipse.cdt.core.parser.ast.IASTOffsetableNamedElement#setNameEndOffset(int)
+ */
+ public void setNameEndOffset(int o)
+ {
+ offsets.setNameEndOffset(o);
+ }
}
Index: parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTUsingDeclaration.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTUsingDeclaration.java,v
retrieving revision 1.6
diff -u -r1.6 ASTUsingDeclaration.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTUsingDeclaration.java 24 Jul 2003 13:47:18 -0000 1.6
+++ parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTUsingDeclaration.java 29 Sep 2003 19:17:43 -0000
@@ -84,7 +84,14 @@
*/
public void acceptElement(ISourceElementRequestor requestor)
{
- requestor.acceptUsingDeclaration(this);
+ try
+ {
+ requestor.acceptUsingDeclaration(this);
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.parser.ISourceElementCallbackDelegate#enter(org.eclipse.cdt.core.parser.ISourceElementRequestor)
Index: parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTUsingDirective.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTUsingDirective.java,v
retrieving revision 1.5
diff -u -r1.5 ASTUsingDirective.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTUsingDirective.java 21 Jul 2003 17:29:54 -0000 1.5
+++ parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTUsingDirective.java 29 Sep 2003 19:17:43 -0000
@@ -76,7 +76,14 @@
*/
public void acceptElement(ISourceElementRequestor requestor)
{
- requestor.acceptUsingDirective(this);
+ try
+ {
+ requestor.acceptUsingDirective(this);
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.parser.ISourceElementCallbackDelegate#enter(org.eclipse.cdt.core.parser.ISourceElementRequestor)
Index: parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTVariable.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTVariable.java,v
retrieving revision 1.8
diff -u -r1.8 ASTVariable.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTVariable.java 13 Aug 2003 23:54:05 -0000 1.8
+++ parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTVariable.java 29 Sep 2003 19:17:44 -0000
@@ -41,7 +41,7 @@
* @param scope
*/
public ASTVariable(IASTScope scope, String name, boolean isAuto, IASTInitializerClause initializerClause, IASTExpression bitfieldExpression,
- IASTAbstractDeclaration abstractDeclaration, boolean isMutable, boolean isExtern, boolean isRegister, boolean isStatic, int startingOffset, int nameOffset, IASTExpression constructorExpression )
+ IASTAbstractDeclaration abstractDeclaration, boolean isMutable, boolean isExtern, boolean isRegister, boolean isStatic, int startingOffset, int nameOffset, int nameEndOffset, IASTExpression constructorExpression )
{
super(scope);
this.isAuto = isAuto;
@@ -57,6 +57,7 @@
qualifiedName = new ASTQualifiedNamedElement( scope, name );
setStartingOffset(startingOffset);
setNameOffset(nameOffset);
+ setNameEndOffset( nameEndOffset );
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.parser.ast.IASTVariable#isAuto()
@@ -182,7 +183,14 @@
*/
public void acceptElement(ISourceElementRequestor requestor)
{
- requestor.acceptVariable(this);
+ try
+ {
+ requestor.acceptVariable(this);
+ }
+ catch (Exception e)
+ {
+ /* do nothing */
+ }
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.parser.ISourceElementCallbackDelegate#enter(org.eclipse.cdt.core.parser.ISourceElementRequestor)
@@ -203,6 +211,20 @@
{
return constructorExpression;
}
-
+
+ /* (non-Javadoc)
+ * @see org.eclipse.cdt.core.parser.ast.IASTOffsetableNamedElement#getNameEndOffset()
+ */
+ public int getNameEndOffset()
+ {
+ return offsets.getNameEndOffset();
+ }
+ /* (non-Javadoc)
+ * @see org.eclipse.cdt.core.parser.ast.IASTOffsetableNamedElement#setNameEndOffset(int)
+ */
+ public void setNameEndOffset(int o)
+ {
+ offsets.setNameEndOffset(o);
+ }
}
Index: parser/org/eclipse/cdt/internal/core/parser/ast/quick/QuickParseASTFactory.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/quick/QuickParseASTFactory.java,v
retrieving revision 1.37
diff -u -r1.37 QuickParseASTFactory.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/quick/QuickParseASTFactory.java 24 Sep 2003 17:26:45 -0000 1.37
+++ parser/org/eclipse/cdt/internal/core/parser/ast/quick/QuickParseASTFactory.java 29 Sep 2003 19:17:44 -0000
@@ -85,10 +85,8 @@
/* (non-Javadoc)
* @see org.eclipse.cdt.internal.core.parser.ast.IASTFactory#createNamespaceDefinition(int, java.lang.String, int)
*/
- public IASTNamespaceDefinition createNamespaceDefinition(IASTScope scope, String identifier, int first, int nameOffset) {
- IASTNamespaceDefinition definition = new ASTNamespaceDefinition( scope, identifier );
- definition.setStartingOffset( first );
- definition.setNameOffset( nameOffset );
+ public IASTNamespaceDefinition createNamespaceDefinition(IASTScope scope, String identifier, int first, int nameOffset, int nameEndOffset) {
+ IASTNamespaceDefinition definition = new ASTNamespaceDefinition( scope, identifier, first, nameOffset, nameEndOffset );
return definition;
}
@@ -116,11 +114,8 @@
/* (non-Javadoc)
* @see org.eclipse.cdt.core.parser.ast.IASTFactory#createClassSpecifier(org.eclipse.cdt.core.parser.ast.IASTScope, java.lang.String, org.eclipse.cdt.core.parser.ast.ClassKind, org.eclipse.cdt.core.parser.ast.ClassNameType, org.eclipse.cdt.core.parser.ast.AccessVisibility, org.eclipse.cdt.core.parser.ast.IASTTemplateDeclaration)
*/
- public IASTClassSpecifier createClassSpecifier(IASTScope scope, ITokenDuple name, ASTClassKind kind, ClassNameType type, ASTAccessVisibility access, int startingOffset, int nameOffset) throws ASTSemanticException {
- IASTClassSpecifier spec = new ASTClassSpecifier( scope, name == null ? "" : name.toString() , kind, type, access );
- spec.setStartingOffset( startingOffset );
- spec.setNameOffset( nameOffset );
- return spec;
+ public IASTClassSpecifier createClassSpecifier(IASTScope scope, ITokenDuple name, ASTClassKind kind, ClassNameType type, ASTAccessVisibility access, int startingOffset, int nameOffset, int nameEndOffset ) throws ASTSemanticException {
+ return new ASTClassSpecifier( scope, name == null ? "" : name.toString() , kind, type, startingOffset, nameOffset, nameEndOffset, access );
}
/* (non-Javadoc)
@@ -134,17 +129,17 @@
/* (non-Javadoc)
* @see org.eclipse.cdt.core.parser.ast.IASTFactory#createEnumerationSpecifier(java.lang.String, int)
*/
- public IASTEnumerationSpecifier createEnumerationSpecifier(IASTScope scope, String name, int startingOffset, int nameOffset)
+ public IASTEnumerationSpecifier createEnumerationSpecifier(IASTScope scope, String name, int startingOffset, int nameOffset, int nameEndOffset)
{
- return new ASTEnumerationSpecifier( scope, name, startingOffset, nameOffset );
+ return new ASTEnumerationSpecifier( scope, name, startingOffset, nameOffset, nameEndOffset );
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.parser.ast.IASTFactory#addEnumerator(org.eclipse.cdt.core.parser.ast.IASTEnumerationSpecifier, java.lang.String, int, int)
*/
- public void addEnumerator(IASTEnumerationSpecifier enumeration, String string, int startingOffset, int endingOffset, IASTExpression initialValue)
+ public void addEnumerator(IASTEnumerationSpecifier enumeration, String string, int startingOffset, int nameOffset, int nameEndOffset, int endingOffset, IASTExpression initialValue)
{
- IASTEnumerator enumerator = new ASTEnumerator( enumeration, string, startingOffset, endingOffset, initialValue );
+ IASTEnumerator enumerator = new ASTEnumerator( enumeration, string, startingOffset, nameOffset, nameEndOffset, endingOffset, initialValue );
((ASTEnumerationSpecifier)enumeration).addEnumerator( enumerator );
}
@@ -189,7 +184,7 @@
/* (non-Javadoc)
* @see org.eclipse.cdt.core.parser.ast.IASTFactory#createFunction(org.eclipse.cdt.core.parser.ast.IASTScope, java.lang.String, java.util.List, org.eclipse.cdt.core.parser.ast.IASTAbstractDeclaration, org.eclipse.cdt.core.parser.ast.IASTExceptionSpecification, boolean, boolean, boolean, int, int, org.eclipse.cdt.core.parser.ast.IASTTemplateDeclaration)
*/
- public IASTFunction createFunction(IASTScope scope, String name, int nameEndOffset, List parameters, IASTAbstractDeclaration returnType, IASTExceptionSpecification exception, boolean isInline, boolean isFriend, boolean isStatic, int startOffset, int nameOffset, IASTTemplate ownerTemplate, boolean isConst, boolean isVolatile, boolean isVirtual, boolean isExplicit, boolean isPureVirtual, List constructorChain, boolean isFunctionDefinition )
+ public IASTFunction createFunction(IASTScope scope, String name, List parameters, IASTAbstractDeclaration returnType, IASTExceptionSpecification exception, boolean isInline, boolean isFriend, boolean isStatic, int startOffset, int nameOffset, int nameEndOffset, IASTTemplate ownerTemplate, boolean isConst, boolean isVolatile, boolean isVirtual, boolean isExplicit, boolean isPureVirtual, List constructorChain, boolean isFunctionDefinition )
{
return new ASTFunction(scope, name, nameEndOffset, parameters, returnType, exception, isInline, isFriend, isStatic, startOffset, nameOffset, ownerTemplate );
}
@@ -197,7 +192,7 @@
/* (non-Javadoc)
* @see org.eclipse.cdt.core.parser.ast.IASTFactory#createMethod(org.eclipse.cdt.core.parser.ast.IASTScope, java.lang.String, java.util.List, org.eclipse.cdt.core.parser.ast.IASTAbstractDeclaration, org.eclipse.cdt.core.parser.ast.IASTExceptionSpecification, boolean, boolean, boolean, int, int, org.eclipse.cdt.core.parser.ast.IASTTemplateDeclaration, boolean, boolean, boolean, boolean, boolean, boolean, boolean, org.eclipse.cdt.core.parser.ast.ASTAccessVisibility)
*/
- public IASTMethod createMethod(IASTScope scope, String name, int nameEndOffset, List parameters, IASTAbstractDeclaration returnType, IASTExceptionSpecification exception, boolean isInline, boolean isFriend, boolean isStatic, int startOffset, int nameOffset, IASTTemplate ownerTemplate, boolean isConst, boolean isVolatile, boolean isVirtual, boolean isExplicit, boolean isPureVirtual, ASTAccessVisibility visibility, List constructorChain, boolean isFunctionDefinition )
+ public IASTMethod createMethod(IASTScope scope, String name, List parameters, IASTAbstractDeclaration returnType, IASTExceptionSpecification exception, boolean isInline, boolean isFriend, boolean isStatic, int startOffset, int nameOffset, int nameEndOffset, IASTTemplate ownerTemplate, boolean isConst, boolean isVolatile, boolean isVirtual, boolean isExplicit, boolean isPureVirtual, ASTAccessVisibility visibility, List constructorChain, boolean isFunctionDefinition )
{
return new ASTMethod(scope, name, nameEndOffset, parameters, returnType, exception, isInline, isFriend, isStatic, startOffset, nameOffset, ownerTemplate, isConst, isVolatile, false, false, isVirtual, isExplicit, isPureVirtual, visibility, constructorChain);
}
@@ -205,17 +200,17 @@
/* (non-Javadoc)
* @see org.eclipse.cdt.core.parser.ast.IASTFactory#createVariable(org.eclipse.cdt.core.parser.ast.IASTScope, java.lang.String, boolean, org.eclipse.cdt.core.parser.ast.IASTInitializerClause, org.eclipse.cdt.core.parser.ast.IASTExpression, org.eclipse.cdt.core.parser.ast.IASTAbstractDeclaration, boolean, boolean, boolean, boolean)
*/
- public IASTVariable createVariable(IASTScope scope, String name, boolean isAuto, IASTInitializerClause initializerClause, IASTExpression bitfieldExpression, IASTAbstractDeclaration abstractDeclaration, boolean isMutable, boolean isExtern, boolean isRegister, boolean isStatic, int startingOffset, int nameOffset, IASTExpression constructorExpression)
+ public IASTVariable createVariable(IASTScope scope, String name, boolean isAuto, IASTInitializerClause initializerClause, IASTExpression bitfieldExpression, IASTAbstractDeclaration abstractDeclaration, boolean isMutable, boolean isExtern, boolean isRegister, boolean isStatic, int startingOffset, int nameOffset, int nameEndOffset, IASTExpression constructorExpression)
{
- return new ASTVariable(scope, name, isAuto, initializerClause, bitfieldExpression, abstractDeclaration, isMutable, isExtern, isRegister, isStatic, startingOffset, nameOffset, constructorExpression);
+ return new ASTVariable(scope, name, isAuto, initializerClause, bitfieldExpression, abstractDeclaration, isMutable, isExtern, isRegister, isStatic, startingOffset, nameOffset, nameEndOffset, constructorExpression);
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.parser.ast.IASTFactory#createField(org.eclipse.cdt.core.parser.ast.IASTScope, java.lang.String, boolean, org.eclipse.cdt.core.parser.ast.IASTInitializerClause, org.eclipse.cdt.core.parser.ast.IASTExpression, org.eclipse.cdt.core.parser.ast.IASTAbstractDeclaration, boolean, boolean, boolean, boolean, org.eclipse.cdt.core.parser.ast.ASTAccessVisibility)
*/
- public IASTField createField(IASTScope scope, String name, boolean isAuto, IASTInitializerClause initializerClause, IASTExpression bitfieldExpression, IASTAbstractDeclaration abstractDeclaration, boolean isMutable, boolean isExtern, boolean isRegister, boolean isStatic, int startingOffset, int nameOffset, IASTExpression constructorExpression, ASTAccessVisibility visibility)
+ public IASTField createField(IASTScope scope, String name, boolean isAuto, IASTInitializerClause initializerClause, IASTExpression bitfieldExpression, IASTAbstractDeclaration abstractDeclaration, boolean isMutable, boolean isExtern, boolean isRegister, boolean isStatic, int startingOffset, int nameOffset, int nameEndOffset, IASTExpression constructorExpression, ASTAccessVisibility visibility)
{
- return new ASTField(scope, name, isAuto, initializerClause, bitfieldExpression, abstractDeclaration, isMutable, isExtern, isRegister, isStatic, startingOffset, nameOffset, constructorExpression, visibility);
+ return new ASTField(scope, name, isAuto, initializerClause, bitfieldExpression, abstractDeclaration, isMutable, isExtern, isRegister, isStatic, startingOffset, nameOffset, nameEndOffset, constructorExpression, visibility);
}
/* (non-Javadoc)
@@ -253,9 +248,9 @@
/* (non-Javadoc)
* @see org.eclipse.cdt.core.parser.ast.IASTFactory#createTypedef(org.eclipse.cdt.core.parser.ast.IASTScope, java.lang.String, org.eclipse.cdt.core.parser.ast.IASTAbstractDeclaration)
*/
- public IASTTypedefDeclaration createTypedef(IASTScope scope, String name, IASTAbstractDeclaration mapping, int startingOffset, int nameOffset)
+ public IASTTypedefDeclaration createTypedef(IASTScope scope, String name, IASTAbstractDeclaration mapping, int startingOffset, int nameOffset, int nameEndOffset)
{
- return new ASTTypedefDeclaration( scope, name, mapping, startingOffset, nameOffset );
+ return new ASTTypedefDeclaration( scope, name, mapping, startingOffset, nameOffset, nameEndOffset);
}
/* (non-Javadoc)
@@ -268,15 +263,15 @@
public IASTElaboratedTypeSpecifier createElaboratedTypeSpecifier(IASTScope scope, ASTClassKind elaboratedClassKind, ITokenDuple typeName, int startingOffset, int endOffset, boolean isForewardDecl)
{
- return new ASTElaboratedTypeSpecifier( scope, elaboratedClassKind, typeName.toString(), startingOffset, typeName.getFirstToken().getOffset(), endOffset );
+ return new ASTElaboratedTypeSpecifier( scope, elaboratedClassKind, typeName.toString(), startingOffset, typeName.getFirstToken().getOffset(), typeName.getLastToken().getEndOffset(), endOffset );
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.parser.ast.IASTFactory#createNamespaceAlias(org.eclipse.cdt.core.parser.ast.IASTScope, java.lang.String, org.eclipse.cdt.core.parser.ITokenDuple, int, int, int)
*/
- public IASTNamespaceAlias createNamespaceAlias(IASTScope scope, String identifier, ITokenDuple alias, int startingOffset, int nameOffset, int endOffset)
+ public IASTNamespaceAlias createNamespaceAlias(IASTScope scope, String identifier, ITokenDuple alias, int startingOffset, int nameOffset, int nameEndOffset, int endOffset)
{
- return new ASTNamespaceAlias( scope, identifier, alias.toString(), startingOffset, nameOffset, endOffset );
+ return new ASTNamespaceAlias( scope, identifier, alias.toString(), startingOffset, nameOffset, nameEndOffset, endOffset );
}
/* (non-Javadoc)
@@ -293,9 +288,9 @@
return true; // we have no information to say that it is not
}
- public IASTParameterDeclaration createParameterDeclaration(boolean isConst, boolean isVolatile, IASTTypeSpecifier typeSpecifier, List pointerOperators, List arrayModifiers, List parameters, ASTPointerOperator pointerOp, String parameterName, IASTInitializerClause initializerClause, int startingOffset, int endingOffset, int nameOffset)
+ public IASTParameterDeclaration createParameterDeclaration(boolean isConst, boolean isVolatile, IASTTypeSpecifier typeSpecifier, List pointerOperators, List arrayModifiers, List parameters, ASTPointerOperator pointerOp, String parameterName, IASTInitializerClause initializerClause, int startingOffset, int nameOffset, int nameEndOffset, int endingOffset)
{
- return new ASTParameterDeclaration( isConst, isVolatile, typeSpecifier, pointerOperators, arrayModifiers, parameters, pointerOp, parameterName, initializerClause, startingOffset, endingOffset, nameOffset );
+ return new ASTParameterDeclaration( isConst, isVolatile, typeSpecifier, pointerOperators, arrayModifiers, parameters, pointerOp, parameterName, initializerClause, startingOffset, endingOffset, nameOffset, nameEndOffset );
}
/* (non-Javadoc)
Index: parser/org/eclipse/cdt/internal/core/parser/problem/DefaultProblem.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/problem/DefaultProblem.java,v
retrieving revision 1.3
diff -u -r1.3 DefaultProblem.java
--- parser/org/eclipse/cdt/internal/core/parser/problem/DefaultProblem.java 18 Jul 2003 16:39:22 -0000 1.3
+++ parser/org/eclipse/cdt/internal/core/parser/problem/DefaultProblem.java 29 Sep 2003 19:17:44 -0000
@@ -253,7 +253,14 @@
*/
public void acceptElement(ISourceElementRequestor requestor)
{
- requestor.acceptProblem( this );
+ try
+ {
+ requestor.acceptProblem( this );
+ }
+ catch (Exception e)
+ {
+ // do nothing
+ }
}
/* (non-Javadoc)Index: ChangeLog
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core.tests/ChangeLog,v
retrieving revision 1.119
diff -u -r1.119 ChangeLog
--- ChangeLog 26 Sep 2003 19:54:28 -0000 1.119
+++ ChangeLog 29 Sep 2003 19:18:23 -0000
@@ -1,3 +1,6 @@
+2003-09-29 John Camelon
+ Added testErrorHandling_1() to CompleteParseASTTest.java.
+
2003-09-26 John Camelon
Added QuickParseASTTests::testBug43644() & testBug43062().
Moved ASTFailedTests::testBug39531() to QuickParseASTTests.
Index: parser/org/eclipse/cdt/core/parser/tests/CompleteParseASTTest.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/CompleteParseASTTest.java,v
retrieving revision 1.34
diff -u -r1.34 CompleteParseASTTest.java
--- parser/org/eclipse/cdt/core/parser/tests/CompleteParseASTTest.java 26 Sep 2003 19:21:07 -0000 1.34
+++ parser/org/eclipse/cdt/core/parser/tests/CompleteParseASTTest.java 29 Sep 2003 19:18:24 -0000
@@ -844,4 +844,16 @@
assertFalse( i.hasNext() );
assertAllReferences( 8, createTaskList( new Task( SD_02), new Task( SD_01, 3 ), new Task( a ), new Task( f_SD_01 ), new Task( f_SD_02 ), new Task( next ) ));
}
+
+ public void testErrorHandling_1() throws Exception
+ {
+ Iterator i = parse( "A anA; int x = c; class A {}; A * anotherA = &anA; int b;", false ).getDeclarations();
+ IASTVariable x = (IASTVariable)i.next();
+ assertEquals( x.getName(), "x");
+ IASTClassSpecifier A = (IASTClassSpecifier)((IASTAbstractTypeSpecifierDeclaration)i.next()).getTypeSpecifier();
+ IASTVariable anotherA = (IASTVariable)i.next();
+ IASTVariable b = (IASTVariable)i.next();
+ assertEquals( b.getName(), "b");
+ assertFalse(i.hasNext());
+ }
}
Index: parser/org/eclipse/cdt/core/parser/tests/CompleteParseBaseTest.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/CompleteParseBaseTest.java,v
retrieving revision 1.8
diff -u -r1.8 CompleteParseBaseTest.java
--- parser/org/eclipse/cdt/core/parser/tests/CompleteParseBaseTest.java 26 Sep 2003 19:21:07 -0000 1.8
+++ parser/org/eclipse/cdt/core/parser/tests/CompleteParseBaseTest.java 29 Sep 2003 19:18:24 -0000
@@ -666,14 +666,19 @@
return null;
}
protected FullParseCallback callback;
- protected IASTScope parse(String code) throws ParserException
+
+ protected IASTScope parse( String code ) throws ParserException
+ {
+ return parse( code, true );
+ }
+ protected IASTScope parse(String code, boolean throwOnError) throws ParserException
{
callback = new FullParseCallback();
IParser parser = ParserFactory.createParser(
ParserFactory.createScanner( new StringReader( code ), "test-code", new ScannerInfo(),
ParserMode.COMPLETE_PARSE, ParserLanguage.CPP, callback ), callback, ParserMode.COMPLETE_PARSE, ParserLanguage.CPP
);
- if( ! parser.parse() ) throw new ParserException( "FAILURE");
+ if( ! parser.parse() && throwOnError ) throw new ParserException( "FAILURE");
return callback.getCompilationUnit();
}
