Cosmetics.

core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/CommentTests.java

@@ -234,7 +234,6 @@ public class CommentTests extends AST2TestBase {
 	// #ifdef WHATEVA // TODO: ignored
 	// #endif // TODO: ignored
 	// // TODO: shows up in task list
-
 	public void testCommentInDirectives_bug192546() throws Exception {
 		CharSequence code= getContents(1)[0];
 		IASTTranslationUnit tu = parse(code.toString(), ParserLanguage.CPP, false, false);

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTLinkageSpecification.java

@@ -22,9 +22,8 @@ import org.eclipse.cdt.internal.core.dom.parser.IASTAmbiguityParent;
 /**
  * Extern "C" construct.
  */
-public class CPPASTLinkageSpecification extends ASTNode implements
+public class CPPASTLinkageSpecification extends ASTNode
-        ICPPASTLinkageSpecification, IASTAmbiguityParent {
+		implements ICPPASTLinkageSpecification, IASTAmbiguityParent {
-
     private String fLiteral;
 	private IASTDeclaration[] fAllDeclarations;
 	private IASTDeclaration[] fActiveDeclarations;
@@ -45,13 +44,10 @@ public class CPPASTLinkageSpecification extends ASTNode implements
 	@Override
 	public CPPASTLinkageSpecification copy(CopyStyle style) {
 		CPPASTLinkageSpecification copy = new CPPASTLinkageSpecification(fLiteral);
-		for (IASTDeclaration declaration : getDeclarations())
+		for (IASTDeclaration declaration : getDeclarations()) {
 			copy.addDeclaration(declaration == null ? null : declaration.copy(style));
-		copy.setOffsetAndLength(this);
-		if (style == CopyStyle.withLocations) {
-			copy.setCopyLocation(this);
 		}
-		return copy;
+		return copy(copy, style);
 	}
 
 	@Override

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/commenthandler/ASTCommenter.java

@@ -169,33 +169,29 @@ public class ASTCommenter {
 	}
 
 	/**
-	 * Creates a NodeCommentMap for the given TranslationUnit. This is the only way
+	 * Creates a NodeCommentMap for the given AST. This is the only way to get a NodeCommentMap
-	 * to get a NodeCommentMap which contains all the comments mapped against nodes.
+	 * which contains all the comments mapped against nodes.
 	 * 
-	 * @param tu TranslationUnit
+	 * @param ast the AST
 	 * @return NodeCommentMap
 	 */
-	public static NodeCommentMap getCommentedNodeMap(IASTTranslationUnit tu){
+	public static NodeCommentMap getCommentedNodeMap(IASTTranslationUnit ast) {
 		NodeCommentMap commentMap = new NodeCommentMap();
-		if (tu == null) {
+		if (ast == null) {
 			return commentMap;
 		}
-		IASTComment[] commentsArray = tu.getComments();
+		IASTComment[] commentsArray = ast.getComments();
-		if (commentsArray == null) {
+		List<IASTComment> comments = new ArrayList<IASTComment>(commentsArray.length);
-			return commentMap;
+		for (IASTComment comment : commentsArray) {
-		}
-		List<IASTComment> comments = filterNonTuComments(commentsArray);
-		return addCommentsToCommentMap(tu, comments);
-	}
-
-	private static List<IASTComment> filterNonTuComments(IASTComment[] comments) {
-		List<IASTComment> filtered = new ArrayList<IASTComment>(comments.length);
-		for (IASTComment comment : comments) {
 			if (comment.isPartOfTranslationUnitFile()) {
-				filtered.add(comment);
+				comments.add(comment);
 			}
 		}
-		return filtered;
+		assignPreprocessorComments(commentMap, comments, ast);
+		CommentHandler commentHandler = new CommentHandler(comments);
+		ASTCommenterVisitor commenter = new ASTCommenterVisitor(commentHandler, commentMap);
+		ast.accept(commenter);
+		return commentMap;
 	}
 
 	private static boolean isCommentDirectlyBeforePreprocessorStatement(IASTComment comment,
@@ -204,11 +200,11 @@ public class ASTCommenter {
 			return true;
 		}
 		IASTFileLocation commentLocation = comment.getFileLocation();
-		int preprcessorOffset = statement.getFileLocation().getNodeOffset();
+		int preprocessorOffset = statement.getFileLocation().getNodeOffset();
-		if (preprcessorOffset > commentLocation.getNodeOffset()) {
+		if (preprocessorOffset > commentLocation.getNodeOffset()) {
-			PreprocessorRangeChecker vister = new PreprocessorRangeChecker(preprcessorOffset, commentLocation);
+			PreprocessorRangeChecker visitor = new PreprocessorRangeChecker(preprocessorOffset, commentLocation);
-			tu.accept(vister);
+			tu.accept(visitor);
-			return vister.isPreStatementComment;
+			return visitor.isPreStatementComment;
 		}
 		return false;
 	}
@@ -218,22 +214,7 @@ public class ASTCommenter {
 	}
 	
 	/**
-	 * Puts leading and training comments to the returned map and removes them from
+	 * Puts leading and trailing comments to {@code commentMap} and removes them from
-	 * the {@code comments} list. 
-	 */
-	private static NodeCommentMap addCommentsToCommentMap(IASTTranslationUnit tu,
-			List<IASTComment> comments) {
-		NodeCommentMap commentMap = new NodeCommentMap();
-		CommentHandler commHandler = new CommentHandler(comments);
-
-		assignPreprocessorComments(commentMap, comments, tu);
-		ASTCommenterVisitor commenter = new ASTCommenterVisitor(commHandler, commentMap);
-		tu.accept(commenter);
-		return commentMap;
-	}
-
-	/**
-	 * Puts leading and training comments to {@code commentMap} and removes them from
 	 * the {@code comments} list. 
 	 */
 	private static void assignPreprocessorComments(NodeCommentMap commentMap,

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/commenthandler/ASTCommenterVisitor.java

@@ -39,7 +39,7 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTCompositeTypeSpecifier
  * @author Guido Zgraggen IFS 
  */
 public class ASTCommenterVisitor extends ASTVisitor {
-	protected CommentHandler commHandler;
+	protected CommentHandler commentHandler;
 	protected NodeCommentMap commentMap;
 		
 	private NodeCommenter nodeCommenter;
@@ -61,14 +61,14 @@ public class ASTCommenterVisitor extends ASTVisitor {
 		shouldVisitTranslationUnit = true;
 	}
 	
-	public ASTCommenterVisitor(CommentHandler commHandler, NodeCommentMap commentMap) {
+	public ASTCommenterVisitor(CommentHandler commentHandler, NodeCommentMap commentMap) {
-		this.commHandler = commHandler;
+		this.commentHandler = commentHandler;
 		this.commentMap = commentMap;
 		init();
 	}
 
 	private void init() {
-		nodeCommenter = new NodeCommenter(this, commHandler, commentMap);
+		nodeCommenter = new NodeCommenter(this, commentHandler, commentMap);
 	}
 	
 	@Override

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/commenthandler/NodeCommenter.java

@@ -62,13 +62,13 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTWhileStatement;
  */
 public class NodeCommenter {
 	protected ASTVisitor visitor;
-	protected CommentHandler commHandler;
+	protected CommentHandler commentHandler;
 	protected NodeCommentMap commentMap;
 	protected List<IASTNode> children;
 
 	public NodeCommenter(ASTVisitor visitor, CommentHandler commHandler, NodeCommentMap commentMap) {
 		this.visitor = visitor;
-		this.commHandler = commHandler;
+		this.commentHandler = commHandler;
 		this.commentMap = commentMap;
 		this.children = new ArrayList<IASTNode>();
 	}
@@ -122,17 +122,17 @@ public class NodeCommenter {
 
 	private void addLeadingCommentToMap(ASTNode node, IASTComment comment) {
 		commentMap.addLeadingCommentToNode(node, comment);
-		commHandler.allreadyAdded(comment);
+		commentHandler.allreadyAdded(comment);
 	}
 
 	private void addTrailingCommentToMap(ASTNode node, IASTComment comment) {
 		commentMap.addTrailingCommentToNode(node, comment);
-		commHandler.allreadyAdded(comment);
+		commentHandler.allreadyAdded(comment);
 	}
 
 	private void addFreestandingCommentToMap(ASTNode node, IASTComment comment) {
 		commentMap.addFreestandingCommentToNode(node, comment);
-		commHandler.allreadyAdded(comment);
+		commentHandler.allreadyAdded(comment);
 	}
 
 	private boolean isTrailing(ASTNode node, ASTNode com, int nodeLineNumber, int commentLineNumber) {
@@ -200,8 +200,8 @@ public class NodeCommenter {
 	}
 	
 	protected int appendComments(ASTNode node) {
-		while (commHandler.hasMore()) {
+		while (commentHandler.hasMore()) {
-			IASTComment comment = commHandler.getFirst();
+			IASTComment comment = commentHandler.getFirst();
 			
 			if (isNotSameFile(node, comment)) {
 				return ASTVisitor.PROCESS_SKIP;
@@ -215,8 +215,8 @@ public class NodeCommenter {
 	}
 	
 	protected int appendFreestandingComments(ASTNode node) {
-		while (commHandler.hasMore()) {
+		while (commentHandler.hasMore()) {
-			IASTComment comment = commHandler.getFirst();
+			IASTComment comment = commentHandler.getFirst();
 			
 			if (isNotSameFile(node, comment)) {
 				return ASTVisitor.PROCESS_SKIP;
@@ -234,8 +234,8 @@ public class NodeCommenter {
 	}
 	
 	public void appendRemainingComments(IASTDeclaration declaration) {
-		while (commHandler.hasMore()) {
+		while (commentHandler.hasMore()) {
-			IASTComment comment = commHandler.getFirst();
+			IASTComment comment = commentHandler.getFirst();
 			if (appendComment((ASTNode) declaration, comment)) {
 				continue;
 			}

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/ASTPreprocessorNode.java

@@ -113,6 +113,7 @@ abstract class ASTPreprocessorNode extends ASTNode {
 class ASTComment extends ASTPreprocessorNode implements IASTComment {
 	private final boolean fIsBlockComment;
 	private String fFilePath;
+
 	public ASTComment(IASTTranslationUnit parent, String filePath, int offset, int endOffset, boolean isBlockComment) {
 		super(parent, IASTTranslationUnit.PREPROCESSOR_STATEMENT, offset, endOffset);
 		fIsBlockComment= isBlockComment;

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/CPreprocessor.java

@@ -68,8 +68,8 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IAdaptable;
 
 /**
- * C-Preprocessor providing tokens for the parsers. The class should not be used directly, rather than that
+ * C-Preprocessor providing tokens for the parsers. The class should not be used directly,
- * you should be using the {@link IScanner} interface.
+ * rather than that you should be using the {@link IScanner} interface.
  * @since 5.0
  */
 public class CPreprocessor implements ILexerLog, IScanner, IAdaptable {
@@ -87,8 +87,7 @@ public class CPreprocessor implements ILexerLog, IScanner, IAdaptable {
 	
     private static final char[] ONE = "1".toCharArray(); //$NON-NLS-1$
 
-
+    // Standard built-ins
-    // standard built-ins
     private static final ObjectStyleMacro __CDT_PARSER__= new ObjectStyleMacro("__CDT_PARSER__".toCharArray(), ONE);   //$NON-NLS-1$
     private static final ObjectStyleMacro __cplusplus = new ObjectStyleMacro("__cplusplus".toCharArray(), ONE);   //$NON-NLS-1$
     private static final ObjectStyleMacro __STDC__ = new ObjectStyleMacro("__STDC__".toCharArray(), ONE);  //$NON-NLS-1$

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/IncludeGuardDetection.java

@@ -8,7 +8,6 @@
  * Contributors:
  *     Markus Schorn - initial API and implementation
  *******************************************************************************/ 
-
 package org.eclipse.cdt.internal.core.parser.scanner;
 
 import static org.eclipse.cdt.core.parser.OffsetLimitReachedException.ORIGIN_PREPROCESSOR_DIRECTIVE;
@@ -124,7 +123,6 @@ public class IncludeGuardDetection {
 		return t;
 	}
 
-	
 	public static boolean detectIncludeEndif(Lexer l) {
 		l.saveState();
 		try {