[cdt-patch] Applied [HEAD] - IASTElaboratedTypeSpecifier should inherit

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]

[cdt-patch] Applied [HEAD] - IASTElaboratedTypeSpecifier should inherit from IASTOffsetableNamedElement

From: John Camelon <jcamelon@xxxxxxxxxx>
Date: Thu, 14 Aug 2003 15:50:31 -0400
Delivered-to: cdt-patch@xxxxxxxxxxx
List-archive: <http://dev.eclipse.org/pipermail/cdt-patch/>
List-help: <mailto:cdt-patch-request@eclipse.org?subject=help>
List-subscribe: <http://dev.eclipse.org/mailman/listinfo/cdt-patch>, <mailto:cdt-patch-request@eclipse.org?subject=subscribe>
List-unsubscribe: <http://dev.eclipse.org/mailman/listinfo/cdt-patch>, <mailto:cdt-patch-request@eclipse.org?subject=unsubscribe>

CORE
        Removed warnings from SymbolTable & QuickParseCallback (removing 
implicit accessor generation).
        Made IASTElaboratedTypeSpecifier derive from 
IASTOffsetableNamedElement (as it should). 

TESTS
        Removed warnings from AutomatedIntegrationSuite.java (removing 
implicit accessor generation).

JohnC

Index: ChangeLog
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core.tests/ChangeLog,v
retrieving revision 1.61
diff -u -r1.61 ChangeLog
--- ChangeLog	14 Aug 2003 15:33:32 -0000	1.61
+++ ChangeLog	14 Aug 2003 19:49:29 -0000
@@ -1,4 +1,7 @@
 2003-08-14 John Camelon
+	Removed warnings from AutomatedIntegrationSuite.java (removing implicit accessor generation).
+
+2003-08-14 John Camelon
 	Added CompleteParseASTTest::testArrayModExpression(), testPointerVariable() & 
 	testExceptionSpecification().  
 
Index: suite/org/eclipse/cdt/core/suite/AutomatedIntegrationSuite.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/suite/AutomatedIntegrationSuite.java,v
retrieving revision 1.13
diff -u -r1.13 AutomatedIntegrationSuite.java
--- suite/org/eclipse/cdt/core/suite/AutomatedIntegrationSuite.java	13 Aug 2003 17:45:21 -0000	1.13
+++ suite/org/eclipse/cdt/core/suite/AutomatedIntegrationSuite.java	14 Aug 2003 19:49:30 -0000
@@ -55,8 +55,8 @@
 	private int numberOfFailedTests = 0;
 	private int numberOfFailedFailedTests = 0;
 	// switching to failed tests
-	private boolean failedTests = false;
-	private boolean skipTest = false;
+	protected boolean failedTests = false;
+	protected boolean skipTest = false;
 	
 
 	public AutomatedIntegrationSuite() {}
@@ -220,14 +220,14 @@
 		System.out.println();
 	}
 	
