mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Parser tests using CPreprocessor

Browse source
This commit is contained in:
Markus Schorn 2007-11-06 16:41:44 +00:00
parent a83d0a7ac9
commit e0ba2b4f84
13 changed files with 156 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2BaseTest.java
View file

@ -56,6 +56,7 @@ import org.eclipse.cdt.core.dom.parser.cpp.ICPPParserExtensionConfiguration;
import org.eclipse.cdt.core.parser.CodeReader; import org.eclipse.cdt.core.parser.CodeReader;
import org.eclipse.cdt.core.parser.IParserLogService; import org.eclipse.cdt.core.parser.IParserLogService;
import org.eclipse.cdt.core.parser.IScanner; import org.eclipse.cdt.core.parser.IScanner;
import org.eclipse.cdt.core.parser.IScannerInfo;
import org.eclipse.cdt.core.parser.NullLogService; import org.eclipse.cdt.core.parser.NullLogService;
import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.ParserLanguage;
import org.eclipse.cdt.core.parser.ParserMode; import org.eclipse.cdt.core.parser.ParserMode;
@ -68,6 +69,7 @@ import org.eclipse.cdt.internal.core.dom.parser.c.GNUCSourceParser;
import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPVisitor; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPVisitor;
import org.eclipse.cdt.internal.core.dom.parser.cpp.GNUCPPSourceParser; import org.eclipse.cdt.internal.core.dom.parser.cpp.GNUCPPSourceParser;
import org.eclipse.cdt.internal.core.parser.ParserException; import org.eclipse.cdt.internal.core.parser.ParserException;
import org.eclipse.cdt.internal.core.parser.scanner.CPreprocessor;
import org.eclipse.cdt.internal.core.parser.scanner2.DOMScanner; import org.eclipse.cdt.internal.core.parser.scanner2.DOMScanner;
import org.eclipse.cdt.internal.core.parser.scanner2.FileCodeReaderFactory; import org.eclipse.cdt.internal.core.parser.scanner2.FileCodeReaderFactory;
@ -77,6 +79,7 @@ import org.eclipse.cdt.internal.core.parser.scanner2.FileCodeReaderFactory;
public class AST2BaseTest extends BaseTestCase { public class AST2BaseTest extends BaseTestCase {
private static final IParserLogService NULL_LOG = new NullLogService(); private static final IParserLogService NULL_LOG = new NullLogService();
protected boolean fUsesCPreprocessor= false;
public AST2BaseTest() { public AST2BaseTest() {
super(); super();
@ -106,6 +109,7 @@ public class AST2BaseTest extends BaseTestCase {
protected IASTTranslationUnit parse( String code, ParserLanguage lang, boolean useGNUExtensions, boolean expectNoProblems , boolean parseComments) throws ParserException { protected IASTTranslationUnit parse( String code, ParserLanguage lang, boolean useGNUExtensions, boolean expectNoProblems , boolean parseComments) throws ParserException {
IScanner scanner = createScanner(new CodeReader(code.toCharArray()), lang, ParserMode.COMPLETE_PARSE, IScanner scanner = createScanner(new CodeReader(code.toCharArray()), lang, ParserMode.COMPLETE_PARSE,
new ScannerInfo(), parseComments); new ScannerInfo(), parseComments);
fUsesCPreprocessor= scanner instanceof CPreprocessor;
ISourceCodeParser parser2 = null; ISourceCodeParser parser2 = null;
if( lang == ParserLanguage.CPP ) if( lang == ParserLanguage.CPP )
{ {
@ -151,14 +155,22 @@ public class AST2BaseTest extends BaseTestCase {
} }
public static IScanner createScanner(CodeReader codeReader, ParserLanguage lang, ParserMode mode, public static IScanner createScanner(CodeReader codeReader, ParserLanguage lang, ParserMode mode,
ScannerInfo scannerInfo, boolean parseComments) { IScannerInfo scannerInfo, boolean parseComments) {
IScannerExtensionConfiguration configuration = null; IScannerExtensionConfiguration configuration = null;
if( lang == ParserLanguage.C ) if( lang == ParserLanguage.C )
configuration = new GCCScannerExtensionConfiguration(); configuration = new GCCScannerExtensionConfiguration();
else else
configuration = new GPPScannerExtensionConfiguration(); configuration = new GPPScannerExtensionConfiguration();
IScanner scanner = new DOMScanner( codeReader, scannerInfo, mode, lang, NULL_LOG, configuration, FileCodeReaderFactory.getInstance() ); IScanner scanner;
scanner.setScanComments(parseComments); if (CPreprocessor.PROP_VALUE.equals(System.getProperty("scanner"))) {
scanner= new CPreprocessor(codeReader, scannerInfo, lang, NULL_LOG, configuration,
FileCodeReaderFactory.getInstance());
}
else {
scanner = new DOMScanner( codeReader, scannerInfo, mode, lang, NULL_LOG, configuration,
FileCodeReaderFactory.getInstance() );
scanner.setScanComments(parseComments);
}
return scanner; return scanner;
} }

12
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CPPSpecTest.java
View file

@ -6572,7 +6572,7 @@ public class AST2CPPSpecTest extends AST2SpecBaseTest {
buffer.append("int i = cobj.c * 100; // value of cobj.c is unspecified\n"); //$NON-NLS-1$ buffer.append("int i = cobj.c * 100; // value of cobj.c is unspecified\n"); //$NON-NLS-1$
buffer.append("cptr->c = 1;\n"); //$NON-NLS-1$ buffer.append("cptr->c = 1;\n"); //$NON-NLS-1$
buffer.append("cout << cobj.c * 100 // value of cobj.c is unspecified\n"); //$NON-NLS-1$ buffer.append("cout << cobj.c * 100 // value of cobj.c is unspecified\n"); //$NON-NLS-1$
buffer.append("<< '\n';\n"); //$NON-NLS-1$ buffer.append("<< '\\n';\n"); //$NON-NLS-1$
buffer.append("}\n"); //$NON-NLS-1$ buffer.append("}\n"); //$NON-NLS-1$
parse(buffer.toString(), ParserLanguage.CPP, false, 0); parse(buffer.toString(), ParserLanguage.CPP, false, 0);
} }
@ -9734,7 +9734,7 @@ public class AST2CPPSpecTest extends AST2SpecBaseTest {
buffer.append("void printall()\n"); //$NON-NLS-1$ buffer.append("void printall()\n"); //$NON-NLS-1$
buffer.append("{\n"); //$NON-NLS-1$ buffer.append("{\n"); //$NON-NLS-1$
buffer.append("for (int i = 0; i<cnt; i++)\n"); //$NON-NLS-1$ buffer.append("for (int i = 0; i<cnt; i++)\n"); //$NON-NLS-1$
buffer.append("cout << p[i] << '\n';\n"); //$NON-NLS-1$ buffer.append("cout << p[i] << '\\n';\n"); //$NON-NLS-1$
buffer.append("}\n"); //$NON-NLS-1$ buffer.append("}\n"); //$NON-NLS-1$
buffer.append("// ...\n"); //$NON-NLS-1$ buffer.append("// ...\n"); //$NON-NLS-1$
buffer.append("};\n"); //$NON-NLS-1$ buffer.append("};\n"); //$NON-NLS-1$
@ -11645,9 +11645,9 @@ public class AST2CPPSpecTest extends AST2SpecBaseTest {
/** /**
[--Start Example(CPP 16.2-8): [--Start Example(CPP 16.2-8):
#if VERSION = = 1 #if VERSION == 1
#define INCFILE "vers1.h" #define INCFILE "vers1.h"
#elif VERSION = = 2 #elif VERSION == 2
#define INCFILE "vers2.h" // and so on #define INCFILE "vers2.h" // and so on
#else #else
#define INCFILE "versN.h" #define INCFILE "versN.h"
@ -11656,9 +11656,9 @@ public class AST2CPPSpecTest extends AST2SpecBaseTest {
*/ */
public void test16_2s8() throws Exception { public void test16_2s8() throws Exception {
StringBuffer buffer = new StringBuffer(); StringBuffer buffer = new StringBuffer();
buffer.append("#if VERSION = = 1\n"); //$NON-NLS-1$ buffer.append("#if VERSION == 1\n"); //$NON-NLS-1$
buffer.append("#define INCFILE \"vers1.h\"\n"); //$NON-NLS-1$ buffer.append("#define INCFILE \"vers1.h\"\n"); //$NON-NLS-1$
buffer.append("#elif VERSION = = 2\n"); //$NON-NLS-1$ buffer.append("#elif VERSION == 2\n"); //$NON-NLS-1$
buffer.append("#define INCFILE \"vers2.h\" // and so on\n"); //$NON-NLS-1$ buffer.append("#define INCFILE \"vers2.h\" // and so on\n"); //$NON-NLS-1$
buffer.append("#else\n"); //$NON-NLS-1$ buffer.append("#else\n"); //$NON-NLS-1$
buffer.append("#define INCFILE \"versN.h\"\n"); //$NON-NLS-1$ buffer.append("#define INCFILE \"versN.h\"\n"); //$NON-NLS-1$

12
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2SelectionParseBaseTest.java
View file

@ -14,15 +14,12 @@ import org.eclipse.cdt.core.dom.CDOM;
import org.eclipse.cdt.core.dom.IASTServiceProvider.UnsupportedDialectException; import org.eclipse.cdt.core.dom.IASTServiceProvider.UnsupportedDialectException;
import org.eclipse.cdt.core.dom.ast.IASTNode; import org.eclipse.cdt.core.dom.ast.IASTNode;
import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
import org.eclipse.cdt.core.dom.parser.IScannerExtensionConfiguration;
import org.eclipse.cdt.core.dom.parser.ISourceCodeParser; import org.eclipse.cdt.core.dom.parser.ISourceCodeParser;
import org.eclipse.cdt.core.dom.parser.c.ANSICParserExtensionConfiguration; import org.eclipse.cdt.core.dom.parser.c.ANSICParserExtensionConfiguration;
import org.eclipse.cdt.core.dom.parser.c.GCCParserExtensionConfiguration; import org.eclipse.cdt.core.dom.parser.c.GCCParserExtensionConfiguration;
import org.eclipse.cdt.core.dom.parser.c.GCCScannerExtensionConfiguration;
import org.eclipse.cdt.core.dom.parser.c.ICParserExtensionConfiguration; import org.eclipse.cdt.core.dom.parser.c.ICParserExtensionConfiguration;
import org.eclipse.cdt.core.dom.parser.cpp.ANSICPPParserExtensionConfiguration; import org.eclipse.cdt.core.dom.parser.cpp.ANSICPPParserExtensionConfiguration;
import org.eclipse.cdt.core.dom.parser.cpp.GPPParserExtensionConfiguration; import org.eclipse.cdt.core.dom.parser.cpp.GPPParserExtensionConfiguration;
import org.eclipse.cdt.core.dom.parser.cpp.GPPScannerExtensionConfiguration;
import org.eclipse.cdt.core.dom.parser.cpp.ICPPParserExtensionConfiguration; import org.eclipse.cdt.core.dom.parser.cpp.ICPPParserExtensionConfiguration;
import org.eclipse.cdt.core.parser.CodeReader; import org.eclipse.cdt.core.parser.CodeReader;
import org.eclipse.cdt.core.parser.IParserLogService; import org.eclipse.cdt.core.parser.IParserLogService;
@ -37,8 +34,6 @@ import org.eclipse.cdt.internal.core.dom.parser.c.GNUCSourceParser;
import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPVisitor; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPVisitor;
import org.eclipse.cdt.internal.core.dom.parser.cpp.GNUCPPSourceParser; import org.eclipse.cdt.internal.core.dom.parser.cpp.GNUCPPSourceParser;
import org.eclipse.cdt.internal.core.parser.ParserException; import org.eclipse.cdt.internal.core.parser.ParserException;
import org.eclipse.cdt.internal.core.parser.scanner2.DOMScanner;
import org.eclipse.cdt.internal.core.parser.scanner2.FileCodeReaderFactory;
import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFile;
/** /**
@ -87,12 +82,7 @@ public class AST2SelectionParseBaseTest extends FileBasePluginTest {
CodeReader codeReader = new CodeReader(code CodeReader codeReader = new CodeReader(code
.toCharArray()); .toCharArray());
ScannerInfo scannerInfo = new ScannerInfo(); ScannerInfo scannerInfo = new ScannerInfo();
IScannerExtensionConfiguration configuration = null; IScanner scanner= AST2BaseTest.createScanner(codeReader, lang, ParserMode.COMPLETE_PARSE, scannerInfo, false);
if( lang == ParserLanguage.C )
configuration = new GCCScannerExtensionConfiguration();
else
configuration = new GPPScannerExtensionConfiguration();
IScanner scanner = new DOMScanner( codeReader, scannerInfo, ParserMode.COMPLETE_PARSE, lang, NULL_LOG, configuration, FileCodeReaderFactory.getInstance() );
ISourceCodeParser parser2 = null; ISourceCodeParser parser2 = null;
if( lang == ParserLanguage.CPP ) if( lang == ParserLanguage.CPP )

16
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2SpecBaseTest.java
View file

@ -13,21 +13,20 @@ package org.eclipse.cdt.core.parser.tests.ast2;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import junit.framework.TestCase;
import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.cdt.core.dom.ast.IASTName;
import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
import org.eclipse.cdt.core.dom.ast.IBinding; import org.eclipse.cdt.core.dom.ast.IBinding;
import org.eclipse.cdt.core.dom.ast.IProblemBinding; import org.eclipse.cdt.core.dom.ast.IProblemBinding;
import org.eclipse.cdt.core.dom.ast.c.CASTVisitor; import org.eclipse.cdt.core.dom.ast.c.CASTVisitor;
import org.eclipse.cdt.core.dom.ast.cpp.CPPASTVisitor; import org.eclipse.cdt.core.dom.ast.cpp.CPPASTVisitor;
import org.eclipse.cdt.core.dom.parser.IScannerExtensionConfiguration;
import org.eclipse.cdt.core.dom.parser.ISourceCodeParser; import org.eclipse.cdt.core.dom.parser.ISourceCodeParser;
import org.eclipse.cdt.core.dom.parser.c.ANSICParserExtensionConfiguration; import org.eclipse.cdt.core.dom.parser.c.ANSICParserExtensionConfiguration;
import org.eclipse.cdt.core.dom.parser.c.GCCParserExtensionConfiguration; import org.eclipse.cdt.core.dom.parser.c.GCCParserExtensionConfiguration;
import org.eclipse.cdt.core.dom.parser.c.GCCScannerExtensionConfiguration;
import org.eclipse.cdt.core.dom.parser.c.ICParserExtensionConfiguration; import org.eclipse.cdt.core.dom.parser.c.ICParserExtensionConfiguration;
import org.eclipse.cdt.core.dom.parser.cpp.ANSICPPParserExtensionConfiguration; import org.eclipse.cdt.core.dom.parser.cpp.ANSICPPParserExtensionConfiguration;
import org.eclipse.cdt.core.dom.parser.cpp.GPPParserExtensionConfiguration; import org.eclipse.cdt.core.dom.parser.cpp.GPPParserExtensionConfiguration;
import org.eclipse.cdt.core.dom.parser.cpp.GPPScannerExtensionConfiguration;
import org.eclipse.cdt.core.dom.parser.cpp.ICPPParserExtensionConfiguration; import org.eclipse.cdt.core.dom.parser.cpp.ICPPParserExtensionConfiguration;
import org.eclipse.cdt.core.parser.CodeReader; import org.eclipse.cdt.core.parser.CodeReader;
import org.eclipse.cdt.core.parser.IParserLogService; import org.eclipse.cdt.core.parser.IParserLogService;
@ -41,10 +40,6 @@ import org.eclipse.cdt.internal.core.dom.parser.c.GNUCSourceParser;
import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPVisitor; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPVisitor;
import org.eclipse.cdt.internal.core.dom.parser.cpp.GNUCPPSourceParser; import org.eclipse.cdt.internal.core.dom.parser.cpp.GNUCPPSourceParser;
import org.eclipse.cdt.internal.core.parser.ParserException; import org.eclipse.cdt.internal.core.parser.ParserException;
import org.eclipse.cdt.internal.core.parser.scanner2.DOMScanner;
import org.eclipse.cdt.internal.core.parser.scanner2.FileCodeReaderFactory;
import junit.framework.TestCase;
/** /**
* @author dsteffle * @author dsteffle
@ -100,12 +95,7 @@ public class AST2SpecBaseTest extends TestCase {
private IASTTranslationUnit parse(CodeReader codeReader, ParserLanguage lang, boolean useGNUExtensions, boolean expectNoProblems, boolean checkBindings, int expectedProblemBindings) throws ParserException { private IASTTranslationUnit parse(CodeReader codeReader, ParserLanguage lang, boolean useGNUExtensions, boolean expectNoProblems, boolean checkBindings, int expectedProblemBindings) throws ParserException {
ScannerInfo scannerInfo = new ScannerInfo(); ScannerInfo scannerInfo = new ScannerInfo();
IScannerExtensionConfiguration configuration = null; IScanner scanner= AST2BaseTest.createScanner(codeReader, lang, ParserMode.COMPLETE_PARSE, scannerInfo, false);
if( lang == ParserLanguage.C )
configuration = new GCCScannerExtensionConfiguration();
else
configuration = new GPPScannerExtensionConfiguration();
IScanner scanner = new DOMScanner( codeReader, scannerInfo, ParserMode.COMPLETE_PARSE, lang, NULL_LOG, configuration, FileCodeReaderFactory.getInstance() );
ISourceCodeParser parser2 = null; ISourceCodeParser parser2 = null;
if( lang == ParserLanguage.CPP ) if( lang == ParserLanguage.CPP )

3
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2Tests.java
View file

@ -3585,7 +3585,8 @@ public class AST2Tests extends AST2BaseTest {
assertEquals("1", macroDefinitions[0].getExpansion()); assertEquals("1", macroDefinitions[0].getExpansion());
assertEquals("1", macroDefinitions[1].getExpansion()); assertEquals("1", macroDefinitions[1].getExpansion());
// regression test for #64268 and #71733 which also handle comments // regression test for #64268 and #71733 which also handle comments
assertEquals("1 + 2", macroDefinitions[2].getExpansion()); String expectExpansion= fUsesCPreprocessor ? "1 + 2" : "1 + 2";
assertEquals(expectExpansion, macroDefinitions[2].getExpansion());
assertEquals("(KDebugNum(x))", macroDefinitions[3].getExpansion()); assertEquals("(KDebugNum(x))", macroDefinitions[3].getExpansion());
assertEquals("{if((DEBUGNUM(a)))p;}", macroDefinitions[4].getExpansion()); assertEquals("{if((DEBUGNUM(a)))p;}", macroDefinitions[4].getExpansion());

12
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/CompleteParser2Tests.java
View file

@ -63,15 +63,12 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPNamespace;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPReferenceType; import org.eclipse.cdt.core.dom.ast.cpp.ICPPReferenceType;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPUsingDeclaration; import org.eclipse.cdt.core.dom.ast.cpp.ICPPUsingDeclaration;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPVariable; import org.eclipse.cdt.core.dom.ast.cpp.ICPPVariable;
import org.eclipse.cdt.core.dom.parser.IScannerExtensionConfiguration;
import org.eclipse.cdt.core.dom.parser.ISourceCodeParser; import org.eclipse.cdt.core.dom.parser.ISourceCodeParser;
import org.eclipse.cdt.core.dom.parser.c.ANSICParserExtensionConfiguration; import org.eclipse.cdt.core.dom.parser.c.ANSICParserExtensionConfiguration;
import org.eclipse.cdt.core.dom.parser.c.GCCParserExtensionConfiguration; import org.eclipse.cdt.core.dom.parser.c.GCCParserExtensionConfiguration;
import org.eclipse.cdt.core.dom.parser.c.GCCScannerExtensionConfiguration;
import org.eclipse.cdt.core.dom.parser.c.ICParserExtensionConfiguration; import org.eclipse.cdt.core.dom.parser.c.ICParserExtensionConfiguration;
import org.eclipse.cdt.core.dom.parser.cpp.ANSICPPParserExtensionConfiguration; import org.eclipse.cdt.core.dom.parser.cpp.ANSICPPParserExtensionConfiguration;
import org.eclipse.cdt.core.dom.parser.cpp.GPPParserExtensionConfiguration; import org.eclipse.cdt.core.dom.parser.cpp.GPPParserExtensionConfiguration;
import org.eclipse.cdt.core.dom.parser.cpp.GPPScannerExtensionConfiguration;
import org.eclipse.cdt.core.dom.parser.cpp.ICPPParserExtensionConfiguration; import org.eclipse.cdt.core.dom.parser.cpp.ICPPParserExtensionConfiguration;
import org.eclipse.cdt.core.parser.CodeReader; import org.eclipse.cdt.core.parser.CodeReader;
import org.eclipse.cdt.core.parser.IScanner; import org.eclipse.cdt.core.parser.IScanner;
@ -85,8 +82,6 @@ import org.eclipse.cdt.internal.core.dom.parser.c.GNUCSourceParser;
import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPVisitor; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPVisitor;
import org.eclipse.cdt.internal.core.dom.parser.cpp.GNUCPPSourceParser; import org.eclipse.cdt.internal.core.dom.parser.cpp.GNUCPPSourceParser;
import org.eclipse.cdt.internal.core.parser.ParserException; import org.eclipse.cdt.internal.core.parser.ParserException;
import org.eclipse.cdt.internal.core.parser.scanner2.DOMScanner;
import org.eclipse.cdt.internal.core.parser.scanner2.FileCodeReaderFactory;
import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Platform;
/** /**
@ -183,13 +178,8 @@ public class CompleteParser2Tests extends BaseTestCase {
CodeReader codeReader = new CodeReader(code CodeReader codeReader = new CodeReader(code
.toCharArray()); .toCharArray());
ScannerInfo scannerInfo = new ScannerInfo(); ScannerInfo scannerInfo = new ScannerInfo();
IScannerExtensionConfiguration configuration = null;
if( lang == ParserLanguage.C )
configuration = new GCCScannerExtensionConfiguration();
else
configuration = new GPPScannerExtensionConfiguration();
ISourceCodeParser parser2 = null; ISourceCodeParser parser2 = null;
IScanner scanner = new DOMScanner( codeReader, scannerInfo, ParserMode.COMPLETE_PARSE, lang, NULL_LOG, configuration, FileCodeReaderFactory.getInstance() ); IScanner scanner= AST2BaseTest.createScanner(codeReader, lang, ParserMode.COMPLETE_PARSE, scannerInfo, false);
if (lang == ParserLanguage.CPP) { if (lang == ParserLanguage.CPP) {
ICPPParserExtensionConfiguration config = null; ICPPParserExtensionConfiguration config = null;
if (gcc) if (gcc)

9
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/DOMLocationMacroTests.java
View file

@ -87,7 +87,7 @@ public class DOMLocationMacroTests extends AST2BaseTest {
IASTPreprocessorObjectStyleMacroDefinition fromExpansion = (IASTPreprocessorObjectStyleMacroDefinition) expansion.getMacroDefinition(); IASTPreprocessorObjectStyleMacroDefinition fromExpansion = (IASTPreprocessorObjectStyleMacroDefinition) expansion.getMacroDefinition();
assertEqualsMacros( fromExpansion, ABC ); assertEqualsMacros( fromExpansion, ABC );
assertEquals( expansion.getNodeOffset(), 0 ); assertEquals( expansion.getNodeOffset(), 0 );
assertEquals( expansion.getNodeLength(), 3 ); assertEquals( fUsesCPreprocessor ? 2 : 3, expansion.getNodeLength() );
IASTNodeLocation [] macroLocation = expansion.getExpansionLocations(); IASTNodeLocation [] macroLocation = expansion.getExpansionLocations();
assertEquals( macroLocation.length, 1 ); assertEquals( macroLocation.length, 1 );
assertTrue( macroLocation[0] instanceof IASTFileLocation ); assertTrue( macroLocation[0] instanceof IASTFileLocation );
@ -98,7 +98,7 @@ public class DOMLocationMacroTests extends AST2BaseTest {
IASTNodeLocation [] nameLocations = n.getNodeLocations(); IASTNodeLocation [] nameLocations = n.getNodeLocations();
assertEquals( nameLocations.length, 1 ); assertEquals( nameLocations.length, 1 );
final IASTMacroExpansion nodeLocation = (IASTMacroExpansion) nameLocations[0]; final IASTMacroExpansion nodeLocation = (IASTMacroExpansion) nameLocations[0];
assertEquals( nodeLocation.getNodeOffset(), 2 ); assertEquals( nodeLocation.getNodeOffset(), fUsesCPreprocessor ? 1 : 2 );
assertEquals( nodeLocation.getNodeLength(), 1 ); assertEquals( nodeLocation.getNodeLength(), 1 );
assertEquals( nodeLocation.getExpansionLocations()[0].getNodeOffset(), macroLocation[0].getNodeOffset() ); assertEquals( nodeLocation.getExpansionLocations()[0].getNodeOffset(), macroLocation[0].getNodeOffset() );
@ -132,7 +132,7 @@ public class DOMLocationMacroTests extends AST2BaseTest {
IASTMacroExpansion expansion = (IASTMacroExpansion) declSpecLocations[0]; IASTMacroExpansion expansion = (IASTMacroExpansion) declSpecLocations[0];
assertEqualsMacros( defXYZ, expansion.getMacroDefinition() ); assertEqualsMacros( defXYZ, expansion.getMacroDefinition() );
assertEquals( expansion.getNodeOffset(), 0 ); assertEquals( expansion.getNodeOffset(), 0 );
assertEquals( expansion.getNodeLength(), "const".length() ); assertEquals( expansion.getNodeLength(), fUsesCPreprocessor ? 1 : "const".length() );
IASTNodeLocation [] expansionLocations = expansion.getExpansionLocations(); IASTNodeLocation [] expansionLocations = expansion.getExpansionLocations();
assertEquals( expansionLocations.length, 1 ); assertEquals( expansionLocations.length, 1 );
assertTrue( expansionLocations[0] instanceof IASTFileLocation ); assertTrue( expansionLocations[0] instanceof IASTFileLocation );
@ -170,7 +170,8 @@ public class DOMLocationMacroTests extends AST2BaseTest {
final IASTPreprocessorMacroDefinition C_PO2 = mac_loc.getMacroDefinition(); final IASTPreprocessorMacroDefinition C_PO2 = mac_loc.getMacroDefinition();
assertEqualsMacros( C_PO, C_PO2 ); assertEqualsMacros( C_PO, C_PO2 );
assertEquals( 0, mac_loc.getNodeOffset()); assertEquals( 0, mac_loc.getNodeOffset());
assertEquals( 4+ C_PO.getExpansion().length() + XYZ.getExpansion().length() + PO.getExpansion().length(), mac_loc.getNodeLength() ); assertEquals( fUsesCPreprocessor ? 2 :
4+ C_PO.getExpansion().length() + XYZ.getExpansion().length() + PO.getExpansion().length(), mac_loc.getNodeLength() );
IASTFileLocation end_loc = (IASTFileLocation) locations[2]; IASTFileLocation end_loc = (IASTFileLocation) locations[2];
assertEquals( code.indexOf( " var"), end_loc.getNodeOffset() ); //$NON-NLS-1$ assertEquals( code.indexOf( " var"), end_loc.getNodeOffset() ); //$NON-NLS-1$
assertEquals( " var;".length(), end_loc.getNodeLength() ); //$NON-NLS-1$ assertEquals( " var;".length(), end_loc.getNodeLength() ); //$NON-NLS-1$

14
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/DOMLocationTests.java
View file

@ -92,13 +92,13 @@ public class DOMLocationTests extends AST2BaseTest {
assertEquals(nodeLocations.length, 1); assertEquals(nodeLocations.length, 1);
assertTrue(nodeLocations[0] instanceof IASTFileLocation); assertTrue(nodeLocations[0] instanceof IASTFileLocation);
IASTFileLocation fileLocation = ((IASTFileLocation) nodeLocations[0]); IASTFileLocation fileLocation = ((IASTFileLocation) nodeLocations[0]);
assertEquals(fileLocation.getFileName(), _TEXT_); //$NON-NLS-1$ assertEquals(fileLocation.getFileName(), _TEXT_);
assertEquals(fileLocation.getNodeOffset(), 0); assertEquals(fileLocation.getNodeOffset(), 0);
assertEquals(fileLocation.getNodeLength(), 6); assertEquals(fileLocation.getNodeLength(), 6);
IASTNodeLocation[] tuLocations = tu.getNodeLocations(); IASTNodeLocation[] tuLocations = tu.getNodeLocations();
assertEquals(tuLocations.length, nodeLocations.length); assertEquals(tuLocations.length, nodeLocations.length);
assertEquals(fileLocation.getFileName(), assertEquals(fileLocation.getFileName(),
((IASTFileLocation) tuLocations[0]).getFileName()); //$NON-NLS-1$ ((IASTFileLocation) tuLocations[0]).getFileName());
assertEquals(fileLocation.getNodeOffset(), tuLocations[0] assertEquals(fileLocation.getNodeOffset(), tuLocations[0]
.getNodeOffset()); .getNodeOffset());
assertEquals(fileLocation.getNodeLength(), tuLocations[0] assertEquals(fileLocation.getNodeLength(), tuLocations[0]
@ -119,7 +119,7 @@ public class DOMLocationTests extends AST2BaseTest {
assertEquals(nodeLocations.length, 1); assertEquals(nodeLocations.length, 1);
assertTrue(nodeLocations[0] instanceof IASTFileLocation); assertTrue(nodeLocations[0] instanceof IASTFileLocation);
IASTFileLocation fileLocation = ((IASTFileLocation) nodeLocations[0]); IASTFileLocation fileLocation = ((IASTFileLocation) nodeLocations[0]);
assertEquals(fileLocation.getFileName(), _TEXT_); //$NON-NLS-1$ assertEquals(fileLocation.getFileName(), _TEXT_);
assertEquals(fileLocation.getNodeOffset(), 0); assertEquals(fileLocation.getNodeOffset(), 0);
assertEquals(fileLocation.getNodeLength(), code.indexOf(";") + 1); //$NON-NLS-1$ assertEquals(fileLocation.getNodeLength(), code.indexOf(";") + 1); //$NON-NLS-1$
IASTDeclarator[] declarators = declaration.getDeclarators(); IASTDeclarator[] declarators = declaration.getDeclarators();
@ -578,7 +578,7 @@ public class DOMLocationTests extends AST2BaseTest {
assertEquals( 2, decls.length); assertEquals( 2, decls.length);
assertEquals( 1, statements.length); assertEquals( 1, statements.length);
assertEquals( 1, problems.length); assertEquals( 1, problems.length);
assertSoleLocation(problems[0], code, "z"); assertSoleLocation(problems[0], code, fUsesCPreprocessor ? "nix(y," : "z");
assertSoleLocation( decls[1], code, "int x;"); assertSoleLocation( decls[1], code, "int x;");
} }
} }
@ -593,13 +593,11 @@ public class DOMLocationTests extends AST2BaseTest {
: null) { : null) {
IASTTranslationUnit tu = parse(code, p, false, false); IASTTranslationUnit tu = parse(code, p, false, false);
IASTDeclaration[] decls= tu.getDeclarations(); IASTDeclaration[] decls= tu.getDeclarations();
IASTPreprocessorStatement [] statements = tu.getAllPreprocessorStatements();
IASTProblem[] problems = tu.getPreprocessorProblems(); IASTProblem[] problems = tu.getPreprocessorProblems();
assertEquals( 1, decls.length); assertEquals( 1, decls.length);
assertEquals( 1, statements.length);
assertEquals( 2, problems.length); assertEquals( 2, problems.length);
assertSoleLocation(problems[0], code, "#include \"\""); assertSoleLocation(problems[0], code, "#include \"\"");
assertSoleLocation(problems[1], code, "else"); assertSoleLocation(problems[1], code, fUsesCPreprocessor ? "#else" : "else");
assertSoleLocation( decls[0], code, "int x;"); assertSoleLocation( decls[0], code, "int x;");
} }
} }
@ -720,6 +718,6 @@ public class DOMLocationTests extends AST2BaseTest {
assertEquals(IASTProblem.PREPROCESSOR_INVALID_DIRECTIVE, problems[2].getID()); assertEquals(IASTProblem.PREPROCESSOR_INVALID_DIRECTIVE, problems[2].getID());
assertSoleLocation(problems[0], code, "#import \"include_once.h\""); assertSoleLocation(problems[0], code, "#import \"include_once.h\"");
assertSoleLocation(problems[1], code, "\"deprecated include\""); assertSoleLocation(problems[1], code, "\"deprecated include\"");
assertSoleLocation(problems[2], code, "invalid"); assertSoleLocation(problems[2], code, fUsesCPreprocessor ? "#invalid" : "invalid");
} }
} }

10
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/DOMPreprocessorInformationTest.java
View file

@ -183,11 +183,13 @@ public class DOMPreprocessorInformationTest extends AST2BaseTest {
IASTNodeLocation[] nodeLocations = init.getNodeLocations(); IASTNodeLocation[] nodeLocations = init.getNodeLocations();
assertEquals(1, nodeLocations.length); assertEquals(1, nodeLocations.length);
FunctionMacroExpansionLocation location = (FunctionMacroExpansionLocation) nodeLocations[0]; if (!fUsesCPreprocessor) {
char[][] actualParameters = location.getActualParameters(); FunctionMacroExpansionLocation location = (FunctionMacroExpansionLocation) nodeLocations[0];
char[][] actualParameters = location.getActualParameters();
assertEquals("foo", new String(actualParameters[0])); assertEquals("foo", new String(actualParameters[0]));
assertEquals("bar", new String(actualParameters[1])); assertEquals("bar", new String(actualParameters[1]));
}
} }
// #ifdef xxx // #ifdef xxx

27
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/DOMScannerTests.java
View file

@ -23,11 +23,15 @@ import junit.framework.TestSuite;
import org.eclipse.cdt.core.dom.ast.IASTPreprocessorIncludeStatement; import org.eclipse.cdt.core.dom.ast.IASTPreprocessorIncludeStatement;
import org.eclipse.cdt.core.dom.ast.IASTProblem; import org.eclipse.cdt.core.dom.ast.IASTProblem;
import org.eclipse.cdt.core.dom.parser.IScannerExtensionConfiguration;
import org.eclipse.cdt.core.dom.parser.c.GCCScannerExtensionConfiguration;
import org.eclipse.cdt.core.dom.parser.cpp.GPPScannerExtensionConfiguration;
import org.eclipse.cdt.core.parser.CodeReader; import org.eclipse.cdt.core.parser.CodeReader;
import org.eclipse.cdt.core.parser.EndOfFileException; import org.eclipse.cdt.core.parser.EndOfFileException;
import org.eclipse.cdt.core.parser.IProblem; import org.eclipse.cdt.core.parser.IProblem;
import org.eclipse.cdt.core.parser.ISourceElementRequestor; import org.eclipse.cdt.core.parser.ISourceElementRequestor;
import org.eclipse.cdt.core.parser.IToken; import org.eclipse.cdt.core.parser.IToken;
import org.eclipse.cdt.core.parser.NullLogService;
import org.eclipse.cdt.core.parser.NullSourceElementRequestor; import org.eclipse.cdt.core.parser.NullSourceElementRequestor;
import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.ParserLanguage;
import org.eclipse.cdt.core.parser.ParserMode; import org.eclipse.cdt.core.parser.ParserMode;
@ -35,6 +39,7 @@ import org.eclipse.cdt.core.parser.ScannerInfo;
import org.eclipse.cdt.core.parser.util.CharArrayUtils; import org.eclipse.cdt.core.parser.util.CharArrayUtils;
import org.eclipse.cdt.core.testplugin.util.BaseTestCase; import org.eclipse.cdt.core.testplugin.util.BaseTestCase;
import org.eclipse.cdt.internal.core.parser.scanner2.DOMScanner; import org.eclipse.cdt.internal.core.parser.scanner2.DOMScanner;
import org.eclipse.cdt.internal.core.parser.scanner2.FileCodeReaderFactory;
import org.eclipse.cdt.internal.core.parser.scanner2.FunctionStyleMacro; import org.eclipse.cdt.internal.core.parser.scanner2.FunctionStyleMacro;
import org.eclipse.cdt.internal.core.parser.scanner2.ILocationResolver; import org.eclipse.cdt.internal.core.parser.scanner2.ILocationResolver;
import org.eclipse.cdt.internal.core.parser.scanner2.ObjectStyleMacro; import org.eclipse.cdt.internal.core.parser.scanner2.ObjectStyleMacro;
@ -62,14 +67,24 @@ public class DOMScannerTests extends BaseTestCase {
initializeScanner(input, ParserMode.COMPLETE_PARSE); initializeScanner(input, ParserMode.COMPLETE_PARSE);
} }
protected void initializeScanner(String input, ParserLanguage lang) throws IOException { protected void initializeScanner(String input, ParserLanguage lang) {
fScanner= (DOMScanner) AST2BaseTest.createScanner(new CodeReader(input.toCharArray()), lang, initializeScanner(input, ParserMode.COMPLETE_PARSE, lang);
ParserMode.COMPLETE_PARSE, new ScannerInfo(), false);
} }
protected void initializeScanner(String input, ParserMode mode) throws IOException { protected void initializeScanner(String input, ParserMode mode) {
fScanner= (DOMScanner) AST2BaseTest.createScanner(new CodeReader(input.toCharArray()), ParserLanguage.CPP, initializeScanner(input, mode, ParserLanguage.CPP);
mode, new ScannerInfo(), false); }
protected void initializeScanner(String input, ParserMode mode, ParserLanguage lang) {
CodeReader codeReader=new CodeReader(input.toCharArray());
IScannerExtensionConfiguration configuration = null;
if( lang == ParserLanguage.C )
configuration = new GCCScannerExtensionConfiguration();
else
configuration = new GPPScannerExtensionConfiguration();
fScanner= new DOMScanner( codeReader, new ScannerInfo(), mode, lang,
new NullLogService(), configuration, FileCodeReaderFactory.getInstance() );
fScanner.setScanComments(false);
} }
protected int fullyTokenize() throws Exception { protected int fullyTokenize() throws Exception {

12
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/QuickParser2Tests.java
View file

@ -18,15 +18,12 @@ import junit.framework.TestCase;
import org.eclipse.cdt.core.dom.ast.IASTProblem; import org.eclipse.cdt.core.dom.ast.IASTProblem;
import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
import org.eclipse.cdt.core.dom.parser.IScannerExtensionConfiguration;
import org.eclipse.cdt.core.dom.parser.ISourceCodeParser; import org.eclipse.cdt.core.dom.parser.ISourceCodeParser;
import org.eclipse.cdt.core.dom.parser.c.ANSICParserExtensionConfiguration; import org.eclipse.cdt.core.dom.parser.c.ANSICParserExtensionConfiguration;
import org.eclipse.cdt.core.dom.parser.c.GCCParserExtensionConfiguration; import org.eclipse.cdt.core.dom.parser.c.GCCParserExtensionConfiguration;
import org.eclipse.cdt.core.dom.parser.c.GCCScannerExtensionConfiguration;
import org.eclipse.cdt.core.dom.parser.c.ICParserExtensionConfiguration; import org.eclipse.cdt.core.dom.parser.c.ICParserExtensionConfiguration;
import org.eclipse.cdt.core.dom.parser.cpp.ANSICPPParserExtensionConfiguration; import org.eclipse.cdt.core.dom.parser.cpp.ANSICPPParserExtensionConfiguration;
import org.eclipse.cdt.core.dom.parser.cpp.GPPParserExtensionConfiguration; import org.eclipse.cdt.core.dom.parser.cpp.GPPParserExtensionConfiguration;
import org.eclipse.cdt.core.dom.parser.cpp.GPPScannerExtensionConfiguration;
import org.eclipse.cdt.core.dom.parser.cpp.ICPPParserExtensionConfiguration; import org.eclipse.cdt.core.dom.parser.cpp.ICPPParserExtensionConfiguration;
import org.eclipse.cdt.core.parser.CodeReader; import org.eclipse.cdt.core.parser.CodeReader;
import org.eclipse.cdt.core.parser.IScanner; import org.eclipse.cdt.core.parser.IScanner;
@ -40,8 +37,6 @@ import org.eclipse.cdt.internal.core.dom.parser.c.GNUCSourceParser;
import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPVisitor; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPVisitor;
import org.eclipse.cdt.internal.core.dom.parser.cpp.GNUCPPSourceParser; import org.eclipse.cdt.internal.core.dom.parser.cpp.GNUCPPSourceParser;
import org.eclipse.cdt.internal.core.parser.ParserException; import org.eclipse.cdt.internal.core.parser.ParserException;
import org.eclipse.cdt.internal.core.parser.scanner2.DOMScanner;
import org.eclipse.cdt.internal.core.parser.scanner2.FileCodeReaderFactory;
/** /**
* @author jcamelon * @author jcamelon
@ -1363,12 +1358,7 @@ public class QuickParser2Tests extends TestCase {
CodeReader codeReader = new CodeReader( code.toCharArray() ); CodeReader codeReader = new CodeReader( code.toCharArray() );
IScannerInfo scannerInfo = new ScannerInfo(); IScannerInfo scannerInfo = new ScannerInfo();
IScannerExtensionConfiguration configuration = null; IScanner scanner= AST2BaseTest.createScanner(codeReader, lang, ParserMode.COMPLETE_PARSE, scannerInfo, false);
if( lang == ParserLanguage.C )
configuration = new GCCScannerExtensionConfiguration();
else
configuration = new GPPScannerExtensionConfiguration();
IScanner scanner = new DOMScanner( codeReader, scannerInfo, ParserMode.COMPLETE_PARSE, lang, NULL_LOG, configuration, FileCodeReaderFactory.getInstance() );
ISourceCodeParser parser2 = null; ISourceCodeParser parser2 = null;
if (lang == ParserLanguage.CPP) { if (lang == ParserLanguage.CPP) {
ICPPParserExtensionConfiguration config = null; ICPPParserExtensionConfiguration config = null;

13
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/prefix/CompletionTestBase.java
View file

@ -17,15 +17,12 @@ import junit.framework.TestCase;
import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; import org.eclipse.cdt.core.dom.ast.IASTCompletionNode;
import org.eclipse.cdt.core.dom.ast.IBinding; import org.eclipse.cdt.core.dom.ast.IBinding;
import org.eclipse.cdt.core.dom.parser.IScannerExtensionConfiguration;
import org.eclipse.cdt.core.dom.parser.ISourceCodeParser; import org.eclipse.cdt.core.dom.parser.ISourceCodeParser;
import org.eclipse.cdt.core.dom.parser.c.ANSICParserExtensionConfiguration; import org.eclipse.cdt.core.dom.parser.c.ANSICParserExtensionConfiguration;
import org.eclipse.cdt.core.dom.parser.c.GCCParserExtensionConfiguration; import org.eclipse.cdt.core.dom.parser.c.GCCParserExtensionConfiguration;
import org.eclipse.cdt.core.dom.parser.c.GCCScannerExtensionConfiguration;
import org.eclipse.cdt.core.dom.parser.c.ICParserExtensionConfiguration; import org.eclipse.cdt.core.dom.parser.c.ICParserExtensionConfiguration;
import org.eclipse.cdt.core.dom.parser.cpp.ANSICPPParserExtensionConfiguration; import org.eclipse.cdt.core.dom.parser.cpp.ANSICPPParserExtensionConfiguration;
import org.eclipse.cdt.core.dom.parser.cpp.GPPParserExtensionConfiguration; import org.eclipse.cdt.core.dom.parser.cpp.GPPParserExtensionConfiguration;
import org.eclipse.cdt.core.dom.parser.cpp.GPPScannerExtensionConfiguration;
import org.eclipse.cdt.core.dom.parser.cpp.ICPPParserExtensionConfiguration; import org.eclipse.cdt.core.dom.parser.cpp.ICPPParserExtensionConfiguration;
import org.eclipse.cdt.core.parser.CodeReader; import org.eclipse.cdt.core.parser.CodeReader;
import org.eclipse.cdt.core.parser.IParserLogService; import org.eclipse.cdt.core.parser.IParserLogService;
@ -34,11 +31,10 @@ import org.eclipse.cdt.core.parser.NullLogService;
import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.ParserLanguage;
import org.eclipse.cdt.core.parser.ParserMode; import org.eclipse.cdt.core.parser.ParserMode;
import org.eclipse.cdt.core.parser.ScannerInfo; import org.eclipse.cdt.core.parser.ScannerInfo;
import org.eclipse.cdt.core.parser.tests.ast2.AST2BaseTest;
import org.eclipse.cdt.internal.core.dom.parser.c.GNUCSourceParser; import org.eclipse.cdt.internal.core.dom.parser.c.GNUCSourceParser;
import org.eclipse.cdt.internal.core.dom.parser.cpp.GNUCPPSourceParser; import org.eclipse.cdt.internal.core.dom.parser.cpp.GNUCPPSourceParser;
import org.eclipse.cdt.internal.core.parser.ParserException; import org.eclipse.cdt.internal.core.parser.ParserException;
import org.eclipse.cdt.internal.core.parser.scanner2.DOMScanner;
import org.eclipse.cdt.internal.core.parser.scanner2.FileCodeReaderFactory;
public class CompletionTestBase extends TestCase { public class CompletionTestBase extends TestCase {
@ -47,12 +43,7 @@ public class CompletionTestBase extends TestCase {
protected IASTCompletionNode getCompletionNode(String code, ParserLanguage lang, boolean useGNUExtensions) throws ParserException { protected IASTCompletionNode getCompletionNode(String code, ParserLanguage lang, boolean useGNUExtensions) throws ParserException {
CodeReader codeReader = new CodeReader(code.toCharArray()); CodeReader codeReader = new CodeReader(code.toCharArray());
ScannerInfo scannerInfo = new ScannerInfo(); ScannerInfo scannerInfo = new ScannerInfo();
IScannerExtensionConfiguration configuration = null; IScanner scanner= AST2BaseTest.createScanner(codeReader, lang, ParserMode.COMPLETE_PARSE, scannerInfo, false);
if( lang == ParserLanguage.C )
configuration = new GCCScannerExtensionConfiguration();
else
configuration = new GPPScannerExtensionConfiguration();
IScanner scanner = new DOMScanner( codeReader, scannerInfo, ParserMode.COMPLETE_PARSE, lang, NULL_LOG, configuration, FileCodeReaderFactory.getInstance() );
ISourceCodeParser parser = null; ISourceCodeParser parser = null;
if( lang == ParserLanguage.CPP ) if( lang == ParserLanguage.CPP )

86
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner/PreprocessorTests.java
View file

@ -452,6 +452,7 @@ public class PreprocessorTests extends PreprocessorTestsBase {
// #define tp2(x,y,z) [ x ## y ## z ] // #define tp2(x,y,z) [ x ## y ## z ]
// #define tstr1(x,y) [#x#y] // #define tstr1(x,y) [#x#y]
// #define tstr2(x,y) [ #x #y ] // #define tstr2(x,y) [ #x #y ]
// #define spaceBeforeStr(x) a #x b
// xstr(nospace); // xstr(nospace);
// xstr(space); // xstr(space);
// xstr(tp1(a b, c d , e f)); // xstr(tp1(a b, c d , e f));
@ -460,6 +461,7 @@ public class PreprocessorTests extends PreprocessorTestsBase {
// xstr(tp2(a-b, c-d , e-f)); // xstr(tp2(a-b, c-d , e-f));
// xstr(tstr1(a b, c d)); // xstr(tstr1(a b, c d));
// xstr(tstr2(a b, c d)); // xstr(tstr2(a b, c d));
// xstr(spaceBeforeStr(c));
public void testSpaceInStringify() throws Exception { public void testSpaceInStringify() throws Exception {
initializeScanner(); initializeScanner();
validateString("fvalfval"); validateString("fvalfval");
@ -486,6 +488,90 @@ public class PreprocessorTests extends PreprocessorTestsBase {
validateString("[ \\\"a b\\\" \\\"c d\\\" ]"); validateString("[ \\\"a b\\\" \\\"c d\\\" ]");
validateToken(IToken.tSEMI); validateToken(IToken.tSEMI);
validateString("a \\\"c\\\" b");
validateToken(IToken.tSEMI);
validateEOF();
validateProblemCount(0);
}
// #define empty
// #define paste1(y) x##y z
// #define paste2(x) x##empty z
// paste1();
// paste1(empty);
// paste2();
// paste2(empty);
// paste2(a);
public void testTokenPasteWithEmptyParam() throws Exception {
initializeScanner();
validateIdentifier("x");
validateIdentifier("z");
validateToken(IToken.tSEMI);
validateIdentifier("xempty");
validateIdentifier("z");
validateToken(IToken.tSEMI);
validateIdentifier("z");
validateToken(IToken.tSEMI);
validateIdentifier("emptyempty");
validateIdentifier("z");
validateToken(IToken.tSEMI);
validateIdentifier("aempty");
validateIdentifier("z");
validateToken(IToken.tSEMI);
validateEOF();
validateProblemCount(0);
}
// #define empty
// #define paste1(y) x##y z
// #define paste2(x) x##empty z
// paste1();
// paste1(empty);
// paste2();
// paste2(empty);
// paste2(a);
public void testSpacesBeforeStringify() throws Exception {
initializeScanner();
validateIdentifier("x");
validateIdentifier("z");
validateToken(IToken.tSEMI);
validateIdentifier("xempty");
validateIdentifier("z");
validateToken(IToken.tSEMI);
validateIdentifier("z");
validateToken(IToken.tSEMI);
validateIdentifier("emptyempty");
validateIdentifier("z");
validateToken(IToken.tSEMI);
validateIdentifier("aempty");
validateIdentifier("z");
validateToken(IToken.tSEMI);
validateEOF();
validateProblemCount(0);
}
// #define paste(x,y,z) x##y##z
// paste(a,b,c);
// paste(1,2,3);
public void testTokenPasteChain() throws Exception {
initializeScanner();
validateIdentifier("abc");
validateToken(IToken.tSEMI);
validateInteger("123");
validateToken(IToken.tSEMI);
validateEOF(); validateEOF();
validateProblemCount(0); validateProblemCount(0);
} }