Skip to content

Commit b7285fb

Browse files
committed
update outputs
1 parent 0834c2d commit b7285fb

File tree

218 files changed

+1155
-1131
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

218 files changed

+1155
-1131
lines changed

pkl-core/src/main/java/org/pkl/core/stdlib/encoding/PklBinaryEncodingParserNodes.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
1919
import com.oracle.truffle.api.dsl.Cached;
2020
import com.oracle.truffle.api.dsl.Specialization;
21-
import com.oracle.truffle.api.frame.VirtualFrame;
2221
import com.oracle.truffle.api.nodes.IndirectCallNode;
2322
import java.net.URI;
2423
import org.msgpack.core.MessagePack;
@@ -34,32 +33,33 @@
3433
import org.pkl.core.runtime.VmTypeAlias;
3534
import org.pkl.core.runtime.VmTyped;
3635
import org.pkl.core.runtime.VmUtils;
37-
import org.pkl.core.stdlib.ExternalMethod1Node;
36+
import org.pkl.core.stdlib.ExternalMethod2Node;
3837
import org.pkl.core.util.Nullable;
3938

4039
public final class PklBinaryEncodingParserNodes {
4140

42-
public abstract static class parse extends ExternalMethod1Node {
41+
public abstract static class parse extends ExternalMethod2Node {
4342
@Specialization
44-
protected Object eval(VirtualFrame frameValue, VmTyped self, VmBytes bytes) {
45-
return doParse(self, bytes.getBytes());
43+
protected Object eval(VmTyped self, VmTyped module, VmBytes bytes) {
44+
return doParse(module, bytes.getBytes());
4645
}
4746

4847
@Specialization
4948
protected Object eval(
50-
VirtualFrame frameValue,
5149
VmTyped self,
50+
VmTyped module,
5251
VmTyped resource,
5352
@Cached("create()") IndirectCallNode callNode) {
5453
var bytes = (VmBytes) VmUtils.readMember(resource, Identifier.BYTES, callNode);
55-
return doParse(self, bytes.getBytes());
54+
return doParse(module, bytes.getBytes());
5655
}
5756

5857
@TruffleBoundary
59-
private Object doParse(VmTyped self, byte[] bytes) {
58+
private Object doParse(VmTyped module, byte[] bytes) {
6059
var unpacker = MessagePack.newDefaultUnpacker(bytes);
61-
// TODO currentModuleUri
62-
return new PklBinaryDecoder(unpacker, new Importer(URI.create("repl:text"))).decode();
60+
return new PklBinaryDecoder(
61+
unpacker, new Importer(module.getVmClass().getPClassInfo().getModuleUri()))
62+
.decode();
6363
}
6464

6565
private class Importer implements PklBinaryDecoder.Importer {

pkl-core/src/test/files/LanguageSnippetTests/input/api/encoding2.pkl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ extends "encoding1.txt.pkl"
22

33
import "pkl:encoding"
44

5-
decoded: Foo = new encoding.PklBinaryEncodingParser {}.parse(encoded) as Foo
5+
decoded: Foo = new encoding.PklBinaryEncodingParser {}.parse(module, encoded) as Foo
66

77
decodedClass = decoded.getClass().toString()
88

pkl-core/src/test/files/LanguageSnippetTests/output/api/jsonRenderer8.err

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ at pkl.base#JsonRenderer.renderDocument (file:///$snippetsDir/input/api/jsonRend
88

99
Consider adding a converter to `output.converters`.
1010

11-
xxx | text = renderer.renderDocument(value)
12-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
11+
xxx | if (renderer is ValueRenderer) renderer.renderDocument(value)
12+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1313
at pkl.base#Module.output.text (pkl:base)
1414

15-
xxx | bytes = text.encodeToBytes("UTF-8")
16-
^^^^
15+
xxx | else text.encodeToBytes("UTF-8")
16+
^^^^
1717
at pkl.base#Module.output.bytes (pkl:base)

pkl-core/src/test/files/LanguageSnippetTests/output/api/jsonnetRenderer7.err

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ at pkl.jsonnet#Renderer.renderDocument (file:///$snippetsDir/input/api/jsonnetRe
88

99
Consider adding a converter to `output.converters`.
1010

11-
xxx | text = renderer.renderDocument(value)
12-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
11+
xxx | if (renderer is ValueRenderer) renderer.renderDocument(value)
12+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1313
at pkl.base#Module.output.text (pkl:base)
1414

15-
xxx | bytes = text.encodeToBytes("UTF-8")
16-
^^^^
15+
xxx | else text.encodeToBytes("UTF-8")
16+
^^^^
1717
at pkl.base#Module.output.bytes (pkl:base)

pkl-core/src/test/files/LanguageSnippetTests/output/api/pListRenderer7.err

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ at pkl.base#PListRenderer.renderDocument (file:///$snippetsDir/input/api/pListRe
88

99
Consider adding a converter to `output.converters`.
1010

11-
xxx | text = renderer.renderDocument(value)
12-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
11+
xxx | if (renderer is ValueRenderer) renderer.renderDocument(value)
12+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1313
at pkl.base#Module.output.text (pkl:base)
1414

15-
xxx | bytes = text.encodeToBytes("UTF-8")
16-
^^^^
15+
xxx | else text.encodeToBytes("UTF-8")
16+
^^^^
1717
at pkl.base#Module.output.bytes (pkl:base)

pkl-core/src/test/files/LanguageSnippetTests/output/api/pcfRenderer8.err

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ at pkl.base#PcfRenderer.renderDocument (file:///$snippetsDir/input/api/pcfRender
88

99
Consider adding a converter to `output.converters`.
1010

11-
xxx | text = renderer.renderDocument(value)
12-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
11+
xxx | if (renderer is ValueRenderer) renderer.renderDocument(value)
12+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1313
at pkl.base#Module.output.text (pkl:base)
1414

15-
xxx | bytes = text.encodeToBytes("UTF-8")
16-
^^^^
15+
xxx | else text.encodeToBytes("UTF-8")
16+
^^^^
1717
at pkl.base#Module.output.bytes (pkl:base)

pkl-core/src/test/files/LanguageSnippetTests/output/api/propertiesRenderer10.err

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ at propertiesRenderer10.properties#foo (file:///$snippetsDir/input/api/propertie
88

99
Consider adding a converter to `output.converters`.
1010

11-
xxx | text = renderer.renderDocument(value)
12-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
11+
xxx | if (renderer is ValueRenderer) renderer.renderDocument(value)
12+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1313
at pkl.base#Module.output.text (pkl:base)
1414

15-
xxx | bytes = text.encodeToBytes("UTF-8")
16-
^^^^
15+
xxx | else text.encodeToBytes("UTF-8")
16+
^^^^
1717
at pkl.base#Module.output.bytes (pkl:base)

pkl-core/src/test/files/LanguageSnippetTests/output/api/propertiesRenderer11.err

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ at pkl.base#PropertiesRenderer.renderDocument (file:///$snippetsDir/input/api/pr
88

99
Consider adding a converter to `output.converters`.
1010

11-
xxx | text = renderer.renderDocument(value)
12-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
11+
xxx | if (renderer is ValueRenderer) renderer.renderDocument(value)
12+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1313
at pkl.base#Module.output.text (pkl:base)
1414

15-
xxx | bytes = text.encodeToBytes("UTF-8")
16-
^^^^
15+
xxx | else text.encodeToBytes("UTF-8")
16+
^^^^
1717
at pkl.base#Module.output.bytes (pkl:base)

pkl-core/src/test/files/LanguageSnippetTests/output/api/propertiesRenderer4.pcf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ res7 = "Cannot render value of type `DataSize` as Properties. Value: 1.mb"
88
res8 = "Cannot render value of type `List` as Properties. Value: List(\"pigeon\", \"parrot\")"
99
res9 = "Cannot render value of type `Set` as Properties. Value: Set(\"pigeon\", \"parrot\")"
1010
res10 = "Cannot render value of type `Map` as Properties. Value: Map(\"name\", \"pigeon\", \"age\", 42)"
11-
res11 = "Cannot render value of type `Listing` as Properties. Value: new Listing { ?; ? }"
11+
res11 = "Cannot render value of type `Listing` as Properties. Value: new Listing { \"pigeon\"; \"parrot\" }"
1212
res12 = "Cannot render value of type `Mapping` as Properties. Value: new Mapping { [\"name\"] = ?; [\"age\"] = ? }"
1313
res13 = "Cannot render value of type `Dynamic` as Properties. Value: new Dynamic { name = ?; age = ? }"
1414
res14 = "Cannot render value of type `propertiesRenderer4#Person` as Properties. Value: new Person { name = ?; age = ? }"

0 commit comments

Comments
 (0)