-		private void startSuccessTests() {
+		protected void startSuccessTests() {
 			failedTests = false;
 			System.out.println();
 			System.out.println("*** Starting success tests ***");
 			System.out.println();
 		}
 	
-		private void startFailedTests() {
+		protected void startFailedTests() {
 			failedTests = true;
 			System.out.println();
 			System.out.println("*** Starting failed tests ***");

Index: parser/ChangeLog
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/ChangeLog,v
retrieving revision 1.101
diff -u -r1.101 ChangeLog
--- parser/ChangeLog	14 Aug 2003 15:33:27 -0000	1.101
+++ parser/ChangeLog	14 Aug 2003 19:48:45 -0000
@@ -1,4 +1,8 @@
 2003-08-14 John Camelon
+	Removed warnings from SymbolTable & QuickParseCallback (removing implicit accessor generation).
+	Made IASTElaboratedTypeSpecifier derive from IASTOffsetableNamedElement (as it should).  
+
+2003-08-14 John Camelon
 	Added X-Reference support for ArrayModifiers and Exception Specifications.  
 	Fixed Bug 41551  -  HandleInclusion always throws ScannerException on local includes.
 
Index: parser/org/eclipse/cdt/core/parser/ast/IASTElaboratedTypeSpecifier.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/ast/IASTElaboratedTypeSpecifier.java,v
retrieving revision 1.7
diff -u -r1.7 IASTElaboratedTypeSpecifier.java
--- parser/org/eclipse/cdt/core/parser/ast/IASTElaboratedTypeSpecifier.java	12 Aug 2003 20:40:04 -0000	1.7
+++ parser/org/eclipse/cdt/core/parser/ast/IASTElaboratedTypeSpecifier.java	14 Aug 2003 19:48:45 -0000
@@ -18,7 +18,7 @@
  * @author jcamelon
  *
  */
-public interface IASTElaboratedTypeSpecifier extends IASTTypeSpecifier, IASTOffsetableElement, IASTQualifiedNameElement, ISourceElementCallbackDelegate {
+public interface IASTElaboratedTypeSpecifier extends IASTTypeSpecifier, IASTOffsetableElement, IASTQualifiedNameElement, ISourceElementCallbackDelegate, IASTOffsetableNamedElement {
 
 	public String getName(); 
 	public ASTClassKind getClassKind();
Index: parser/org/eclipse/cdt/internal/core/parser/QuickParseCallback.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/QuickParseCallback.java,v
retrieving revision 1.3
diff -u -r1.3 QuickParseCallback.java
--- parser/org/eclipse/cdt/internal/core/parser/QuickParseCallback.java	22 Jul 2003 18:32:40 -0000	1.3
+++ parser/org/eclipse/cdt/internal/core/parser/QuickParseCallback.java	14 Aug 2003 19:48:46 -0000
@@ -27,9 +27,9 @@
 
 public class QuickParseCallback extends NullSourceElementRequestor implements IQuickParseCallback
 {
-	private IASTCompilationUnit compilationUnit = null;
-	private List inclusions = new ArrayList(); 
-	private List macros = new ArrayList(); 
+	protected IASTCompilationUnit compilationUnit = null;
+	protected List inclusions = new ArrayList(); 
+	protected List macros = new ArrayList(); 
 	
 	public Iterator getInclusions()
 	{
Index: parser/org/eclipse/cdt/internal/core/parser/TokenDuple.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/TokenDuple.java,v
retrieving revision 1.9
diff -u -r1.9 TokenDuple.java
--- parser/org/eclipse/cdt/internal/core/parser/TokenDuple.java	12 Aug 2003 18:19:38 -0000	1.9
+++ parser/org/eclipse/cdt/internal/core/parser/TokenDuple.java	14 Aug 2003 19:48:46 -0000
@@ -27,7 +27,7 @@
 		firstToken = first; 
 		lastToken = last; 
 	}
-	private final IToken firstToken, lastToken; 
+	protected final IToken firstToken, lastToken; 
 	/**
 	 * @return
 	 */
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.3
diff -u -r1.3 ASTElaboratedTypeSpecifier.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTElaboratedTypeSpecifier.java	12 Aug 2003 20:40:04 -0000	1.3
+++ parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTElaboratedTypeSpecifier.java	14 Aug 2003 19:48:46 -0000
@@ -17,7 +17,7 @@
 import org.eclipse.cdt.core.parser.ast.ASTNotImplementedException;
 import org.eclipse.cdt.core.parser.ast.IASTElaboratedTypeSpecifier;
 import org.eclipse.cdt.internal.core.parser.ast.ASTQualifiedNamedElement;
-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;
 
 /**
@@ -29,7 +29,7 @@
 	private final boolean isForwardDeclaration;
     private final ASTClassKind kind;
 	private final ASTQualifiedNamedElement qualifiedName;
-    private Offsets offsets = new Offsets();
+    private NamedOffsets offsets = new NamedOffsets();
     private final ASTReferenceStore store; 
 	
     /**
@@ -38,11 +38,12 @@
      * @param startingOffset
      * @param endOffset
      */
-    public ASTElaboratedTypeSpecifier(ISymbol checkSymbol, ASTClassKind kind, int startingOffset, int endOffset, List references, boolean isDecl )
+    public ASTElaboratedTypeSpecifier(ISymbol checkSymbol, ASTClassKind kind, int startingOffset, int nameOffset, int endOffset, List references, boolean isDecl )
     {
         super( checkSymbol );
         this.kind = kind;
         setStartingOffset( startingOffset );
+        setNameOffset( nameOffset );
         setEndingOffset( endOffset );
         qualifiedName = new ASTQualifiedNamedElement( getOwnerScope(), checkSymbol.getName() );
         store = new ASTReferenceStore( references );
@@ -126,4 +127,16 @@
     {
         return qualifiedName.getFullyQualifiedName();
     }
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.core.parser.ast.IASTOffsetableNamedElement#getNameOffset()
+	 */
+	public int getNameOffset() {
+		return offsets.getNameOffset();
+	}
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.core.parser.ast.IASTOffsetableNamedElement#setNameOffset(int)
+	 */
+	public void setNameOffset(int o) {
+		offsets.setNameOffset(o);
+	}
 }
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.16
diff -u -r1.16 CompleteParseASTFactory.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/complete/CompleteParseASTFactory.java	14 Aug 2003 15:33:27 -0000	1.16
+++ parser/org/eclipse/cdt/internal/core/parser/ast/complete/CompleteParseASTFactory.java	14 Aug 2003 19:48:50 -0000
@@ -1344,7 +1344,6 @@
  		{
 			if( checkSymbol == null ) 
 			{ 
-				
 				checkSymbol  = pst.newDerivableContainerSymbol( lastToken.getImage(), pstType );
 				checkSymbol.setIsForwardDeclaration( true );
 				try
@@ -1357,7 +1356,7 @@
 	            }
 	            
 	            ASTElaboratedTypeSpecifier elab = 
-	            	new ASTElaboratedTypeSpecifier( checkSymbol, kind, startingOffset, endOffset, references, isForewardDecl );
+	            	new ASTElaboratedTypeSpecifier( checkSymbol, kind, startingOffset, name.getFirstToken().getOffset(), endOffset, references, isForewardDecl );
 	            	
 	            try
                 {
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.6
diff -u -r1.6 ASTElaboratedTypeSpecifier.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTElaboratedTypeSpecifier.java	12 Aug 2003 20:40:04 -0000	1.6
+++ parser/org/eclipse/cdt/internal/core/parser/ast/quick/ASTElaboratedTypeSpecifier.java	14 Aug 2003 19:48:50 -0000
@@ -16,7 +16,7 @@
 import org.eclipse.cdt.core.parser.ast.IASTElaboratedTypeSpecifier;
 import org.eclipse.cdt.core.parser.ast.IASTScope;
 import org.eclipse.cdt.internal.core.parser.ast.ASTQualifiedNamedElement;
-import org.eclipse.cdt.internal.core.parser.ast.Offsets;
+import org.eclipse.cdt.internal.core.parser.ast.NamedOffsets;
 
 /**
  * @author jcamelon
@@ -25,7 +25,7 @@
 public class ASTElaboratedTypeSpecifier implements IASTElaboratedTypeSpecifier
 {
 
-	private Offsets offsets = new Offsets();
+	private NamedOffsets offsets = new NamedOffsets();
 	private final String typeName;
 	private final ASTClassKind classKind;
 	private final ASTQualifiedNamedElement qualifiedName;   
@@ -35,12 +35,13 @@
      * @param startingOffset
      * @param endOffset
      */
-    public ASTElaboratedTypeSpecifier(IASTScope scope, ASTClassKind elaboratedClassKind, String typeName, int startingOffset, int endOffset)
+    public ASTElaboratedTypeSpecifier(IASTScope scope, ASTClassKind elaboratedClassKind, String typeName, int startingOffset, int nameOffset, int endOffset)
     {
     	classKind = elaboratedClassKind; 
     	this.typeName = typeName;
-    	offsets.setStartingOffset( startingOffset );
-    	offsets.setEndingOffset( endOffset );
+    	setStartingOffset( startingOffset );
+    	setNameOffset( nameOffset );
+    	setEndingOffset( endOffset );
     	qualifiedName = new ASTQualifiedNamedElement( scope, typeName );
     }
     /* (non-Javadoc)
@@ -119,4 +120,16 @@
     public void exitScope(ISourceElementRequestor requestor)
     {
     }
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.core.parser.ast.IASTOffsetableNamedElement#getNameOffset()
+	 */
+	public int getNameOffset() {
+		return offsets.getNameOffset();
+	}
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.core.parser.ast.IASTOffsetableNamedElement#setNameOffset(int)
+	 */
+	public void setNameOffset(int o) {
+		offsets.setNameOffset(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.24
diff -u -r1.24 QuickParseASTFactory.java
--- parser/org/eclipse/cdt/internal/core/parser/ast/quick/QuickParseASTFactory.java	14 Aug 2003 15:33:27 -0000	1.24
+++ parser/org/eclipse/cdt/internal/core/parser/ast/quick/QuickParseASTFactory.java	14 Aug 2003 19:48:52 -0000
@@ -265,6 +265,6 @@
 
     public IASTElaboratedTypeSpecifier createElaboratedTypeSpecifier(IASTScope scope, ASTClassKind elaboratedClassKind, ITokenDuple typeName, int startingOffset, int endOffset, boolean isForewardDecl)
     {
-        return new ASTElaboratedTypeSpecifier( scope, elaboratedClassKind, typeName.toString(), startingOffset, endOffset );
+        return new ASTElaboratedTypeSpecifier( scope, elaboratedClassKind, typeName.toString(), startingOffset, typeName.getFirstToken().getOffset(), endOffset );
     }
 }
Index: parser/org/eclipse/cdt/internal/core/parser/pst/ParserSymbolTable.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/pst/ParserSymbolTable.java,v
retrieving revision 1.12
diff -u -r1.12 ParserSymbolTable.java
--- parser/org/eclipse/cdt/internal/core/parser/pst/ParserSymbolTable.java	7 Aug 2003 14:46:58 -0000	1.12
+++ parser/org/eclipse/cdt/internal/core/parser/pst/ParserSymbolTable.java	14 Aug 2003 19:48:54 -0000
@@ -82,7 +82,7 @@
 	 * @return Declaration
 	 * @throws ParserSymbolTableException
 	 */
-	static private void lookup( LookupData data, IContainerSymbol inSymbol ) throws ParserSymbolTableException
+	static protected void lookup( LookupData data, IContainerSymbol inSymbol ) throws ParserSymbolTableException
 	{
 		if( data.type != TypeInfo.t_any && data.type.compareTo(TypeInfo.t_class) < 0 && data.upperType.compareTo(TypeInfo.t_union) > 0 ){
 			throw new ParserSymbolTableException( ParserSymbolTableException.r_BadTypeInfo );
@@ -218,7 +218,7 @@
 	 * 
 	 * Look for data.name in our collection _containedDeclarations
 	 */
-	private static boolean lookupInContained( LookupData data, IContainerSymbol lookIn ){
+	protected static boolean lookupInContained( LookupData data, IContainerSymbol lookIn ){
 	
 		boolean foundSomething = false;
 		ISymbol temp  = null;
@@ -436,7 +436,7 @@
 	 * 3.4-1 "Name lookup may associate more than one declaration with a name if
 	 * it finds the name to be a function name"
 	 */
-	private static boolean isValidOverload( ISymbol origSymbol, ISymbol newSymbol ){
+	protected static boolean isValidOverload( ISymbol origSymbol, ISymbol newSymbol ){
 		TypeInfo.eType origType = origSymbol.getType();
 		TypeInfo.eType newType  = newSymbol.getType();
 		
@@ -460,7 +460,7 @@
 		return false;
 	}
 	
-	private static boolean isValidOverload( LinkedList origList, ISymbol newSymbol ){
+	protected static boolean isValidOverload( LinkedList origList, ISymbol newSymbol ){
 		if( origList.size() == 1 ){
 			return isValidOverload( (ISymbol)origList.getFirst(), newSymbol );
 		} else if ( origList.size() > 1 ){
@@ -534,7 +534,7 @@
 	 * all, when looking for functions with no parameters, an empty list must be
 	 * provided in data.parameters.
 	 */
-	static private ISymbol resolveAmbiguities( LookupData data ) throws ParserSymbolTableException{
+	static protected ISymbol resolveAmbiguities( LookupData data ) throws ParserSymbolTableException{
 		ISymbol decl = null;
 		ISymbol obj	= null;
 		IContainerSymbol cls = null;
@@ -655,7 +655,7 @@
 		}
 	}
 
-	static private IParameterizedSymbol resolveFunction( LookupData data, LinkedList functions ) throws ParserSymbolTableException{
+	static protected IParameterizedSymbol resolveFunction( LookupData data, LinkedList functions ) throws ParserSymbolTableException{
 		if( functions == null ){
 			return null;
 		}
@@ -983,7 +983,7 @@
 		return -1;
 	}
 
-	static private void getAssociatedScopes( ISymbol symbol, HashSet associated ){
+	static protected void getAssociatedScopes( ISymbol symbol, HashSet associated ){
 		if( symbol == null ){
 			return;
 		}
@@ -1027,7 +1027,7 @@
 		}
 	}
 	
-	static private boolean okToAddUsingDeclaration( ISymbol obj, IContainerSymbol context ){
+	static protected boolean okToAddUsingDeclaration( ISymbol obj, IContainerSymbol context ){
 		boolean okToAdd = false;
 			
 		//7.3.3-5  A using-declaration shall not name a template-id
@@ -1426,7 +1426,7 @@
 	 * remaining TypeInfo's represent the object.
 	 */
 	// TODO move this to ITypeInfo ?
-	static private TypeInfo getFlatTypeInfo( TypeInfo topInfo ){
+	static protected TypeInfo getFlatTypeInfo( TypeInfo topInfo ){
 		TypeInfo returnInfo = topInfo;
 		TypeInfo info = null;
 		
@@ -1794,7 +1794,7 @@
 	private LinkedList undoList = new LinkedList();
 	private HashSet markSet = new HashSet();
 	
-	private void pushCommand( Command command ){
+	protected void pushCommand( Command command ){
 		undoList.addFirst( command );
 	}
 	
@@ -3257,7 +3257,7 @@
 			}
 			
 			private boolean isVirtual = false;
-			private ISymbol parent = null;
+			protected ISymbol parent = null;
 			private final ASTAccessVisibility access;
 			private final int offset; 
 			private final List references; 
Index: parser/org/eclipse/cdt/internal/core/parser/pst/TypeInfo.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/pst/TypeInfo.java,v
retrieving revision 1.3
diff -u -r1.3 TypeInfo.java
--- parser/org/eclipse/cdt/internal/core/parser/pst/TypeInfo.java	7 Aug 2003 14:46:58 -0000	1.3
+++ parser/org/eclipse/cdt/internal/core/parser/pst/TypeInfo.java	14 Aug 2003 19:48:54 -0000
@@ -114,7 +114,7 @@
 	//public static final eType t_templateParameter = new eType( 18 );
 	
 	public static class eType implements Comparable{
-		private eType( int v ){
+		protected eType( int v ){
 			_val = v;
 		}

Prev by Date: [cdt-patch] Applied [HEAD] ArrayModifiers & Exception Specifications
Next by Date: [cdt-patch] New Build Targets
Previous by thread: [cdt-patch] Applied [HEAD] ArrayModifiers & Exception Specifications
Next by thread: [cdt-patch] New Build Targets
Index(es):
- Date
- Thread

Breadcrumbs