Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Schorn2008-04-08 12:50:31 +0000
committerMarkus Schorn2008-04-08 12:50:31 +0000
commit52d33205031167af533dd69546ddbb9003c71134 (patch)
tree2cf564365f1f933d2a2c8d4333a2d9d8c138f1d0 /core/org.eclipse.cdt.ui.tests
parent61cc1a811f9960c35ade853400a83885e7174d9b (diff)
downloadorg.eclipse.cdt-52d33205031167af533dd69546ddbb9003c71134.tar.gz
org.eclipse.cdt-52d33205031167af533dd69546ddbb9003c71134.tar.xz
org.eclipse.cdt-52d33205031167af533dd69546ddbb9003c71134.zip
Configure gcc-extensions as keywords, rather than macros, bug 226112.
Diffstat (limited to 'core/org.eclipse.cdt.ui.tests')
-rw-r--r--core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MacroRef_NoPrefix.java16
-rw-r--r--core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTests_PlainC.java10
2 files changed, 8 insertions, 18 deletions
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MacroRef_NoPrefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MacroRef_NoPrefix.java
index 707c9a16bcc..2115b9db281 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MacroRef_NoPrefix.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MacroRef_NoPrefix.java
@@ -36,24 +36,15 @@ public class CompletionTest_MacroRef_NoPrefix extends CompletionProposalsBaseTe
"__LINE__",
"__STDC__",
"__TIME__",
- "__asm__",
"__builtin_constant_p(exp)",
"__builtin_va_arg(ap, type)",
"__complex__",
- "__const",
- "__const__",
"__cplusplus",
"__extension__",
"__imag__",
- "__inline__",
"__null",
"__real__",
- "__restrict",
- "__restrict__",
- "__signed__",
"__stdcall",
- "__volatile__",
- "__typeof__"
};
public CompletionTest_MacroRef_NoPrefix(String name) {
@@ -69,6 +60,7 @@ public class CompletionTest_MacroRef_NoPrefix extends CompletionProposalsBaseTe
/* (non-Javadoc)
* @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getCompletionPosition()
*/
+ @Override
protected int getCompletionPosition() {
return getBuffer().indexOf("#ifdef ") + 7;
}
@@ -76,6 +68,7 @@ public class CompletionTest_MacroRef_NoPrefix extends CompletionProposalsBaseTe
/* (non-Javadoc)
* @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedPrefix()
*/
+ @Override
protected String getExpectedPrefix() {
return expectedPrefix;
}
@@ -83,6 +76,7 @@ public class CompletionTest_MacroRef_NoPrefix extends CompletionProposalsBaseTe
/* (non-Javadoc)
* @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedResultsValues()
*/
+ @Override
protected String[] getExpectedResultsValues() {
return expectedResults;
}
@@ -90,6 +84,7 @@ public class CompletionTest_MacroRef_NoPrefix extends CompletionProposalsBaseTe
/* (non-Javadoc)
* @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileName()
*/
+ @Override
protected String getFileName() {
return fileName;
}
@@ -97,12 +92,14 @@ public class CompletionTest_MacroRef_NoPrefix extends CompletionProposalsBaseTe
/* (non-Javadoc)
* @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileFullPath()
*/
+ @Override
protected String getFileFullPath() {
return fileFullPath;
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileFullPath()
*/
+ @Override
protected String getHeaderFileFullPath() {
return headerFileFullPath;
}
@@ -110,6 +107,7 @@ public class CompletionTest_MacroRef_NoPrefix extends CompletionProposalsBaseTe
/* (non-Javadoc)
* @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileName()
*/
+ @Override
protected String getHeaderFileName() {
return headerFileName;
}
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTests_PlainC.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTests_PlainC.java
index daeada3ec7a..b3487bc5f1d 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTests_PlainC.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTests_PlainC.java
@@ -158,6 +158,7 @@ public class CompletionTests_PlainC extends AbstractContentAssistTest {
/*
* @see org.eclipse.cdt.ui.tests.text.contentassist2.AbstractContentAssistTest#setUpProjectContent(org.eclipse.core.resources.IProject)
*/
+ @Override
protected IFile setUpProjectContent(IProject project) throws Exception {
fProject= project;
String headerContent= readTaggedComment(HEADER_FILE_NAME);
@@ -356,23 +357,14 @@ public class CompletionTests_PlainC extends AbstractContentAssistTest {
"__STDC_VERSION_",
"__STDC__",
"__TIME__",
- "__asm__",
"__builtin_constant_p(exp)",
"__builtin_va_arg(ap, type)",
"__complex__",
- "__const",
- "__const__",
"__extension__",
"__imag__",
- "__inline__",
"__null",
"__real__",
- "__restrict",
- "__restrict__",
- "__signed__",
"__stdcall",
- "__volatile__",
- "__typeof__"
};
assertCompletionResults(expected);
}

Back to the top