From 044af29ec9a532b241c90a2150ada9b06987ca1f Mon Sep 17 00:00:00 2001 From: John Camelon Date: Wed, 25 May 2005 19:17:07 +0000 Subject: [PATCH] Patch for Devin Steffler. Fixed Bug 96678 - Scanner is reporting bad character problem on // comments --- .../org/eclipse/cdt/core/parser/tests/ast2/AST2CPPTests.java | 4 ++++ .../cdt/internal/core/parser/scanner2/BaseScanner.java | 1 + 2 files changed, 5 insertions(+) diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CPPTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CPPTests.java index 22e225f411e..2e875a29dbd 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CPPTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CPPTests.java @@ -4468,6 +4468,10 @@ public class AST2CPPTests extends AST2BaseTest { ICPPFunction copy = (ICPPFunction) col.getName(0).resolveBinding(); assertSame( copy, col.getName(7).resolveBinding() ); } + + public void testBug96678() throws Exception { + IASTTranslationUnit tu = parse( "int x; // comment \r\n", ParserLanguage.CPP, false, true ); //$NON-NLS-1$ + } public void testNewExpressionType() throws Exception { StringBuffer buffer = new StringBuffer(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/BaseScanner.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/BaseScanner.java index 81f83c286b6..7f6584f2008 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/BaseScanner.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/BaseScanner.java @@ -1654,6 +1654,7 @@ abstract class BaseScanner implements IScanner { int pos = bufferPos[bufferStackPos]; switch (buffer[pos]) { + case '\r': case '\n': continue;