-
Notifications
You must be signed in to change notification settings - Fork 275
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
Fix globbed read/import bugs #449
Merged
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
f5042c8
Split MemberNode into (Regular/Shared)MemberNode
translatenix 879d853
Invert shouldRunTypeCheck to match its name
translatenix 8742111
Introduce VmObjectBuilder
translatenix a8b7047
Improve implementation of globbed read/import nodes
translatenix 5b9e27d
Simplify code
translatenix f307a45
Fix ClassCastException when reflecting on globbed import
translatenix 5fba868
Fix caching of globbed reads
translatenix e2a4604
Address comments per review
bioball 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
67 changes: 67 additions & 0 deletions
67
pkl-core/src/main/java/org/pkl/core/ast/expression/unary/ImportGlobMemberBodyNode.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,67 @@ | ||
/** | ||
* Copyright © 2024 Apple Inc. and the Pkl project authors. All rights reserved. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* https://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
package org.pkl.core.ast.expression.unary; | ||
|
||
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; | ||
import com.oracle.truffle.api.frame.VirtualFrame; | ||
import com.oracle.truffle.api.source.SourceSection; | ||
import java.util.Map; | ||
import org.pkl.core.SecurityManagerException; | ||
import org.pkl.core.ast.ExpressionNode; | ||
import org.pkl.core.http.HttpClientInitException; | ||
import org.pkl.core.module.ResolvedModuleKey; | ||
import org.pkl.core.packages.PackageLoadError; | ||
import org.pkl.core.runtime.VmContext; | ||
import org.pkl.core.runtime.VmLanguage; | ||
import org.pkl.core.runtime.VmObjectLike; | ||
import org.pkl.core.runtime.VmTyped; | ||
import org.pkl.core.runtime.VmUtils; | ||
import org.pkl.core.util.GlobResolver.ResolvedGlobElement; | ||
|
||
/** Used by {@link ReadGlobNode}. */ | ||
public final class ImportGlobMemberBodyNode extends ExpressionNode { | ||
private final VmLanguage language; | ||
private final ResolvedModuleKey currentModule; | ||
|
||
public ImportGlobMemberBodyNode( | ||
SourceSection sourceSection, VmLanguage language, ResolvedModuleKey currentModule) { | ||
super(sourceSection); | ||
this.language = language; | ||
this.currentModule = currentModule; | ||
} | ||
|
||
@Override | ||
public Object executeGeneric(VirtualFrame frame) { | ||
var mapping = VmUtils.getObjectReceiver(frame); | ||
var path = (String) VmUtils.getMemberKey(frame); | ||
return importModule(mapping, path); | ||
} | ||
|
||
@TruffleBoundary | ||
private VmTyped importModule(VmObjectLike mapping, String path) { | ||
@SuppressWarnings("unchecked") | ||
var globElements = (Map<String, ResolvedGlobElement>) mapping.getExtraStorage(); | ||
var importUri = globElements.get(path).getUri(); | ||
var context = VmContext.get(this); | ||
try { | ||
context.getSecurityManager().checkImportModule(currentModule.getUri(), importUri); | ||
var moduleToImport = context.getModuleResolver().resolve(importUri, this); | ||
return language.loadModule(moduleToImport, this); | ||
} catch (SecurityManagerException | PackageLoadError | HttpClientInitException e) { | ||
throw exceptionBuilder().withCause(e).build(); | ||
} | ||
} | ||
} |
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
Oops, something went wrong.
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.
I swear we've fixed this at least three times already but it keeps sneaking back in.