This commit was manufactured by cvs2svn to create tag 'CDT_5_0_0'.
Sprout from master 2008-06-17 15:29:53 UTC Warren Paul <warren.paul@nokia.com> 'fixed bug #237385.'
Delete:
lrparser/org.eclipse.cdt.core.lrparser.tests/.classpath
lrparser/org.eclipse.cdt.core.lrparser.tests/.project
lrparser/org.eclipse.cdt.core.lrparser.tests/.settings/org.eclipse.jdt.core.prefs
lrparser/org.eclipse.cdt.core.lrparser.tests/.settings/org.eclipse.jdt.ui.prefs
lrparser/org.eclipse.cdt.core.lrparser.tests/META-INF/MANIFEST.MF
lrparser/org.eclipse.cdt.core.lrparser.tests/about.html
lrparser/org.eclipse.cdt.core.lrparser.tests/build.properties
lrparser/org.eclipse.cdt.core.lrparser.tests/plugin.properties
lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCPPSpecFailingTest.java
lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCPPSpecTest.java
lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCPPTests.java
lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCSpecFailingTest.java
lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCSpecTests.java
lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCommentTests.java
lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCompleteParser2Tests.java
lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCompletionBasicTest.java
lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCompletionParseTest.java
lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMLocationInclusionTests.java
lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMLocationMacroTests.java
lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMLocationTests.java
lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMPreprocessorInformationTest.java
lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDigraphTrigraphTests.java
lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRGCCTests.java
lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRImageLocationTests.java
lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRKnRTests.java
lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRNodeSelectorTest.java
lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRParserTestSuite.java
lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRQuickParser2Tests.java
lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRSelectionParseTest.java
lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRSemanticsTests.java
lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRTaskParserTest.java
lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRTemplateTests.java
lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRTests.java
lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRUtilOldTests.java
lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRUtilTests.java
lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/ParseHelper.java
upc/org.eclipse.cdt.core.parser.upc.tests/.classpath
upc/org.eclipse.cdt.core.parser.upc.tests/.project
upc/org.eclipse.cdt.core.parser.upc.tests/.settings/org.eclipse.jdt.core.prefs
upc/org.eclipse.cdt.core.parser.upc.tests/META-INF/MANIFEST.MF
upc/org.eclipse.cdt.core.parser.upc.tests/about.html
upc/org.eclipse.cdt.core.parser.upc.tests/build.properties
upc/org.eclipse.cdt.core.parser.upc.tests/plugin.properties
upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCCSpecTests.java
upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCCommentTests.java
upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCCompleteParser2Tests.java
upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCCompletionBasicTest.java
upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCCompletionParseTest.java
upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCDOMLocationInclusionTests.java
upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCDOMLocationMacroTests.java
upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCDOMLocationTests.java
upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCDOMPreprocessorInformationTest.java
upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCDigraphTrigraphTests.java
upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCGCCTests.java
upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCKnRTests.java
upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCLanguageExtensionTests.java
upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCParserTestSuite.java
upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCSelectionParseTest.java
upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCTaskParserTest.java
upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCTests.java
upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCUtilOldTests.java
upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCUtilTests.java
windows/org.eclipse.cdt.msw.build/.classpath
windows/org.eclipse.cdt.msw.build/.cvsignore
windows/org.eclipse.cdt.msw.build/.project
windows/org.eclipse.cdt.msw.build/.settings/org.eclipse.jdt.core.prefs
windows/org.eclipse.cdt.msw.build/META-INF/MANIFEST.MF
windows/org.eclipse.cdt.msw.build/build.properties
windows/org.eclipse.cdt.msw.build/plugin.properties
windows/org.eclipse.cdt.msw.build/plugin.xml
windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/Activator.java
windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinDiscoveredPathInfo.java
windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinEnvironmentVariableSupplier.java
windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinScannerInfoCollector.javadiff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/.classpath b/lrparser/org.eclipse.cdt.core.lrparser.tests/.classpath
deleted file mode 100644
index 64c5e31..0000000
--- a/lrparser/org.eclipse.cdt.core.lrparser.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/.project b/lrparser/org.eclipse.cdt.core.lrparser.tests/.project
deleted file mode 100644
index 4b301f0..0000000
--- a/lrparser/org.eclipse.cdt.core.lrparser.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.cdt.core.parser.c99.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/.settings/org.eclipse.jdt.core.prefs b/lrparser/org.eclipse.cdt.core.lrparser.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2a8aa99..0000000
--- a/lrparser/org.eclipse.cdt.core.lrparser.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,65 +0,0 @@
-#Fri Apr 25 15:22:29 EDT 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
-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.5
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/.settings/org.eclipse.jdt.ui.prefs b/lrparser/org.eclipse.cdt.core.lrparser.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 95087c6..0000000
--- a/lrparser/org.eclipse.cdt.core.lrparser.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Oct 05 11:17:36 EDT 2007
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/META-INF/MANIFEST.MF b/lrparser/org.eclipse.cdt.core.lrparser.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 5aab575..0000000
--- a/lrparser/org.eclipse.cdt.core.lrparser.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.cdt.core.lrparser.tests
-Bundle-Version: 4.0.0.qualifier
-Require-Bundle: org.eclipse.core.runtime,
- org.junit,
- org.eclipse.cdt.core.tests,
- org.eclipse.cdt.core,
- org.eclipse.core.resources,
- org.eclipse.cdt.core.lrparser;bundle-version="4.0.1"
-Export-Package: org.eclipse.cdt.core.lrparser.tests
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/about.html b/lrparser/org.eclipse.cdt.core.lrparser.tests/about.html
deleted file mode 100644
index 9b669c2..0000000
--- a/lrparser/org.eclipse.cdt.core.lrparser.tests/about.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>About</title></head>
-
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 8, 2007</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body></html>
\ No newline at end of file
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/build.properties b/lrparser/org.eclipse.cdt.core.lrparser.tests/build.properties
deleted file mode 100644
index 185a840..0000000
--- a/lrparser/org.eclipse.cdt.core.lrparser.tests/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2007 IBM Corporation and others
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- about.html,\
- plugin.properties
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/plugin.properties b/lrparser/org.eclipse.cdt.core.lrparser.tests/plugin.properties
deleted file mode 100644
index b09765a..0000000
--- a/lrparser/org.eclipse.cdt.core.lrparser.tests/plugin.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-###############################################################################
-# Copyright (c) 2007 IBM Corporation and others
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# properties file for org.eclipse.cdt.core.parser.c99.tests
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = C99 Parser Tests Plug-in
-
-upcSourceName=UPC Source File
\ No newline at end of file
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCPPSpecFailingTest.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCPPSpecFailingTest.java
deleted file mode 100644
index 2ca06bd..0000000
--- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCPPSpecFailingTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.core.lrparser.tests;
-
-import junit.framework.TestSuite;
-
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.cdt.core.dom.lrparser.BaseExtensibleLanguage;
-import org.eclipse.cdt.core.dom.lrparser.c99.C99Language;
-import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage;
-import org.eclipse.cdt.core.model.ILanguage;
-import org.eclipse.cdt.core.parser.ParserLanguage;
-import org.eclipse.cdt.core.parser.tests.ast2.AST2CPPSpecFailingTest;
-import org.eclipse.cdt.internal.core.parser.ParserException;
-
-@SuppressWarnings("restriction")
-public class LRCPPSpecFailingTest extends AST2CPPSpecFailingTest {
-
- public static TestSuite suite() {
- return suite(LRCPPSpecFailingTest.class);
- }
-
- public LRCPPSpecFailingTest() { }
- public LRCPPSpecFailingTest(String name) { super(name); }
-
-
- @Override
- protected void parseCandCPP( String code, boolean checkBindings, int expectedProblemBindings ) throws ParserException {
- parse(code, ParserLanguage.C, checkBindings, expectedProblemBindings);
- parse(code, ParserLanguage.CPP, checkBindings, expectedProblemBindings);
- }
-
- @Override
- protected IASTTranslationUnit parse( String code, ParserLanguage lang, boolean checkBindings, int expectedProblemBindings ) throws ParserException {
- ILanguage language = lang.isCPP() ? getCPPLanguage() : getCLanguage();
- return ParseHelper.parse(code, language, true, checkBindings, expectedProblemBindings );
- }
-
- @Override
- protected IASTTranslationUnit parse(String code, ParserLanguage lang, String[] problems) throws ParserException {
- ILanguage language = lang.isCPP() ? getCPPLanguage() : getCLanguage();
- return ParseHelper.parse(code, language, problems);
- }
-
-
- protected BaseExtensibleLanguage getCLanguage() {
- return C99Language.getDefault();
- }
-
- protected BaseExtensibleLanguage getCPPLanguage() {
- return ISOCPPLanguage.getDefault();
- }
-
-}
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCPPSpecTest.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCPPSpecTest.java
deleted file mode 100644
index bc2477f..0000000
--- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCPPSpecTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.core.lrparser.tests;
-
-import junit.framework.TestSuite;
-
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.cdt.core.dom.lrparser.BaseExtensibleLanguage;
-import org.eclipse.cdt.core.dom.lrparser.c99.C99Language;
-import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage;
-import org.eclipse.cdt.core.model.ILanguage;
-import org.eclipse.cdt.core.parser.ParserLanguage;
-import org.eclipse.cdt.core.parser.tests.ast2.AST2CPPSpecTest;
-import org.eclipse.cdt.internal.core.parser.ParserException;
-
-@SuppressWarnings("restriction")
-public class LRCPPSpecTest extends AST2CPPSpecTest {
-
- public static TestSuite suite() {
- return suite(LRCPPSpecTest.class);
- }
-
- public LRCPPSpecTest() { }
- public LRCPPSpecTest(String name) { super(name); }
-
-
- @Override
- protected void parseCandCPP( String code, boolean checkBindings, int expectedProblemBindings ) throws ParserException {
- parse(code, ParserLanguage.C, checkBindings, expectedProblemBindings);
- parse(code, ParserLanguage.CPP, checkBindings, expectedProblemBindings);
- }
-
- @Override
- protected IASTTranslationUnit parse( String code, ParserLanguage lang, boolean checkBindings, int expectedProblemBindings ) throws ParserException {
- ILanguage language = lang.isCPP() ? getCPPLanguage() : getCLanguage();
- return ParseHelper.parse(code, language, true, checkBindings, expectedProblemBindings );
- }
-
- @Override
- protected IASTTranslationUnit parse(String code, ParserLanguage lang, String[] problems) throws ParserException {
- ILanguage language = lang.isCPP() ? getCPPLanguage() : getCLanguage();
- return ParseHelper.parse(code, language, problems);
- }
-
- protected BaseExtensibleLanguage getCLanguage() {
- return C99Language.getDefault();
- }
-
- protected BaseExtensibleLanguage getCPPLanguage() {
- return ISOCPPLanguage.getDefault();
- }
-
-
-}
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCPPTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCPPTests.java
deleted file mode 100644
index 450a073..0000000
--- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCPPTests.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.core.lrparser.tests;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestSuite;
-
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.cdt.core.dom.lrparser.c99.C99Language;
-import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage;
-import org.eclipse.cdt.core.model.ILanguage;
-import org.eclipse.cdt.core.parser.ParserLanguage;
-import org.eclipse.cdt.core.parser.tests.ast2.AST2CPPTests;
-import org.eclipse.cdt.internal.core.parser.ParserException;
-
-@SuppressWarnings("restriction")
-public class LRCPPTests extends AST2CPPTests {
-
-
- public static TestSuite suite() {
- return suite(LRCPPTests.class);
- }
-
- public LRCPPTests() {
-
- }
-
- public LRCPPTests(String name) {
- super(name);
- }
-
-
- @Override
- protected IASTTranslationUnit parse( String code, ParserLanguage lang, @SuppressWarnings("unused") boolean useGNUExtensions, boolean expectNoProblems, @SuppressWarnings("unused") boolean parseComments) throws ParserException {
- ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language();
- return ParseHelper.parse(code, language, expectNoProblems);
- }
-
- protected ILanguage getC99Language() {
- return C99Language.getDefault();
- }
-
- protected ILanguage getCPPLanguage() {
- return ISOCPPLanguage.getDefault();
- }
-
-
- @Override
- public void testBug98704() throws Exception {
- // this one gets stuck in infinite loop
-
- }
-
- @Override
- public void testBug87424() throws Exception { // gcc extension
- try {
- super.testBug87424();
- fail();
- } catch(AssertionFailedError _) {
- }
- }
-
-
- @Override
- public void testBug95757() throws Exception { // gcc extension
- try {
- super.testBug95757();
- fail();
- } catch(AssertionFailedError _) {
- }
- }
-
- @Override
- public void testBug108202() throws Exception { // gcc attributes not supported
- try {
- super.testBug108202();
- fail();
- } catch(AssertionFailedError _) {
- }
- }
-
-
- @Override
- public void testBug195701() throws Exception { // gcc attributes not supported
- try {
- super.testBug195701();
- fail();
- } catch(AssertionFailedError _) {
- }
- }
-
- @Override
- public void testBug179712() throws Exception { // gcc attributes not supported
- try {
- super.testBug179712();
- fail();
- } catch(AssertionFailedError _) {
- }
- }
-
- @Override
- public void testBug99262B() throws Exception { // gcc
- try {
- super.testBug99262B();
- fail();
- } catch(AssertionFailedError _) {
- }
- }
-
- @Override
- public void testLiteralsViaOverloads_225534() throws Exception { // gcc, I think
- try {
- super.testLiteralsViaOverloads_225534();
- fail();
- } catch(AssertionFailedError _) {
- }
- }
-
-
-}
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCSpecFailingTest.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCSpecFailingTest.java
deleted file mode 100644
index aa47ce7..0000000
--- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCSpecFailingTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.core.lrparser.tests;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestSuite;
-
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.cdt.core.dom.lrparser.BaseExtensibleLanguage;
-import org.eclipse.cdt.core.dom.lrparser.c99.C99Language;
-import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage;
-import org.eclipse.cdt.core.model.ILanguage;
-import org.eclipse.cdt.core.parser.ParserLanguage;
-import org.eclipse.cdt.core.parser.tests.ast2.AST2CSpecFailingTest;
-import org.eclipse.cdt.internal.core.parser.ParserException;
-
-@SuppressWarnings("restriction")
-public class LRCSpecFailingTest extends AST2CSpecFailingTest {
-
- public static TestSuite suite() {
- return suite(LRCSpecFailingTest.class);
- }
-
- public LRCSpecFailingTest() { }
- public LRCSpecFailingTest(String name) { super(name); }
-
-
- @Override
- protected void parseCandCPP( String code, boolean checkBindings, int expectedProblemBindings ) throws ParserException {
- parse(code, ParserLanguage.C, checkBindings, expectedProblemBindings);
- parse(code, ParserLanguage.CPP, checkBindings, expectedProblemBindings);
- }
-
- @Override
- protected IASTTranslationUnit parse( String code, ParserLanguage lang, boolean checkBindings, int expectedProblemBindings ) throws ParserException {
- ILanguage language = lang.isCPP() ? getCPPLanguage() : getCLanguage();
- return ParseHelper.parse(code, language, true, checkBindings, expectedProblemBindings );
- }
-
- @Override
- protected IASTTranslationUnit parse(String code, ParserLanguage lang, String[] problems) throws ParserException {
- ILanguage language = lang.isCPP() ? getCPPLanguage() : getCLanguage();
- return ParseHelper.parse(code, language, problems);
- }
-
- protected BaseExtensibleLanguage getCLanguage() {
- return C99Language.getDefault();
- }
-
- protected BaseExtensibleLanguage getCPPLanguage() {
- return ISOCPPLanguage.getDefault();
- }
-
- @Override
- public void test6_7_7s6() throws Exception { // this test actually passes, yay!
- try {
- super.test6_7_7s6();
- } catch (AssertionFailedError e) {
- }
- }
-}
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCSpecTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCSpecTests.java
deleted file mode 100644
index 6c3833f..0000000
--- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCSpecTests.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.core.lrparser.tests;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestSuite;
-
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.cdt.core.dom.lrparser.c99.C99Language;
-import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage;
-import org.eclipse.cdt.core.model.ILanguage;
-import org.eclipse.cdt.core.parser.ParserLanguage;
-import org.eclipse.cdt.core.parser.tests.ast2.AST2CSpecTest;
-import org.eclipse.cdt.internal.core.parser.ParserException;
-
-@SuppressWarnings({"restriction", "nls"})
-public class LRCSpecTests extends AST2CSpecTest {
-
- public static TestSuite suite() {
- return suite(LRCSpecTests.class);
- }
-
- public LRCSpecTests() { }
- public LRCSpecTests(String name) { super(name); }
-
-
- @Override
- protected void parseCandCPP( String code, boolean checkBindings, int expectedProblemBindings ) throws ParserException {
- parse(code, ParserLanguage.C, checkBindings, expectedProblemBindings);
- parse(code, ParserLanguage.CPP, checkBindings, expectedProblemBindings);
- }
-
- @Override
- protected IASTTranslationUnit parse( String code, ParserLanguage lang, boolean checkBindings, int expectedProblemBindings ) throws ParserException {
- ILanguage language = lang.isCPP() ? getCPPLanguage() : getCLanguage();
- return ParseHelper.parse(code, language, true, checkBindings, expectedProblemBindings );
- }
-
- @Override
- protected IASTTranslationUnit parse(String code, ParserLanguage lang, String[] problems) throws ParserException {
- ILanguage language = lang.isCPP() ? getCPPLanguage() : getCLanguage();
- return ParseHelper.parse(code, language, problems);
- }
-
- protected ILanguage getCLanguage() {
- return C99Language.getDefault();
- }
-
- protected ILanguage getCPPLanguage() {
- return ISOCPPLanguage.getDefault();
- }
-
-
- @Override // example code needs to be nested in a function body
- public void test5_1_2_3s15() throws Exception {
- String code =
- "//#include <stdio.h>\n" +
- "int foo() { \n" +
- "int sum;\n" +
- "char *p;\n" +
- "sum = sum * 10 - '0' + (*p++ = getchar());\n" +
- "sum = (((sum * 10) - '0') + ((*(p++)) = (getchar())));\n" +
- "} \n";
-
- parseCandCPP(code, false, 0);
- }
-
-
-
- @Override
- public void test6_7_2_1s17() throws Exception { // what the heck is offsetof
- try {
- super.test6_7_2_1s17();
- fail();
- } catch(AssertionFailedError _) { }
- }
-
-
-}
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCommentTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCommentTests.java
deleted file mode 100644
index 087c2a9..0000000
--- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCommentTests.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.core.lrparser.tests;
-
-import junit.framework.TestSuite;
-
-import org.eclipse.cdt.core.dom.ast.IASTComment;
-import org.eclipse.cdt.core.dom.ast.IASTFileLocation;
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.cdt.core.dom.lrparser.c99.C99Language;
-import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage;
-import org.eclipse.cdt.core.model.ILanguage;
-import org.eclipse.cdt.core.parser.ParserLanguage;
-import org.eclipse.cdt.core.parser.tests.ast2.CommentTests;
-import org.eclipse.cdt.internal.core.parser.ParserException;
-
-@SuppressWarnings("restriction")
-public class LRCommentTests extends CommentTests {
-
- public static TestSuite suite() {
- return suite(LRCommentTests.class);
- }
-
-
- @Override
- @SuppressWarnings("unused")
- protected IASTTranslationUnit parse( String code, ParserLanguage lang, boolean useGNUExtensions, boolean expectNoProblems ) throws ParserException {
- ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language();
- return ParseHelper.parse(code, language, expectNoProblems);
- }
-
-
- @Override
- @SuppressWarnings("unused")
- protected IASTTranslationUnit parse(String code, ParserLanguage lang,
- boolean useGNUExtensions, boolean expectNoProblems,
- boolean parseComments) throws ParserException {
-
- ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language();
- return ParseHelper.commentParse(code, language);
- }
-
- protected ILanguage getC99Language() {
- return C99Language.getDefault();
- }
-
- protected ILanguage getCPPLanguage() {
- return ISOCPPLanguage.getDefault();
- }
-
-
- @SuppressWarnings("nls")
- public void testBug191266() throws Exception {
- String code =
- "#define MACRO 1000000000000 \n" +
- "int x = MACRO; \n" +
- "//comment\n";
-
- IASTTranslationUnit tu = parse(code, ParserLanguage.C, false, false, true);
-
- IASTComment[] comments = tu.getComments();
- assertEquals(1, comments.length);
-
- IASTFileLocation location = comments[0].getFileLocation();
- assertEquals(code.indexOf("//"), location.getNodeOffset());
- assertEquals("//comment".length(), location.getNodeLength());
- }
-}
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCompleteParser2Tests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCompleteParser2Tests.java
deleted file mode 100644
index 58cb191..0000000
--- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCompleteParser2Tests.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.core.lrparser.tests;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestSuite;
-
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.cdt.core.dom.lrparser.c99.C99Language;
-import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage;
-import org.eclipse.cdt.core.model.ILanguage;
-import org.eclipse.cdt.core.parser.ParserLanguage;
-import org.eclipse.cdt.core.parser.tests.ast2.CompleteParser2Tests;
-
-public class LRCompleteParser2Tests extends CompleteParser2Tests {
-
- public static TestSuite suite() {
- return suite(LRCompleteParser2Tests.class);
- }
-
- @Override
- @SuppressWarnings("unused")
- protected IASTTranslationUnit parse(String code, boolean expectedToPass,
- ParserLanguage lang, boolean gcc) throws Exception {
- ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language();
- return ParseHelper.parse(code, language, expectedToPass);
- }
-
- protected ILanguage getC99Language() {
- return C99Language.getDefault();
- }
-
- protected ILanguage getCPPLanguage() {
- return ISOCPPLanguage.getDefault();
- }
-
-
- // Tests that are failing at this point
-
- @Override
- public void testBug39676_tough() { // is this C99?
- try {
- super.testBug39676_tough();
- } catch(AssertionFailedError _) {
- return;
- } catch(Exception _) {
- return;
- }
- fail();
- }
-
-// public void testPredefinedSymbol_bug70928_infinite_loop_test1() throws Exception { // gcc extension
-// try {
-// super.testPredefinedSymbol_bug70928_infinite_loop_test1();
-// fail();
-// } catch(AssertionError _) { }
-// }
-//
-// public void testPredefinedSymbol_bug70928_infinite_loop_test2() throws Exception { // gcc extension
-// try {
-// super.testPredefinedSymbol_bug70928_infinite_loop_test2();
-// fail();
-// } catch(AssertionError _) { }
-// }
-
-
- @Override
- public void testBug102376() throws Exception { // gcc extension
- try {
- super.testBug102376();
- fail();
- } catch(AssertionFailedError _) { }
- }
-
- @Override
- public void test158192_declspec_in_declarator() throws Exception {
- try {
- super.test158192_declspec_in_declarator();
- fail();
- } catch(AssertionFailedError _) { }
- }
-
- @Override
- public void test158192_declspec_on_class() throws Exception {
- try {
- super.test158192_declspec_on_class();
- fail();
- } catch(AssertionFailedError _) { }
- }
-
- @Override
- public void test158192_declspec_on_variable() throws Exception {
- try {
- super.test158192_declspec_on_variable();
- fail();
- } catch(AssertionFailedError _) { }
- }
-
- @Override
- public void testPredefinedSymbol_bug70928() throws Exception {
- try {
- super.testPredefinedSymbol_bug70928();
- fail();
- } catch(AssertionFailedError _) { }
- }
-
- @Override
- public void testBug64010() throws Exception { // 10000 else-ifs, busts LPG's stack
- try {
- //super.testBug64010();
- //fail();
- } catch(AssertionFailedError _) { }
- }
-
-
- @Override
- public void testGNUASMExtension() throws Exception {
- try {
- super.testGNUASMExtension();
- fail();
- } catch(AssertionFailedError _) {
- } catch(AssertionError _) {
- }
- }
-
- @Override
- public void testBug39551B() throws Exception {
- try {
- super.testBug39551B();
- fail();
- } catch(AssertionFailedError _) { }
- }
-
-
-
-
-}
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCompletionBasicTest.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCompletionBasicTest.java
deleted file mode 100644
index 9d51fd5..0000000
--- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCompletionBasicTest.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.core.lrparser.tests;
-
-import junit.framework.TestSuite;
-
-import org.eclipse.cdt.core.dom.ast.IASTCompletionNode;
-import org.eclipse.cdt.core.dom.ast.IBinding;
-import org.eclipse.cdt.core.dom.ast.IFunction;
-import org.eclipse.cdt.core.dom.ast.ITypedef;
-import org.eclipse.cdt.core.dom.lrparser.c99.C99Language;
-import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage;
-import org.eclipse.cdt.core.model.ILanguage;
-import org.eclipse.cdt.core.parser.ParserLanguage;
-import org.eclipse.cdt.core.parser.tests.prefix.BasicCompletionTest;
-import org.eclipse.cdt.internal.core.parser.ParserException;
-
-@SuppressWarnings({"restriction", "nls"})
-public class LRCompletionBasicTest extends BasicCompletionTest {
-
- public static TestSuite suite() {
- return new TestSuite(LRCompletionBasicTest.class);
- }
-
- public LRCompletionBasicTest() { }
-
-
- @Override
- @SuppressWarnings("unused")
- protected IASTCompletionNode getCompletionNode(String code,
- ParserLanguage lang, boolean useGNUExtensions)
- throws ParserException {
-
- ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language();
- return ParseHelper.getCompletionNode(code, language);
- }
-
-
- protected ILanguage getC99Language() {
- return C99Language.getDefault();
- }
-
- protected ILanguage getCPPLanguage() {
- return ISOCPPLanguage.getDefault();
- }
-
-
- @Override
- public void testFunction() throws Exception {
- String code =
- "void func(int x) { }" +
- "void func2() { fu";
-
- // C++
- IASTCompletionNode node = getGPPCompletionNode(code);
- IBinding[] bindings = LRCompletionParseTest.getBindings(node.getNames());
-
- assertEquals(2, bindings.length);
- assertEquals("func", ((IFunction)bindings[0]).getName());
- assertEquals("func2", ((IFunction)bindings[1]).getName());
-
- // C
- node = getGCCCompletionNode(code);
- bindings = LRCompletionParseTest.getBindings(node.getNames());
-
- assertEquals(2, bindings.length);
- assertEquals("func", ((IFunction)bindings[0]).getName());
- assertEquals("func2", ((IFunction)bindings[1]).getName());
- }
-
-
- @Override
- public void testTypedef() throws Exception {
- String code =
- "typedef int blah;" +
- "bl";
-
- // C++
- IASTCompletionNode node = getGPPCompletionNode(code);
- IBinding[] bindings = LRCompletionParseTest.getBindings(node.getNames());
-
- assertEquals(1, bindings.length);
- assertEquals("blah", ((ITypedef)bindings[0]).getName());
-
- // C
- node = getGCCCompletionNode(code);
- bindings = LRCompletionParseTest.getBindings(node.getNames());
-
- assertEquals(1, bindings.length);
- assertEquals("blah", ((ITypedef)bindings[0]).getName());
- }
-
-
-}
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCompletionParseTest.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCompletionParseTest.java
deleted file mode 100644
index bbca81a..0000000
--- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCompletionParseTest.java
+++ /dev/null
@@ -1,415 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.core.lrparser.tests;
-
-import java.util.ArrayList;
-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;
-import org.eclipse.cdt.core.dom.ast.IEnumerator;
-import org.eclipse.cdt.core.dom.ast.IField;
-import org.eclipse.cdt.core.dom.ast.ITypedef;
-import org.eclipse.cdt.core.dom.ast.IVariable;
-import org.eclipse.cdt.core.dom.lrparser.c99.C99Language;
-import org.eclipse.cdt.core.model.ILanguage;
-
-
-/**
- * Reuse the completion parse tests from the old parser for now.
- */
-@SuppressWarnings("nls")
-public class LRCompletionParseTest extends TestCase {
-
- public static TestSuite suite() {
- return new TestSuite(LRCompletionParseTest.class);
- }
-
-
- public LRCompletionParseTest() { }
- public LRCompletionParseTest(String name) { super(name); }
-
-
- protected IASTCompletionNode parse(String code, int offset) throws Exception {
- return ParseHelper.getCompletionNode(code, getC99Language(), offset);
- }
-
-
- private static final Comparator<IBinding> BINDING_COMPARATOR = new Comparator<IBinding>() {
- public int compare(IBinding b1, IBinding b2) {
- return b1.getName().compareTo(b2.getName());
- }
- };
-
-
- public static IBinding[] getBindings(IASTName[] names) {
- List<IBinding> bindings = new ArrayList<IBinding>();
-
- for(IASTName name : names) {
- if(name.getTranslationUnit() == null)
- continue;
-
- 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 getC99Language() {
- return C99Language.getDefault();
- }
-
-
- // First steal tests from CompletionParseTest
-
-
- public void testCompletionStructField() throws Exception {
- String code =
- "int aVar; " +
- "struct D{ " +
- " int aField1; " +
- " int aField2; " +
- "}; " +
- "void foo(){" +
- " struct D d; " +
- " d.a " +
- "}\n";
-
- int index = code.indexOf( "d.a" );
-
- IASTCompletionNode node = parse( code, index + 3 );
- assertNotNull( node );
-
- String prefix = node.getPrefix();
- assertNotNull( prefix );
- assertEquals( prefix, "a" );
-
- IASTName[] names = node.getNames();
- assertEquals(1, names.length);
-
- IBinding[] bindings = getBindings(names);
-
- assertEquals(2, bindings.length);
- assertEquals("aField1", ((IField)bindings[0]).getName());
- assertEquals("aField2", ((IField)bindings[1]).getName());
- }
-
- public void testCompletionStructFieldPointer() throws Exception {
- String code =
- "struct Cube { " +
- " int nLen; " +
- " int nWidth; " +
- " int nHeight; " +
- "}; " +
- "int volume( struct Cube * pCube ) { " +
- " pCube->SP ";
-
- IASTCompletionNode node = parse( code, code.indexOf("SP"));
-
- IASTName[] names = node.getNames();
- assertEquals(1, names.length);
-
- IBinding[] bindings = getBindings(names);
-
- assertEquals(3, bindings.length);
- assertEquals("nHeight", ((IField)bindings[0]).getName());
- assertEquals("nLen", ((IField)bindings[1]).getName());
- assertEquals("nWidth", ((IField)bindings[2]).getName());
- }
-
-
- public void testCompletionParametersAsLocalVariables() throws Exception{
- String code =
- "int foo( int aParameter ){" +
- " int aLocal;" +
- " if( aLocal != 0 ){" +
- " int aBlockLocal;" +
- " a \n";
-
- int index = code.indexOf( " a " );
-
- IASTCompletionNode node = parse( code, index + 2 );
- assertNotNull( node );
-
- assertEquals("a", node.getPrefix()); //$NON-NLS-1$
-
- IASTName[] names = node.getNames();
- assertEquals(2, names.length);
-
- 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());
- }
-
-
- public void testCompletionTypedef() throws Exception {
- String code =
- "typedef int Int; " +
- "InSP";
-
- int index = code.indexOf( "SP" );
-
- IASTCompletionNode node = parse( code, index );
- assertNotNull(node);
-
- IASTName[] names = node.getNames();
- assertEquals(1, names.length);
-
- assertEquals("In", node.getPrefix());
-
- IBinding[] bindings = getBindings(names);
-
- assertEquals(1, bindings.length);
- assertEquals("Int", ((ITypedef)bindings[0]).getName());
- }
-
- public void testCompletion() throws Exception {
- String code =
- "#define GL_T 0x2001\n" +
- "#define GL_TRUE 0x1\n" +
- "typedef unsigned char GLboolean;\n" +
- "static GLboolean should_rotate = GL_T";
-
- int index = code.indexOf("= GL_T");
-
- IASTCompletionNode node = parse( code, index + 6);
- assertNotNull(node);
-
- assertEquals("GL_T", node.getPrefix()); //$NON-NLS-1$
-
- IASTName[] names = node.getNames();
- assertEquals(1, names.length);
- }
-
- public void testCompletionInTypeDef() throws Exception {
- String code =
- "struct A { int name; }; \n" +
- "typedef struct A * PA; \n" +
- "int main() { \n" +
- " PA a; \n" +
- " a->SP \n" +
- "} \n";
-
- int index = code.indexOf("SP"); //$NON-NLS-1$
-
- IASTCompletionNode node = parse( code, index );
- assertNotNull( node );
-
-
- IASTName[] names = node.getNames();
- assertEquals(1, names.length);
-
- IBinding[] bindings = getBindings(names);
-
- assertEquals(1, bindings.length);
- 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" +
- "{ \n" +
- " foo()->SP \n";
-
- int index = code.indexOf( "SP" );
-
- IASTCompletionNode node = parse( code, index );
- assertNotNull( node );
-
- IASTName[] names = node.getNames();
- assertEquals(1, names.length);
-
- IBinding[] bindings = getBindings(names);
-
- assertEquals(2, bindings.length);
- 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" );
-
- IASTCompletionNode node = parse( code, index + 5);
- assertNotNull( node );
-
- IASTName[] names = node.getNames();
- assertEquals(1, names.length);
-
- IBinding[] bindings = getBindings(names);
-
- assertEquals(1, bindings.length);
- assertEquals("blah", ((IVariable)bindings[0]).getName());
- }
-
-
- public void testCompletionForLoop() throws Exception {
- String code =
- "int f() {\n" +
- " int biSizeImage = 5;\n" +
- "for (int i = 0; i < bi ";
-
- int index = code.indexOf("< bi");
-
- IASTCompletionNode node = parse( code, index + 4);
- assertNotNull( node );
-
- IASTName[] names = node.getNames();
- assertEquals(1, names.length);
-
- IBinding[] bindings = getBindings(names);
-
- assertEquals(1, bindings.length);
- assertEquals("biSizeImage", ((IVariable)bindings[0]).getName());
- }
-
-
-
- public void testCompletionStructPointer() throws Exception {
- String code =
- " struct Temp { char * total; };" +
- " int f(struct Temp * t) {" +
- " t->t[5] = t->";
-
- int index = code.indexOf("= t->");
-
- IASTCompletionNode node = parse( code, index + 5);
- assertNotNull( node );
-
- IASTName[] names = node.getNames();
- assertEquals(1, names.length);
-
- IBinding[] bindings = getBindings(names);
-
- assertEquals(1, bindings.length);
- 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" +
- "enum e {\n" +
- "blah1 = 5,\n" +
- "blah2 = MAKEFOURCC('a', 'b', 'c', 'd'),\n" +
- "blah3\n" +
- "};\n" +
- "e mye = bl\n";
-
- int index = code.indexOf("= bl");
-
- IASTCompletionNode node = parse( code, index + 4);
- assertNotNull( node );
-
- IASTName[] names = node.getNames();
- assertEquals(1, names.length);
-
- 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());
- }
-
-
- public void testCompletionStructArray() throws Exception {
- String code =
- "struct packet { int a; int b; };\n" +
- "struct packet buffer[5];\n" +
- "int main(int argc, char **argv) {\n" +
- " buffer[2].";
-
- int index = code.indexOf("[2].");
-
- IASTCompletionNode node = parse( code, index + 4);
- assertNotNull( node );
-
- IASTName[] names = node.getNames();
- assertEquals(1, names.length);
-
- IBinding[] bindings = getBindings(names);
-
- assertEquals(2, bindings.length);
- assertEquals("a", ((IField)bindings[0]).getName());
- assertEquals("b", ((IField)bindings[1]).getName());
- }
-
-
- public void testCompletionPreprocessorDirective() throws Exception {
- IASTCompletionNode node = parse("#", 1);
- assertNotNull( node );
-
- IASTName[] names = node.getNames();
- assertEquals(1, names.length);
-
- //assertEquals("#", node.getPrefix());
- }
-
- public void testCompletionPreprocessorMacro() throws Exception {
- String code =
- "#define AMACRO 99 \n" +
- "int main() { \n" +
- " int AVAR; \n" +
- " int x = A \n";
-
- int index = code.indexOf("= A");
-
- 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" +
- "#define MAC2 99 \n" +
- "#ifdef MA";
-
- int index = code.length();
-
- IASTCompletionNode node = parse( code, index );
- assertNotNull( node );
-
- assertEquals("MA", node.getPrefix());
- }
-}
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMLocationInclusionTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMLocationInclusionTests.java
deleted file mode 100644
index 976311a..0000000
--- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMLocationInclusionTests.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.core.lrparser.tests;
-
-import junit.framework.TestSuite;
-
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.cdt.core.dom.lrparser.c99.C99Language;
-import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage;
-import org.eclipse.cdt.core.model.ILanguage;
-import org.eclipse.cdt.core.parser.CodeReader;
-import org.eclipse.cdt.core.parser.ExtendedScannerInfo;
-import org.eclipse.cdt.core.parser.IScannerInfo;
-import org.eclipse.cdt.core.parser.ParserUtil;
-import org.eclipse.cdt.core.parser.tests.ast2.DOMLocationInclusionTests;
-import org.eclipse.cdt.internal.core.dom.SavedCodeReaderFactory;
-import org.eclipse.core.resources.IFile;
-
-@SuppressWarnings("restriction")
-public class LRDOMLocationInclusionTests extends DOMLocationInclusionTests {
-
- public static TestSuite suite() {
- return new TestSuite(LRDOMLocationInclusionTests.class);
- }
-
- public LRDOMLocationInclusionTests() {
- }
-
- public LRDOMLocationInclusionTests(String name, Class<Object> className) {
- super(name, className);
- }
-
- public LRDOMLocationInclusionTests(String name) {
- super(name);
- }
-
- @Override
- protected IASTTranslationUnit parse(IFile code, IScannerInfo s)throws Exception {
- // TODO: total freakin hack! the test suite needs to be refactored
- ILanguage lang = code.getName().endsWith("cc") ? getCPPLanguage() : getC99Language(); //$NON-NLS-1$
-
- CodeReader codeReader = new CodeReader(code.getLocation().toOSString());
- IASTTranslationUnit tu = lang.getASTTranslationUnit(codeReader, s, SavedCodeReaderFactory.getInstance(), null, ILanguage.OPTION_ADD_COMMENTS, ParserUtil.getParserLogService());
-
- return tu;
- }
-
- @Override
- protected IASTTranslationUnit parse(IFile code) throws Exception {
-
- return parse(code, new ExtendedScannerInfo());
- }
-
-
- protected ILanguage getC99Language() {
- return C99Language.getDefault();
- }
-
- protected ILanguage getCPPLanguage() {
- return ISOCPPLanguage.getDefault();
- }
-
-
-}
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMLocationMacroTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMLocationMacroTests.java
deleted file mode 100644
index 8fcc5d5..0000000
--- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMLocationMacroTests.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.core.lrparser.tests;
-
-import junit.framework.TestSuite;
-
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.cdt.core.dom.lrparser.c99.C99Language;
-import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage;
-import org.eclipse.cdt.core.model.ILanguage;
-import org.eclipse.cdt.core.parser.ParserLanguage;
-import org.eclipse.cdt.core.parser.tests.ast2.DOMLocationMacroTests;
-import org.eclipse.cdt.internal.core.parser.ParserException;
-
-@SuppressWarnings("restriction")
-public class LRDOMLocationMacroTests extends DOMLocationMacroTests {
-
- public static TestSuite suite() {
- return suite(LRDOMLocationMacroTests.class);
- }
-
- public LRDOMLocationMacroTests() {}
- public LRDOMLocationMacroTests(String name) { super(name); }
-
-
- @Override
- @SuppressWarnings("unused")
- protected IASTTranslationUnit parse( String code, ParserLanguage lang, boolean useGNUExtensions, boolean expectNoProblems ) throws ParserException {
- ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language();
- return ParseHelper.parse(code, language, expectNoProblems);
- }
-
-
- protected ILanguage getC99Language() {
- return C99Language.getDefault();
- }
-
- protected ILanguage getCPPLanguage() {
- return ISOCPPLanguage.getDefault();
- }
-
-
- /**
- * Tests GCC specific stuff, not applicable at this point
- */
-
- @Override
- public void testStdioBug() throws ParserException {
- try {
- super.testStdioBug();
- fail();
- }
- catch(Throwable e) { }
- }
-
-}
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMLocationTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMLocationTests.java
deleted file mode 100644
index 11af2e1..0000000
--- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMLocationTests.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.core.lrparser.tests;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestSuite;
-
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.cdt.core.dom.lrparser.c99.C99Language;
-import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage;
-import org.eclipse.cdt.core.model.ILanguage;
-import org.eclipse.cdt.core.parser.ParserLanguage;
-import org.eclipse.cdt.core.parser.tests.ast2.DOMLocationTests;
-import org.eclipse.cdt.internal.core.parser.ParserException;
-
-@SuppressWarnings("restriction")
-public class LRDOMLocationTests extends DOMLocationTests {
-
- public static TestSuite suite() {
- return suite(LRDOMLocationTests.class);
- }
-
- public LRDOMLocationTests() { }
- public LRDOMLocationTests(String name) { super(name); }
-
- @Override
- @SuppressWarnings("unused")
- protected IASTTranslationUnit parse( String code, ParserLanguage lang, boolean useGNUExtensions, boolean expectNoProblems ) throws ParserException {
- ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language();
- return ParseHelper.parse(code, language, expectNoProblems);
- }
-
- protected ILanguage getC99Language() {
- return C99Language.getDefault();
- }
-
- protected ILanguage getCPPLanguage() {
- return ISOCPPLanguage.getDefault();
- }
-
-
-
- // this one fails because the C99 parser does error recovery differently
- @Override
- public void test162180_1() throws Exception {
- try {
- super.test162180_1();
- fail();
- }
- catch(AssertionFailedError e) {}
-
- }
-
- @Override
- public void test162180_3() throws Exception {
- try {
- super.test162180_3();
- fail();
- }
- catch(AssertionFailedError e) {}
- }
-
- @Override
- public void testBug86698_2() throws Exception { // I don't think C++ supports nested functions
- try {
- super.testBug86698_2();
- fail();
- }
- catch(AssertionFailedError e) {}
- }
-
-
- @Override
- public void testBug120607() throws Exception { // #assert and #unassert are gcc extensions
- try {
- super.testBug120607();
- fail();
- }
- catch(AssertionFailedError e) {}
- }
-
-}
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMPreprocessorInformationTest.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMPreprocessorInformationTest.java
deleted file mode 100644
index b6b7cce..0000000
--- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMPreprocessorInformationTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.core.lrparser.tests;
-
-import junit.framework.TestSuite;
-
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.cdt.core.dom.lrparser.c99.C99Language;
-import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage;
-import org.eclipse.cdt.core.model.ILanguage;
-import org.eclipse.cdt.core.parser.ParserLanguage;
-import org.eclipse.cdt.core.parser.tests.ast2.DOMPreprocessorInformationTest;
-import org.eclipse.cdt.internal.core.parser.ParserException;
-
-@SuppressWarnings("restriction")
-public class LRDOMPreprocessorInformationTest extends DOMPreprocessorInformationTest {
-
- public static TestSuite suite() {
- return suite(LRDOMPreprocessorInformationTest.class);
- }
-
- @Override
- @SuppressWarnings("unused")
- protected IASTTranslationUnit parse( String code, ParserLanguage lang, boolean useGNUExtensions, boolean expectNoProblems ) throws ParserException {
- ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language();
- return ParseHelper.parse(code, language, expectNoProblems);
- }
-
-
- protected ILanguage getC99Language() {
- return C99Language.getDefault();
- }
-
- protected ILanguage getCPPLanguage() {
- return ISOCPPLanguage.getDefault();
- }
-
-}
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDigraphTrigraphTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDigraphTrigraphTests.java
deleted file mode 100644
index fafc19c..0000000
--- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDigraphTrigraphTests.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.core.lrparser.tests;
-
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.cdt.core.dom.ast.IASTArrayDeclarator;
-import org.eclipse.cdt.core.dom.ast.IASTArrayModifier;
-import org.eclipse.cdt.core.dom.ast.IASTArraySubscriptExpression;
-import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression;
-import org.eclipse.cdt.core.dom.ast.IASTCompoundStatement;
-import org.eclipse.cdt.core.dom.ast.IASTDeclarationStatement;
-import org.eclipse.cdt.core.dom.ast.IASTDeclarator;
-import org.eclipse.cdt.core.dom.ast.IASTExpressionList;
-import org.eclipse.cdt.core.dom.ast.IASTExpressionStatement;
-import org.eclipse.cdt.core.dom.ast.IASTFunctionCallExpression;
-import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition;
-import org.eclipse.cdt.core.dom.ast.IASTInitializerExpression;
-import org.eclipse.cdt.core.dom.ast.IASTLiteralExpression;
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorMacroDefinition;
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorStatement;
-import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclaration;
-import org.eclipse.cdt.core.dom.ast.IASTStatement;
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression;
-import org.eclipse.cdt.core.dom.lrparser.c99.C99Language;
-import org.eclipse.cdt.core.model.ILanguage;
-
-
-/**
- * TODO these tests can be moved into the core
- */
-@SuppressWarnings("nls")
-public class LRDigraphTrigraphTests extends TestCase {
-
- public static TestSuite suite() {
- return new TestSuite(LRCSpecTests.class);
- }
-
-
- public LRDigraphTrigraphTests() { }
- public LRDigraphTrigraphTests(String name) { super(name); }
-
-
- protected IASTTranslationUnit parse(String code) {
- return ParseHelper.parse(code, getCLanguage(), true);
- }
-
-
- protected ILanguage getCLanguage() {
- return C99Language.getDefault();
- }
-
-
- public void testTrigraphSequences() {
- String code =
- "??=define SIZE ??/ \n" + // trigraph used as backslash to ignore newline
- "99 \n" +
- "int main(void)??< \n" +
- " int arr??(SIZE??); \n" +
- " arr??(4??) = '0' - (??-0 ??' 1 ??! 2); \n" +
- " printf(\"%c??/n\", arr??(4??)); \n" +
- "??> \n";
-
- IASTTranslationUnit tu = parse(code);
- assertNotNull(tu);
-
- IASTPreprocessorStatement[] defines = tu.getAllPreprocessorStatements();
- assertEquals(1, defines.length);
- IASTPreprocessorMacroDefinition macro = (IASTPreprocessorMacroDefinition)defines[0];
- assertEquals("SIZE", macro.getName().toString());
- //assertEquals("99", macro.getExpansion());
-
- IASTFunctionDefinition main = (IASTFunctionDefinition)tu.getDeclarations()[0];
- IASTCompoundStatement body = (IASTCompoundStatement) main.getBody();
- IASTStatement[] statements = body.getStatements();
- assertEquals(3, statements.length);
-
- // int arr??(SIZE??);
- IASTSimpleDeclaration arr = (IASTSimpleDeclaration)((IASTDeclarationStatement)statements[0]).getDeclaration();
- IASTArrayDeclarator arr_decl = (IASTArrayDeclarator)arr.getDeclarators()[0];
- IASTArrayModifier modifier = arr_decl.getArrayModifiers()[0];
- IASTLiteralExpression lit = (IASTLiteralExpression)modifier.getConstantExpression();
- assertEquals(IASTLiteralExpression.lk_integer_constant, lit.getKind());
-
- // arr??(4??) = '0' - (??-0 ??' 1 ??! 2);
- IASTBinaryExpression expr = (IASTBinaryExpression)((IASTExpressionStatement)statements[1]).getExpression();
- assertEquals(IASTBinaryExpression.op_assign, expr.getOperator());
- IASTArraySubscriptExpression arr_op = (IASTArraySubscriptExpression)expr.getOperand1();
- assertEquals("4", ((IASTLiteralExpression)arr_op.getSubscriptExpression()).toString());
- IASTBinaryExpression cond = (IASTBinaryExpression)((IASTUnaryExpression)((IASTBinaryExpression)expr.getOperand2()).getOperand2()).getOperand();
- assertEquals(IASTBinaryExpression.op_binaryOr, cond.getOperator());
- IASTBinaryExpression cond2 = (IASTBinaryExpression)cond.getOperand1();
- assertEquals(IASTBinaryExpression.op_binaryXor, cond2.getOperator());
- IASTUnaryExpression not = (IASTUnaryExpression)cond2.getOperand1();
- assertEquals(IASTUnaryExpression.op_tilde, not.getOperator());
-
- // printf(\"%c??/n\", arr??(4??));
- IASTFunctionCallExpression expr2 = (IASTFunctionCallExpression)((IASTExpressionStatement)statements[2]).getExpression();
- IASTExpressionList params = (IASTExpressionList) expr2.getParameterExpression();
- IASTArraySubscriptExpression arr_op2 = (IASTArraySubscriptExpression)params.getExpressions()[1];
- assertEquals("4", ((IASTLiteralExpression)arr_op2.getSubscriptExpression()).toString());
- }
-
-
- public void testTrigraphEscapeSequences() {
- // a ??/ trigraph should act just like a backslash in a string literal
- String code =
- "int main(void)??< \n" +
- " char str[] = \"??/\"??/n\"; \n" +
- " char c = '??/u0000'; \n" +
- "??> \n";
-
- parse(code); // will throw an exception if there are parse errors
- }
-
-
- public void testDigraphSequences() {
- String code =
- "%:define join(a, b) a %:%: b \n" +
- "int main() <% \n" +
- " int arr<:5:>; \n" +
- "%> \n";
-
- IASTTranslationUnit tu = parse(code); // will throw an exception if there are parse errors
-
- IASTFunctionDefinition main = (IASTFunctionDefinition)tu.getDeclarations()[0];
- IASTCompoundStatement body = (IASTCompoundStatement) main.getBody();
- IASTStatement[] statements = body.getStatements();
- assertEquals(1, statements.length);
-
- IASTSimpleDeclaration arr = (IASTSimpleDeclaration)((IASTDeclarationStatement)statements[0]).getDeclaration();
- IASTArrayDeclarator arr_decl = (IASTArrayDeclarator)arr.getDeclarators()[0];
- IASTArrayModifier modifier = arr_decl.getArrayModifiers()[0];
- IASTLiteralExpression lit = (IASTLiteralExpression)modifier.getConstantExpression();
- assertEquals("5", lit.toString());
-
- }
-
-
-
- public void testTrigraphAndDigraphSequecesInPreprocessorDirectives() {
- String code =
- "%:define join1(a, b) a %:%: b \n" +
- "%:define str1(a) %: a \n" +
- "??=define join2(a, b) a ??=??= b \n" +
- "??=define str2(a) ??= a \n" +
- "int main() <% \n" +
- " int join1(x, y) = str1(its all good); \n" +
- " int join2(a, b) = str2(its still good); \n" +
- "%> \n";
-
- IASTTranslationUnit tu = parse(code); // will throw an exception if there are parse errors
-
- IASTFunctionDefinition main = (IASTFunctionDefinition)tu.getDeclarations()[0];
- IASTCompoundStatement body = (IASTCompoundStatement) main.getBody();
- IASTStatement[] statements = body.getStatements();
- assertEquals(2, statements.length);
-
- IASTSimpleDeclaration decl1 = (IASTSimpleDeclaration)((IASTDeclarationStatement)statements[0]).getDeclaration();
- IASTDeclarator declarator1 = decl1.getDeclarators()[0];
- assertEquals("xy", declarator1.getName().toString());
- IASTLiteralExpression expr1 = (IASTLiteralExpression)((IASTInitializerExpression)declarator1.getInitializer()).getExpression();
- assertEquals(IASTLiteralExpression.lk_string_literal, expr1.getKind());
- assertEquals("\"its all good\"", expr1.toString());
-
- IASTSimpleDeclaration decl2 = (IASTSimpleDeclaration)((IASTDeclarationStatement)statements[1]).getDeclaration();
- IASTDeclarator declarator2 = decl2.getDeclarators()[0];
- assertEquals("ab", declarator2.getName().toString());
- IASTLiteralExpression expr2 = (IASTLiteralExpression)((IASTInitializerExpression)declarator2.getInitializer()).getExpression();
- assertEquals(IASTLiteralExpression.lk_string_literal, expr2.getKind());
- assertEquals("\"its still good\"", expr2.toString());
- }
-}
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRGCCTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRGCCTests.java
deleted file mode 100644
index 0b66034..0000000
--- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRGCCTests.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.core.lrparser.tests;
-
-import junit.framework.TestSuite;
-
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.cdt.core.dom.lrparser.c99.C99Language;
-import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage;
-import org.eclipse.cdt.core.model.ILanguage;
-import org.eclipse.cdt.core.parser.ParserLanguage;
-import org.eclipse.cdt.core.parser.tests.ast2.GCCTests;
-import org.eclipse.cdt.internal.core.parser.ParserException;
-
-@SuppressWarnings("restriction")
-public class LRGCCTests extends GCCTests {
-
- public static TestSuite suite() {
- return suite(LRGCCTests.class);
- }
-
- public LRGCCTests() {}
- public LRGCCTests(String name) { super(name); }
-
-
- @Override
- @SuppressWarnings("unused")
- protected IASTTranslationUnit parse( String code, ParserLanguage lang, boolean useGNUExtensions, boolean expectNoProblems ) throws ParserException {
- ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language();
- return ParseHelper.parse(code, language, expectNoProblems);
- }
-
-
- protected ILanguage getC99Language() {
- return C99Language.getDefault();
- }
-
- protected ILanguage getCPPLanguage() {
- return ISOCPPLanguage.getDefault();
- }
-
-}
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRImageLocationTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRImageLocationTests.java
deleted file mode 100644
index 2bca1e7..0000000
--- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRImageLocationTests.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others All rights reserved. This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.cdt.core.lrparser.tests;
-
-import junit.framework.TestSuite;
-
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.cdt.core.dom.lrparser.c99.C99Language;
-import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage;
-import org.eclipse.cdt.core.model.ILanguage;
-import org.eclipse.cdt.core.parser.ParserLanguage;
-import org.eclipse.cdt.core.parser.tests.ast2.ImageLocationTests;
-import org.eclipse.cdt.internal.core.parser.ParserException;
-
-@SuppressWarnings("restriction")
-public class LRImageLocationTests extends ImageLocationTests {
-
- public static TestSuite suite() {
- return suite(LRImageLocationTests.class);
- }
-
- public LRImageLocationTests() { }
- public LRImageLocationTests(String name) { super(name); }
-
-
- @Override
- @SuppressWarnings("unused")
- protected IASTTranslationUnit parse( String code, ParserLanguage lang, boolean useGNUExtensions,
- boolean expectNoProblems, boolean parseComments) throws ParserException {
- ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language();
- return ParseHelper.parse(code, language, expectNoProblems);
- }
-
- protected ILanguage getC99Language() {
- return C99Language.getDefault();
- }
-
- protected ILanguage getCPPLanguage() {
- return ISOCPPLanguage.getDefault();
- }
-
-}
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRKnRTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRKnRTests.java
deleted file mode 100644
index 2dc57ce..0000000
--- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRKnRTests.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.core.lrparser.tests;
-
-import junit.framework.TestSuite;
-
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.cdt.core.dom.lrparser.c99.C99Language;
-import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage;
-import org.eclipse.cdt.core.model.ILanguage;
-import org.eclipse.cdt.core.parser.ParserLanguage;
-import org.eclipse.cdt.core.parser.tests.ast2.AST2KnRTests;
-import org.eclipse.cdt.internal.core.parser.ParserException;
-
-/**
- * @author Mike Kucera
- */
-@SuppressWarnings("restriction")
-public class LRKnRTests extends AST2KnRTests {
-
- public static TestSuite suite() {
- return suite(LRKnRTests.class);
- }
-
- @Override
- @SuppressWarnings("unused")
- protected IASTTranslationUnit parse( String code, ParserLanguage lang, boolean useGNUExtensions, boolean expectNoProblems ) throws ParserException {
- ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language();
- return ParseHelper.parse(code, language, expectNoProblems);
- }
-
-
- protected ILanguage getC99Language() {
- return C99Language.getDefault();
- }
-
- protected ILanguage getCPPLanguage() {
- return ISOCPPLanguage.getDefault();
- }
-
- // LPG handles syntax errors differently than the DOM parser
- // these tests look for syntax errors in specific places and they fail
-
- @Override
- public void testKRCProblem3() throws Exception {
- try {
- super.testKRCProblem3();
- fail();
- } catch(Throwable _) { }
- }
-
- @Override
- public void testKRCProblem4() throws Exception {
- try {
- super.testKRCProblem4();
- fail();
- } catch(Throwable _) { }
- }
-
- @Override
- public void testKRCProblem5() throws Exception {
- try {
- super.testKRCProblem5();
- fail();
- } catch(Throwable _) { }
- }
-
- @Override
- public void testKRCProblem2() throws Exception {
- try {
- super.testKRCProblem2();
- fail();
- } catch(Throwable _) { }
- }
-
-}
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRNodeSelectorTest.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRNodeSelectorTest.java
deleted file mode 100644
index 9e47a0d..0000000
--- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRNodeSelectorTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.core.lrparser.tests;
-
-import java.io.IOException;
-
-import junit.framework.TestSuite;
-
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.cdt.core.dom.lrparser.c99.C99Language;
-import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage;
-import org.eclipse.cdt.core.model.ILanguage;
-import org.eclipse.cdt.core.parser.ParserLanguage;
-import org.eclipse.cdt.core.parser.tests.ast2.ASTNodeSelectorTest;
-import org.eclipse.cdt.internal.core.parser.ParserException;
-
-@SuppressWarnings("restriction")
-public class LRNodeSelectorTest extends ASTNodeSelectorTest {
-
- public static TestSuite suite() {
- return suite(LRNodeSelectorTest.class);
- }
-
- public LRNodeSelectorTest() {}
- public LRNodeSelectorTest(String name) { super(name); }
-
-
- @Override
- protected IASTTranslationUnit parse( String code, ParserLanguage lang, @SuppressWarnings("unused") boolean useGNUExtensions, boolean expectNoProblems, @SuppressWarnings("unused") boolean parseComments) throws ParserException {
- ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language();
- return ParseHelper.parse(code, language, expectNoProblems);
- }
-
- @Override
- protected void createTranslationUnit() throws IOException {
- fCode= getContents(1)[0].toString();
- fTu = ParseHelper.parse(fCode, getCPPLanguage(), false);
- fSelector= fTu.getNodeSelector(null);
- }
-
-
- protected ILanguage getC99Language() {
- return C99Language.getDefault();
- }
-
- protected ILanguage getCPPLanguage() {
- return ISOCPPLanguage.getDefault();
- }
-
-}
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRParserTestSuite.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRParserTestSuite.java
deleted file mode 100644
index 19b4c5e..0000000
--- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRParserTestSuite.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.core.lrparser.tests;
-
-
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class LRParserTestSuite extends TestSuite {
-
- // TODO: the following test are not being reused
- //
- // DOMGCCSelectionParseExtensionsTest
- // DOMSelectionParseTest
- // GCCCompleteParseExtensionsTest
- // QuickParser2Tests
- //
- // and perhaps others
-
- public static Test suite() {
- return new TestSuite() {{
-
- addTestSuite(LRCommentTests.class);
- addTestSuite(LRCompleteParser2Tests.class);
- addTestSuite(LRCompletionBasicTest.class);
- addTestSuite(LRCompletionParseTest.class);
- addTestSuite(LRCPPSpecFailingTest.class);
- addTestSuite(LRCPPSpecTest.class);
- addTestSuite(LRCPPTests.class);
- addTestSuite(LRCSpecFailingTest.class);
- addTestSuite(LRCSpecTests.class); // a couple of failures
- addTestSuite(LRDigraphTrigraphTests.class);
- addTestSuite(LRDOMLocationInclusionTests.class);
- addTestSuite(LRDOMLocationMacroTests.class);
- addTestSuite(LRDOMLocationTests.class);
- addTestSuite(LRDOMPreprocessorInformationTest.class);
- addTestSuite(LRGCCTests.class);
- addTestSuite(LRImageLocationTests.class);
- addTestSuite(LRKnRTests.class); // mostly fail due to ambiguities
- addTestSuite(LRNodeSelectorTest.class);
- addTestSuite(LRQuickParser2Tests.class);
- addTestSuite(LRSelectionParseTest.class); // this one still has a lot of failing tests though
- addTestSuite(LRSemanticsTests.class);
- addTestSuite(LRTaskParserTest.class);
- addTestSuite(LRTemplateTests.class);
- addTestSuite(LRTests.class); // has some tests that do fail
- addTestSuite(LRUtilOldTests.class);
- addTestSuite(LRUtilTests.class);
-
- }};
- }
-}
-
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRQuickParser2Tests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRQuickParser2Tests.java
deleted file mode 100644
index 7ddb87c..0000000
--- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRQuickParser2Tests.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others All rights reserved. This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.cdt.core.lrparser.tests;
-
-import junit.framework.AssertionFailedError;
-
-import org.eclipse.cdt.core.dom.lrparser.c99.C99Language;
-import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage;
-import org.eclipse.cdt.core.model.ILanguage;
-import org.eclipse.cdt.core.parser.CodeReader;
-import org.eclipse.cdt.core.parser.ParserLanguage;
-import org.eclipse.cdt.core.parser.ScannerInfo;
-import org.eclipse.cdt.core.parser.tests.ast2.QuickParser2Tests;
-import org.eclipse.cdt.core.parser.tests.scanner.FileCodeReaderFactory;
-
-public class LRQuickParser2Tests extends QuickParser2Tests {
-
- public LRQuickParser2Tests() {}
- public LRQuickParser2Tests(String name) { super(name); }
-
-
- @Override
- protected void parse(String code, boolean expectedToPass,
- ParserLanguage lang, @SuppressWarnings("unused") boolean gcc) throws Exception {
- ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language();
- CodeReader reader = new CodeReader(code.toCharArray());
- // don't check preprocessor problems for this test suite (causes tons of failures)
- ParseHelper.parse(reader, language, new ScannerInfo(), FileCodeReaderFactory.getInstance(), expectedToPass, false, 0, null, false);
- }
-
-
- protected ILanguage getC99Language() {
- return C99Language.getDefault();
- }
-
- protected ILanguage getCPPLanguage() {
- return ISOCPPLanguage.getDefault();
- }
-
-
- @Override
- public void testBug36532() {
- // ParseHelper does not throw ParserException
- // just ignore this test
- }
-
- @Override
- public void testBug39695() throws Exception { // no support for __alignof__
- try {
- super.testBug39695();
- fail();
- } catch(AssertionFailedError _) { }
- }
-
- @Override
- public void testBug39684() throws Exception { // typeof is gcc extension
- try {
- super.testBug39684();
- fail();
- } catch(AssertionFailedError _) { }
- }
-
- @Override
- public void testBug39698A() throws Exception { // gcc extension
- try {
- super.testBug39698A();
- fail();
- } catch(AssertionFailedError _) { }
- }
-
- @Override
- public void testBug39698B() throws Exception { // gcc extension
- try {
- super.testBug39698B();
- fail();
- } catch(AssertionFailedError _) { }
- }
-
- @Override
- public void testBug39704B() throws Exception { // gcc extension
- try {
- super.testBug39704B();
- fail();
- } catch(AssertionFailedError _) { }
- }
-
- @Override
- public void testBug39704C() throws Exception { // gcc extension
- try {
- super.testBug39704C();
- fail();
- } catch(AssertionFailedError _) { }
- }
-
- @Override
- public void testBug39677() throws Exception { // gcc extension
- try {
- super.testBug39677();
- fail();
- } catch(AssertionFailedError _) { }
- }
-
-
- @Override
- public void testBug57652() throws Exception { // gcc extension
- try {
- super.testBug57652();
- fail();
- } catch(AssertionFailedError _) { }
- }
-
-
- @Override
- public void testBug39701A() throws Exception { // gcc extension
- try {
- super.testBug39701A();
- fail();
- } catch(AssertionFailedError _) { }
- }
-
- @Override
- public void testBug39701B() throws Exception { // gcc extension
- try {
- super.testBug39701B();
- fail();
- } catch(AssertionFailedError _) { }
- }
-
- @Override
- public void testBug39701C() throws Exception { // gcc extension
- try {
- super.testBug39701C();
- fail();
- } catch(AssertionFailedError _) { }
- }
-
-
- @Override
- public void testBug40007() throws Exception { // gcc extension
- try {
- super.testBug40007();
- fail();
- } catch(AssertionFailedError _) {
- } catch(AssertionError _) {
- }
-
- }
-
- @Override
- public void testBug39703() throws Exception { // gcc extension
- try {
- super.testBug39703();
- fail();
- } catch(AssertionFailedError _) { }
- }
-
-
- @Override
- public void testBug39554() throws Exception { // gcc extension
- try {
- super.testBug39554();
- fail();
- } catch(AssertionFailedError _) { }
- }
-
-
- @Override
- public void testBug39686() throws Exception { // gcc extension
- try {
- super.testBug39686();
- fail();
- } catch(AssertionFailedError _) { }
- }
-
-
-}
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRSelectionParseTest.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRSelectionParseTest.java
deleted file mode 100644
index 40dc773..0000000
--- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRSelectionParseTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.core.lrparser.tests;
-
-import junit.framework.TestSuite;
-
-import org.eclipse.cdt.core.dom.ICodeReaderFactory;
-import org.eclipse.cdt.core.dom.ast.IASTNode;
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.cdt.core.dom.lrparser.c99.C99Language;
-import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage;
-import org.eclipse.cdt.core.model.ILanguage;
-import org.eclipse.cdt.core.parser.CodeReader;
-import org.eclipse.cdt.core.parser.IScannerInfo;
-import org.eclipse.cdt.core.parser.ParserLanguage;
-import org.eclipse.cdt.core.parser.ScannerInfo;
-import org.eclipse.cdt.core.parser.tests.ast2.AST2SelectionParseTest;
-import org.eclipse.cdt.internal.core.dom.SavedCodeReaderFactory;
-import org.eclipse.cdt.internal.core.parser.ParserException;
-import org.eclipse.core.resources.IFile;
-
-@SuppressWarnings("restriction")
-public class LRSelectionParseTest extends AST2SelectionParseTest {
-
- public static TestSuite suite() {
- return new TestSuite(LRSelectionParseTest.class);
- }
-
- public LRSelectionParseTest() {}
- public LRSelectionParseTest(String name) { super(name); }
-
- @Override
- protected IASTNode parse(String code, ParserLanguage lang, int offset, int length) throws ParserException {
- return parse(code, lang, false, false, offset, length);
- }
-
- @Override
- protected IASTNode parse(IFile file, ParserLanguage lang, int offset, int length) throws ParserException {
- IASTTranslationUnit tu = parse(file, lang, false, false);
- return tu.selectNodeForLocation(tu.getFilePath(), offset, length);
- }
-
- @Override
- protected IASTNode parse(String code, ParserLanguage lang, int offset, int length, boolean expectedToPass) throws ParserException {
- return parse(code, lang, false, expectedToPass, offset, length);
- }
-
- @Override
- protected IASTNode parse(String code, ParserLanguage lang, boolean useGNUExtensions, boolean expectNoProblems, int offset, int length) throws ParserException {
- ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language();
-
- IASTTranslationUnit tu = ParseHelper.parse(code, language, useGNUExtensions, expectNoProblems, 0);
- return tu.selectNodeForLocation(tu.getFilePath(), offset, length);
- }
-
- protected IASTTranslationUnit parse( IFile file, ParserLanguage lang, IScannerInfo scanInfo, boolean useGNUExtensions, boolean expectNoProblems ) {
-
- ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language();
-
- String fileName = file.getLocation().toOSString();
- ICodeReaderFactory fileCreator = SavedCodeReaderFactory.getInstance();
- CodeReader reader = fileCreator.createCodeReaderForTranslationUnit(fileName);
- return ParseHelper.parse(reader, language, scanInfo, fileCreator, expectNoProblems, true, 0, null, true);
- }
-
- @Override
- protected IASTTranslationUnit parse( IFile file, ParserLanguage lang, boolean useGNUExtensions, boolean expectNoProblems )
- throws ParserException {
- return parse(file, lang, new ScannerInfo(), useGNUExtensions, expectNoProblems);
- }
-
- protected ILanguage getC99Language() {
- return C99Language.getDefault();
- }
-
- protected ILanguage getCPPLanguage() {
- return ISOCPPLanguage.getDefault();
- }
-
-}
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRSemanticsTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRSemanticsTests.java
deleted file mode 100644
index c5ffa32..0000000
--- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRSemanticsTests.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others All rights reserved. This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.cdt.core.lrparser.tests;
-
-import junit.framework.TestSuite;
-
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.cdt.core.dom.lrparser.c99.C99Language;
-import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage;
-import org.eclipse.cdt.core.model.ILanguage;
-import org.eclipse.cdt.core.parser.ParserLanguage;
-import org.eclipse.cdt.core.parser.tests.ast2.SemanticsTests;
-import org.eclipse.cdt.internal.core.parser.ParserException;
-
-@SuppressWarnings("restriction")
-public class LRSemanticsTests extends SemanticsTests {
-
- public static TestSuite suite() {
- return suite(LRSemanticsTests.class);
- }
-
- public LRSemanticsTests() { }
- public LRSemanticsTests(String name) { super(name); }
-
-
- @SuppressWarnings("unused")
- @Override
- protected IASTTranslationUnit parse( String code, ParserLanguage lang, boolean useGNUExtensions,
- boolean expectNoProblems, boolean parseComments) throws ParserException {
- ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language();
- return ParseHelper.parse(code, language, expectNoProblems);
- }
-
- protected ILanguage getC99Language() {
- return C99Language.getDefault();
- }
-
- protected ILanguage getCPPLanguage() {
- return ISOCPPLanguage.getDefault();
- }
-}
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRTaskParserTest.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRTaskParserTest.java
deleted file mode 100644
index 1882fc7..0000000
--- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRTaskParserTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.core.lrparser.tests;
-
-import junit.framework.TestSuite;
-
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.cdt.core.dom.lrparser.c99.C99Language;
-import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage;
-import org.eclipse.cdt.core.model.ILanguage;
-import org.eclipse.cdt.core.parser.ParserLanguage;
-import org.eclipse.cdt.core.parser.tests.ast2.TaskParserTest;
-import org.eclipse.cdt.internal.core.parser.ParserException;
-
-@SuppressWarnings("restriction")
-public class LRTaskParserTest extends TaskParserTest {
-
- public static TestSuite suite() {
- return new TestSuite(LRTaskParserTest.class);
- }
-
- @Override
- @SuppressWarnings("unused")
- protected IASTTranslationUnit parse( String code, ParserLanguage lang, boolean useGNUExtensions, boolean expectNoProblems ) throws ParserException {
- ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language();
-
- return ParseHelper.parse(code, language, expectNoProblems);
- }
-
- @Override
- protected IASTTranslationUnit parse( String code, ParserLanguage lang, boolean useGNUExtensions, boolean expectNoProblems, @SuppressWarnings("unused") boolean parseComments) throws ParserException {
- return parse(code,lang, useGNUExtensions, expectNoProblems );
- }
-
- protected ILanguage getC99Language() {
- return C99Language.getDefault();
- }
-
- protected ILanguage getCPPLanguage() {
- return ISOCPPLanguage.getDefault();
- }
-}
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRTemplateTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRTemplateTests.java
deleted file mode 100644
index 4ccf659..0000000
--- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRTemplateTests.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.core.lrparser.tests;
-
-import junit.framework.TestSuite;
-
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.cdt.core.dom.lrparser.c99.C99Language;
-import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage;
-import org.eclipse.cdt.core.model.ILanguage;
-import org.eclipse.cdt.core.parser.ParserLanguage;
-import org.eclipse.cdt.core.parser.tests.ast2.AST2TemplateTests;
-import org.eclipse.cdt.internal.core.parser.ParserException;
-
-@SuppressWarnings("restriction")
-public class LRTemplateTests extends AST2TemplateTests {
-
-
- public static TestSuite suite() {
- return suite(LRTemplateTests.class);
- }
-
-
- @Override
- @SuppressWarnings("unused")
- protected IASTTranslationUnit parse( String code, ParserLanguage lang, boolean useGNUExtensions, boolean expectNoProblems, boolean parseComments) throws ParserException {
- ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language();
- return ParseHelper.parse(code, language, expectNoProblems);
- }
-
- protected ILanguage getC99Language() {
- return C99Language.getDefault();
- }
-
- protected ILanguage getCPPLanguage() {
- return ISOCPPLanguage.getDefault();
- }
-
-}
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRTests.java
deleted file mode 100644
index 8560935..0000000
--- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRTests.java
+++ /dev/null
@@ -1,283 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.core.lrparser.tests;
-
-import junit.framework.TestSuite;
-
-import org.eclipse.cdt.core.dom.ast.IASTDeclaration;
-import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition;
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.cdt.core.dom.ast.c.ICASTSimpleDeclSpecifier;
-import org.eclipse.cdt.core.dom.lrparser.c99.C99Language;
-import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage;
-import org.eclipse.cdt.core.model.ILanguage;
-import org.eclipse.cdt.core.parser.ParserLanguage;
-import org.eclipse.cdt.core.parser.tests.ast2.AST2Tests;
-import org.eclipse.cdt.internal.core.parser.ParserException;
-
-
-/**
- *
- * @author Mike Kucera
- *
- */
-@SuppressWarnings({ "nls", "restriction" })
-public class LRTests extends AST2Tests {
-
- public static TestSuite suite() {
- return suite(LRTests.class);
- }
-
- public LRTests(String name) {
- super(name);
- }
-
-
- @Override
- protected IASTTranslationUnit parse( String code, ParserLanguage lang, @SuppressWarnings("unused") boolean useGNUExtensions, boolean expectNoProblems ) throws ParserException {
- ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language();
- return ParseHelper.parse(code, language, expectNoProblems);
- }
-
- @Override
- protected IASTTranslationUnit parse( String code, ParserLanguage lang, boolean useGNUExtensions, boolean expectNoProblems, @SuppressWarnings("unused") boolean parseComments) throws ParserException {
- return parse(code,lang, useGNUExtensions, expectNoProblems );
- }
-
- protected ILanguage getC99Language() {
- return C99Language.getDefault();
- }
-
- protected ILanguage getCPPLanguage() {
- return ISOCPPLanguage.getDefault();
- }
-
-
- public void testMultipleHashHash() throws Exception {
- String code = "#define TWICE(a) int a##tera; int a##ther; \n TWICE(pan)";
- parseAndCheckBindings(code, ParserLanguage.C);
- }
-
-
- public void testBug191279() throws Exception {
- StringBuffer sb = new StringBuffer();
- sb.append(" /**/ \n");
- sb.append("# define YO 99 /**/ \n");
- sb.append("# undef YO /**/ ");
- sb.append(" /* $ */ ");
- String code = sb.toString();
- parseAndCheckBindings(code, ParserLanguage.C);
- }
-
-
- public void testBug191324() throws Exception {
- StringBuffer sb = new StringBuffer();
- sb.append("int x$y = 99; \n");
- sb.append("int $q = 100; \n"); // can use $ as first character in identifier
- sb.append("#ifndef SS$_INVFILFOROP \n");
- sb.append("int z; \n");
- sb.append("#endif \n");
- String code = sb.toString();
- parseAndCheckBindings(code, ParserLanguage.C);
- }
-
-
- public void testBug192009_implicitInt() throws Exception {
- String code = "main() { int x; }";
- IASTTranslationUnit tu = parse(code, ParserLanguage.C, false, true);
-
- IASTDeclaration[] declarations = tu.getDeclarations();
- assertEquals(1, declarations.length);
-
- IASTFunctionDefinition main = (IASTFunctionDefinition) declarations[0];
- ICASTSimpleDeclSpecifier declSpec = (ICASTSimpleDeclSpecifier) main.getDeclSpecifier();
- assertEquals(0, declSpec.getType());
-
-
- assertEquals("main", main.getDeclarator().getName().toString());
- }
-
-
-
- @Override
- public void testBug93980() { // some wierd gcc extension I think
- try {
- super.testBug93980();
- fail();
- } catch(Throwable _) { }
- }
-
-
- @Override
- public void testBug95866() { // gcc extension
- try {
- super.testBug95866();
- fail();
- } catch(Throwable _) { }
- }
-
-
- @Override
- public void testBug80171() throws Exception { // implicit int not supported
- try {
- super.testBug80171();
- fail();
- } catch(Throwable _) { }
- }
-
-
- @Override
- public void testBug196468_emptyArrayInitializer() { // empty array initializer is a gcc extension
- try {
- super.testBug196468_emptyArrayInitializer();
- fail();
- } catch(Throwable _) { }
- }
-
-
- @Override
- public void testBug75340() { // not legal c99
- try {
- super.testBug75340();
- fail();
- } catch(Throwable _) { }
- }
-
-
- @Override
- public void test92791() { // I think the test is wrong, the second code snippet contains a redeclaration
- try {
- super.test92791();
- fail();
- } catch(Throwable _) { }
- }
-
-
-
- @Override
- public void testBug192165() { // gcc extension: typeof
- try {
- super.testBug192165();
- fail();
- } catch(Throwable _) { }
- }
-
-
-
- @Override
- public void testBug191450_attributesInBetweenPointers() { // gcc extension: attributes
- try {
- super.testBug191450_attributesInBetweenPointers();
- fail();
- } catch(Throwable _) { }
- }
-
- @Override
- public void testOmittedPositiveExpression_Bug212905() throws Exception {
- try {
- super.testOmittedPositiveExpression_Bug212905();
- fail();
- } catch(Throwable _) { }
- }
-
- @Override
- public void testRedefinedGCCKeywords_Bug226112() throws Exception {
- try {
- super.testRedefinedGCCKeywords_Bug226112();
- fail();
- } catch(Throwable _) { }
- }
-
- @Override
- public void testASMLabels_Bug226121() throws Exception {
- try {
- super.testASMLabels_Bug226121();
- fail();
- } catch(Throwable _) { }
- }
-
- @Override
- public void testCompoundStatementExpression_Bug226274() throws Exception {
- try {
- super.testCompoundStatementExpression_Bug226274();
- fail();
- } catch(Throwable _) { }
- }
-
-
-
- // GCC extensions
- @Override
- public void testTypeofUnaryExpression_Bug226492() throws Exception {
- try {
- super.testTypeofUnaryExpression_Bug226492();
- fail();
- } catch(Throwable _) { }
- }
-
- @Override
- public void testTypeofExpression_Bug226492() throws Exception {
- try {
- super.testTypeofExpression_Bug226492();
- fail();
- } catch(Throwable _) { }
- }
-
- @Override
- public void testTypeofExpressionWithAttribute_Bug226492() throws Exception {
- try {
- super.testTypeofExpressionWithAttribute_Bug226492();
- fail();
- } catch(Throwable _) { }
- }
-
- @Override
- public void testCaseRange_Bug211882() throws Exception {
- try {
- super.testCaseRange_Bug211882();
- fail();
- } catch(Throwable _) { }
- }
-
- @Override
- public void testAttributeInElaboratedTypeSpecifier_Bug227085() throws Exception {
- try {
- super.testAttributeInElaboratedTypeSpecifier_Bug227085();
- fail();
- } catch(Throwable _) { }
- }
-
- @Override
- public void testRestrictReference_Bug227110() throws Exception {
- try {
- super.testRestrictReference_Bug227110();
- fail();
- } catch(Throwable _) { }
- }
-
- @Override
- public void testRedefinePtrdiff_Bug230895() throws Exception {
- try {
- super.testRedefinePtrdiff_Bug230895();
- fail();
- } catch(Throwable _) { }
- }
-
-
- @Override
- public void testReturnTypeOfBuiltin_Bug234309() throws Exception {
- try {
- super.testReturnTypeOfBuiltin_Bug234309();
- fail();
- } catch(Throwable _) { }
- }
-
-}
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRUtilOldTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRUtilOldTests.java
deleted file mode 100644
index 04ed8d6..0000000
--- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRUtilOldTests.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.core.lrparser.tests;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestSuite;
-
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.cdt.core.dom.lrparser.c99.C99Language;
-import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage;
-import org.eclipse.cdt.core.model.ILanguage;
-import org.eclipse.cdt.core.parser.ParserLanguage;
-import org.eclipse.cdt.core.parser.tests.ast2.AST2UtilOldTests;
-import org.eclipse.cdt.internal.core.parser.ParserException;
-
-@SuppressWarnings("restriction")
-public class LRUtilOldTests extends AST2UtilOldTests {
-
- public static TestSuite suite() {
- return suite(LRUtilOldTests.class);
- }
-
-
- @Override
- @SuppressWarnings("unused")
- protected IASTTranslationUnit parse( String code, ParserLanguage lang, boolean useGNUExtensions, boolean expectNoProblems ) throws ParserException {
- ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language();
- return ParseHelper.parse(code, language, expectNoProblems);
- }
-
-
- protected ILanguage getC99Language() {
- return C99Language.getDefault();
- }
-
- protected ILanguage getCPPLanguage() {
- return ISOCPPLanguage.getDefault();
- }
-
-
- @Override
- public void testCastExpression() throws Exception { // A not typedefed
- try {
- super.testCastExpression();
- fail();
- } catch(AssertionFailedError _) {}
- }
-}
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRUtilTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRUtilTests.java
deleted file mode 100644
index aeafe6e..0000000
--- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRUtilTests.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.core.lrparser.tests;
-
-import junit.framework.TestSuite;
-
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.cdt.core.dom.lrparser.c99.C99Language;
-import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage;
-import org.eclipse.cdt.core.model.ILanguage;
-import org.eclipse.cdt.core.parser.ParserLanguage;
-import org.eclipse.cdt.core.parser.tests.ast2.AST2UtilTests;
-import org.eclipse.cdt.internal.core.parser.ParserException;
-
-@SuppressWarnings("restriction")
-public class LRUtilTests extends AST2UtilTests {
-
- public static TestSuite suite() {
- return suite(LRUtilTests.class);
- }
-
- @Override
- protected IASTTranslationUnit parse( String code, ParserLanguage lang ) throws ParserException {
- return parse(code, lang, false, true );
- }
-
- @Override
- protected IASTTranslationUnit parse( String code, ParserLanguage lang, boolean useGNUExtensions ) throws ParserException {
- return parse( code, lang, useGNUExtensions, true );
- }
-
- @Override
- @SuppressWarnings("unused")
- protected IASTTranslationUnit parse( String code, ParserLanguage lang, boolean useGNUExtensions, boolean expectNoProblems ) throws ParserException {
- ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language();
- return ParseHelper.parse(code, language, expectNoProblems);
- }
-
-
- protected ILanguage getC99Language() {
- return C99Language.getDefault();
- }
-
- protected ILanguage getCPPLanguage() {
- return ISOCPPLanguage.getDefault();
- }
-}
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/ParseHelper.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/ParseHelper.java
deleted file mode 100644
index 8ce2fbc..0000000
--- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/ParseHelper.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.core.lrparser.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.AssertionFailedError;
-
-import org.eclipse.cdt.core.dom.ICodeReaderFactory;
-import org.eclipse.cdt.core.dom.ast.ASTVisitor;
-import org.eclipse.cdt.core.dom.ast.IASTCompletionNode;
-import org.eclipse.cdt.core.dom.ast.IASTName;
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.cdt.core.dom.ast.IBinding;
-import org.eclipse.cdt.core.dom.ast.IProblemBinding;
-import org.eclipse.cdt.core.model.ILanguage;
-import org.eclipse.cdt.core.parser.CodeReader;
-import org.eclipse.cdt.core.parser.IScannerInfo;
-import org.eclipse.cdt.core.parser.ParserUtil;
-import org.eclipse.cdt.core.parser.ScannerInfo;
-import org.eclipse.cdt.internal.core.dom.parser.c.CVisitor;
-import org.eclipse.core.runtime.CoreException;
-
-/**
- * Utility methods for parsing test code using the C99 LPG parser.
- *
- * @author Mike Kucera
- */
-@SuppressWarnings({"restriction", "nls"})
-public class ParseHelper {
-
- static int testsRun = 0;
-
-
-
- static protected class NameResolver extends ASTVisitor {
- {
- shouldVisitNames = true;
- }
-
- public List<IASTName> nameList = new ArrayList<IASTName>();
- public List<String> problemBindings = new ArrayList<String>();
- public int numNullBindings = 0;
-
-
- @Override
- public int visit(IASTName name) {
- nameList.add(name);
- IBinding binding = name.resolveBinding();
- if (binding instanceof IProblemBinding)
- problemBindings.add(name.toString());
- if (binding == null)
- numNullBindings++;
- return PROCESS_CONTINUE;
- }
-
- public IASTName getName(int idx) {
- if(idx < 0 || idx >= nameList.size())
- return null;
- return nameList.get(idx);
- }
-
- public int size() {
- return nameList.size();
- }
- }
-
-
-
- public static IASTTranslationUnit parse(char[] code, ILanguage lang, boolean expectNoProblems, boolean checkBindings, int expectedProblemBindings) {
- CodeReader codeReader = new CodeReader(code);
- return parse(codeReader, lang, new ScannerInfo(), null, expectNoProblems, checkBindings, expectedProblemBindings, null, expectNoProblems);
- }
-
- public static IASTTranslationUnit parse(String code, ILanguage lang, boolean expectNoProblems, boolean checkBindings, int expectedProblemBindings) {
- return parse(code.toCharArray(), lang, expectNoProblems, checkBindings, expectedProblemBindings);
- }
-
- public static IASTTranslationUnit parse(String code, ILanguage lang, boolean expectNoProblems) {
- return parse(code, lang, expectNoProblems, false, 0);
- }
-
- public static IASTTranslationUnit parse(String code, ILanguage lang, String[] problems) {
- CodeReader codeReader = new CodeReader(code.toCharArray());
- return parse(codeReader, lang, new ScannerInfo(), null, true, true, problems.length, problems, true);
- }
-
-
- /**
- * TODO thats WAY too many parameters, need to use a parameter object, need to refactor the
- * DOM parser test suite so that its a lot cleaner.
- *
- * @param codeReader
- * @param language
- * @param scanInfo
- * @param fileCreator
- * @param checkSyntaxProblems
- * @param checkBindings
- * @param expectedProblemBindings
- * @param problems
- * @param checkPreprocessorProblems
- * @return
- */
- public static IASTTranslationUnit parse(CodeReader codeReader, ILanguage language, IScannerInfo scanInfo,
- ICodeReaderFactory fileCreator, boolean checkSyntaxProblems,
- boolean checkBindings, int expectedProblemBindings, String[] problems,
- boolean checkPreprocessorProblems) {
- testsRun++;
-
- IASTTranslationUnit tu;
- try {
- tu = language.getASTTranslationUnit(codeReader, scanInfo, fileCreator, null, ParserUtil.getParserLogService());
- } catch (CoreException e) {
- throw new AssertionFailedError(e.toString());
- }
-
- // should parse correctly first before we look at the bindings
- if(checkSyntaxProblems) {
-
- // this should work for C++ also, CVisitor.getProblems() and CPPVisitor.getProblems() are exactly the same code!
- if (CVisitor.getProblems(tu).length != 0) {
- throw new AssertionFailedError(" CVisitor has AST Problems " );
- }
- }
-
- if(checkPreprocessorProblems) {
- if (tu.getPreprocessorProblems().length != 0) {
- throw new AssertionFailedError(language.getName() + " TranslationUnit has Preprocessor Problems " );
- }
- }
-
- // resolve all bindings
- if (checkBindings) {
- NameResolver res = new NameResolver();
- tu.accept( res );
- if(res.problemBindings.size() != expectedProblemBindings)
- throw new AssertionFailedError("Expected " + expectedProblemBindings + " problem(s), encountered " + res.problemBindings.size());
-
- if(problems != null) {
- for(int i = 0; i < problems.length; i++) {
- String expected = problems[i];
- String actual = res.problemBindings.get(i);
- if(!expected.equals(actual))
- throw new AssertionFailedError(String.format("Problem binding not equal, expected: %s, got: %s", expected, actual));
- }
- }
- }
-
- return tu;
- }
-
-
- public static IASTTranslationUnit commentParse(String code, ILanguage language) {
- CodeReader codeReader = new CodeReader(code.toCharArray());
- IASTTranslationUnit tu;
- try {
- tu = language.getASTTranslationUnit(codeReader, new ScannerInfo(), null, null, ILanguage.OPTION_ADD_COMMENTS, ParserUtil.getParserLogService());
- } catch (CoreException e) {
- throw new AssertionFailedError(e.toString());
- }
- return tu;
- }
-
- public static IASTCompletionNode getCompletionNode(String code, ILanguage lang) {
- return getCompletionNode(code, lang, code.length());
- }
-
-
- public static IASTCompletionNode getCompletionNode(String code, ILanguage language, int offset) {
- CodeReader reader = new CodeReader(code.toCharArray());
- try {
- return language.getCompletionNode(reader, new ScannerInfo(), null, null, ParserUtil.getParserLogService(), offset);
- } catch (CoreException e) {
- throw new RuntimeException(e);
- }
- }
-
-}
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/.classpath b/upc/org.eclipse.cdt.core.parser.upc.tests/.classpath
deleted file mode 100644
index 64c5e31..0000000
--- a/upc/org.eclipse.cdt.core.parser.upc.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/.project b/upc/org.eclipse.cdt.core.parser.upc.tests/.project
deleted file mode 100644
index 5ccd5d6..0000000
--- a/upc/org.eclipse.cdt.core.parser.upc.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.cdt.core.parser.upc.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/.settings/org.eclipse.jdt.core.prefs b/upc/org.eclipse.cdt.core.parser.upc.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f88f26d..0000000
--- a/upc/org.eclipse.cdt.core.parser.upc.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,65 +0,0 @@
-#Fri Apr 25 15:24:03 EDT 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
-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.5
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/META-INF/MANIFEST.MF b/upc/org.eclipse.cdt.core.parser.upc.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 36da253..0000000
--- a/upc/org.eclipse.cdt.core.parser.upc.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.cdt.core.parser.upc.tests
-Bundle-Version: 4.0.0.qualifier
-Require-Bundle: org.eclipse.core.runtime,
- org.junit,
- org.eclipse.cdt.core.tests,
- org.eclipse.cdt.core,
- org.eclipse.core.resources,
- org.eclipse.cdt.core.parser.upc,
- org.eclipse.cdt.core.lrparser;bundle-version="4.0.1",
- org.eclipse.cdt.core.lrparser.tests;bundle-version="4.0.0"
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/about.html b/upc/org.eclipse.cdt.core.parser.upc.tests/about.html
deleted file mode 100644
index 9b669c2..0000000
--- a/upc/org.eclipse.cdt.core.parser.upc.tests/about.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>About</title></head>
-
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 8, 2007</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body></html>
\ No newline at end of file
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/build.properties b/upc/org.eclipse.cdt.core.parser.upc.tests/build.properties
deleted file mode 100644
index 185a840..0000000
--- a/upc/org.eclipse.cdt.core.parser.upc.tests/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2007 IBM Corporation and others
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- about.html,\
- plugin.properties
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/plugin.properties b/upc/org.eclipse.cdt.core.parser.upc.tests/plugin.properties
deleted file mode 100644
index 73788c4..0000000
--- a/upc/org.eclipse.cdt.core.parser.upc.tests/plugin.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-###############################################################################
-# Copyright (c) 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# properties file for org.eclipse.cdt.core.parser.c99.tests
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = C99 Parser Tests Plug-in
-
-upcSourceName=UPC Source File
\ No newline at end of file
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCCSpecTests.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCCSpecTests.java
deleted file mode 100644
index 54f87b2..0000000
--- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCCSpecTests.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.core.parser.upc.tests;
-
-import org.eclipse.cdt.core.dom.upc.UPCLanguage;
-import org.eclipse.cdt.core.lrparser.tests.LRCSpecTests;
-import org.eclipse.cdt.core.model.ILanguage;
-
-public class UPCCSpecTests extends LRCSpecTests {
-
- public UPCCSpecTests() {
- }
-
- public UPCCSpecTests(String name) {
- super(name);
- }
-
- @Override
- protected ILanguage getCLanguage() {
- return UPCLanguage.getDefault();
- }
-
-}
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCCommentTests.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCCommentTests.java
deleted file mode 100644
index 348902a..0000000
--- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCCommentTests.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.core.parser.upc.tests;
-
-import org.eclipse.cdt.core.dom.upc.UPCLanguage;
-import org.eclipse.cdt.core.lrparser.tests.LRCommentTests;
-import org.eclipse.cdt.core.model.ILanguage;
-
-public class UPCCommentTests extends LRCommentTests {
-
- @Override
- protected ILanguage getC99Language() {
- return UPCLanguage.getDefault();
- }
-}
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCCompleteParser2Tests.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCCompleteParser2Tests.java
deleted file mode 100644
index 7d18d2b..0000000
--- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCCompleteParser2Tests.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.core.parser.upc.tests;
-
-import org.eclipse.cdt.core.dom.upc.UPCLanguage;
-import org.eclipse.cdt.core.lrparser.tests.LRCompleteParser2Tests;
-import org.eclipse.cdt.core.model.ILanguage;
-
-public class UPCCompleteParser2Tests extends LRCompleteParser2Tests {
-
- @Override
- protected ILanguage getC99Language() {
- return UPCLanguage.getDefault();
- }
-
-}
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCCompletionBasicTest.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCCompletionBasicTest.java
deleted file mode 100644
index 6353ad0..0000000
--- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCCompletionBasicTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.core.parser.upc.tests;
-
-import org.eclipse.cdt.core.dom.lrparser.c99.C99Language;
-import org.eclipse.cdt.core.lrparser.tests.LRCompletionBasicTest;
-import org.eclipse.cdt.core.model.ILanguage;
-
-public class UPCCompletionBasicTest extends LRCompletionBasicTest {
-
- public UPCCompletionBasicTest() { }
-
- @Override
- protected ILanguage getC99Language() {
- return C99Language.getDefault();
- }
-
-}
\ No newline at end of file
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCCompletionParseTest.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCCompletionParseTest.java
deleted file mode 100644
index 7208a3c..0000000
--- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCCompletionParseTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.core.parser.upc.tests;
-
-import org.eclipse.cdt.core.dom.upc.UPCLanguage;
-import org.eclipse.cdt.core.lrparser.tests.LRCompletionParseTest;
-import org.eclipse.cdt.core.model.ILanguage;
-
-public class UPCCompletionParseTest extends LRCompletionParseTest {
-
- public UPCCompletionParseTest() { }
- public UPCCompletionParseTest(String name) { super(name); }
-
- @Override
- protected ILanguage getC99Language() {
- return UPCLanguage.getDefault();
- }
-}
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCDOMLocationInclusionTests.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCDOMLocationInclusionTests.java
deleted file mode 100644
index 9a76613..0000000
--- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCDOMLocationInclusionTests.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.core.parser.upc.tests;
-
-import org.eclipse.cdt.core.dom.upc.UPCLanguage;
-import org.eclipse.cdt.core.lrparser.tests.LRDOMLocationInclusionTests;
-import org.eclipse.cdt.core.model.ILanguage;
-
-public class UPCDOMLocationInclusionTests extends LRDOMLocationInclusionTests {
-
- public UPCDOMLocationInclusionTests() {
- }
-
- public UPCDOMLocationInclusionTests(String name) {
- super(name);
- }
-
- @Override
- protected ILanguage getC99Language() {
- return UPCLanguage.getDefault();
- }
-}
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCDOMLocationMacroTests.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCDOMLocationMacroTests.java
deleted file mode 100644
index 3ed629b..0000000
--- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCDOMLocationMacroTests.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.core.parser.upc.tests;
-
-import org.eclipse.cdt.core.dom.upc.UPCLanguage;
-import org.eclipse.cdt.core.lrparser.tests.LRDOMLocationMacroTests;
-import org.eclipse.cdt.core.model.ILanguage;
-
-public class UPCDOMLocationMacroTests extends LRDOMLocationMacroTests {
-
- public UPCDOMLocationMacroTests() {
- }
-
- @Override
- protected ILanguage getC99Language() {
- return UPCLanguage.getDefault();
- }
-}
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCDOMLocationTests.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCDOMLocationTests.java
deleted file mode 100644
index bad2b68..0000000
--- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCDOMLocationTests.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.core.parser.upc.tests;
-
-import org.eclipse.cdt.core.dom.upc.UPCLanguage;
-import org.eclipse.cdt.core.lrparser.tests.LRDOMLocationTests;
-import org.eclipse.cdt.core.model.ILanguage;
-
-public class UPCDOMLocationTests extends LRDOMLocationTests {
-
- public UPCDOMLocationTests() {
- }
-
- public UPCDOMLocationTests(String name) {
- super(name);
- }
-
- @Override
- protected ILanguage getC99Language() {
- return UPCLanguage.getDefault();
- }
-}
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCDOMPreprocessorInformationTest.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCDOMPreprocessorInformationTest.java
deleted file mode 100644
index 15f7455..0000000
--- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCDOMPreprocessorInformationTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.core.parser.upc.tests;
-
-import org.eclipse.cdt.core.dom.upc.UPCLanguage;
-import org.eclipse.cdt.core.lrparser.tests.LRDOMPreprocessorInformationTest;
-import org.eclipse.cdt.core.model.ILanguage;
-
-public class UPCDOMPreprocessorInformationTest extends LRDOMPreprocessorInformationTest {
-
- @Override
- protected ILanguage getC99Language() {
- return UPCLanguage.getDefault();
- }
-
-}
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCDigraphTrigraphTests.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCDigraphTrigraphTests.java
deleted file mode 100644
index 990f5b1..0000000
--- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCDigraphTrigraphTests.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.core.parser.upc.tests;
-
-import org.eclipse.cdt.core.dom.upc.UPCLanguage;
-import org.eclipse.cdt.core.lrparser.tests.LRDigraphTrigraphTests;
-import org.eclipse.cdt.core.model.ILanguage;
-
-
-public class UPCDigraphTrigraphTests extends LRDigraphTrigraphTests {
-
- public UPCDigraphTrigraphTests() { }
- public UPCDigraphTrigraphTests(String name) { super(name); }
-
- @Override
- protected ILanguage getCLanguage() {
- return UPCLanguage.getDefault();
- }
-}
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCGCCTests.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCGCCTests.java
deleted file mode 100644
index 8b8f2ea..0000000
--- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCGCCTests.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.core.parser.upc.tests;
-
-import org.eclipse.cdt.core.dom.upc.UPCLanguage;
-import org.eclipse.cdt.core.lrparser.tests.LRGCCTests;
-import org.eclipse.cdt.core.model.ILanguage;
-
-public class UPCGCCTests extends LRGCCTests {
-
- public UPCGCCTests() {
- }
-
- public UPCGCCTests(String message) {
- super(message);
- }
-
- @Override
- protected ILanguage getC99Language() {
- return UPCLanguage.getDefault();
- }
-
-}
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCKnRTests.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCKnRTests.java
deleted file mode 100644
index cac0c19..0000000
--- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCKnRTests.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.core.parser.upc.tests;
-
-import org.eclipse.cdt.core.dom.upc.UPCLanguage;
-import org.eclipse.cdt.core.lrparser.tests.LRKnRTests;
-import org.eclipse.cdt.core.model.ILanguage;
-
-public class UPCKnRTests extends LRKnRTests {
-
- public UPCKnRTests() {
- }
-
- @Override
- protected ILanguage getC99Language() {
- return UPCLanguage.getDefault();
- }
-
-}
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCLanguageExtensionTests.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCLanguageExtensionTests.java
deleted file mode 100644
index 7825063..0000000
--- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCLanguageExtensionTests.java
+++ /dev/null
@@ -1,539 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.core.parser.upc.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.cdt.core.dom.ast.IASTArrayDeclarator;
-import org.eclipse.cdt.core.dom.ast.IASTArrayModifier;
-import org.eclipse.cdt.core.dom.ast.IASTArraySubscriptExpression;
-import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression;
-import org.eclipse.cdt.core.dom.ast.IASTCompoundStatement;
-import org.eclipse.cdt.core.dom.ast.IASTDeclaration;
-import org.eclipse.cdt.core.dom.ast.IASTDeclarationStatement;
-import org.eclipse.cdt.core.dom.ast.IASTDeclarator;
-import org.eclipse.cdt.core.dom.ast.IASTExpressionStatement;
-import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition;
-import org.eclipse.cdt.core.dom.ast.IASTIdExpression;
-import org.eclipse.cdt.core.dom.ast.IASTLiteralExpression;
-import org.eclipse.cdt.core.dom.ast.IASTName;
-import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclSpecifier;
-import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclaration;
-import org.eclipse.cdt.core.dom.ast.IASTStatement;
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.cdt.core.dom.ast.IASTTypeIdExpression;
-import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression;
-import org.eclipse.cdt.core.dom.ast.IScope;
-import org.eclipse.cdt.core.dom.ast.IVariable;
-import org.eclipse.cdt.core.dom.lrparser.BaseExtensibleLanguage;
-import org.eclipse.cdt.core.dom.upc.UPCLanguage;
-import org.eclipse.cdt.core.dom.upc.ast.IUPCASTDeclSpecifier;
-import org.eclipse.cdt.core.dom.upc.ast.IUPCASTForallStatement;
-import org.eclipse.cdt.core.dom.upc.ast.IUPCASTKeywordExpression;
-import org.eclipse.cdt.core.dom.upc.ast.IUPCASTSimpleDeclSpecifier;
-import org.eclipse.cdt.core.dom.upc.ast.IUPCASTSynchronizationStatement;
-import org.eclipse.cdt.core.dom.upc.ast.IUPCASTTypeIdSizeofExpression;
-import org.eclipse.cdt.core.dom.upc.ast.IUPCASTUnarySizeofExpression;
-import org.eclipse.cdt.core.lrparser.tests.ParseHelper;
-
-@SuppressWarnings("nls")
-public class UPCLanguageExtensionTests extends TestCase {
-
- public UPCLanguageExtensionTests() {
- }
-
- public UPCLanguageExtensionTests(String name) {
- super(name);
- }
-
-
- protected BaseExtensibleLanguage getLanguage() {
- return UPCLanguage.getDefault();
- }
-
- // test problem-free parsing of UPC constructs (maily declarations)
- // test the AST is correct
- // test that binding resolution works
-
- private IASTTranslationUnit parseAndCheckBindings(String code) {
- return ParseHelper.parse(code, getLanguage(), true, true, 0 );
- }
-
-
- private IASTTranslationUnit parse(String code) {
- return ParseHelper.parse(code, getLanguage(), true, false, 0 );
- }
-
-
-
- public void testUPCSharedDeclarations1() throws Exception {
- String code =
- "shared int a [100+THREADS];\n" +
- "shared [] int b [THREADS];\n" +
- "shared [90] int c [10];\n" +
- "shared [*] int d [];\n" +
- "relaxed int x;" +
- "strict int y;";
-
- IASTTranslationUnit tu = parseAndCheckBindings(code);
- IScope globalScope = tu.getScope();
- assertNotNull(globalScope);
-
- IASTDeclaration[] declarations = tu.getDeclarations();
- assertNotNull(declarations);
- assertEquals(6, declarations.length);
-
- // shared int a [100+THREADS];
- IASTSimpleDeclaration decl_a = (IASTSimpleDeclaration) declarations[0];
- IUPCASTSimpleDeclSpecifier declspec_a = (IUPCASTSimpleDeclSpecifier) decl_a.getDeclSpecifier();
- assertEquals(IUPCASTDeclSpecifier.rt_unspecified, declspec_a.getReferenceType());
- assertEquals(IUPCASTDeclSpecifier.sh_shared_default_block_size, declspec_a.getSharedQualifier());
- assertEquals(IASTSimpleDeclSpecifier.t_int, declspec_a.getType());
- assertNull(declspec_a.getBlockSizeExpression());
- IASTDeclarator[] declarators = decl_a.getDeclarators();
- assertNotNull(declarators);
- assertEquals(1, declarators.length);
- IASTArrayDeclarator declarator_a = (IASTArrayDeclarator) declarators[0];
- IASTName name_a = declarator_a.getName();
- assertEquals("a", name_a.toString());
- IASTArrayModifier[] array_modifiers = declarator_a.getArrayModifiers();
- assertNotNull(array_modifiers);
- assertEquals(1, array_modifiers.length);
- IASTBinaryExpression expr = (IASTBinaryExpression) array_modifiers[0].getConstantExpression();
- IUPCASTKeywordExpression threads = (IUPCASTKeywordExpression) expr.getOperand2();
- assertEquals(IUPCASTKeywordExpression.kw_threads, threads.getKeywordKind());
-
- // shared [] int b [THREADS];
- IASTSimpleDeclaration decl_b = (IASTSimpleDeclaration) declarations[1];
- IUPCASTSimpleDeclSpecifier declspec_b = (IUPCASTSimpleDeclSpecifier) decl_b.getDeclSpecifier();
- assertEquals(IUPCASTDeclSpecifier.rt_unspecified, declspec_b.getReferenceType());
- assertEquals(IUPCASTDeclSpecifier.sh_shared_indefinite_allocation, declspec_b.getSharedQualifier());
- assertEquals(IASTSimpleDeclSpecifier.t_int, declspec_b.getType());
- assertNull(declspec_b.getBlockSizeExpression());
- declarators = decl_b.getDeclarators();
- assertNotNull(declarators);
- assertEquals(1, declarators.length);
- IASTArrayDeclarator declarator_b = (IASTArrayDeclarator) declarators[0];
- IASTName name_b = declarator_b.getName();
- assertEquals("b", name_b.toString());
- array_modifiers = declarator_b.getArrayModifiers();
- assertNotNull(array_modifiers);
- assertEquals(1, array_modifiers.length);
- threads = (IUPCASTKeywordExpression) array_modifiers[0].getConstantExpression();
- assertEquals(IUPCASTKeywordExpression.kw_threads, threads.getKeywordKind());
-
- // shared [90] int c [10];
- IASTSimpleDeclaration decl_c = (IASTSimpleDeclaration) declarations[2];
- IUPCASTSimpleDeclSpecifier declspec_c = (IUPCASTSimpleDeclSpecifier) decl_c.getDeclSpecifier();
- assertEquals(IUPCASTDeclSpecifier.rt_unspecified, declspec_c.getReferenceType());
- assertEquals(IUPCASTDeclSpecifier.sh_shared_constant_expression, declspec_c.getSharedQualifier());
- assertEquals(IASTSimpleDeclSpecifier.t_int, declspec_c.getType());
- @SuppressWarnings("unused")
- IASTLiteralExpression literalExpr = (IASTLiteralExpression) declspec_c.getBlockSizeExpression();
- declarators = decl_c.getDeclarators();
- assertNotNull(declarators);
- assertEquals(1, declarators.length);
- IASTArrayDeclarator declarator_c = (IASTArrayDeclarator) declarators[0];
- IASTName name_c = declarator_c.getName();
- assertEquals("c", name_c.toString());
- array_modifiers = declarator_c.getArrayModifiers();
- assertNotNull(array_modifiers);
- assertEquals(1, array_modifiers.length);
- assertNotNull(array_modifiers[0].getConstantExpression());
-
- // shared [*] int d [];
- IASTSimpleDeclaration decl_d = (IASTSimpleDeclaration) declarations[3];
- IUPCASTSimpleDeclSpecifier declspec_d = (IUPCASTSimpleDeclSpecifier) decl_d.getDeclSpecifier();
- assertEquals(IUPCASTDeclSpecifier.rt_unspecified, declspec_d.getReferenceType());
- assertEquals(IUPCASTDeclSpecifier.sh_shared_pure_allocation, declspec_d.getSharedQualifier());
- assertEquals(IASTSimpleDeclSpecifier.t_int, declspec_d.getType());
- assertNull(declspec_d.getBlockSizeExpression());
- declarators = decl_d.getDeclarators();
- assertNotNull(declarators);
- assertEquals(1, declarators.length);
- IASTArrayDeclarator declarator_d = (IASTArrayDeclarator) declarators[0];
- IASTName name_d = declarator_d.getName();
- assertEquals("d", name_d.toString());
- array_modifiers = declarator_d.getArrayModifiers();
- assertNotNull(array_modifiers);
- assertEquals(1, array_modifiers.length);
- assertNull(array_modifiers[0].getConstantExpression());
-
- IASTSimpleDeclaration decl_x = (IASTSimpleDeclaration) declarations[4];
- IUPCASTSimpleDeclSpecifier declspec_x = (IUPCASTSimpleDeclSpecifier) decl_x.getDeclSpecifier();
- assertEquals(IUPCASTDeclSpecifier.rt_relaxed, declspec_x.getReferenceType());
-
- IASTSimpleDeclaration decl_y = (IASTSimpleDeclaration) declarations[5];
- IUPCASTSimpleDeclSpecifier declspec_y = (IUPCASTSimpleDeclSpecifier) decl_y.getDeclSpecifier();
- assertEquals(IUPCASTDeclSpecifier.rt_strict, declspec_y.getReferenceType());
-
-
- IVariable binding_a = (IVariable) name_a.resolveBinding();
- assertNotNull(binding_a);
- assertEquals(globalScope, binding_a.getScope());
-
- IVariable binding_b = (IVariable) name_a.resolveBinding();
- assertNotNull(binding_b);
- assertEquals(globalScope, binding_b.getScope());
-
- IVariable binding_c = (IVariable) name_a.resolveBinding();
- assertNotNull(binding_c);
- assertEquals(globalScope, binding_c.getScope());
-
- IVariable binding_d = (IVariable) name_a.resolveBinding();
- assertNotNull(binding_d);
- assertEquals(globalScope, binding_d.getScope());
-
- }
-
-
-
- public void testUPCSharedDeclarations2() throws Exception {
- String code =
- "int x = 10;" +
- "shared [x] int a [];\n";
-
- IASTTranslationUnit tu = parseAndCheckBindings(code);
- IScope globalScope = tu.getScope();
- assertNotNull(globalScope);
-
- IASTDeclaration[] declarations = tu.getDeclarations();
- assertNotNull(declarations);
- assertEquals(2, declarations.length);
-
- IASTSimpleDeclaration decl_x = (IASTSimpleDeclaration) declarations[0];
-
- // shared [x] int a [];
- IASTSimpleDeclaration decl_a = (IASTSimpleDeclaration) declarations[1];
- IUPCASTSimpleDeclSpecifier declspec_a = (IUPCASTSimpleDeclSpecifier) decl_a.getDeclSpecifier();
- assertEquals(IUPCASTDeclSpecifier.rt_unspecified, declspec_a.getReferenceType());
- assertEquals(IUPCASTDeclSpecifier.sh_shared_constant_expression, declspec_a.getSharedQualifier());
- assertEquals(IASTSimpleDeclSpecifier.t_int, declspec_a.getType());
- IASTIdExpression expr_x = (IASTIdExpression) declspec_a.getBlockSizeExpression();
-
- IASTName name_x = expr_x.getName();
- IVariable binding_x = (IVariable) name_x.resolveBinding();
- assertNotNull(binding_x);
- assertEquals(decl_x.getDeclarators()[0].getName().resolveBinding(), binding_x);
- }
-
-
-
- public void testUPCForall1() throws Exception {
- String code =
- "int main() {\n" +
- " int i;\n" +
- " shared float *a;\n" +
- " upc_forall(i=0; i<N; i++; &a[i]) { \n" +
- " a[i] = 99; \n" +
- " } \n" +
- "}\n";
-
- IASTTranslationUnit tu = parse(code);
-
- IScope globalScope = tu.getScope();
- assertNotNull(globalScope);
-
- IASTDeclaration[] declarations = tu.getDeclarations();
- assertNotNull(declarations);
- assertEquals(1, declarations.length);
-
- IASTFunctionDefinition main = (IASTFunctionDefinition) declarations[0];
- IASTStatement[] body = ((IASTCompoundStatement)main.getBody()).getStatements();
- assertEquals(3, body.length);
-
- IASTSimpleDeclaration decl_i = (IASTSimpleDeclaration)((IASTDeclarationStatement)body[0]).getDeclaration();
- IVariable binding_i = (IVariable) decl_i.getDeclarators()[0].getName().resolveBinding();
-
- IASTSimpleDeclaration decl_a = (IASTSimpleDeclaration)((IASTDeclarationStatement)body[1]).getDeclaration();
- IVariable binding_a = (IVariable) decl_a.getDeclarators()[0].getName().resolveBinding();
-
- IUPCASTForallStatement forall = (IUPCASTForallStatement) body[2];
-
- IASTBinaryExpression expr1 = (IASTBinaryExpression)((IASTExpressionStatement)forall.getInitializerStatement()).getExpression();
- IASTName name_i_1 = ((IASTIdExpression)expr1.getOperand1()).getName();
-
- IASTBinaryExpression expr2 = (IASTBinaryExpression)forall.getConditionExpression();
- IASTName name_i_2 = ((IASTIdExpression)expr2.getOperand1()).getName();
-
- IASTUnaryExpression expr3 = (IASTUnaryExpression)forall.getIterationExpression();
- IASTName name_i_3 = ((IASTIdExpression)expr3.getOperand()).getName();
-
- IASTUnaryExpression expr4 = (IASTUnaryExpression)forall.getAffinityExpresiion();
- IASTName name_i_4 = ((IASTIdExpression)((IASTArraySubscriptExpression)expr4.getOperand()).getSubscriptExpression()).getName();
- IASTName name_a_1 = ((IASTIdExpression)((IASTArraySubscriptExpression)expr4.getOperand()).getArrayExpression()).getName();
-
- IASTBinaryExpression expr5 = (IASTBinaryExpression)((IASTExpressionStatement)((IASTCompoundStatement)forall.getBody()).getStatements()[0]).getExpression();
- IASTName name_i_5 = ((IASTIdExpression)((IASTArraySubscriptExpression)expr5.getOperand1()).getSubscriptExpression()).getName();
- IASTName name_a_2 = ((IASTIdExpression)((IASTArraySubscriptExpression)expr5.getOperand1()).getArrayExpression()).getName();
-
- // test binding resolution
- IVariable binding_i_1 = (IVariable) name_i_1.resolveBinding();
- assertNotNull(binding_i_1);
- assertEquals(binding_i, binding_i_1);
-
- IVariable binding_i_2 = (IVariable) name_i_2.resolveBinding();
- assertNotNull(binding_i_2);
- assertEquals(binding_i, binding_i_2);
-
- IVariable binding_i_3 = (IVariable) name_i_3.resolveBinding();
- assertNotNull(binding_i_3);
- assertEquals(binding_i, binding_i_3);
-
- IVariable binding_i_4 = (IVariable) name_i_4.resolveBinding();
- assertNotNull(binding_i_4);
- assertEquals(binding_i, binding_i_4);
-
- IVariable binding_i_5 = (IVariable) name_i_5.resolveBinding();
- assertNotNull(binding_i_5);
- assertEquals(binding_i, binding_i_5);
-
- IVariable binding_a_1 = (IVariable) name_a_1.resolveBinding();
- assertNotNull(binding_a_1);
- assertEquals(binding_a, binding_a_1);
-
- IVariable binding_a_2 = (IVariable) name_a_2.resolveBinding();
- assertNotNull(binding_a_2);
- assertEquals(binding_a, binding_a_2);
- }
-
-
- /**
- * Test a declaration inside a upc_forall definition.
- */
- public void testUPCForall2() throws Exception {
- String code =
- "int main() {\n" +
- " shared float *a;\n" +
- " upc_forall(int i=0; i<N; i++; &a[i]) { \n" +
- " a[i] = 99; \n" +
- " } \n" +
- "}\n";
-
- IASTTranslationUnit tu = parse(code);
-
- IScope globalScope = tu.getScope();
- assertNotNull(globalScope);
-
- IASTDeclaration[] declarations = tu.getDeclarations();
- assertNotNull(declarations);
- assertEquals(1, declarations.length);
-
- IASTFunctionDefinition main = (IASTFunctionDefinition) declarations[0];
- IASTStatement[] body = ((IASTCompoundStatement)main.getBody()).getStatements();
- assertEquals(2, body.length);
-
- IASTSimpleDeclaration decl_a = (IASTSimpleDeclaration)((IASTDeclarationStatement)body[0]).getDeclaration();
- IVariable binding_a = (IVariable) decl_a.getDeclarators()[0].getName().resolveBinding();
-
- IUPCASTForallStatement forall = (IUPCASTForallStatement) body[1];
-
- IASTSimpleDeclaration decl_i = (IASTSimpleDeclaration)((IASTDeclarationStatement)forall.getInitializerStatement()).getDeclaration();
- IVariable binding_i = (IVariable) decl_i.getDeclarators()[0].getName().resolveBinding();
-
- IASTBinaryExpression expr2 = (IASTBinaryExpression)forall.getConditionExpression();
- IASTName name_i_2 = ((IASTIdExpression)expr2.getOperand1()).getName();
-
- IASTUnaryExpression expr3 = (IASTUnaryExpression)forall.getIterationExpression();
- IASTName name_i_3 = ((IASTIdExpression)expr3.getOperand()).getName();
-
- IASTUnaryExpression expr4 = (IASTUnaryExpression)forall.getAffinityExpresiion();
- IASTName name_i_4 = ((IASTIdExpression)((IASTArraySubscriptExpression)expr4.getOperand()).getSubscriptExpression()).getName();
- IASTName name_a_1 = ((IASTIdExpression)((IASTArraySubscriptExpression)expr4.getOperand()).getArrayExpression()).getName();
-
- IASTBinaryExpression expr5 = (IASTBinaryExpression)((IASTExpressionStatement)((IASTCompoundStatement)forall.getBody()).getStatements()[0]).getExpression();
- IASTName name_i_5 = ((IASTIdExpression)((IASTArraySubscriptExpression)expr5.getOperand1()).getSubscriptExpression()).getName();
- IASTName name_a_2 = ((IASTIdExpression)((IASTArraySubscriptExpression)expr5.getOperand1()).getArrayExpression()).getName();
-
- // test binding resolution
- IVariable binding_i_2 = (IVariable) name_i_2.resolveBinding();
- assertNotNull(binding_i_2);
- assertEquals(binding_i, binding_i_2);
-
- IVariable binding_i_3 = (IVariable) name_i_3.resolveBinding();
- assertNotNull(binding_i_3);
- assertEquals(binding_i, binding_i_3);
-
- IVariable binding_i_4 = (IVariable) name_i_4.resolveBinding();
- assertNotNull(binding_i_4);
- assertEquals(binding_i, binding_i_4);
-
- IVariable binding_i_5 = (IVariable) name_i_5.resolveBinding();
- assertNotNull(binding_i_5);
- assertEquals(binding_i, binding_i_5);
-
- IVariable binding_a_1 = (IVariable) name_a_1.resolveBinding();
- assertNotNull(binding_a_1);
- assertEquals(binding_a, binding_a_1);
-
- IVariable binding_a_2 = (IVariable) name_a_2.resolveBinding();
- assertNotNull(binding_a_2);
- assertEquals(binding_a, binding_a_2);
- }
-
- /**
- * Test 'continue' inside upc_forall
- */
- public void testUPCForall3() throws Exception {
- String code =
- "int main() {\n" +
- " upc_forall(int i=0; i<N; i++; continue) { \n" +
- " } \n" +
- "}\n";
-
- IASTTranslationUnit tu = parse(code);
-
- IASTDeclaration[] declarations = tu.getDeclarations();
- assertNotNull(declarations);
- assertEquals(1, declarations.length);
-
- IASTFunctionDefinition main = (IASTFunctionDefinition) declarations[0];
- IASTStatement[] body = ((IASTCompoundStatement)main.getBody()).getStatements();
- assertEquals(1, body.length);
-
-
- IUPCASTForallStatement forall = (IUPCASTForallStatement) body[0];
-
- assertTrue(forall.isAffinityContinue());
- assertNull(forall.getAffinityExpresiion());
- }
-
-
- public void testUPCSynchronizationStatment() throws Exception {
- String code =
- "int main() {\n" +
- " upc_notify 1;\n" +
- " upc_notify;\n" +
- " upc_wait 1;\n" +
- " upc_wait;\n" +
- " upc_barrier 1;\n" +
- " upc_barrier;\n" +
- " upc_fence;\n" +
- "}\n";
-
- IASTTranslationUnit tu = parse(code);
-
- IASTDeclaration[] declarations = tu.getDeclarations();
- assertNotNull(declarations);
- assertEquals(1, declarations.length);
-
- IASTFunctionDefinition main = (IASTFunctionDefinition) declarations[0];
- IASTStatement[] body = ((IASTCompoundStatement)main.getBody()).getStatements();
- assertEquals(7, body.length);
-
- IUPCASTSynchronizationStatement stat;
-
- stat = (IUPCASTSynchronizationStatement) body[0];
- assertEquals(stat.getStatementKind(), IUPCASTSynchronizationStatement.st_upc_notify);
- assertNotNull(stat.getBarrierExpression());
-
- stat = (IUPCASTSynchronizationStatement) body[1];
- assertEquals(stat.getStatementKind(), IUPCASTSynchronizationStatement.st_upc_notify);
- assertNull(stat.getBarrierExpression());
-
- stat = (IUPCASTSynchronizationStatement) body[2];
- assertEquals(stat.getStatementKind(), IUPCASTSynchronizationStatement.st_upc_wait);
- assertNotNull(stat.getBarrierExpression());
-
- stat = (IUPCASTSynchronizationStatement) body[3];
- assertEquals(stat.getStatementKind(), IUPCASTSynchronizationStatement.st_upc_wait);
- assertNull(stat.getBarrierExpression());
-
- stat = (IUPCASTSynchronizationStatement) body[4];
- assertEquals(stat.getStatementKind(), IUPCASTSynchronizationStatement.st_upc_barrier);
- assertNotNull(stat.getBarrierExpression());
-
- stat = (IUPCASTSynchronizationStatement) body[5];
- assertEquals(stat.getStatementKind(), IUPCASTSynchronizationStatement.st_upc_barrier);
- assertNull(stat.getBarrierExpression());
-
- stat = (IUPCASTSynchronizationStatement) body[6];
- assertEquals(stat.getStatementKind(), IUPCASTSynchronizationStatement.st_upc_fence);
- assertNull(stat.getBarrierExpression());
- }
-
- public void testUPCSizeofExpressions() throws Exception {
- String code =
- "int main() {\n" +
- " sizeof(int); \n" +
- " sizeof x; \n" +
- " upc_localsizeof(int); \n" +
- " upc_localsizeof x; \n" +
- " upc_blocksizeof(int); \n" +
- " upc_blocksizeof x; \n" +
- " upc_elemsizeof(int); \n" +
- " upc_elemsizeof x; \n" +
- "}\n";
-
- IASTTranslationUnit tu = parse(code);
-
- IASTDeclaration[] declarations = tu.getDeclarations();
- assertNotNull(declarations);
- assertEquals(1, declarations.length);
-
- IASTFunctionDefinition main = (IASTFunctionDefinition) declarations[0];
- IASTStatement[] body = ((IASTCompoundStatement)main.getBody()).getStatements();
- assertEquals(8, body.length);
-
- @SuppressWarnings("unused")
- IASTTypeIdExpression cidexpr = (IASTTypeIdExpression)((IASTExpressionStatement)body[0]).getExpression();
-
- IASTUnaryExpression cexpr = (IASTUnaryExpression)((IASTExpressionStatement)body[1]).getExpression();
- assertEquals(IASTUnaryExpression.op_sizeof, cexpr.getOperator());
-
- IUPCASTUnarySizeofExpression expr;
- IUPCASTTypeIdSizeofExpression idexpr;
-
- idexpr = (IUPCASTTypeIdSizeofExpression)((IASTExpressionStatement)body[2]).getExpression();
- assertEquals(IASTTypeIdExpression.op_sizeof, idexpr.getOperator());
- assertEquals(IUPCASTTypeIdSizeofExpression.upc_localsizeof, idexpr.getUPCSizeofOperator());
-
- expr = (IUPCASTUnarySizeofExpression)((IASTExpressionStatement)body[3]).getExpression();
- assertEquals(IASTUnaryExpression.op_sizeof, expr.getOperator());
- assertEquals(IUPCASTUnarySizeofExpression.upc_localsizeof, expr.getUPCSizeofOperator());
-
- idexpr = (IUPCASTTypeIdSizeofExpression)((IASTExpressionStatement)body[4]).getExpression();
- assertEquals(IASTTypeIdExpression.op_sizeof, idexpr.getOperator());
- assertEquals(IUPCASTTypeIdSizeofExpression.upc_blocksizeof, idexpr.getUPCSizeofOperator());
-
- expr = (IUPCASTUnarySizeofExpression)((IASTExpressionStatement)body[5]).getExpression();
- assertEquals(IASTUnaryExpression.op_sizeof, expr.getOperator());
- assertEquals(IUPCASTUnarySizeofExpression.upc_blocksizeof, expr.getUPCSizeofOperator());
-
- idexpr = (IUPCASTTypeIdSizeofExpression)((IASTExpressionStatement)body[6]).getExpression();
- assertEquals(IASTTypeIdExpression.op_sizeof, idexpr.getOperator());
- assertEquals(IUPCASTTypeIdSizeofExpression.upc_elemsizeof, idexpr.getUPCSizeofOperator());
-
- expr = (IUPCASTUnarySizeofExpression)((IASTExpressionStatement)body[7]).getExpression();
- assertEquals(IASTUnaryExpression.op_sizeof, expr.getOperator());
- assertEquals(IUPCASTUnarySizeofExpression.upc_elemsizeof, expr.getUPCSizeofOperator());
- }
-
-
- public void testUPCSizeofExpressionsDisambiguate() throws Exception {
- String code =
- "int foo() {" +
- " typedef int t;" +
- " int x;" +
- " upc_blocksizeof(t);" +
- " upc_blocksizeof(x);" +
- "}";
-
- IASTTranslationUnit tu = parse(code);
-
- IASTDeclaration[] declarations = tu.getDeclarations();
- IASTFunctionDefinition main = (IASTFunctionDefinition) declarations[0];
- IASTStatement[] body = ((IASTCompoundStatement)main.getBody()).getStatements();
-
- assertTrue(((IASTExpressionStatement)body[2]).getExpression() instanceof IUPCASTTypeIdSizeofExpression);
- assertTrue(((IASTExpressionStatement)body[3]).getExpression() instanceof IUPCASTUnarySizeofExpression);
- }
-}
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCParserTestSuite.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCParserTestSuite.java
deleted file mode 100644
index ff84f06..0000000
--- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCParserTestSuite.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.core.parser.upc.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class UPCParserTestSuite extends TestSuite {
-
- public static Test suite() {
- return new TestSuite() {{
- addTestSuite(UPCCommentTests.class);
- addTestSuite(UPCCompletionBasicTest.class);
- addTestSuite(UPCCompletionParseTest.class);
- addTestSuite(UPCDOMLocationInclusionTests.class);
- addTestSuite(UPCDOMLocationMacroTests.class);
- addTestSuite(UPCDOMLocationTests.class);
- addTestSuite(UPCDOMPreprocessorInformationTest.class);
- addTestSuite(UPCKnRTests.class);
- addTestSuite(UPCSelectionParseTest.class);
- addTestSuite(UPCCSpecTests.class);
- addTestSuite(UPCTests.class);
- addTestSuite(UPCLanguageExtensionTests.class);
- addTestSuite(UPCDigraphTrigraphTests.class);
- addTestSuite(UPCGCCTests.class);
- addTestSuite(UPCUtilOldTests.class);
- addTestSuite(UPCUtilTests.class);
- addTestSuite(UPCCompleteParser2Tests.class);
- addTestSuite(UPCTaskParserTest.class);
- }};
- }
-}
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCSelectionParseTest.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCSelectionParseTest.java
deleted file mode 100644
index 6b1345b..0000000
--- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCSelectionParseTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.core.parser.upc.tests;
-
-import org.eclipse.cdt.core.dom.upc.UPCLanguage;
-import org.eclipse.cdt.core.lrparser.tests.LRSelectionParseTest;
-import org.eclipse.cdt.core.model.ILanguage;
-
-public class UPCSelectionParseTest extends LRSelectionParseTest {
-
- public UPCSelectionParseTest() { }
- public UPCSelectionParseTest(String name) { super(name); }
-
-
- @Override
- protected ILanguage getC99Language() {
- return UPCLanguage.getDefault();
- }
-}
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCTaskParserTest.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCTaskParserTest.java
deleted file mode 100644
index 2bfdf83..0000000
--- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCTaskParserTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.core.parser.upc.tests;
-
-import org.eclipse.cdt.core.dom.upc.UPCLanguage;
-import org.eclipse.cdt.core.lrparser.tests.LRTaskParserTest;
-import org.eclipse.cdt.core.model.ILanguage;
-
-public class UPCTaskParserTest extends LRTaskParserTest {
-
- @Override
- protected ILanguage getC99Language() {
- return UPCLanguage.getDefault();
- }
-
-}
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCTests.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCTests.java
deleted file mode 100644
index d2c2452..0000000
--- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCTests.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.core.parser.upc.tests;
-
-import junit.framework.TestSuite;
-
-import org.eclipse.cdt.core.dom.upc.UPCLanguage;
-import org.eclipse.cdt.core.lrparser.tests.LRTests;
-import org.eclipse.cdt.core.model.ILanguage;
-/**
- * Run the C99 tests against the UPC parser
- *
- */
-public class UPCTests extends LRTests {
-
- public static TestSuite suite() {
- return suite(UPCTests.class);
- }
-
- public UPCTests(String name) {
- super(name);
- }
-
- @Override
- protected ILanguage getC99Language() {
- return UPCLanguage.getDefault();
- }
-
-}
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCUtilOldTests.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCUtilOldTests.java
deleted file mode 100644
index 3c29524..0000000
--- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCUtilOldTests.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.core.parser.upc.tests;
-
-import org.eclipse.cdt.core.dom.upc.UPCLanguage;
-import org.eclipse.cdt.core.lrparser.tests.LRUtilOldTests;
-import org.eclipse.cdt.core.model.ILanguage;
-
-public class UPCUtilOldTests extends LRUtilOldTests {
-
- @Override
- protected ILanguage getC99Language() {
- return UPCLanguage.getDefault();
- }
-
-}
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCUtilTests.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCUtilTests.java
deleted file mode 100644
index b3cb530..0000000
--- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCUtilTests.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.core.parser.upc.tests;
-
-import org.eclipse.cdt.core.dom.upc.UPCLanguage;
-import org.eclipse.cdt.core.lrparser.tests.LRUtilTests;
-import org.eclipse.cdt.core.model.ILanguage;
-
-public class UPCUtilTests extends LRUtilTests {
-
- @Override
- protected ILanguage getC99Language() {
- return UPCLanguage.getDefault();
- }
-
-}
diff --git a/windows/org.eclipse.cdt.msw.build/.classpath b/windows/org.eclipse.cdt.msw.build/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/windows/org.eclipse.cdt.msw.build/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/windows/org.eclipse.cdt.msw.build/.cvsignore b/windows/org.eclipse.cdt.msw.build/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/windows/org.eclipse.cdt.msw.build/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/windows/org.eclipse.cdt.msw.build/.project b/windows/org.eclipse.cdt.msw.build/.project
deleted file mode 100644
index e97910d..0000000
--- a/windows/org.eclipse.cdt.msw.build/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.cdt.msw.build</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/windows/org.eclipse.cdt.msw.build/.settings/org.eclipse.jdt.core.prefs b/windows/org.eclipse.cdt.msw.build/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0f0eb30..0000000
--- a/windows/org.eclipse.cdt.msw.build/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Jul 23 15:38:07 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/windows/org.eclipse.cdt.msw.build/META-INF/MANIFEST.MF b/windows/org.eclipse.cdt.msw.build/META-INF/MANIFEST.MF
deleted file mode 100644
index 492bcb7..0000000
--- a/windows/org.eclipse.cdt.msw.build/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: MSVC Build Integration Plug-in
-Bundle-SymbolicName: org.eclipse.cdt.msw.build;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.cdt.msw.build.Activator
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.cdt.core,
- org.eclipse.cdt.managedbuilder.core
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/windows/org.eclipse.cdt.msw.build/build.properties b/windows/org.eclipse.cdt.msw.build/build.properties
deleted file mode 100644
index 30b2fc4..0000000
--- a/windows/org.eclipse.cdt.msw.build/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.properties,\
- plugin.xml
diff --git a/windows/org.eclipse.cdt.msw.build/plugin.properties b/windows/org.eclipse.cdt.msw.build/plugin.properties
deleted file mode 100644
index 05150db..0000000
--- a/windows/org.eclipse.cdt.msw.build/plugin.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-toolchain.name=Microsoft Visual C++
-
-compiler.name=C/C++ Compiler (cl)
-rc.name=Resource Compiler (rc)
-linker.name=Linker (link)
-lib.name=Library Manager (lib)
-
-config.debug=Debug
-config.release=Release
\ No newline at end of file
diff --git a/windows/org.eclipse.cdt.msw.build/plugin.xml b/windows/org.eclipse.cdt.msw.build/plugin.xml
deleted file mode 100644
index bb86d18..0000000
--- a/windows/org.eclipse.cdt.msw.build/plugin.xml
+++ /dev/null
@@ -1,648 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
- <extension
- point="org.eclipse.cdt.managedbuilder.core.buildDefinitions">
- <managedBuildRevision fileVersion="4.0.0"/>
- <toolChain
- archList="all"
- configurationEnvironmentSupplier="org.eclipse.cdt.msw.build.WinEnvironmentVariableSupplier"
- id="org.eclipse.cdt.msvc.toolchain.base"
- isAbstract="true"
- name="%toolchain.name"
- osList="win32"
- targetTool="org.eclipse.cdt.msvc.link;org.eclipse.cdt.msvc.lib">
- <targetPlatform
- archList="all"
- binaryParser="org.eclipse.cdt.core.PE"
- id="org.eclipse.cdt.msvc.targetPlatform"
- osList="win32">
- </targetPlatform>
- <builder
- id="org.eclipse.cdt.msvc.builder"
- isVariableCaseSensitive="false"
- superClass="org.eclipse.cdt.build.core.internal.builder">
- </builder>
- <tool
- command="cl /c"
- errorParsers="org.eclipse.cdt.core.VCErrorParser"
- id="org.eclipse.cdt.msvc.cl"
- name="%compiler.name"
- natureFilter="both"
- outputFlag="/Fo">
- <supportedProperties>
- <property
- id="org.eclipse.cdt.build.core.buildType">
- <value
- id="org.eclipse.cdt.build.core.buildType.debug">
- </value>
- <value
- id="org.eclipse.cdt.build.core.buildType.release">
- </value>
- </property>
- </supportedProperties>
- <optionCategory
- id="org.eclipse.cdt.msvc.cl.optionCategory.optimization"
- name="Optimization"/>
- <option
- category="org.eclipse.cdt.msvc.cl.optionCategory.optimization"
- id="org.eclipse.cdt.msvc.cl.option.optimization"
- name="Optimization"
- resourceFilter="all"
- valueType="enumerated">
- <enumeratedOptionValue
- id="org.eclipse.cdt.msvc.cl.option.optimization.default"
- isDefault="false"
- name="Default"/>
- <enumeratedOptionValue
- command="/O1"
- id="org.eclipse.cdt.msvc.cl.option.optimization.1"
- isDefault="false"
- name="Minimize Size (/O1)"/>
- <enumeratedOptionValue
- command="/O2"
- id="org.eclipse.cdt.msvc.cl.option.optimization.2"
- isDefault="true"
- name="Maximize Speed (/O2)"/>
- <enablement
- attribute="value"
- extensionAdjustment="false"
- type="CONTAINER_ATTRIBUTE"
- value="org.eclipse.cdt.msvc.cl.option.optimization.2">
- <checkBuildProperty
- property="org.eclipse.cdt.build.core.buildType"
- value="org.eclipse.cdt.build.core.buildType.release">
- </checkBuildProperty>
- </enablement>
- <enablement
- attribute="value"
- extensionAdjustment="false"
- type="CONTAINER_ATTRIBUTE"
- value="org.eclipse.cdt.msvc.cl.option.optimization.default">
- <checkBuildProperty
- property="org.eclipse.cdt.build.core.buildType"
- value="org.eclipse.cdt.build.core.buildType.debug">
- </checkBuildProperty>
- </enablement>
- </option>
- <optionCategory
- id="org.eclipse.cdt.msvc.cl.optionCategory.codegen"
- name="Code Generation"/>
- <option
- category="org.eclipse.cdt.msvc.cl.optionCategory.codegen"
- id="org.eclipse.cdt.msvc.cl.option.arch"
- name="Minimum CPU Architecture"
- resourceFilter="all"
- valueType="enumerated">
- <enumeratedOptionValue
- id="org.eclipse.cdt.msvc.cl.option.arch.default"
- isDefault="true"
- name="Default"/>
- <enumeratedOptionValue
- command="/arch:SSE"
- id="org.eclipse.cdt.msvc.cl.option.arch.sse"
- isDefault="false"
- name="SSE (/arch:SSE)"/>
- <enumeratedOptionValue
- id="org.eclipse.cdt.msvc.cl.option.arch.sse2"
- isDefault="false"
- name="SSE2 (/arch:SSE2)"/>
- </option>
- <option
- category="org.eclipse.cdt.msvc.cl.optionCategory.codegen"
- command="/clr"
- defaultValue="false"
- id="org.eclipse.cdt.msvc.cl.option.clr"
- name="Common Language Runtime (/clr)"
- resourceFilter="all"
- valueType="boolean"/>
- <option
- category="org.eclipse.cdt.msvc.cl.optionCategory.codegen"
- command="/EHs"
- defaultValue="true"
- id="org.eclipse.cdt.msvc.cl.option.exceptions"
- name="Enable C++ Exception Handling (/EHs)"
- resourceFilter="all"
- valueType="boolean"/>
- <option
- category="org.eclipse.cdt.msvc.cl.optionCategory.codegen"
- commandFalse="/GR-"
- defaultValue="true"
- id="org.eclipse.cdt.msvc.cl.option.rtti"
- name="Enable Run-Time Type Information (/GR)"
- resourceFilter="all"
- valueType="boolean"/>
- <option
- category="org.eclipse.cdt.msvc.cl.optionCategory.codegen"
- id="org.eclipse.cdt.msvc.cl.option.runtime"
- name="Run-Time Library"
- resourceFilter="all"
- valueType="enumerated">
- <enumeratedOptionValue
- command="/MT"
- id="org.eclipse.cdt.msvc.cl.option.runtime.mt"
- isDefault="false"
- name="Multi-Threaded Static (/MT)"/>
- <enumeratedOptionValue
- command="/MTd"
- id="org.eclipse.cdt.msvc.cl.option.runtime.mtd"
- isDefault="false"
- name="Multi-Threaded Static Debug (/MTd)"/>
- <enumeratedOptionValue
- command="/MD"
- id="org.eclipse.cdt.msvc.cl.option.runtime.md"
- isDefault="true"
- name="Multi-Threaded DLL (/MD)"/>
- <enumeratedOptionValue
- command="/MDd"
- id="org.eclipse.cdt.msvc.cl.option.runtime.mdd"
- isDefault="false"
- name="Multi-Threaded DLL Debug (/MDd)"/>
- </option>
- <optionCategory
- id="org.eclipse.cdt.msvc.cl.optionCategory.debug"
- name="Debugging"/>
- <option
- category="org.eclipse.cdt.msvc.cl.optionCategory.debug"
- id="org.eclipse.cdt.msvc.cl.option.debugFormat"
- name="Debug Information Format"
- resourceFilter="all"
- valueType="enumerated">
- <enumeratedOptionValue
- id="org.eclipse.cdt.msvc.cl.option.debugFormat.none"
- isDefault="true"
- name="None"/>
- <enumeratedOptionValue
- command="/Z7"
- id="org.eclipse.cdt.msvc.cl.option.debugFormat.c7"
- isDefault="false"
- name="C7 Compatible (/Z7)"/>
- <enumeratedOptionValue
- command="/Zi"
- id="org.eclipse.cdt.msvc.cl.option.debugFormat.complete"
- isDefault="false"
- name="Complete (/Zi)"/>
- <enablement
- attribute="value"
- extensionAdjustment="false"
- type="CONTAINER_ATTRIBUTE"
- value="org.eclipse.cdt.msvc.cl.option.debugFormat.none">
- <checkBuildProperty
- property="org.eclipse.cdt.build.core.buildType"
- value="org.eclipse.cdt.build.core.buildType.release">
- </checkBuildProperty>
- </enablement>
- <enablement
- attribute="value"
- extensionAdjustment="false"
- type="CONTAINER_ATTRIBUTE"
- value="org.eclipse.cdt.msvc.cl.option.debugFormat.complete">
- <checkBuildProperty
- property="org.eclipse.cdt.build.core.buildType"
- value="org.eclipse.cdt.build.core.buildType.debug">
- </checkBuildProperty>
- </enablement>
- </option>
- <optionCategory
- id="org.eclipse.cdt.msvc.cl.optionCategory.preprocessor"
- name="Preprocessor"/>
- <option
- category="org.eclipse.cdt.msvc.cl.optionCategory.preprocessor"
- command="/D"
- id="org.eclipse.cdt.msvc.cl.option.macros"
- name="Defines (/D)"
- resourceFilter="all"
- valueType="definedSymbols"/>
- <option
- browseType="directory"
- category="org.eclipse.cdt.msvc.cl.optionCategory.preprocessor"
- command="/I"
- id="org.eclipse.cdt.msvc.cl.option.includes"
- name="Include Path (/I)"
- resourceFilter="all"
- valueType="includePath"/>
- <optionCategory
- id="org.eclipse.cdt.msvc.cl.optionCategory.language"
- name="Language"/>
- <option
- category="org.eclipse.cdt.msvc.cl.optionCategory.language"
- command="/openmp"
- defaultValue="false"
- id="org.eclipse.cdt.msvc.cl.option.openmp"
- name="Enable OpenMP (/openmp)"
- resourceFilter="all"
- valueType="boolean"/>
- <option
- category="org.eclipse.cdt.msvc.cl.optionCategory.language"
- commandFalse="/Za"
- defaultValue="true"
- id="org.eclipse.cdt.msvc.cl.option.langExtensions"
- name="Enable Language Extensions (/Ze,/Za)"
- resourceFilter="all"
- valueType="boolean"/>
- <optionCategory
- id="org.eclipse.cdt.msvc.cl.optionCategory.miscellaneous"
- name="Miscellaneous"/>
- <option
- category="org.eclipse.cdt.msvc.cl.optionCategory.miscellaneous"
- command="/nologo"
- defaultValue="true"
- id="org.eclipse.cdt.msvc.cl.option.nologo"
- name="Suppress Banner (/nologo)"
- resourceFilter="all"
- valueType="boolean"/>
- <option
- category="org.eclipse.cdt.msvc.cl.optionCategory.miscellaneous"
- id="org.eclipse.cdt.msvc.cl.option.others"
- name="Other Options"
- resourceFilter="all"
- valueType="stringList"/>
- <inputType
- dependencyContentType="org.eclipse.cdt.core.cxxHeader"
- id="org.eclipse.cdt.msvc.cl.inputType"
- scannerConfigDiscoveryProfileId="org.eclipse.cdt.msw.build.clScannerInfo"
- sourceContentType="org.eclipse.cdt.core.cxxSource">
- </inputType>
- <outputType
- id="org.eclipse.cdt.msvc.cl.outputType"
- outputs="obj">
- </outputType>
- </tool>
- <tool
- command="rc"
- errorParsers="org.eclipse.cdt.core.VCErrorParser"
- id="org.eclipse.cdt.msvc.rc"
- name="%rc.name"
- natureFilter="both"
- outputFlag="/Fo"
- >
- <optionCategory
- id="org.eclipse.cdt.msvc.rc.optionCategory.preprocessor"
- name="Preprocessor"/>
- <option
- browseType="directory"
- category="org.eclipse.cdt.msvc.rc.optionCategory.preprocessor"
- command="/I"
- id="org.eclipse.cdt.msvc.rc.option.includes"
- name="Include Path (/I)"
- resourceFilter="all"
- valueType="includePath"/>
- <option
- category="org.eclipse.cdt.msvc.rc.optionCategory.preprocessor"
- command="/D"
- id="org.eclipse.cdt.msvc.rc.option.defines"
- name="Defines (/D)"
- resourceFilter="all"
- valueType="definedSymbols"/>
- <optionCategory
- id="org.eclipse.cdt.msvc.rc.optionCategory.misc"
- name="Miscellaneous"/>
- <option
- category="org.eclipse.cdt.msvc.rc.optionCategory.misc"
- id="org.eclipse.cdt.msvc.rc.option.others"
- name="Other Options"
- resourceFilter="all"
- valueType="stringList"/>
- <inputType
- id="org.eclipse.cdt.msvc.rc.inputType"
- sources="rc">
- </inputType>
- <outputType
- id="org.eclipse.cdt.msvc.rc.outputType"
- outputs="res">
- </outputType>
- </tool>
- <tool
- command="link"
- errorParsers="org.eclipse.cdt.core.VCErrorParser"
- id="org.eclipse.cdt.msvc.link"
- name="%linker.name"
- natureFilter="both"
- outputFlag="/OUT:"
- >
- <supportedProperties>
- <property
- id="org.eclipse.cdt.build.core.buildArtefactType">
- <value
- id="org.eclipse.cdt.build.core.buildArtefactType.exe"></value>
- <value
- id="org.eclipse.cdt.build.core.buildArtefactType.sharedLib">
- </value>
- </property>
- </supportedProperties>
- <option
- command="/DLL"
- defaultValue="false"
- id="org.eclipse.cdt.msvc.link.option.dll"
- name="Build a DLL"
- resourceFilter="all"
- valueType="boolean">
- <enablement
- attribute="defaultValue"
- extensionAdjustment="false"
- type="CONTAINER_ATTRIBUTE"
- value="true">
- <checkBuildProperty
- property="org.eclipse.cdt.build.core.buildArtefactType"
- value="org.eclipse.cdt.build.core.buildArtefactType.sharedLib">
- </checkBuildProperty>
- </enablement>
- </option>
- <optionCategory
- id="org.eclipse.cdt.msvc.link.optionCategory.general"
- name="General"/>
- <option
- category="org.eclipse.cdt.msvc.link.optionCategory.general"
- command="/debug"
- defaultValue="false"
- id="org.eclipse.cdt.msvc.link.option.debug"
- name="Generate Debug Info (/debug)"
- resourceFilter="all"
- valueType="boolean"/>
- <option
- category="org.eclipse.cdt.msvc.link.optionCategory.general"
- command="/nologo"
- defaultValue="true"
- id="org.eclipse.cdt.msvc.link.option.nologo"
- name="Suppress Banner (/nologo)"
- resourceFilter="all"
- valueType="boolean"/>
- <option
- category="org.eclipse.cdt.msvc.link.optionCategory.general"
- id="org.eclipse.cdt.msvc.link.option.others"
- name="Other Options"
- resourceFilter="all"
- valueType="stringList"/>
- <optionCategory
- id="org.eclipse.cdt.msvc.link.optionCategory.libraries"
- name="Libraries"/>
- <option
- browseType="directory"
- category="org.eclipse.cdt.msvc.link.optionCategory.libraries"
- command="/libpath:"
- id="org.eclipse.cdt.msvc.link.option.libpath"
- name="Additional Libpath (/libpath)"
- resourceFilter="all"
- valueType="stringList"/>
- <option
- browseType="file"
- category="org.eclipse.cdt.msvc.link.optionCategory.libraries"
- id="org.eclipse.cdt.msvc.link.option.libraries"
- name="Libraries"
- resourceFilter="all"
- valueType="libs"/>
- <inputType
- id="org.eclipse.cdt.msvc.link.inputType"
- multipleOfType="true"
- sources="res,obj">
- </inputType>
- <outputType
- id="org.eclipse.cdt.msvc.link.outputType"
- outputs="exe">
- </outputType>
- <outputType
- id="org.eclipse.cdt.msvc.link.outputType.dll"
- outputs="dll">
- </outputType>
- </tool>
- <tool
- command="lib"
- id="org.eclipse.cdt.msvc.lib"
- name="%lib.name"
- natureFilter="both"
- outputFlag="/OUT:"
- >
- <supportedProperties>
- <property
- id="org.eclipse.cdt.build.core.buildArtefactType">
- <value
- id="org.eclipse.cdt.build.core.buildArtefactType.staticLib">
- </value>
- </property>
- </supportedProperties>
- <optionCategory
- id="org.eclipse.cdt.msvc.lib.optionCategory.general"
- name="General"/>
- <option
- category="org.eclipse.cdt.msvc.lib.optionCategory.general"
- command="/nologo"
- defaultValue="true"
- id="org.eclipse.cdt.msvc.lib.option.nologo"
- name="Suppress Banner (/nologo)"
- resourceFilter="all"
- valueType="boolean"/>
- <inputType
- id="org.eclipse.cdt.msvc.lib.inputType"
- sources="obj,res">
- </inputType>
- <outputType
- id="org.eclipse.cdt.msvc.lib.outputType"
- outputs="lib">
- </outputType>
- </tool>
- </toolChain>
- <configuration
- artifactExtension="exe"
- id="org.eclipse.cdt.msvc.configuration">
- <enablement
- attribute="artifactExtension"
- extensionAdjustment="false"
- type="CONTAINER_ATTRIBUTE"
- value="dll">
- <checkBuildProperty
- property="org.eclipse.cdt.build.core.buildArtefactType"
- value="org.eclipse.cdt.build.core.buildArtefactType.sharedLib"></checkBuildProperty>
- </enablement>
- <enablement
- attribute="artifactExtension"
- extensionAdjustment="false"
- type="CONTAINER_ATTRIBUTE"
- value="lib">
- <checkBuildProperty
- property="org.eclipse.cdt.build.core.buildArtefactType"
- value="org.eclipse.cdt.build.core.buildArtefactType.staticLib"></checkBuildProperty>
- </enablement>
- </configuration>
- <projectType
- buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe"
- id="org.eclipse.cdt.msvc.projectType.exe"
- projectEnvironmentSupplier="org.eclipse.cdt.msw.build.WinEnvironmentVariableSupplier">
- <configuration
- buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug"
- id="org.eclipse.cdt.msvc.exe.debug"
- name="%config.debug"
- parent="org.eclipse.cdt.msvc.configuration">
- <toolChain
- id="org.eclipse.cdt.msvc.toolchain.exe.debug"
- superClass="org.eclipse.cdt.msvc.toolchain.base">
- <targetPlatform
- id="org.eclipse.cdt.msvc.targetPlatform.exe.debug"
- superClass="org.eclipse.cdt.msvc.targetPlatform">
- </targetPlatform>
- <tool
- id="org.eclipse.cdt.msvc.cl.exe.debug"
- superClass="org.eclipse.cdt.msvc.cl">
- </tool>
- <tool
- id="org.eclipse.cdt.msvc.rc.exe.debug"
- superClass="org.eclipse.cdt.msvc.rc">
- </tool>
- <tool
- id="org.eclipse.cdt.msvc.link.exe.debug"
- superClass="org.eclipse.cdt.msvc.link">
- </tool>
- </toolChain>
- </configuration>
- <configuration
- buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release"
- id="org.eclipse.cdt.msvc.exe.release"
- name="%config.release"
- parent="org.eclipse.cdt.msvc.configuration">
- <toolChain
- id="org.eclipse.cdt.msvc.toolchain.exe.release"
- superClass="org.eclipse.cdt.msvc.toolchain.base">
- <targetPlatform
- id="org.eclipse.cdt.msvc.targetPlatform.exe.release"
- superClass="org.eclipse.cdt.msvc.targetPlatform">
- </targetPlatform>
- <tool
- id="org.eclipse.cdt.msvc.cl.exe.release"
- superClass="org.eclipse.cdt.msvc.cl">
- </tool>
- <tool
- id="org.eclipse.cdt.msvc.rc.exe.release"
- superClass="org.eclipse.cdt.msvc.rc">
- </tool>
- <tool
- id="org.eclipse.cdt.msvc.link.exe.release"
- superClass="org.eclipse.cdt.msvc.link">
- </tool>
- </toolChain>
- </configuration>
- </projectType>
- <projectType
- buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.sharedLib"
- id="org.eclipse.cdt.msvc.projectType.dll"
- projectEnvironmentSupplier="org.eclipse.cdt.msw.build.WinEnvironmentVariableSupplier">
- <configuration
- buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug"
- id="org.eclipse.cdt.msvc.dll.debug"
- name="%config.debug"
- parent="org.eclipse.cdt.msvc.configuration">
- <toolChain
- id="org.eclipse.cdt.msvc.toolchain.dll.debug"
- superClass="org.eclipse.cdt.msvc.toolchain.base">
- <targetPlatform
- id="org.eclipse.cdt.msvc.targetPlatform.dll.debug"
- superClass="org.eclipse.cdt.msvc.targetPlatform">
- </targetPlatform>
- <tool
- id="org.eclipse.cdt.msvc.cl.dll.debug"
- superClass="org.eclipse.cdt.msvc.cl">
- </tool>
- <tool
- id="org.eclipse.cdt.msvc.rc.dll.debug"
- superClass="org.eclipse.cdt.msvc.rc">
- </tool>
- <tool
- id="org.eclipse.cdt.msvc.link.dll.debug"
- superClass="org.eclipse.cdt.msvc.link">
- </tool>
- </toolChain>
- </configuration>
- <configuration
- buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release"
- id="org.eclipse.cdt.msvc.dll.release"
- name="%config.release"
- parent="org.eclipse.cdt.msvc.configuration">
- <toolChain
- id="org.eclipse.cdt.msvc.toolchain.dll.release"
- superClass="org.eclipse.cdt.msvc.toolchain.base">
- <targetPlatform
- id="org.eclipse.cdt.msvc.targetPlatform.dll.release"
- superClass="org.eclipse.cdt.msvc.targetPlatform">
- </targetPlatform>
- <tool
- id="org.eclipse.cdt.msvc.cl.dll.release"
- superClass="org.eclipse.cdt.msvc.cl">
- </tool>
- <tool
- id="org.eclipse.cdt.msvc.rc.dll.release"
- superClass="org.eclipse.cdt.msvc.rc">
- </tool>
- <tool
- id="org.eclipse.cdt.msvc.link.dll.release"
- superClass="org.eclipse.cdt.msvc.link">
- </tool>
- </toolChain>
- </configuration>
- </projectType>
- <projectType
- buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.staticLib"
- id="org.eclipse.cdt.msvc.projectType.lib"
- projectEnvironmentSupplier="org.eclipse.cdt.msw.build.WinEnvironmentVariableSupplier">
- <configuration
- buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug"
- id="org.eclipse.cdt.msvc.lib.debug"
- name="%config.debug"
- parent="org.eclipse.cdt.msvc.configuration">
- <toolChain
- id="org.eclipse.cdt.msvc.toolchain.lib.debug"
- superClass="org.eclipse.cdt.msvc.toolchain.base">
- <targetPlatform
- id="org.eclipse.cdt.msvc.targetPlatform.lib.debug"
- superClass="org.eclipse.cdt.msvc.targetPlatform">
- </targetPlatform>
- <tool
- id="org.eclipse.cdt.msvc.cl.lib.debug"
- superClass="org.eclipse.cdt.msvc.cl">
- </tool>
- <tool
- id="org.eclipse.cdt.msvc.rc.lib.debug"
- superClass="org.eclipse.cdt.msvc.rc">
- </tool>
- <tool
- id="org.eclipse.cdt.msvc.lib.lib.debug"
- superClass="org.eclipse.cdt.msvc.lib">
- </tool>
- </toolChain>
- </configuration>
- <configuration
- buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release"
- id="org.eclipse.cdt.msvc.lib.release"
- name="%config.release"
- parent="org.eclipse.cdt.msvc.configuration">
- <toolChain
- id="org.eclipse.cdt.msvc.toolchain.lib.release"
- superClass="org.eclipse.cdt.msvc.toolchain.base">
- <targetPlatform
- id="org.eclipse.cdt.msvc.targetPlatform.lib.release"
- superClass="org.eclipse.cdt.msvc.targetPlatform">
- </targetPlatform>
- <tool
- id="org.eclipse.cdt.msvc.cl.lib.release"
- superClass="org.eclipse.cdt.msvc.cl">
- </tool>
- <tool
- id="org.eclipse.cdt.msvc.rc.lib.release"
- superClass="org.eclipse.cdt.msvc.rc">
- </tool>
- <tool
- id="org.eclipse.cdt.msvc.lib.lib.release"
- superClass="org.eclipse.cdt.msvc.lib">
- </tool>
- </toolChain>
- </configuration>
- </projectType>
- </extension>
- <extension
- id="clScannerInfo"
- name="Windows SDK Scanner Info Provider"
- point="org.eclipse.cdt.make.core.ScannerConfigurationDiscoveryProfile">
- <scannerInfoCollector
- class="org.eclipse.cdt.msw.build.WinScannerInfoCollector"
- scope="project">
- </scannerInfoCollector>
- </extension>
-
-</plugin>
diff --git a/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/Activator.java b/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/Activator.java
deleted file mode 100644
index c9e6ca4..0000000
--- a/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/Activator.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.eclipse.cdt.msw.build;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends Plugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "net.sf.wascana.msvc.build";
-
- // The shared instance
- private static Activator plugin;
-
- /**
- * The constructor
- */
- public Activator() {
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
-
-}
diff --git a/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinDiscoveredPathInfo.java b/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinDiscoveredPathInfo.java
deleted file mode 100644
index baae87b..0000000
--- a/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinDiscoveredPathInfo.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.eclipse.cdt.msw.build;
-
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.cdt.make.core.scannerconfig.IDiscoveredPathManager.IDiscoveredPathInfo;
-import org.eclipse.cdt.make.core.scannerconfig.IDiscoveredPathManager.IDiscoveredScannerInfoSerializable;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-
-/**
- * @author Doug Schaefer
- *
- */
-public class WinDiscoveredPathInfo implements IDiscoveredPathInfo {
-
- private final IPath[] paths;
- private final Map<String, String> symbols = new HashMap<String, String>();
-
- public WinDiscoveredPathInfo() {
- // Include paths
- String sdkDir = WinEnvironmentVariableSupplier.getSDKDir();
- if (sdkDir != null) {
- String vcDir = WinEnvironmentVariableSupplier.getVCDir();
- paths = new IPath[] {
- new Path(vcDir.concat("Include")),
- new Path(vcDir.concat("Include\\Sys")),
- new Path(sdkDir.concat("Include")),
- new Path(sdkDir.concat("Include\\gl"))
- };
- } else
- paths = new IPath[0];
-
- symbols.put("_M_IX86", "600");
- symbols.put("_WIN32", "1");
- symbols.put("_MSC_VER", "1400");
- }
-
- public IPath[] getIncludePaths() {
- return paths;
- }
-
- public IProject getProject() {
- return null;
- }
-
- public IDiscoveredScannerInfoSerializable getSerializable() {
- return null;
- }
-
- public Map<String, String> getSymbols() {
- return symbols;
- }
-
-}
diff --git a/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinEnvironmentVariableSupplier.java b/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinEnvironmentVariableSupplier.java
deleted file mode 100644
index e759581..0000000
--- a/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinEnvironmentVariableSupplier.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package org.eclipse.cdt.msw.build;
-
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.cdt.managedbuilder.core.IConfiguration;
-import org.eclipse.cdt.managedbuilder.core.IManagedProject;
-import org.eclipse.cdt.managedbuilder.envvar.IBuildEnvironmentVariable;
-import org.eclipse.cdt.managedbuilder.envvar.IConfigurationEnvironmentVariableSupplier;
-import org.eclipse.cdt.managedbuilder.envvar.IEnvironmentVariableProvider;
-import org.eclipse.cdt.managedbuilder.envvar.IProjectEnvironmentVariableSupplier;
-import org.eclipse.cdt.utils.WindowsRegistry;
-
-/**
- * @author DSchaefer
- *
- */
-public class WinEnvironmentVariableSupplier
- implements IConfigurationEnvironmentVariableSupplier, IProjectEnvironmentVariableSupplier {
-
- private Map<String, IBuildEnvironmentVariable> envvars;
-
- private static class WindowsBuildEnvironmentVariable implements IBuildEnvironmentVariable {
-
- private final String name;
- private final String value;
- private final int operation;
-
- public WindowsBuildEnvironmentVariable(String name, String value, int operation) {
- this.name = name;
- this.value = value;
- this.operation = operation;
- }
-
- public String getDelimiter() {
- return ";";
- }
-
- public String getName() {
- return name;
- }
-
- public String getValue() {
- return value;
- }
-
- public int getOperation() {
- return operation;
- }
-
- }
-
- public IBuildEnvironmentVariable getVariable(String variableName,
- IManagedProject project, IEnvironmentVariableProvider provider) {
- if (envvars == null)
- initvars();
- return envvars.get(variableName);
- }
-
- public IBuildEnvironmentVariable getVariable(String variableName,
- IConfiguration configuration, IEnvironmentVariableProvider provider) {
- if (envvars == null)
- initvars();
- return envvars.get(variableName);
- }
-
- public IBuildEnvironmentVariable[] getVariables(IManagedProject project,
- IEnvironmentVariableProvider provider) {
- if (envvars == null)
- initvars();
- return envvars.values().toArray(new IBuildEnvironmentVariable[envvars.size()]);
- }
-
- public IBuildEnvironmentVariable[] getVariables(
- IConfiguration configuration, IEnvironmentVariableProvider provider) {
- if (envvars == null)
- initvars();
- return envvars.values().toArray(new IBuildEnvironmentVariable[envvars.size()]);
- }
-
- private void addvar(IBuildEnvironmentVariable var) {
- envvars.put(var.getName(), var);
- }
-
- public static String getSDKDir() {
- WindowsRegistry reg = WindowsRegistry.getRegistry();
-
- String[] keys = {
- "SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v6.1",
- "SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v6.0A",
- "SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v6.0",
- };
-
- for (int i = 0; i < keys.length; ++i) {
- String sdkDir = reg.getLocalMachineValue(keys[i], "InstallationFolder");
- if (sdkDir != null)
- return sdkDir;
- }
-
- return null;
- }
-
- public static String getVCDir() {
- WindowsRegistry reg = WindowsRegistry.getRegistry();
-
- String vcDir = reg.getLocalMachineValue("SOFTWARE\\Microsoft\\VisualStudio\\SxS\\VC7", "9.0");
- if (vcDir != null)
- return vcDir;
-
- // Try full SDK with compiler
- String sdkDir = getSDKDir();
- if (sdkDir != null)
- return sdkDir.concat("VC\\");
-
- return null;
- }
-
- public static String getVSDir() {
- WindowsRegistry reg = WindowsRegistry.getRegistry();
- return reg.getLocalMachineValue("SOFTWARE\\Microsoft\\VisualStudio\\SxS\\VS7", "9.0");
- }
-
- private void initvars() {
- envvars = new HashMap<String, IBuildEnvironmentVariable>();
-
- // The SDK Location
- String sdkDir = getSDKDir();
- if (sdkDir == null)
- return;
-
- String vcDir = getVCDir();
-
- // INCLUDE
- StringBuffer buff = new StringBuffer();
- buff.append(vcDir).append("Include;");
- buff.append(vcDir).append("Include\\Sys;");
- buff.append(sdkDir).append("Include;");
- buff.append(sdkDir).append("Include\\gl;");
- addvar(new WindowsBuildEnvironmentVariable("INCLUDE", buff.toString(), IBuildEnvironmentVariable.ENVVAR_PREPEND));
-
- // LIB
- buff = new StringBuffer();
- buff.append(vcDir).append("Lib;");
- buff.append(sdkDir).append("Lib;");
- addvar(new WindowsBuildEnvironmentVariable("LIB", buff.toString(), IBuildEnvironmentVariable.ENVVAR_PREPEND));
-
- // PATH
- buff = new StringBuffer();
-
- String vsDir = getVSDir();
- if (vsDir != null)
- buff.append(vsDir).append("Common7\\IDE;");
-
- buff.append(vcDir).append("Bin;");
- buff.append(sdkDir).append("Bin;");
- addvar(new WindowsBuildEnvironmentVariable("PATH", buff.toString(), IBuildEnvironmentVariable.ENVVAR_PREPEND));
- }
-
-}
diff --git a/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinScannerInfoCollector.java b/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinScannerInfoCollector.java
deleted file mode 100644
index e955c51..0000000
--- a/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinScannerInfoCollector.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.eclipse.cdt.msw.build;
-
-
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.cdt.make.core.scannerconfig.IScannerInfoCollector3;
-import org.eclipse.cdt.make.core.scannerconfig.InfoContext;
-import org.eclipse.cdt.make.core.scannerconfig.ScannerInfoTypes;
-import org.eclipse.cdt.make.core.scannerconfig.IDiscoveredPathManager.IDiscoveredPathInfo;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-/**
- * @author Doug Schaefer
- *
- */
-public class WinScannerInfoCollector implements IScannerInfoCollector3 {
-
- public void contributeToScannerConfig(Object resource, Map scannerInfo) {
- }
-
- public List getCollectedScannerInfo(Object resource, ScannerInfoTypes type) {
- return null;
- }
-
- public IDiscoveredPathInfo createPathInfoObject() {
- return new WinDiscoveredPathInfo();
- }
-
- public void setInfoContext(InfoContext context) {
- }
-
- public void setProject(IProject project) {
- }
-
- public void updateScannerConfiguration(IProgressMonitor monitor) throws CoreException {
- }
-
-}
