mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-04-29 19:45:01 +02:00
org.eclipse.cdt.core
==================== Changed IASTNode.LookupException to IASTNode.LookupError. Updated IASTElaboratedTypeSpecifier to remove redundant extends relationships. org.eclipse.cdt.ui ================== IASTNode.LookupException references changed to IASTNode.LookupError.
This commit is contained in:
parent
57d668240a
commit
9960da3ec4
6 changed files with 18 additions and 11 deletions
|
@ -1,3 +1,7 @@
|
||||||
|
2004-01-16 John Camelon
|
||||||
|
Changed IASTNode.LookupException to IASTNode.LookupError.
|
||||||
|
Updated IASTElaboratedTypeSpecifier to remove redundant extends relationships.
|
||||||
|
|
||||||
2004-01-15 Andrew Niefer
|
2004-01-15 Andrew Niefer
|
||||||
Modified symbol table constructor to take a ParseMode as a parameter.
|
Modified symbol table constructor to take a ParseMode as a parameter.
|
||||||
Modified symbol table to use a TreeMap instead of HashMap when ParseMode is CONTEXTUAL_PARSE
|
Modified symbol table to use a TreeMap instead of HashMap when ParseMode is CONTEXTUAL_PARSE
|
||||||
|
|
|
@ -18,7 +18,7 @@ import org.eclipse.cdt.core.parser.ISourceElementCallbackDelegate;
|
||||||
* @author jcamelon
|
* @author jcamelon
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public interface IASTElaboratedTypeSpecifier extends IASTTypeSpecifier, IASTOffsetableElement, IASTQualifiedNameElement, ISourceElementCallbackDelegate, IASTOffsetableNamedElement {
|
public interface IASTElaboratedTypeSpecifier extends IASTTypeSpecifier, IASTQualifiedNameElement, ISourceElementCallbackDelegate, IASTOffsetableNamedElement {
|
||||||
|
|
||||||
public String getName();
|
public String getName();
|
||||||
public ASTClassKind getClassKind();
|
public ASTClassKind getClassKind();
|
||||||
|
|
|
@ -48,7 +48,7 @@ public interface IASTNode {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static class LookupException extends Exception
|
public static class LookupError extends Error
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -64,8 +64,8 @@ public interface IASTNode {
|
||||||
* @param kind
|
* @param kind
|
||||||
* @param context
|
* @param context
|
||||||
* @return
|
* @return
|
||||||
* @throws LookupException
|
* @throws LookupError
|
||||||
*/
|
*/
|
||||||
public ILookupResult lookup( String prefix, LookupKind[] kind, IASTNode context) throws LookupException, ASTNotImplementedException;
|
public ILookupResult lookup( String prefix, LookupKind[] kind, IASTNode context) throws LookupError, ASTNotImplementedException;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -33,7 +33,7 @@ public class ASTNode implements IASTNode {
|
||||||
/* (non-Javadoc)
|
/* (non-Javadoc)
|
||||||
* @see org.eclipse.cdt.core.parser.ast.IASTNode#lookup(java.lang.String, org.eclipse.cdt.core.parser.ast.IASTNode.LookupKind, org.eclipse.cdt.core.parser.ast.IASTNode)
|
* @see org.eclipse.cdt.core.parser.ast.IASTNode#lookup(java.lang.String, org.eclipse.cdt.core.parser.ast.IASTNode.LookupKind, org.eclipse.cdt.core.parser.ast.IASTNode)
|
||||||
*/
|
*/
|
||||||
public ILookupResult lookup(String prefix, LookupKind[] kind, IASTNode context) throws LookupException, ASTNotImplementedException {
|
public ILookupResult lookup(String prefix, LookupKind[] kind, IASTNode context) throws LookupError, ASTNotImplementedException {
|
||||||
|
|
||||||
if( ! ( this instanceof ISymbolOwner ) || ( context != null && !(context instanceof ISymbolOwner) ) ){
|
if( ! ( this instanceof ISymbolOwner ) || ( context != null && !(context instanceof ISymbolOwner) ) ){
|
||||||
return null;
|
return null;
|
||||||
|
@ -49,7 +49,7 @@ public class ASTNode implements IASTNode {
|
||||||
if( context != null ){
|
if( context != null ){
|
||||||
ISymbol sym = (IContainerSymbol) ((ISymbolOwner)context).getSymbol();
|
ISymbol sym = (IContainerSymbol) ((ISymbolOwner)context).getSymbol();
|
||||||
if( sym == null || !(sym instanceof IContainerSymbol) ){
|
if( sym == null || !(sym instanceof IContainerSymbol) ){
|
||||||
throw new LookupException();
|
throw new LookupError();
|
||||||
}
|
}
|
||||||
qualification = (IContainerSymbol) sym;
|
qualification = (IContainerSymbol) sym;
|
||||||
}
|
}
|
||||||
|
@ -57,7 +57,7 @@ public class ASTNode implements IASTNode {
|
||||||
ISymbolOwner owner = (ISymbolOwner) this;
|
ISymbolOwner owner = (ISymbolOwner) this;
|
||||||
ISymbol symbol = owner.getSymbol();
|
ISymbol symbol = owner.getSymbol();
|
||||||
if( symbol == null || !(symbol instanceof IContainerSymbol) ){
|
if( symbol == null || !(symbol instanceof IContainerSymbol) ){
|
||||||
throw new LookupException();
|
throw new LookupError();
|
||||||
}
|
}
|
||||||
|
|
||||||
boolean lookInThis = false;
|
boolean lookInThis = false;
|
||||||
|
@ -93,7 +93,7 @@ public class ASTNode implements IASTNode {
|
||||||
lookupResults = thisContainer.prefixLookup( filter, prefix, false );
|
lookupResults = thisContainer.prefixLookup( filter, prefix, false );
|
||||||
}
|
}
|
||||||
} catch (ParserSymbolTableException e) {
|
} catch (ParserSymbolTableException e) {
|
||||||
throw new LookupException();
|
throw new LookupError();
|
||||||
}
|
}
|
||||||
|
|
||||||
if(lookupResults == null)
|
if(lookupResults == null)
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
2004-01-13 Andrew Niefer
|
2004-01-16 John Camelon
|
||||||
Updated CompletionEngine to catch ASTNotImplementedException from IASTNode.lookup
|
IASTNode.LookupException references changed to IASTNode.LookupError.
|
||||||
|
|
||||||
2004-01-15 Hoda Amer
|
2004-01-15 Hoda Amer
|
||||||
Moved Content Assist log to the UI plugin
|
Moved Content Assist log to the UI plugin
|
||||||
|
@ -10,6 +10,9 @@
|
||||||
Updated references of ParserNotImplementedException to ParseError.
|
Updated references of ParserNotImplementedException to ParseError.
|
||||||
Updated references of CONTEXTUAL_PARSE to COMPLETION_PARSE.
|
Updated references of CONTEXTUAL_PARSE to COMPLETION_PARSE.
|
||||||
|
|
||||||
|
2004-01-13 Andrew Niefer
|
||||||
|
Updated CompletionEngine to catch ASTNotImplementedException from IASTNode.lookup
|
||||||
|
|
||||||
2004-01-13 John Camelon
|
2004-01-13 John Camelon
|
||||||
Updated CompletionEngine to handle IASTCompletionKind.CompletionKind.STATEMENT_START
|
Updated CompletionEngine to handle IASTCompletionKind.CompletionKind.STATEMENT_START
|
||||||
|
|
||||||
|
|
|
@ -398,7 +398,7 @@ public class CompletionEngine implements RelevanceConstants{
|
||||||
logLookups (kinds);
|
logLookups (kinds);
|
||||||
ILookupResult result = searchNode.lookup (prefix, kinds, context);
|
ILookupResult result = searchNode.lookup (prefix, kinds, context);
|
||||||
return result ;
|
return result ;
|
||||||
} catch (IASTNode.LookupException ilk ){
|
} catch (IASTNode.LookupError ilk ){
|
||||||
// do we want to do something here?
|
// do we want to do something here?
|
||||||
ilk.printStackTrace();
|
ilk.printStackTrace();
|
||||||
return null;
|
return null;
|
||||||
|
|
Loading…
Add table
Reference in a new issue