From 35a922fdfdf6742caf91f8067ac276d208977e96 Mon Sep 17 00:00:00 2001 From: John Camelon Date: Thu, 6 Jan 2005 15:44:56 +0000 Subject: [PATCH] Add in common IASTProblemHolder interface. --- .../core/dom/ast/IASTProblemDeclaration.java | 6 ++---- .../core/dom/ast/IASTProblemExpression.java | 6 +----- .../cdt/core/dom/ast/IASTProblemHolder.java | 20 +++++++++++++++++++ .../core/dom/ast/IASTProblemStatement.java | 5 +---- .../cdt/core/dom/ast/IASTProblemTypeId.java | 6 +----- .../parser/AbstractGNUSourceCodeParser.java | 5 +++-- .../core/dom/parser/c/GNUCSourceParser.java | 5 +++-- .../dom/parser/cpp/GNUCPPSourceParser.java | 13 ++++++------ 8 files changed, 38 insertions(+), 28 deletions(-) create mode 100644 core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblemHolder.java diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblemDeclaration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblemDeclaration.java index c2b432cb240..d5d3242a4af 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblemDeclaration.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblemDeclaration.java @@ -13,9 +13,7 @@ package org.eclipse.cdt.core.dom.ast; /** * @author jcamelon */ -public interface IASTProblemDeclaration extends IASTDeclaration { +public interface IASTProblemDeclaration extends IASTDeclaration, IASTProblemHolder { - public static final ASTNodeProperty PROBLEM = new ASTNodeProperty( "Problem"); //$NON-NLS-1$ - public IASTProblem getProblem(); - public void setProblem(IASTProblem p); + } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblemExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblemExpression.java index fac2ac4f54f..0a0f2a2dd3d 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblemExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblemExpression.java @@ -14,10 +14,6 @@ package org.eclipse.cdt.core.dom.ast; /** * @author jcamelon */ -public interface IASTProblemExpression extends IASTExpression { - - public static final ASTNodeProperty PROBLEM = new ASTNodeProperty( "Problem"); //$NON-NLS-1$ - public IASTProblem getProblem(); - public void setProblem(IASTProblem p); +public interface IASTProblemExpression extends IASTExpression, IASTProblemHolder { } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblemHolder.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblemHolder.java new file mode 100644 index 00000000000..bf6bd8d772a --- /dev/null +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblemHolder.java @@ -0,0 +1,20 @@ +/********************************************************************** + * Copyright (c) 2004 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Common Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/cpl-v10.html + * + * Contributors: + * IBM - Initial API and implementation + **********************************************************************/ +package org.eclipse.cdt.core.dom.ast; + +/** + * @author jcamelon + */ +public interface IASTProblemHolder { + public static final ASTNodeProperty PROBLEM = new ASTNodeProperty( "Problem"); //$NON-NLS-1$ + public IASTProblem getProblem(); + public void setProblem(IASTProblem p); +} diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblemStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblemStatement.java index 41d427e1ae6..0188c51a6d6 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblemStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblemStatement.java @@ -13,10 +13,7 @@ package org.eclipse.cdt.core.dom.ast; /** * @author jcamelon */ -public interface IASTProblemStatement extends IASTStatement { +public interface IASTProblemStatement extends IASTStatement, IASTProblemHolder { - public static final ASTNodeProperty PROBLEM = new ASTNodeProperty( "Problem"); //$NON-NLS-1$ - public IASTProblem getProblem(); - public void setProblem(IASTProblem p); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblemTypeId.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblemTypeId.java index e9b697c3c1b..1f84f8d69ac 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblemTypeId.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblemTypeId.java @@ -13,10 +13,6 @@ package org.eclipse.cdt.core.dom.ast; /** * @author jcamelon */ -public interface IASTProblemTypeId extends IASTTypeId { - - public static final ASTNodeProperty PROBLEM = new ASTNodeProperty( "Problem"); //$NON-NLS-1$ - public IASTProblem getProblem(); - public void setProblem(IASTProblem p); +public interface IASTProblemTypeId extends IASTTypeId, IASTProblemHolder { } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/AbstractGNUSourceCodeParser.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/AbstractGNUSourceCodeParser.java index eed2f7c8812..712d454ec42 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/AbstractGNUSourceCodeParser.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/AbstractGNUSourceCodeParser.java @@ -38,6 +38,7 @@ import org.eclipse.cdt.core.dom.ast.IASTNode; import org.eclipse.cdt.core.dom.ast.IASTNullStatement; import org.eclipse.cdt.core.dom.ast.IASTProblem; import org.eclipse.cdt.core.dom.ast.IASTProblemExpression; +import org.eclipse.cdt.core.dom.ast.IASTProblemHolder; import org.eclipse.cdt.core.dom.ast.IASTProblemStatement; import org.eclipse.cdt.core.dom.ast.IASTReturnStatement; import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclSpecifier; @@ -476,7 +477,7 @@ public abstract class AbstractGNUSourceCodeParser implements ISourceCodeParser { ps.setProblem( p ); ((ASTNode)ps).setOffset( ((ASTNode)p).getOffset() ); p.setParent( ps ); - p.setPropertyInParent( IASTProblemStatement.PROBLEM ); + p.setPropertyInParent( IASTProblemHolder.PROBLEM ); statements.add( ps ); if (LA(1).hashCode() == checkToken) failParseWithErrorHandling(); @@ -1693,7 +1694,7 @@ public abstract class AbstractGNUSourceCodeParser implements ISourceCodeParser { ps.setProblem( p ); ((ASTNode)ps).setOffset( ((ASTNode)p).getOffset() ); p.setParent( ps ); - p.setPropertyInParent( IASTProblemExpression.PROBLEM ); + p.setPropertyInParent( IASTProblemHolder.PROBLEM ); condition = ps; failParseWithErrorHandling(); passedCondition = false; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/GNUCSourceParser.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/GNUCSourceParser.java index 23253ff0e01..583e5234e4e 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/GNUCSourceParser.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/GNUCSourceParser.java @@ -59,6 +59,7 @@ import org.eclipse.cdt.core.dom.ast.IASTPointerOperator; import org.eclipse.cdt.core.dom.ast.IASTProblem; import org.eclipse.cdt.core.dom.ast.IASTProblemDeclaration; import org.eclipse.cdt.core.dom.ast.IASTProblemExpression; +import org.eclipse.cdt.core.dom.ast.IASTProblemHolder; import org.eclipse.cdt.core.dom.ast.IASTProblemStatement; import org.eclipse.cdt.core.dom.ast.IASTReturnStatement; import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclSpecifier; @@ -556,7 +557,7 @@ public class GNUCSourceParser extends AbstractGNUSourceCodeParser { pd.setProblem(p); ((CASTNode) pd).setOffset(((CASTNode) p).getOffset()); p.setParent(pd); - p.setPropertyInParent(IASTProblemDeclaration.PROBLEM); + p.setPropertyInParent(IASTProblemHolder.PROBLEM); pd.setParent(translationUnit); pd .setPropertyInParent(IASTTranslationUnit.OWNED_DECLARATION); @@ -1940,7 +1941,7 @@ public class GNUCSourceParser extends AbstractGNUSourceCodeParser { ((CASTNode) pe).setOffset(((CASTNode) p).getOffset()); pe.setProblem(p); p.setParent(pe); - p.setPropertyInParent(IASTProblemExpression.PROBLEM); + p.setPropertyInParent(IASTProblemHolder.PROBLEM); return pe; } } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java index ab445d5f65f..ec2e91552fe 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java @@ -61,6 +61,7 @@ import org.eclipse.cdt.core.dom.ast.IASTPointerOperator; import org.eclipse.cdt.core.dom.ast.IASTProblem; import org.eclipse.cdt.core.dom.ast.IASTProblemDeclaration; import org.eclipse.cdt.core.dom.ast.IASTProblemExpression; +import org.eclipse.cdt.core.dom.ast.IASTProblemHolder; import org.eclipse.cdt.core.dom.ast.IASTProblemStatement; import org.eclipse.cdt.core.dom.ast.IASTProblemTypeId; import org.eclipse.cdt.core.dom.ast.IASTReturnStatement; @@ -1845,7 +1846,7 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser { p.setParent( pd ); pd.setProblem( p ); ((CPPASTNode)pd).setOffset( ((CPPASTNode)p).getOffset() ); - p.setPropertyInParent( IASTProblemDeclaration.PROBLEM ); + p.setPropertyInParent( IASTProblemHolder.PROBLEM ); linkage.addDeclaration( pd ); pd.setParent( linkage ); pd.setPropertyInParent( ICPPASTLinkageSpecification.OWNED_DECLARATION ); @@ -2293,7 +2294,7 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser { p.setParent( pd ); pd.setProblem( p ); ((CPPASTNode)pd).setOffset( ((CPPASTNode)p).getOffset() ); - p.setPropertyInParent( IASTProblemDeclaration.PROBLEM ); + p.setPropertyInParent( IASTProblemHolder.PROBLEM ); namespaceDefinition.addDeclaration( pd ); pd.setParent( namespaceDefinition ); pd.setPropertyInParent( ICPPASTNamespaceDefinition.OWNED_DECLARATION ); @@ -3485,7 +3486,7 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser { typeIdProblem.setProblem( p ); ((CPPASTNode)typeIdProblem).setOffset( ((CPPASTNode)p).getOffset() ); p.setParent( typeIdProblem ); - p.setPropertyInParent( IASTProblemTypeId.PROBLEM ); + p.setPropertyInParent( IASTProblemHolder.PROBLEM ); exceptionSpecIds.add( typeIdProblem ); } break; @@ -3804,7 +3805,7 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser { pd.setProblem( p ); ((CPPASTNode)pd).setOffset( ((CPPASTNode)p).getOffset() ); p.setParent( pd ); - p.setPropertyInParent( IASTProblemDeclaration.PROBLEM ); + p.setPropertyInParent( IASTProblemHolder.PROBLEM ); astClassSpecifier.addMemberDeclaration( pd ); pd.setParent( astClassSpecifier ); pd.setPropertyInParent( IASTCompositeTypeSpecifier.MEMBER_DECLARATION ); @@ -3993,7 +3994,7 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser { pd.setProblem( p ); ((CPPASTNode)pd).setOffset( ((CPPASTNode)p).getOffset() ); p.setParent( pd ); - p.setPropertyInParent( IASTProblemDeclaration.PROBLEM ); + p.setPropertyInParent( IASTProblemHolder.PROBLEM ); decl = pd; } @@ -4103,7 +4104,7 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser { p.setParent( pd ); pd.setProblem( p ); ((CPPASTNode)pd).setOffset( ((CPPASTNode)p).getOffset() ); - p.setPropertyInParent( IASTProblemDeclaration.PROBLEM ); + p.setPropertyInParent( IASTProblemHolder.PROBLEM ); translationUnit.addDeclaration( pd ); pd.setParent( translationUnit ); pd.setPropertyInParent( IASTTranslationUnit.OWNED_DECLARATION );