From f1b89e7b9475853cd4a1af0cc4c650ef5ec728a3 Mon Sep 17 00:00:00 2001 From: John Camelon Date: Fri, 8 Apr 2005 17:58:25 +0000 Subject: [PATCH] Applied patch for Devin Steffler. patch includes: - made getUnpreprocessedSignature public in IASTNode - refactored it to be named getRawSignature --- .../eclipse/cdt/core/dom/ast/IASTDeclSpecifier.java | 2 +- .../parser/org/eclipse/cdt/core/dom/ast/IASTNode.java | 10 ++++++++++ .../eclipse/cdt/internal/core/dom/parser/ASTNode.java | 4 ++-- .../core/dom/parser/c/CASTCompositeTypeSpecifier.java | 4 ++-- .../core/dom/parser/c/CASTEnumerationSpecifier.java | 4 ++-- .../dom/parser/cpp/CPPASTCompositeTypeSpecifier.java | 4 ++-- .../dom/parser/cpp/CPPASTEnumerationSpecifier.java | 4 ++-- .../eclipse/cdt/ui/tests/DOMAST/DOMASTNodeLeaf.java | 2 +- 8 files changed, 22 insertions(+), 12 deletions(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTDeclSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTDeclSpecifier.java index 08766584aa2..505b75cad49 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTDeclSpecifier.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTDeclSpecifier.java @@ -123,6 +123,6 @@ public interface IASTDeclSpecifier extends IASTNode { * * @return String */ - public String getUnpreprocessedSignature(); + public String getRawSignature(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTNode.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTNode.java index 94fdedb9a27..05d4f5dcfea 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTNode.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTNode.java @@ -82,5 +82,15 @@ public interface IASTNode { * @return continue on (true) or quit( false ) */ public boolean accept(ASTVisitor visitor); + + /** + * Returns the raw signature of the IASTNode before it is processed by the preprocessor. + * + * Example: + * #define ONE 1 + * int x=ONE; // getRawSignature() for this declaration would return "int x=ONE;" + * @return the raw signature of the IASTNode before it is processed by the preprocessor + */ + public String getRawSignature(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ASTNode.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ASTNode.java index 32ad742bf33..f3c69e873af 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ASTNode.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ASTNode.java @@ -64,9 +64,9 @@ public abstract class ASTNode implements IASTNode { } /* (non-Javadoc) - * @see org.eclipse.cdt.core.dom.ast.IASTNode#getUnpreprocessedSignature() + * @see org.eclipse.cdt.core.dom.ast.IASTNode#getRawSignature() */ - public String getUnpreprocessedSignature() { + public String getRawSignature() { return getTranslationUnit().getUnpreprocessedSignature( getNodeLocations() ); } } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTCompositeTypeSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTCompositeTypeSpecifier.java index c91307f0d0d..e9b2197a1eb 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTCompositeTypeSpecifier.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTCompositeTypeSpecifier.java @@ -113,9 +113,9 @@ public class CASTCompositeTypeSpecifier extends CASTBaseDeclSpecifier implements } /* (non-Javadoc) - * @see org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier#getUnpreprocessedSignature() + * @see org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier#getRawSignature() */ - public String getUnpreprocessedSignature() { + public String getRawSignature() { return getName().toString() == null ? "" : getName().toString(); //$NON-NLS-1$ } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTEnumerationSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTEnumerationSpecifier.java index 3e3d5738177..4f881311bec 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTEnumerationSpecifier.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTEnumerationSpecifier.java @@ -82,9 +82,9 @@ public class CASTEnumerationSpecifier extends CASTBaseDeclSpecifier implements } /* (non-Javadoc) - * @see org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier#getUnpreprocessedSignature() + * @see org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier#getRawSignature() */ - public String getUnpreprocessedSignature() { + public String getRawSignature() { return getName().toString() == null ? "" : getName().toString(); //$NON-NLS-1$ } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCompositeTypeSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCompositeTypeSpecifier.java index c9b6df7d940..bd919107035 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCompositeTypeSpecifier.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCompositeTypeSpecifier.java @@ -27,9 +27,9 @@ public class CPPASTCompositeTypeSpecifier extends CPPASTBaseDeclSpecifier private IScope scope; /* (non-Javadoc) - * @see org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier#getUnpreprocessedSignature() + * @see org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier#getRawSignature() */ - public String getUnpreprocessedSignature() { + public String getRawSignature() { return getName().toString() == null ? "" : getName().toString(); //$NON-NLS-1$ } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTEnumerationSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTEnumerationSpecifier.java index d08d5d6de1e..7ad2bb5fdcc 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTEnumerationSpecifier.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTEnumerationSpecifier.java @@ -96,9 +96,9 @@ public class CPPASTEnumerationSpecifier extends CPPASTBaseDeclSpecifier /* * (non-Javadoc) * - * @see org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier#getUnpreprocessedSignature() + * @see org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier#getRawSignature() */ - public String getUnpreprocessedSignature() { + public String getRawSignature() { return getName().toString() == null ? "" : getName().toString(); //$NON-NLS-1$ } diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMASTNodeLeaf.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMASTNodeLeaf.java index 2c01e15665b..40325e11b1f 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMASTNodeLeaf.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMASTNodeLeaf.java @@ -163,7 +163,7 @@ public class DOMASTNodeLeaf implements IAdaptable { } else if( node instanceof IASTDeclSpecifier ) { buffer.append( START_OF_LIST ); - buffer.append( ((IASTDeclSpecifier)node).getUnpreprocessedSignature() ); + buffer.append( ((IASTDeclSpecifier)node).getRawSignature() ); return buffer.toString(); } else if ( node instanceof IASTPreprocessorIncludeStatement ) { String path = ((IASTPreprocessorIncludeStatement)node).getPath();