-
Notifications
You must be signed in to change notification settings - Fork 184
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[Compatibility] Add Refinement#refined_class #3094
Closed
itarato
wants to merge
2
commits into
oracle:master
from
Shopify:feature/PA-3039-Refinement-refined_class
Closed
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
110 changes: 110 additions & 0 deletions
110
src/main/java/org/truffleruby/core/refinement/RefinementNodes.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,110 @@ | ||
| /* | ||
| * Copyright (c) 2023 Oracle and/or its affiliates. All rights reserved. This | ||
| * code is released under a tri EPL/GPL/LGPL license. You can use it, | ||
| * redistribute it and/or modify it under the terms of the: | ||
| * | ||
| * Eclipse Public License version 2.0, or | ||
| * GNU General Public License version 2, or | ||
| * GNU Lesser General Public License version 2.1. | ||
| */ | ||
| package org.truffleruby.core.refinement; | ||
|
|
||
| import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; | ||
| import com.oracle.truffle.api.RootCallTarget; | ||
| import com.oracle.truffle.api.dsl.Specialization; | ||
| import org.truffleruby.RubyLanguage; | ||
| import org.truffleruby.annotations.CoreMethod; | ||
| import org.truffleruby.annotations.CoreModule; | ||
| import org.truffleruby.annotations.Primitive; | ||
| import org.truffleruby.annotations.Visibility; | ||
| import org.truffleruby.builtins.CoreMethodArrayArgumentsNode; | ||
| import org.truffleruby.builtins.PrimitiveArrayArgumentsNode; | ||
| import org.truffleruby.core.module.RubyModule; | ||
| import org.truffleruby.core.string.StringUtils; | ||
| import org.truffleruby.language.RubyRootNode; | ||
| import org.truffleruby.language.control.RaiseException; | ||
| import org.truffleruby.language.methods.DeclarationContext; | ||
| import org.truffleruby.language.methods.DeclarationContext.FixedDefaultDefinee; | ||
| import org.truffleruby.language.methods.InternalMethod; | ||
|
|
||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
|
|
||
| @CoreModule(value = "Refinement", isClass = true) | ||
| public abstract class RefinementNodes { | ||
|
|
||
| @Primitive(name = "refinement_import_methods") | ||
| public abstract static class ImportMethodsNode extends PrimitiveArrayArgumentsNode { | ||
|
|
||
| @TruffleBoundary | ||
| @Specialization | ||
| protected RubyModule importMethods(RubyModule refinement, RubyModule moduleToImportFrom) { | ||
| var firstNonRubyMethod = getFirstNonRubyMethodOrNull(moduleToImportFrom, getLanguage()); | ||
| if (firstNonRubyMethod != null) { | ||
| throw new RaiseException(getContext(), | ||
| coreExceptions().argumentError(createErrorMessage(firstNonRubyMethod, moduleToImportFrom), | ||
| this)); | ||
| } | ||
|
|
||
| importMethodsFromModuleToRefinement(moduleToImportFrom, refinement); | ||
|
|
||
| return refinement; | ||
| } | ||
|
|
||
| private String createErrorMessage(InternalMethod method, RubyModule module) { | ||
| return StringUtils.format("Can't import method which is not defined with Ruby code: %s#%s", | ||
| module.getName(), method.getName()); | ||
| } | ||
|
|
||
| private void importMethodsFromModuleToRefinement(RubyModule module, RubyModule refinement) { | ||
| var declarationContext = createDeclarationContextWithRefinement(refinement); | ||
| for (InternalMethod methodToCopy : module.fields.getMethods()) { | ||
| var clonedMethod = cloneMethod(methodToCopy, declarationContext, refinement); | ||
| refinement.fields.addMethod(getContext(), this, clonedMethod); | ||
| } | ||
| } | ||
|
|
||
| private InternalMethod getFirstNonRubyMethodOrNull(RubyModule module, RubyLanguage language) { | ||
| for (InternalMethod method : module.fields.getMethods()) { | ||
| if (!method.isDefinedInRuby(language)) { | ||
| return method; | ||
| } | ||
| } | ||
|
|
||
| return null; | ||
| } | ||
|
|
||
| // Creates a declaration context which contains the refined methods from the given refinement | ||
| private DeclarationContext createDeclarationContextWithRefinement(RubyModule refinement) { | ||
| final Map<RubyModule, RubyModule[]> refinements = new HashMap<>(); | ||
| refinements.put(refinement.fields.getRefinedModule(), new RubyModule[]{ refinement }); | ||
| return new DeclarationContext( | ||
| Visibility.PUBLIC, | ||
| new FixedDefaultDefinee(refinement), | ||
| refinements); | ||
| } | ||
|
|
||
| private InternalMethod cloneMethod(InternalMethod method, DeclarationContext declarationContext, | ||
| RubyModule refinement) { | ||
| var clonedCallTarget = cloneCallTarget(method); | ||
| return method.withCallTargetAndDeclarationContextAndDeclarationModule(clonedCallTarget, declarationContext, | ||
| refinement); | ||
| } | ||
|
|
||
| private RootCallTarget cloneCallTarget(InternalMethod method) { | ||
| var rubyRootNode = (RubyRootNode) method.getCallTarget().getRootNode(); | ||
| var clonedRootNode = rubyRootNode.cloneUninitialized(); | ||
|
|
||
| return clonedRootNode.getCallTarget(); | ||
| } | ||
| } | ||
|
|
||
| @CoreMethod(names = "refined_class") | ||
| public abstract static class RefinedClassNode extends CoreMethodArrayArgumentsNode { | ||
|
|
||
| @Specialization | ||
| protected RubyModule refinedClass(RubyModule refinement) { | ||
| return refinement.fields.getRefinedModule(); | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
suggestion: it makes sense to have moving the class into a separate file committed separately.