Skip to content

Commit 3fb8ee9

Browse files
eregoneregon
committed
Set implementationName for RubyLanguage
PullRequest: truffleruby/493
2 parents 03f6b83 + b343722 commit 3fb8ee9

File tree

9 files changed

+21
-21
lines changed

9 files changed

+21
-21
lines changed

‎src/main/java/org/truffleruby/RubyLanguage.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,10 @@
3535
@TruffleLanguage.Registration(
3636
name = "Ruby",
3737
id = TruffleRuby.LANGUAGE_ID,
38+
implementationName = "TruffleRuby",
3839
version = TruffleRuby.LANGUAGE_VERSION,
39-
characterMimeTypes = RubyLanguage.MIME_TYPE,
40-
defaultMimeType = RubyLanguage.MIME_TYPE,
40+
characterMimeTypes = TruffleRuby.MIME_TYPE,
41+
defaultMimeType = TruffleRuby.MIME_TYPE,
4142
dependentLanguages = TruffleRuby.LLVM_ID)
4243
@ProvidedTags({
4344
CoverageManager.LineTag.class,
@@ -52,9 +53,6 @@ public class RubyLanguage extends TruffleLanguage<RubyContext> {
5253

5354
public static final String PLATFORM = String.format("%s-%s", Platform.getArchitecture(), Platform.getOSName());
5455

55-
public static final String MIME_TYPE = TruffleRuby.MIME_TYPE;
56-
public static final String EXTENSION = TruffleRuby.EXTENSION;
57-
5856
public static final String LLVM_BITCODE_MIME_TYPE = "application/x-llvm-ir-bitcode";
5957

6058
public static final String CEXT_MIME_TYPE = "application/x-ruby-cext-library";

‎src/main/java/org/truffleruby/core/kernel/TraceManager.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,14 @@
2626
import com.oracle.truffle.api.source.SourceSection;
2727
import com.oracle.truffle.api.utilities.CyclicAssumption;
2828
import org.truffleruby.RubyContext;
29-
import org.truffleruby.RubyLanguage;
3029
import org.truffleruby.core.binding.BindingNodes;
3130
import org.truffleruby.core.string.StringOperations;
3231
import org.truffleruby.core.tracepoint.TraceBaseEventNode;
3332
import org.truffleruby.language.RubyGuards;
3433
import org.truffleruby.language.arguments.RubyArguments;
3534
import org.truffleruby.language.objects.LogicalClassNode;
35+
import org.truffleruby.shared.TruffleRuby;
36+
3637
import java.util.ArrayList;
3738
import java.util.Collection;
3839

@@ -86,20 +87,20 @@ public void setTraceFunc(final DynamicObject traceFunc) {
8687
instruments = new ArrayList<>();
8788

8889
instruments.add(instrumenter.attachExecutionEventFactory(SourceSectionFilter.newBuilder()
89-
.mimeTypeIs(RubyLanguage.MIME_TYPE)
90+
.mimeTypeIs(TruffleRuby.MIME_TYPE)
9091
.tagIs(LineTag.class)
9192
.build(),
9293
eventContext -> new BaseEventEventNode(context, eventContext, traceFunc, context.getCoreStrings().LINE.createInstance())));
9394

9495
instruments.add(instrumenter.attachExecutionEventFactory(SourceSectionFilter.newBuilder()
95-
.mimeTypeIs(RubyLanguage.MIME_TYPE)
96+
.mimeTypeIs(TruffleRuby.MIME_TYPE)
9697
.tagIs(ClassTag.class)
9798
.build(),
9899
eventContext -> new BaseEventEventNode(context, eventContext, traceFunc, context.getCoreStrings().CLASS.createInstance())));
99100

100101
if (context.getOptions().TRACE_CALLS) {
101102
instruments.add(instrumenter.attachExecutionEventFactory(SourceSectionFilter.newBuilder()
102-
.mimeTypeIs(RubyLanguage.MIME_TYPE)
103+
.mimeTypeIs(TruffleRuby.MIME_TYPE)
103104
.tagIs(CallTag.class)
104105
.includeInternal(false)
105106
.build(),

‎src/main/java/org/truffleruby/core/tracepoint/TracePointNodes.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import org.jcodings.specific.UTF8Encoding;
2020
import org.truffleruby.Layouts;
2121
import org.truffleruby.RubyContext;
22-
import org.truffleruby.RubyLanguage;
2322
import org.truffleruby.builtins.CoreClass;
2423
import org.truffleruby.builtins.CoreMethod;
2524
import org.truffleruby.builtins.CoreMethodArrayArgumentsNode;
@@ -34,6 +33,7 @@
3433
import org.truffleruby.language.arguments.RubyArguments;
3534
import org.truffleruby.language.methods.InternalMethod;
3635
import org.truffleruby.language.objects.AllocateObjectNode;
36+
import org.truffleruby.shared.TruffleRuby;
3737

3838
@CoreClass("TracePoint")
3939
public abstract class TracePointNodes {
@@ -102,7 +102,7 @@ public Object enable(DynamicObject tracePoint, DynamicObject block) {
102102
public static EventBinding<?> createEventBinding(RubyContext context, DynamicObject tracePoint) {
103103
return context.getInstrumenter().attachExecutionEventFactory(
104104
SourceSectionFilter.newBuilder()
105-
.mimeTypeIs(RubyLanguage.MIME_TYPE)
105+
.mimeTypeIs(TruffleRuby.MIME_TYPE)
106106
.tagIs((Class<?>[]) Layouts.TRACE_POINT.getTags(tracePoint))
107107
.includeInternal(false)
108108
.build(), eventContext -> new TracePointEventNode(context, eventContext, tracePoint));

‎src/main/java/org/truffleruby/debug/TruffleDebugNodes.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
import org.truffleruby.language.objects.ReadObjectFieldNodeGen;
5050
import org.truffleruby.language.objects.shared.SharedObjects;
5151
import org.truffleruby.language.yield.YieldNode;
52+
import org.truffleruby.shared.TruffleRuby;
5253

5354
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
5455
import com.oracle.truffle.api.RootCallTarget;
@@ -88,7 +89,7 @@ public DynamicObject setBreak(DynamicObject file, int line, DynamicObject block)
8889
final String fileString = StringOperations.getString(file);
8990

9091
final SourceSectionFilter filter = SourceSectionFilter.newBuilder()
91-
.mimeTypeIs(RubyLanguage.MIME_TYPE)
92+
.mimeTypeIs(TruffleRuby.MIME_TYPE)
9293
.sourceIs(source -> source != null && getContext().getPath(source).equals(fileString))
9394
.lineIs(line)
9495
.tagIs(StandardTags.StatementTag.class)

‎src/main/java/org/truffleruby/language/loader/FeatureLoader.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import org.truffleruby.language.control.JavaException;
3434
import org.truffleruby.language.control.RaiseException;
3535
import org.truffleruby.shared.Metrics;
36+
import org.truffleruby.shared.TruffleRuby;
3637
import org.truffleruby.shared.options.OptionsCatalog;
3738
import org.truffleruby.platform.NativeConfiguration;
3839
import org.truffleruby.platform.TruffleNFIPlatform;
@@ -201,7 +202,7 @@ private String findFeatureWithAndWithoutExtension(String path) {
201202
}
202203
}
203204

204-
final String withExtension = findFeatureWithExactPath(path + RubyLanguage.EXTENSION);
205+
final String withExtension = findFeatureWithExactPath(path + TruffleRuby.EXTENSION);
205206

206207
if (withExtension != null) {
207208
return withExtension;

‎src/main/java/org/truffleruby/language/loader/FileLoader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public RubySource loadFile(String path) throws IOException {
8686
} else {
8787
// We need to assume all other files are Ruby, so the file type detection isn't enough
8888
language = TruffleRuby.LANGUAGE_ID;
89-
mimeType = RubyLanguage.MIME_TYPE;
89+
mimeType = TruffleRuby.MIME_TYPE;
9090
}
9191

9292
// We set an explicit MIME type because LLVM does not have a default one

‎src/main/java/org/truffleruby/language/loader/MainLoader.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import com.oracle.truffle.api.source.Source;
1313
import org.jcodings.specific.UTF8Encoding;
1414
import org.truffleruby.RubyContext;
15-
import org.truffleruby.RubyLanguage;
1615
import org.truffleruby.core.rope.CodeRange;
1716
import org.truffleruby.core.rope.Rope;
1817
import org.truffleruby.core.rope.RopeOperations;
@@ -104,7 +103,7 @@ public RubySource loadFromFile(RubyNode currentNode, String path) throws IOExcep
104103
* - test/truffle/integration/tracing.sh (again, probably the values, and I'm not sure we were correct before, it's just changed)
105104
*/
106105

107-
final Source source = Source.newBuilder(TruffleRuby.LANGUAGE_ID, sourceRope.toString(), path).mimeType(RubyLanguage.MIME_TYPE).build();
106+
final Source source = Source.newBuilder(TruffleRuby.LANGUAGE_ID, sourceRope.toString(), path).mimeType(TruffleRuby.MIME_TYPE).build();
108107

109108
context.setMainSources(source, new File(path).getAbsolutePath());
110109

‎src/main/java/org/truffleruby/stdlib/CoverageManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import com.oracle.truffle.api.source.Source;
2222
import com.oracle.truffle.api.source.SourceSection;
2323
import org.truffleruby.RubyContext;
24-
import org.truffleruby.RubyLanguage;
2524
import org.truffleruby.collections.ConcurrentOperations;
25+
import org.truffleruby.shared.TruffleRuby;
2626

2727
import java.io.PrintStream;
2828
import java.util.Arrays;
@@ -87,7 +87,7 @@ public synchronized void enable() {
8787
}
8888

8989
binding = instrumenter.attachExecutionEventFactory(SourceSectionFilter.newBuilder()
90-
.mimeTypeIs(RubyLanguage.MIME_TYPE)
90+
.mimeTypeIs(TruffleRuby.MIME_TYPE)
9191
.sourceIs(coveredSources::contains)
9292
.tagIs(LineTag.class)
9393
.build(), eventContext -> new ExecutionEventNode() {

‎src/test/java/org/truffleruby/services/RubyFileTypeDetectorTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
package org.truffleruby.services;
1111

1212
import org.junit.Test;
13-
import org.truffleruby.RubyLanguage;
1413
import org.truffleruby.RubyTest;
14+
import org.truffleruby.shared.TruffleRuby;
1515

1616
import java.io.IOException;
1717
import java.nio.charset.StandardCharsets;
@@ -29,14 +29,14 @@ public class RubyFileTypeDetectorTest extends RubyTest {
2929
public void testDirect() throws IOException {
3030
final RubyFileTypeDetector fileTypeDetector = new RubyFileTypeDetector();
3131
for (Path path : getTestPaths()) {
32-
assertEquals(RubyLanguage.MIME_TYPE, fileTypeDetector.probeContentType(path));
32+
assertEquals(TruffleRuby.MIME_TYPE, fileTypeDetector.probeContentType(path));
3333
}
3434
}
3535

3636
@Test
3737
public void testIndirect() throws IOException {
3838
for (Path path : getTestPaths()) {
39-
assertEquals(RubyLanguage.MIME_TYPE, Files.probeContentType(path));
39+
assertEquals(TruffleRuby.MIME_TYPE, Files.probeContentType(path));
4040
}
4141
}
4242

0 commit comments

Comments
 (0)