From af1f552bf4e75d52321cdd8188cd0f9524e9e894 Mon Sep 17 00:00:00 2001 From: Fumihiko Hata Date: Fri, 5 Jan 2024 01:40:59 +0900 Subject: [PATCH] fixed: quoting KDL string nodes containing `//` to prevent them from being interpreted as comments --- core/encoding/kdl/encoder.onyx | 4 +++- shared/lib/darwin_arm64/lib/libovmwasm.a | Bin 322768 -> 323064 bytes 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/core/encoding/kdl/encoder.onyx b/core/encoding/kdl/encoder.onyx index b1fe8661..8ea46d1b 100644 --- a/core/encoding/kdl/encoder.onyx +++ b/core/encoding/kdl/encoder.onyx @@ -4,6 +4,7 @@ package core.encoding.kdl KDL_TAB_SIZE :: 4 use core {io} +use core.string {contains} write :: (d: &Document, w: &io.Writer) { for d.nodes { @@ -19,7 +20,8 @@ write_node :: (n: &Node, w: &io.Writer, indentation := 0) { io.write_format(w, "({}) ", ta); }); - io.write(w, n.node); + if contains(n.node, "//") do io.write_format(w, "{\"}", n.node); + else do io.write(w, n.node); io.write(w, " "); for n.values { diff --git a/shared/lib/darwin_arm64/lib/libovmwasm.a b/shared/lib/darwin_arm64/lib/libovmwasm.a index 515623ffb1aced4ae25691686064777d5192e112..fd8ff64d16e4d8286d7c484306bb22ffdd8ad636 100644 GIT binary patch delta 8002 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 KaH4a5@BaeXa#Ab+ -- 2.25.1