From e9d6747a7451c6d5f0b58b181a703972eca84c76 Mon Sep 17 00:00:00 2001 From: Martin Weber Date: Thu, 7 May 2020 21:34:43 +0200 Subject: [PATCH] Bug 559674: Migrating from a ILanguageSettingsProvider implementation to IIndexerInfoConsumer (5/6) Adjust detection participant implementations & tests to new API. This is piece five of change https://git.eclipse.org/r/c/159828 being split into pieces. Splitting is done for code reviewing reasons. Change-Id: Iab6917c45f9e749f2a8ff1f1c0b4c4991131cbd2 Signed-off-by: Martin Weber --- .../arm/ArmClangToolDetectionParticipant.java | 2 +- .../is/arm/ArmccBuiltinDetectionBehavior.java | 14 +--- .../is/arm/ArmccToolDetectionParticipant.java | 4 +- .../HpeC11ToolDetectionParticipant.java | 4 +- .../HpeC89ToolDetectionParticipant.java | 4 +- .../HpeC99ToolDetectionParticipant.java | 4 +- .../IclCandCppToolDetectionParticipant.java | 4 +- .../is/intel/IntelCToolCommandlineParser.java | 6 +- .../intel/IntelCppToolCommandlineParser.java | 6 +- .../microsoft/MsclToolCommandlineParser.java | 24 +++---- .../is/nvidia/NvccSystemIncludePathTest.java | 31 +++------ .../NvccBuiltins_DetectLangStdTest.java | 6 +- .../builtins/NvccOutputProcessorTest.java | 68 ++++++++++--------- .../nvidia/NvccBuiltinDetectionBehavior.java | 16 +---- .../cmake/is/nvidia/NvccLangStdArglet.java | 4 +- .../nvidia/NvccSystemIncludePathArglet.java | 4 +- .../nvidia/NvccToolDetectionParticipant.java | 8 +-- 17 files changed, 82 insertions(+), 127 deletions(-) diff --git a/cmake/org.eclipse.cdt.cmake.is.arm/src/main/java/org/eclipse/cdt/cmake/is/arm/ArmClangToolDetectionParticipant.java b/cmake/org.eclipse.cdt.cmake.is.arm/src/main/java/org/eclipse/cdt/cmake/is/arm/ArmClangToolDetectionParticipant.java index 0c42b5e65b6..d0183d01948 100644 --- a/cmake/org.eclipse.cdt.cmake.is.arm/src/main/java/org/eclipse/cdt/cmake/is/arm/ArmClangToolDetectionParticipant.java +++ b/cmake/org.eclipse.cdt.cmake.is.arm/src/main/java/org/eclipse/cdt/cmake/is/arm/ArmClangToolDetectionParticipant.java @@ -33,7 +33,7 @@ public class ArmClangToolDetectionParticipant extends DefaultToolDetectionPartic new Arglets.MacroUndefine_C_POSIX() }; private ToolCommandlineParser() { - super(null, new ResponseFileArglets.At(), null, arglets); + super(new ResponseFileArglets.At(), null, arglets); } } } diff --git a/cmake/org.eclipse.cdt.cmake.is.arm/src/main/java/org/eclipse/cdt/cmake/is/arm/ArmccBuiltinDetectionBehavior.java b/cmake/org.eclipse.cdt.cmake.is.arm/src/main/java/org/eclipse/cdt/cmake/is/arm/ArmccBuiltinDetectionBehavior.java index 8b1d9ff9b83..915799d3532 100644 --- a/cmake/org.eclipse.cdt.cmake.is.arm/src/main/java/org/eclipse/cdt/cmake/is/arm/ArmccBuiltinDetectionBehavior.java +++ b/cmake/org.eclipse.cdt.cmake.is.arm/src/main/java/org/eclipse/cdt/cmake/is/arm/ArmccBuiltinDetectionBehavior.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019 Martin Weber. + * Copyright (c) 2019-2020 Martin Weber. * * Content is provided to you under the terms and conditions of the Eclipse Public License Version 2.0 "EPL". * A copy of the EPL is available at http://www.eclipse.org/legal/epl-2.0. @@ -43,16 +43,4 @@ class ArmccBuiltinDetectionBehavior implements IBuiltinsDetectionBehavior { // enable built-in detection return false; } - - @SuppressWarnings("nls") - @Override - public String getInputFileExtension(String languageId) { - if (languageId.equals("org.eclipse.cdt.core.gcc")) { - return "c"; - } - if (languageId.equals("org.eclipse.cdt.core.g++")) { - return "cpp"; - } - return null; - } } diff --git a/cmake/org.eclipse.cdt.cmake.is.arm/src/main/java/org/eclipse/cdt/cmake/is/arm/ArmccToolDetectionParticipant.java b/cmake/org.eclipse.cdt.cmake.is.arm/src/main/java/org/eclipse/cdt/cmake/is/arm/ArmccToolDetectionParticipant.java index 9ac8c8c17b3..4858f6f61af 100644 --- a/cmake/org.eclipse.cdt.cmake.is.arm/src/main/java/org/eclipse/cdt/cmake/is/arm/ArmccToolDetectionParticipant.java +++ b/cmake/org.eclipse.cdt.cmake.is.arm/src/main/java/org/eclipse/cdt/cmake/is/arm/ArmccToolDetectionParticipant.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019 Martin Weber. + * Copyright (c) 2019-2020 Martin Weber. * * Content is provided to you under the terms and conditions of the Eclipse Public License Version 2.0 "EPL". * A copy of the EPL is available at http://www.eclipse.org/legal/epl-2.0. @@ -32,7 +32,7 @@ public class ArmccToolDetectionParticipant extends DefaultToolDetectionParticipa new Arglets.MacroUndefine_C_POSIX(), new Arglets.SystemIncludePath_armcc() }; private ToolCommandlineParser() { - super(null, null, new ArmccBuiltinDetectionBehavior(), arglets); + super(null, new ArmccBuiltinDetectionBehavior(), arglets); } } } diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop/src/main/java/org/eclipse/cdt/cmake/is/hpenonstop/HpeC11ToolDetectionParticipant.java b/cmake/org.eclipse.cdt.cmake.is.hpenonstop/src/main/java/org/eclipse/cdt/cmake/is/hpenonstop/HpeC11ToolDetectionParticipant.java index f70dfd86951..ba1fbd1efb7 100644 --- a/cmake/org.eclipse.cdt.cmake.is.hpenonstop/src/main/java/org/eclipse/cdt/cmake/is/hpenonstop/HpeC11ToolDetectionParticipant.java +++ b/cmake/org.eclipse.cdt.cmake.is.hpenonstop/src/main/java/org/eclipse/cdt/cmake/is/hpenonstop/HpeC11ToolDetectionParticipant.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019 Martin Weber. + * Copyright (c) 2019-2020 Martin Weber. * * Content is provided to you under the terms and conditions of the Eclipse Public License Version 2.0 "EPL". * A copy of the EPL is available at http://www.eclipse.org/legal/epl-2.0. @@ -32,7 +32,7 @@ public class HpeC11ToolDetectionParticipant extends DefaultToolDetectionParticip new Arglets.MacroUndefine_C_POSIX() }; private ToolCommandlineParser() { - super(null, new ResponseFileArglets.At(), null, arglets); + super(new ResponseFileArglets.At(), null, arglets); } } } diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop/src/main/java/org/eclipse/cdt/cmake/is/hpenonstop/HpeC89ToolDetectionParticipant.java b/cmake/org.eclipse.cdt.cmake.is.hpenonstop/src/main/java/org/eclipse/cdt/cmake/is/hpenonstop/HpeC89ToolDetectionParticipant.java index e42e7a6cb32..9afa0c6c993 100644 --- a/cmake/org.eclipse.cdt.cmake.is.hpenonstop/src/main/java/org/eclipse/cdt/cmake/is/hpenonstop/HpeC89ToolDetectionParticipant.java +++ b/cmake/org.eclipse.cdt.cmake.is.hpenonstop/src/main/java/org/eclipse/cdt/cmake/is/hpenonstop/HpeC89ToolDetectionParticipant.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019 Martin Weber. + * Copyright (c) 2019-2020 Martin Weber. * * Content is provided to you under the terms and conditions of the Eclipse Public License Version 2.0 "EPL". * A copy of the EPL is available at http://www.eclipse.org/legal/epl-2.0. @@ -32,7 +32,7 @@ public class HpeC89ToolDetectionParticipant extends DefaultToolDetectionParticip new Arglets.MacroUndefine_C_POSIX() }; private ToolCommandlineParser() { - super(null, new ResponseFileArglets.At(), null, arglets); + super(new ResponseFileArglets.At(), null, arglets); } } } diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop/src/main/java/org/eclipse/cdt/cmake/is/hpenonstop/HpeC99ToolDetectionParticipant.java b/cmake/org.eclipse.cdt.cmake.is.hpenonstop/src/main/java/org/eclipse/cdt/cmake/is/hpenonstop/HpeC99ToolDetectionParticipant.java index a2aae080744..82df1a9ebdf 100644 --- a/cmake/org.eclipse.cdt.cmake.is.hpenonstop/src/main/java/org/eclipse/cdt/cmake/is/hpenonstop/HpeC99ToolDetectionParticipant.java +++ b/cmake/org.eclipse.cdt.cmake.is.hpenonstop/src/main/java/org/eclipse/cdt/cmake/is/hpenonstop/HpeC99ToolDetectionParticipant.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019 Martin Weber. + * Copyright (c) 2019-2020 Martin Weber. * * Content is provided to you under the terms and conditions of the Eclipse Public License Version 2.0 "EPL". * A copy of the EPL is available at http://www.eclipse.org/legal/epl-2.0. @@ -32,7 +32,7 @@ public class HpeC99ToolDetectionParticipant extends DefaultToolDetectionParticip new Arglets.MacroUndefine_C_POSIX() }; private ToolCommandlineParser() { - super(null, new ResponseFileArglets.At(), null, arglets); + super(new ResponseFileArglets.At(), null, arglets); } } } diff --git a/cmake/org.eclipse.cdt.cmake.is.intel/src/main/java/org/eclipse/cdt/cmake/is/intel/IclCandCppToolDetectionParticipant.java b/cmake/org.eclipse.cdt.cmake.is.intel/src/main/java/org/eclipse/cdt/cmake/is/intel/IclCandCppToolDetectionParticipant.java index 0d25f6f8817..b363c833d65 100644 --- a/cmake/org.eclipse.cdt.cmake.is.intel/src/main/java/org/eclipse/cdt/cmake/is/intel/IclCandCppToolDetectionParticipant.java +++ b/cmake/org.eclipse.cdt.cmake.is.intel/src/main/java/org/eclipse/cdt/cmake/is/intel/IclCandCppToolDetectionParticipant.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019 Martin Weber. + * Copyright (c) 2019-2020 Martin Weber. * * Content is provided to you under the terms and conditions of the Eclipse Public License Version 2.0 "EPL". * A copy of the EPL is available at http://www.eclipse.org/legal/epl-2.0. @@ -32,7 +32,7 @@ public class IclCandCppToolDetectionParticipant extends DefaultToolDetectionPart new Arglets.MacroUndefine_C_POSIX() }; private CandCppToolCommandlineParser() { - super(null, new ResponseFileArglets.At(), null, arglets); + super(new ResponseFileArglets.At(), null, arglets); } } } diff --git a/cmake/org.eclipse.cdt.cmake.is.intel/src/main/java/org/eclipse/cdt/cmake/is/intel/IntelCToolCommandlineParser.java b/cmake/org.eclipse.cdt.cmake.is.intel/src/main/java/org/eclipse/cdt/cmake/is/intel/IntelCToolCommandlineParser.java index bbb43fcb423..d0eea505f97 100644 --- a/cmake/org.eclipse.cdt.cmake.is.intel/src/main/java/org/eclipse/cdt/cmake/is/intel/IntelCToolCommandlineParser.java +++ b/cmake/org.eclipse.cdt.cmake.is.intel/src/main/java/org/eclipse/cdt/cmake/is/intel/IntelCToolCommandlineParser.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019 Martin Weber. + * Copyright (c) 2019-2020 Martin Weber. * * Content is provided to you under the terms and conditions of the Eclipse Public License Version 2.0 "EPL". * A copy of the EPL is available at http://www.eclipse.org/legal/epl-2.0. @@ -24,7 +24,7 @@ class IntelCToolCommandlineParser extends DefaultToolCommandlineParser { static final IntelCToolCommandlineParser INSTANCE = new IntelCToolCommandlineParser(); private IntelCToolCommandlineParser() { - super("org.eclipse.cdt.core.gcc", new ResponseFileArglets.At(), null, new Arglets.IncludePath_C_POSIX(), - new Arglets.MacroDefine_C_POSIX(), new Arglets.MacroUndefine_C_POSIX()); + super(new ResponseFileArglets.At(), null, new Arglets.IncludePath_C_POSIX(), new Arglets.MacroDefine_C_POSIX(), + new Arglets.MacroUndefine_C_POSIX()); } } diff --git a/cmake/org.eclipse.cdt.cmake.is.intel/src/main/java/org/eclipse/cdt/cmake/is/intel/IntelCppToolCommandlineParser.java b/cmake/org.eclipse.cdt.cmake.is.intel/src/main/java/org/eclipse/cdt/cmake/is/intel/IntelCppToolCommandlineParser.java index 1b43d3a1008..e36282a2c98 100644 --- a/cmake/org.eclipse.cdt.cmake.is.intel/src/main/java/org/eclipse/cdt/cmake/is/intel/IntelCppToolCommandlineParser.java +++ b/cmake/org.eclipse.cdt.cmake.is.intel/src/main/java/org/eclipse/cdt/cmake/is/intel/IntelCppToolCommandlineParser.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019 Martin Weber. + * Copyright (c) 2019-2020 Martin Weber. * * Content is provided to you under the terms and conditions of the Eclipse Public License Version 2.0 "EPL". * A copy of the EPL is available at http://www.eclipse.org/legal/epl-2.0. @@ -24,7 +24,7 @@ class IntelCppToolCommandlineParser extends DefaultToolCommandlineParser { static final IntelCppToolCommandlineParser INSTANCE = new IntelCppToolCommandlineParser(); private IntelCppToolCommandlineParser() { - super("org.eclipse.cdt.core.g++", new ResponseFileArglets.At(), null, new Arglets.IncludePath_C_POSIX(), - new Arglets.MacroDefine_C_POSIX(), new Arglets.MacroUndefine_C_POSIX()); + super(new ResponseFileArglets.At(), null, new Arglets.IncludePath_C_POSIX(), new Arglets.MacroDefine_C_POSIX(), + new Arglets.MacroUndefine_C_POSIX()); } } diff --git a/cmake/org.eclipse.cdt.cmake.is.microsoft/src/main/java/org/eclipse/cdt/cmake/is/microsoft/MsclToolCommandlineParser.java b/cmake/org.eclipse.cdt.cmake.is.microsoft/src/main/java/org/eclipse/cdt/cmake/is/microsoft/MsclToolCommandlineParser.java index 0133756da4e..ea8ef0d7d9b 100644 --- a/cmake/org.eclipse.cdt.cmake.is.microsoft/src/main/java/org/eclipse/cdt/cmake/is/microsoft/MsclToolCommandlineParser.java +++ b/cmake/org.eclipse.cdt.cmake.is.microsoft/src/main/java/org/eclipse/cdt/cmake/is/microsoft/MsclToolCommandlineParser.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019 Martin Weber. + * Copyright (c) 2019-2020 Martin Weber. * * Content is provided to you under the terms and conditions of the Eclipse Public License Version 2.0 "EPL". * A copy of the EPL is available at http://www.eclipse.org/legal/epl-2.0. @@ -31,15 +31,7 @@ class MsclToolCommandlineParser extends DefaultToolCommandlineParser { new MacroUndefine_C_CL() }; public MsclToolCommandlineParser() { - super(null, new ResponseFileArglets.At(), null, arglets); - } - - /** - * Overridden to get the language ID from the file name extension. - */ - @Override - public String getLanguageId(String sourceFileExtension) { - return super.determineLanguageId(sourceFileExtension).orElse(null); + super(new ResponseFileArglets.At(), null, arglets); } //////////////////////////////////////////////////////////////////// @@ -71,8 +63,8 @@ class MsclToolCommandlineParser extends DefaultToolCommandlineParser { * @see org.eclipse.cdt.cmake.is.IArglet#processArgs(java.lang.String) */ @Override - public int processArgument(IParseContext parseContext, IPath cwd, String argsLine) { - return processArgument(parseContext, cwd, argsLine, optionMatchers); + public int processArgument(IArgumentCollector resultCollector, IPath cwd, String argsLine) { + return processArgument(false, resultCollector, cwd, argsLine, optionMatchers); } } @@ -97,8 +89,8 @@ class MsclToolCommandlineParser extends DefaultToolCommandlineParser { * @see org.eclipse.cdt.cmake.is.IArglet#processArgs(java.lang.String) */ @Override - public int processArgument(IParseContext parseContext, IPath cwd, String argsLine) { - return processArgument(parseContext, argsLine, optionMatchers); + public int processArgument(IArgumentCollector resultCollector, IPath cwd, String argsLine) { + return processArgument(resultCollector, argsLine, optionMatchers); } } @@ -115,8 +107,8 @@ class MsclToolCommandlineParser extends DefaultToolCommandlineParser { * @see org.eclipse.cdt.cmake.is.IArglet#processArgument(java.util.List, java.lang.String) */ @Override - public int processArgument(IParseContext parseContext, IPath cwd, String argsLine) { - return processArgument(parseContext, argsLine, optionMatcher); + public int processArgument(IArgumentCollector resultCollector, IPath cwd, String argsLine) { + return processArgument(resultCollector, argsLine, optionMatcher); } } } diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/src/main/java/org/eclipse/cdt/cmake/is/nvidia/NvccSystemIncludePathTest.java b/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/src/main/java/org/eclipse/cdt/cmake/is/nvidia/NvccSystemIncludePathTest.java index 0454ba8dbdb..a7d370be78e 100644 --- a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/src/main/java/org/eclipse/cdt/cmake/is/nvidia/NvccSystemIncludePathTest.java +++ b/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/src/main/java/org/eclipse/cdt/cmake/is/nvidia/NvccSystemIncludePathTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018 Martin Weber. + * Copyright (c) 2018-2020 Martin Weber. * * Content is provided to you under the terms and conditions of the Eclipse Public License Version 2.0 "EPL". * A copy of the EPL is available at http://www.eclipse.org/legal/epl-2.0. @@ -12,8 +12,6 @@ import static org.junit.Assert.assertEquals; import org.eclipse.cdt.cmake.is.core.DefaultToolCommandlineParser; import org.eclipse.cdt.cmake.is.core.IToolCommandlineParser.IResult; -import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry; -import org.eclipse.cdt.core.settings.model.ICSettingEntry; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; import org.junit.Before; @@ -36,41 +34,32 @@ public class NvccSystemIncludePathTest { @Test public final void testProcessArgument() { - DefaultToolCommandlineParser tcp = new DefaultToolCommandlineParser("egal", null, null, testee); + DefaultToolCommandlineParser tcp = new DefaultToolCommandlineParser(null, null, testee); final String more = " -g -MMD -MT CMakeFiles/execut1.dir/util1.c.o -MF \"CMakeFiles/execut1.dir/util1.c.o.d\"" + " -o CMakeFiles/execut1.dir/util1.c.o -c /testprojects/C-subsrc/src/src-sub/main1.cu"; final IPath cwd = new Path(""); - ICLanguageSettingEntry parsed; // -isystem=/an/Include/Path String name = "/an/Include/Path"; IResult result = tcp.processArgs(cwd, "-isystem" + "=" + name + more); - assertEquals("#entries", 1, result.getSettingEntries().size()); - parsed = result.getSettingEntries().get(0); - assertEquals("kind", ICSettingEntry.INCLUDE_PATH, parsed.getKind()); - assertEquals("name", name, parsed.getName()); + assertEquals("#entries", 1, result.getSystemIncludePaths().size()); + assertEquals("name", name, result.getSystemIncludePaths().get(0)); // -isystem='/an/Include/Path' result = tcp.processArgs(cwd, "-isystem" + "=" + "'" + name + "'" + more); - assertEquals("#entries", 1, result.getSettingEntries().size()); - parsed = result.getSettingEntries().get(0); - assertEquals("kind", ICSettingEntry.INCLUDE_PATH, parsed.getKind()); - assertEquals("name", name, parsed.getName()); + assertEquals("#entries", 1, result.getSystemIncludePaths().size()); + assertEquals("name", name, result.getSystemIncludePaths().get(0)); // -isystem="/an/Include/Path" result = tcp.processArgs(cwd, "-isystem" + "=" + "\"" + name + "\"" + more); - assertEquals("#entries", 1, result.getSettingEntries().size()); - parsed = result.getSettingEntries().get(0); - assertEquals("kind", ICSettingEntry.INCLUDE_PATH, parsed.getKind()); - assertEquals("name", name, parsed.getName()); + assertEquals("#entries", 1, result.getSystemIncludePaths().size()); + assertEquals("name", name, result.getSystemIncludePaths().get(0)); name = (new Path("A:an\\In CLU de/Pat h")).toOSString(); // -isystem="A:an\In CLU de/Pat h" result = tcp.processArgs(cwd, "-isystem" + "=" + "\"" + name + "\"" + more); - assertEquals("#entries", 1, result.getSettingEntries().size()); - parsed = result.getSettingEntries().get(0); - assertEquals("kind", ICSettingEntry.INCLUDE_PATH, parsed.getKind()); - assertEquals("name", name, parsed.getName()); + assertEquals("#entries", 1, result.getSystemIncludePaths().size()); + assertEquals("name", name, result.getSystemIncludePaths().get(0)); // -isystem='A:an\In CLU de/Pat h' } diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/src/main/java/org/eclipse/cdt/cmake/is/nvidia/builtins/NvccBuiltins_DetectLangStdTest.java b/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/src/main/java/org/eclipse/cdt/cmake/is/nvidia/builtins/NvccBuiltins_DetectLangStdTest.java index 42c180abe73..0437fb812d7 100644 --- a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/src/main/java/org/eclipse/cdt/cmake/is/nvidia/builtins/NvccBuiltins_DetectLangStdTest.java +++ b/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/src/main/java/org/eclipse/cdt/cmake/is/nvidia/builtins/NvccBuiltins_DetectLangStdTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019 Martin Weber. + * Copyright (c) 2019-2020 Martin Weber. * * Content is provided to you under the terms and conditions of the Eclipse Public License Version 2.0 "EPL". * A copy of the EPL is available at http://www.eclipse.org/legal/epl-2.0. @@ -38,7 +38,7 @@ public class NvccBuiltins_DetectLangStdTest { */ @Test public final void testProcessArgument_std() { - DefaultToolCommandlineParser tcp = new DefaultToolCommandlineParser("egal", null, null, testee); + DefaultToolCommandlineParser tcp = new DefaultToolCommandlineParser(null, null, testee); final String more = " -g -MMD -MT CMakeFiles/execut1.dir/util1.c.o -MF \"CMakeFiles/execut1.dir/util1.c.o.d\"" + " -o CMakeFiles/execut1.dir/util1.c.o -c /testprojects/C-subsrc/src/src-sub/main1.c"; @@ -79,7 +79,7 @@ public class NvccBuiltins_DetectLangStdTest { public final void testProcessArgument_std2() { final String more = " -g -MMD -MT CMakeFiles/execut1.dir/util1.c.o -MF \"CMakeFiles/execut1.dir/util1.c.o.d\"" + " -o CMakeFiles/execut1.dir/util1.c.o -c /testprojects/C-subsrc/src/src-sub/main1.c"; - DefaultToolCommandlineParser tcp = new DefaultToolCommandlineParser("egal", null, null, testee); + DefaultToolCommandlineParser tcp = new DefaultToolCommandlineParser(null, null, testee); String parsed; diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/src/main/java/org/eclipse/cdt/cmake/is/nvidia/builtins/NvccOutputProcessorTest.java b/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/src/main/java/org/eclipse/cdt/cmake/is/nvidia/builtins/NvccOutputProcessorTest.java index 4ec580523a7..f6d49f4fc03 100644 --- a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/src/main/java/org/eclipse/cdt/cmake/is/nvidia/builtins/NvccOutputProcessorTest.java +++ b/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/src/main/java/org/eclipse/cdt/cmake/is/nvidia/builtins/NvccOutputProcessorTest.java @@ -15,13 +15,14 @@ import static org.junit.Assert.assertTrue; import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; -import java.util.Collections; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.Objects; +import org.eclipse.cdt.cmake.is.core.IRawIndexerInfoCollector; import org.eclipse.cdt.cmake.is.core.builtins.GccOutputProcessor; -import org.eclipse.cdt.cmake.is.core.builtins.IBuiltinsOutputProcessor; import org.eclipse.cdt.cmake.is.core.builtins.OutputSniffer; -import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry; import org.junit.Before; import org.junit.Test; @@ -44,7 +45,7 @@ public class NvccOutputProcessorTest { @Test public void testProcessFile() throws IOException { // pass resource content line-wise to the testee... - ProcessingContextMock pc = new ProcessingContextMock(); + RawIndexerInfoMock pc = new RawIndexerInfoMock(); try (InputStream is = getClass().getResourceAsStream("cbd-nvcc.output.txt"); OutputSniffer os = new OutputSniffer(testee, null, pc)) { byte[] buffer = new byte[1024]; @@ -54,38 +55,43 @@ public class NvccOutputProcessorTest { } } - // check __GNUC__ - for (ICLanguageSettingEntry entry : pc.entries) { - if (entry.getKind() == ICLanguageSettingEntry.MACRO) { - if ("__CUDACC_VER_BUILD__".equals(entry.getName())) - assertEquals("value (" + entry.getName() + ")", "85", entry.getValue()); - } - } + assertEquals("# include paths", 6, pc.includePaths.size()); + assertEquals("# macros", 242, pc.defines.size()); - int inc = 0; - int macro = 0; - for (ICLanguageSettingEntry entry : pc.entries) { - if (entry.getKind() == ICLanguageSettingEntry.INCLUDE_PATH) { - inc++; - assertTrue("path", !"".equals(entry.getName())); - } else if (entry.getKind() == ICLanguageSettingEntry.MACRO) { - macro++; - assertTrue("macro", !"".equals(entry.getName())); - assertTrue("value (" + entry.getName() + ")", entry.getValue() != null); - } - } - assertEquals("# include paths", 6, inc); - assertEquals("# macros", 242, macro); + // check __CUDACC_VER_BUILD__ + assertTrue("__CUDACC_VER_BUILD__", pc.defines.containsKey("__GNUC__")); + assertEquals("value", "85", pc.defines.get("__CUDACC_VER_BUILD__")); } - private static class ProcessingContextMock implements IBuiltinsOutputProcessor.IProcessingContext { - - private final List entries = Collections - .synchronizedList(new ArrayList()); + private static class RawIndexerInfoMock implements IRawIndexerInfoCollector { + private final Map defines = new HashMap<>(); + private final List undefines = new ArrayList<>(); + private final List includePaths = new ArrayList<>(); + private final List systemIncludePaths = new ArrayList<>(); @Override - public void addSettingEntry(ICLanguageSettingEntry entry) { - entries.add(entry); + public void addDefine(String name, String value) { + Objects.requireNonNull(name); + value = Objects.toString(value, ""); //$NON-NLS-1$ + defines.put(name, value); + } + + @Override + public void addUndefine(String name) { + Objects.requireNonNull(name); + undefines.add(name); + } + + @Override + public void addIncludePath(String path) { + Objects.requireNonNull(path); + includePaths.add(path); + } + + @Override + public void addSystemIncludePath(String path) { + Objects.requireNonNull(path); + systemIncludePaths.add(path); } } } diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia/src/main/java/org/eclipse/cdt/cmake/is/nvidia/NvccBuiltinDetectionBehavior.java b/cmake/org.eclipse.cdt.cmake.is.nvidia/src/main/java/org/eclipse/cdt/cmake/is/nvidia/NvccBuiltinDetectionBehavior.java index 552509c83f1..c0da24647bf 100644 --- a/cmake/org.eclipse.cdt.cmake.is.nvidia/src/main/java/org/eclipse/cdt/cmake/is/nvidia/NvccBuiltinDetectionBehavior.java +++ b/cmake/org.eclipse.cdt.cmake.is.nvidia/src/main/java/org/eclipse/cdt/cmake/is/nvidia/NvccBuiltinDetectionBehavior.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019 Martin Weber. + * Copyright (c) 2019-2020 Martin Weber. * * Content is provided to you under the terms and conditions of the Eclipse Public License Version 2.0 "EPL". * A copy of the EPL is available at http://www.eclipse.org/legal/epl-2.0. @@ -42,18 +42,4 @@ class NvccBuiltinDetectionBehavior implements IBuiltinsDetectionBehavior { // enable built-in detection return false; } - - @Override - public String getInputFileExtension(String languageId) { - if (languageId.equals("org.eclipse.cdt.core.gcc")) { - return "c"; - } - if (languageId.equals("org.eclipse.cdt.core.g++")) { - return "cpp"; - } - if (languageId.equals("com.nvidia.cuda.toolchain.language.cuda.cu")) { - return "cu"; - } - return null; - } } diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia/src/main/java/org/eclipse/cdt/cmake/is/nvidia/NvccLangStdArglet.java b/cmake/org.eclipse.cdt.cmake.is.nvidia/src/main/java/org/eclipse/cdt/cmake/is/nvidia/NvccLangStdArglet.java index 57ecceb2b60..488830b8058 100644 --- a/cmake/org.eclipse.cdt.cmake.is.nvidia/src/main/java/org/eclipse/cdt/cmake/is/nvidia/NvccLangStdArglet.java +++ b/cmake/org.eclipse.cdt.cmake.is.nvidia/src/main/java/org/eclipse/cdt/cmake/is/nvidia/NvccLangStdArglet.java @@ -28,7 +28,7 @@ public class NvccLangStdArglet extends BuiltinDetctionArgsGeneric implements IAr * @see org.eclipse.cdt.cmake.is.IArglet#processArgs(java.lang.String) */ @Override - public int processArgument(IParseContext parseContext, IPath cwd, String argsLine) { - return processArgument(parseContext, argsLine, optionMatchers); + public int processArgument(IArgumentCollector resultCollector, IPath cwd, String argsLine) { + return processArgument(resultCollector, argsLine, optionMatchers); } } \ No newline at end of file diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia/src/main/java/org/eclipse/cdt/cmake/is/nvidia/NvccSystemIncludePathArglet.java b/cmake/org.eclipse.cdt.cmake.is.nvidia/src/main/java/org/eclipse/cdt/cmake/is/nvidia/NvccSystemIncludePathArglet.java index c4926947e33..788dc97b594 100644 --- a/cmake/org.eclipse.cdt.cmake.is.nvidia/src/main/java/org/eclipse/cdt/cmake/is/nvidia/NvccSystemIncludePathArglet.java +++ b/cmake/org.eclipse.cdt.cmake.is.nvidia/src/main/java/org/eclipse/cdt/cmake/is/nvidia/NvccSystemIncludePathArglet.java @@ -33,7 +33,7 @@ class NvccSystemIncludePathArglet extends IncludePathGeneric implements IArglet * @see org.eclipse.cdt.cmake.is.IArglet#processArgs(java.lang.String) */ @Override - public int processArgument(IParseContext parseContext, IPath cwd, String argsLine) { - return processArgument(parseContext, cwd, argsLine, optionMatchers); + public int processArgument(IArgumentCollector resultCollector, IPath cwd, String argsLine) { + return processArgument(true, resultCollector, cwd, argsLine, optionMatchers); } } \ No newline at end of file diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia/src/main/java/org/eclipse/cdt/cmake/is/nvidia/NvccToolDetectionParticipant.java b/cmake/org.eclipse.cdt.cmake.is.nvidia/src/main/java/org/eclipse/cdt/cmake/is/nvidia/NvccToolDetectionParticipant.java index 1b1aa6c0343..d2b91660710 100644 --- a/cmake/org.eclipse.cdt.cmake.is.nvidia/src/main/java/org/eclipse/cdt/cmake/is/nvidia/NvccToolDetectionParticipant.java +++ b/cmake/org.eclipse.cdt.cmake.is.nvidia/src/main/java/org/eclipse/cdt/cmake/is/nvidia/NvccToolDetectionParticipant.java @@ -37,13 +37,7 @@ public class NvccToolDetectionParticipant extends DefaultToolDetectionParticipan new Arglets.SystemIncludePath_C(), new NvccLangStdArglet() }; private ToolCommandlineParser() { - super(COM_NVIDIA_CUDA_LANGUAGE_ID, new ResponseFileArglets.At(), new NvccBuiltinDetectionBehavior(), - arglets); - } - - @Override - public Set getCustomLanguageIds() { - return Collections.singleton(COM_NVIDIA_CUDA_LANGUAGE_ID); + super(new ResponseFileArglets.At(), new NvccBuiltinDetectionBehavior(), arglets); } } }