mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-04-22 06:02:11 +02:00
Moved to JDK 1.8.
Change-Id: I415625d3cebe3ff38454bd6722c31da07eb466c4
This commit is contained in:
Sergey Prigogin
parent
744765be6f
commit
00e7081b17
4 changed files with 251 additions and 265 deletions
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
|
||||
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
|
||||
<classpathentry kind="src" path="src"/>
|
||||
<classpathentry kind="output" path="bin"/>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#Fri Apr 25 15:22:29 EDT 2008
|
||||
eclipse.preferences.version=1
|
||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
|
||||
org.eclipse.jdt.core.compiler.compliance=1.7
|
||||
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
|
||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
|
||||
org.eclipse.jdt.core.compiler.compliance=1.8
|
||||
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
|
||||
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
|
||||
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
|
||||
|
|
@ -62,4 +62,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enab
|
|||
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
|
||||
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
|
||||
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
|
||||
org.eclipse.jdt.core.compiler.source=1.7
|
||||
org.eclipse.jdt.core.compiler.source=1.8
|
||||
|
|
|
|||
|
|
@ -12,4 +12,4 @@ Require-Bundle: org.eclipse.core.runtime,
|
|||
Export-Package: org.eclipse.cdt.core.lrparser.tests
|
||||
Bundle-Vendor: %Bundle-Vendor.0
|
||||
Bundle-Localization: plugin
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
|
|
|
|||
|
|
@ -15,9 +15,6 @@ import java.util.Collections;
|
|||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
|
||||
import junit.framework.TestCase;
|
||||
import junit.framework.TestSuite;
|
||||
|
||||
import org.eclipse.cdt.core.dom.ast.IASTCompletionNode;
|
||||
import org.eclipse.cdt.core.dom.ast.IASTName;
|
||||
import org.eclipse.cdt.core.dom.ast.IBinding;
|
||||
|
|
@ -28,6 +25,8 @@ import org.eclipse.cdt.core.dom.ast.IVariable;
|
|||
import org.eclipse.cdt.core.dom.lrparser.gnu.GCCLanguage;
|
||||
import org.eclipse.cdt.core.model.ILanguage;
|
||||
|
||||
import junit.framework.TestCase;
|
||||
import junit.framework.TestSuite;
|
||||
|
||||
/**
|
||||
* Reuse the completion parse tests from the old parser for now.
|
||||
|
|
@ -39,16 +38,17 @@ public class LRCompletionParseTest extends TestCase {
|
|||
return new TestSuite(LRCompletionParseTest.class);
|
||||
}
|
||||
|
||||
public LRCompletionParseTest() {
|
||||
}
|
||||
|
||||
public LRCompletionParseTest() { }
|
||||
public LRCompletionParseTest(String name) { super(name); }
|
||||
|
||||
public LRCompletionParseTest(String name) {
|
||||
super(name);
|
||||
}
|
||||
|
||||
protected IASTCompletionNode parse(String code, int offset) throws Exception {
|
||||
return ParseHelper.getCompletionNode(code, getCLanguage(), offset);
|
||||
}
|
||||
|
||||
|
||||
private static final Comparator<IBinding> BINDING_COMPARATOR = new Comparator<IBinding>() {
|
||||
@Override
|
||||
public int compare(IBinding b1, IBinding b2) {
|
||||
|
|
@ -56,31 +56,28 @@ public class LRCompletionParseTest extends TestCase {
|
|||
}
|
||||
};
|
||||
|
||||
|
||||
public static IBinding[] getBindings(IASTName[] names) {
|
||||
List<IBinding> bindings = new ArrayList<IBinding>();
|
||||
List<IBinding> bindings = new ArrayList<>();
|
||||
|
||||
for(IASTName name : names) {
|
||||
if(name.getTranslationUnit() == null)
|
||||
for (IASTName name : names) {
|
||||
if (name.getTranslationUnit() == null)
|
||||
continue;
|
||||
|
||||
for(IBinding binding : name.getCompletionContext().findBindings(name, true))
|
||||
for (IBinding binding : name.getCompletionContext().findBindings(name, true)) {
|
||||
bindings.add(binding);
|
||||
}
|
||||
}
|
||||
|
||||
Collections.sort(bindings, BINDING_COMPARATOR);
|
||||
return bindings.toArray(new IBinding[bindings.size()]);
|
||||
}
|
||||
|
||||
|
||||
protected ILanguage getCLanguage() {
|
||||
return GCCLanguage.getDefault();
|
||||
}
|
||||
|
||||
|
||||
// First steal tests from CompletionParseTest
|
||||
|
||||
|
||||
public void testCompletionStructField() throws Exception {
|
||||
String code =
|
||||
"int aVar; " +
|
||||
|
|
@ -88,19 +85,19 @@ public class LRCompletionParseTest extends TestCase {
|
|||
" int aField1; " +
|
||||
" int aField2; " +
|
||||
"}; " +
|
||||
"void foo(){" +
|
||||
"void foo() {" +
|
||||
" struct D d; " +
|
||||
" d.a " +
|
||||
"}\n";
|
||||
|
||||
int index = code.indexOf( "d.a" );
|
||||
int index = code.indexOf("d.a");
|
||||
|
||||
IASTCompletionNode node = parse( code, index + 3 );
|
||||
assertNotNull( node );
|
||||
IASTCompletionNode node = parse(code, index + 3);
|
||||
assertNotNull(node);
|
||||
|
||||
String prefix = node.getPrefix();
|
||||
assertNotNull( prefix );
|
||||
assertEquals( prefix, "a" );
|
||||
assertNotNull(prefix);
|
||||
assertEquals(prefix, "a");
|
||||
|
||||
IASTName[] names = node.getNames();
|
||||
assertEquals(1, names.length);
|
||||
|
|
@ -119,10 +116,10 @@ public class LRCompletionParseTest extends TestCase {
|
|||
" int nWidth; " +
|
||||
" int nHeight; " +
|
||||
"}; " +
|
||||
"int volume( struct Cube * pCube ) { " +
|
||||
"int volume(struct Cube * pCube) { " +
|
||||
" pCube->SP ";
|
||||
|
||||
IASTCompletionNode node = parse( code, code.indexOf("SP"));
|
||||
IASTCompletionNode node = parse(code, code.indexOf("SP"));
|
||||
|
||||
IASTName[] names = node.getNames();
|
||||
assertEquals(1, names.length);
|
||||
|
|
@ -135,19 +132,18 @@ public class LRCompletionParseTest extends TestCase {
|
|||
assertEquals("nWidth", ((IField)bindings[2]).getName());
|
||||
}
|
||||
|
||||
|
||||
public void testCompletionParametersAsLocalVariables() throws Exception{
|
||||
String code =
|
||||
"int foo( int aParameter ){" +
|
||||
"int foo(int aParameter) {" +
|
||||
" int aLocal;" +
|
||||
" if( aLocal != 0 ){" +
|
||||
" if (aLocal != 0) {" +
|
||||
" int aBlockLocal;" +
|
||||
" a \n";
|
||||
|
||||
int index = code.indexOf( " a " );
|
||||
int index = code.indexOf(" a ");
|
||||
|
||||
IASTCompletionNode node = parse( code, index + 2 );
|
||||
assertNotNull( node );
|
||||
IASTCompletionNode node = parse(code, index + 2);
|
||||
assertNotNull(node);
|
||||
|
||||
assertEquals("a", node.getPrefix()); //$NON-NLS-1$
|
||||
|
||||
|
|
@ -157,20 +153,19 @@ public class LRCompletionParseTest extends TestCase {
|
|||
IBinding[] bindings = getBindings(names);
|
||||
|
||||
assertEquals(3, bindings.length);
|
||||
assertEquals("aBlockLocal", ((IVariable)bindings[0]).getName());
|
||||
assertEquals("aLocal", ((IVariable)bindings[1]).getName());
|
||||
assertEquals("aParameter", ((IVariable)bindings[2]).getName());
|
||||
assertEquals("aBlockLocal", ((IVariable) bindings[0]).getName());
|
||||
assertEquals("aLocal", ((IVariable) bindings[1]).getName());
|
||||
assertEquals("aParameter", ((IVariable) bindings[2]).getName());
|
||||
}
|
||||
|
||||
|
||||
public void testCompletionTypedef() throws Exception {
|
||||
String code =
|
||||
"typedef int Int; " +
|
||||
"InSP";
|
||||
|
||||
int index = code.indexOf( "SP" );
|
||||
int index = code.indexOf("SP");
|
||||
|
||||
IASTCompletionNode node = parse( code, index );
|
||||
IASTCompletionNode node = parse(code, index);
|
||||
assertNotNull(node);
|
||||
|
||||
IASTName[] names = node.getNames();
|
||||
|
|
@ -181,7 +176,7 @@ public class LRCompletionParseTest extends TestCase {
|
|||
IBinding[] bindings = getBindings(names);
|
||||
|
||||
assertEquals(1, bindings.length);
|
||||
assertEquals("Int", ((ITypedef)bindings[0]).getName());
|
||||
assertEquals("Int", ((ITypedef) bindings[0]).getName());
|
||||
}
|
||||
|
||||
public void testCompletion() throws Exception {
|
||||
|
|
@ -193,7 +188,7 @@ public class LRCompletionParseTest extends TestCase {
|
|||
|
||||
int index = code.indexOf("= GL_T");
|
||||
|
||||
IASTCompletionNode node = parse( code, index + 6);
|
||||
IASTCompletionNode node = parse(code, index + 6);
|
||||
assertNotNull(node);
|
||||
|
||||
assertEquals("GL_T", node.getPrefix()); //$NON-NLS-1$
|
||||
|
|
@ -213,8 +208,8 @@ public class LRCompletionParseTest extends TestCase {
|
|||
|
||||
int index = code.indexOf("SP"); //$NON-NLS-1$
|
||||
|
||||
IASTCompletionNode node = parse( code, index );
|
||||
assertNotNull( node );
|
||||
IASTCompletionNode node = parse(code, index);
|
||||
assertNotNull(node);
|
||||
|
||||
|
||||
IASTName[] names = node.getNames();
|
||||
|
|
@ -223,25 +218,24 @@ public class LRCompletionParseTest extends TestCase {
|
|||
IBinding[] bindings = getBindings(names);
|
||||
|
||||
assertEquals(1, bindings.length);
|
||||
assertEquals("name", ((IField)bindings[0]).getName());
|
||||
assertEquals("name", ((IField) bindings[0]).getName());
|
||||
}
|
||||
|
||||
|
||||
public void _testCompletionFunctionCall() throws Exception {
|
||||
String code =
|
||||
"struct A { \n" +
|
||||
" int f2; \n" +
|
||||
" int f4; \n" +
|
||||
"}; \n" +
|
||||
"const A * foo(){} \n" +
|
||||
"void main( ) \n" +
|
||||
"const A * foo() {} \n" +
|
||||
"void main() \n" +
|
||||
"{ \n" +
|
||||
" foo()->SP \n";
|
||||
|
||||
int index = code.indexOf( "SP" );
|
||||
int index = code.indexOf("SP");
|
||||
|
||||
IASTCompletionNode node = parse( code, index );
|
||||
assertNotNull( node );
|
||||
IASTCompletionNode node = parse(code, index);
|
||||
assertNotNull(node);
|
||||
|
||||
IASTName[] names = node.getNames();
|
||||
assertEquals(1, names.length);
|
||||
|
|
@ -249,21 +243,20 @@ public class LRCompletionParseTest extends TestCase {
|
|||
IBinding[] bindings = getBindings(names);
|
||||
|
||||
assertEquals(2, bindings.length);
|
||||
assertEquals("f2", ((IField)bindings[0]).getName());
|
||||
assertEquals("f4", ((IField)bindings[1]).getName());
|
||||
assertEquals("f2", ((IField) bindings[0]).getName());
|
||||
assertEquals("f4", ((IField) bindings[1]).getName());
|
||||
}
|
||||
|
||||
|
||||
public void _testCompletionSizeof() throws Exception {
|
||||
String code =
|
||||
"int f() {\n" +
|
||||
"short blah;\n" +
|
||||
"int x = sizeof(bl";
|
||||
|
||||
int index = code.indexOf( "of(bl" );
|
||||
int index = code.indexOf("of(bl");
|
||||
|
||||
IASTCompletionNode node = parse( code, index + 5);
|
||||
assertNotNull( node );
|
||||
IASTCompletionNode node = parse(code, index + 5);
|
||||
assertNotNull(node);
|
||||
|
||||
IASTName[] names = node.getNames();
|
||||
assertEquals(1, names.length);
|
||||
|
|
@ -271,10 +264,9 @@ public class LRCompletionParseTest extends TestCase {
|
|||
IBinding[] bindings = getBindings(names);
|
||||
|
||||
assertEquals(1, bindings.length);
|
||||
assertEquals("blah", ((IVariable)bindings[0]).getName());
|
||||
assertEquals("blah", ((IVariable) bindings[0]).getName());
|
||||
}
|
||||
|
||||
|
||||
public void testCompletionForLoop() throws Exception {
|
||||
String code =
|
||||
"int f() {\n" +
|
||||
|
|
@ -283,8 +275,8 @@ public class LRCompletionParseTest extends TestCase {
|
|||
|
||||
int index = code.indexOf("< bi");
|
||||
|
||||
IASTCompletionNode node = parse( code, index + 4);
|
||||
assertNotNull( node );
|
||||
IASTCompletionNode node = parse(code, index + 4);
|
||||
assertNotNull(node);
|
||||
|
||||
IASTName[] names = node.getNames();
|
||||
assertEquals(1, names.length);
|
||||
|
|
@ -292,11 +284,9 @@ public class LRCompletionParseTest extends TestCase {
|
|||
IBinding[] bindings = getBindings(names);
|
||||
|
||||
assertEquals(1, bindings.length);
|
||||
assertEquals("biSizeImage", ((IVariable)bindings[0]).getName());
|
||||
assertEquals("biSizeImage", ((IVariable) bindings[0]).getName());
|
||||
}
|
||||
|
||||
|
||||
|
||||
public void testCompletionStructPointer() throws Exception {
|
||||
String code =
|
||||
" struct Temp { char * total; };" +
|
||||
|
|
@ -305,8 +295,8 @@ public class LRCompletionParseTest extends TestCase {
|
|||
|
||||
int index = code.indexOf("= t->");
|
||||
|
||||
IASTCompletionNode node = parse( code, index + 5);
|
||||
assertNotNull( node );
|
||||
IASTCompletionNode node = parse(code, index + 5);
|
||||
assertNotNull(node);
|
||||
|
||||
IASTName[] names = node.getNames();
|
||||
assertEquals(1, names.length);
|
||||
|
|
@ -314,17 +304,16 @@ public class LRCompletionParseTest extends TestCase {
|
|||
IBinding[] bindings = getBindings(names);
|
||||
|
||||
assertEquals(1, bindings.length);
|
||||
assertEquals("total", ((IVariable)bindings[0]).getName());
|
||||
assertEquals("total", ((IVariable) bindings[0]).getName());
|
||||
}
|
||||
|
||||
|
||||
public void testCompletionEnum() throws Exception {
|
||||
String code =
|
||||
"typedef int DWORD;\n" +
|
||||
"typedef char BYTE;\n" +
|
||||
"#define MAKEFOURCC(ch0, ch1, ch2, ch3) \\\n" +
|
||||
"((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \\\n" +
|
||||
"((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24 ))\n" +
|
||||
"((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24))\n" +
|
||||
"enum e {\n" +
|
||||
"blah1 = 5,\n" +
|
||||
"blah2 = MAKEFOURCC('a', 'b', 'c', 'd'),\n" +
|
||||
|
|
@ -334,8 +323,8 @@ public class LRCompletionParseTest extends TestCase {
|
|||
|
||||
int index = code.indexOf("= bl");
|
||||
|
||||
IASTCompletionNode node = parse( code, index + 4);
|
||||
assertNotNull( node );
|
||||
IASTCompletionNode node = parse(code, index + 4);
|
||||
assertNotNull(node);
|
||||
|
||||
IASTName[] names = node.getNames();
|
||||
assertEquals(1, names.length);
|
||||
|
|
@ -343,12 +332,11 @@ public class LRCompletionParseTest extends TestCase {
|
|||
IBinding[] bindings = getBindings(names);
|
||||
|
||||
assertEquals(3, bindings.length);
|
||||
assertEquals("blah1", ((IEnumerator)bindings[0]).getName());
|
||||
assertEquals("blah2", ((IEnumerator)bindings[1]).getName());
|
||||
assertEquals("blah3", ((IEnumerator)bindings[2]).getName());
|
||||
assertEquals("blah1", ((IEnumerator) bindings[0]).getName());
|
||||
assertEquals("blah2", ((IEnumerator) bindings[1]).getName());
|
||||
assertEquals("blah3", ((IEnumerator) bindings[2]).getName());
|
||||
}
|
||||
|
||||
|
||||
public void testCompletionStructArray() throws Exception {
|
||||
String code =
|
||||
"struct packet { int a; int b; };\n" +
|
||||
|
|
@ -358,8 +346,8 @@ public class LRCompletionParseTest extends TestCase {
|
|||
|
||||
int index = code.indexOf("[2].");
|
||||
|
||||
IASTCompletionNode node = parse( code, index + 4);
|
||||
assertNotNull( node );
|
||||
IASTCompletionNode node = parse(code, index + 4);
|
||||
assertNotNull(node);
|
||||
|
||||
IASTName[] names = node.getNames();
|
||||
assertEquals(1, names.length);
|
||||
|
|
@ -367,14 +355,13 @@ public class LRCompletionParseTest extends TestCase {
|
|||
IBinding[] bindings = getBindings(names);
|
||||
|
||||
assertEquals(2, bindings.length);
|
||||
assertEquals("a", ((IField)bindings[0]).getName());
|
||||
assertEquals("b", ((IField)bindings[1]).getName());
|
||||
assertEquals("a", ((IField) bindings[0]).getName());
|
||||
assertEquals("b", ((IField) bindings[1]).getName());
|
||||
}
|
||||
|
||||
|
||||
public void testCompletionPreprocessorDirective() throws Exception {
|
||||
IASTCompletionNode node = parse("#", 1);
|
||||
assertNotNull( node );
|
||||
assertNotNull(node);
|
||||
|
||||
IASTName[] names = node.getNames();
|
||||
assertEquals(1, names.length);
|
||||
|
|
@ -391,15 +378,14 @@ public class LRCompletionParseTest extends TestCase {
|
|||
|
||||
int index = code.indexOf("= A");
|
||||
|
||||
IASTCompletionNode node = parse( code, index + 3);
|
||||
assertNotNull( node );
|
||||
IASTCompletionNode node = parse(code, index + 3);
|
||||
assertNotNull(node);
|
||||
|
||||
IASTName[] names = node.getNames();
|
||||
assertEquals(1, names.length);
|
||||
assertEquals("A", node.getPrefix());
|
||||
}
|
||||
|
||||
|
||||
public void testCompletionInsidePreprocessorDirective() throws Exception {
|
||||
String code =
|
||||
"#define MAC1 99 \n" +
|
||||
|
|
@ -408,8 +394,8 @@ public class LRCompletionParseTest extends TestCase {
|
|||
|
||||
int index = code.length();
|
||||
|
||||
IASTCompletionNode node = parse( code, index );
|
||||
assertNotNull( node );
|
||||
IASTCompletionNode node = parse(code, index);
|
||||
assertNotNull(node);
|
||||
|
||||
assertEquals("MA", node.getPrefix());
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue