diff --git a/ez.lock.toml b/ez.lock.toml index 6172e133..7369e41c 100644 --- a/ez.lock.toml +++ b/ez.lock.toml @@ -2,45 +2,49 @@ version = "2" hub = "https://hub.bend-lang.com" [packages] -[packages.0x8e26a6f8c31689519e618374376ee3dd] -[packages.0x8e26a6f8c31689519e618374376ee3dd.source] +[packages.0x597f8af3f77d8983aacfa076df42d235] +[packages.0x597f8af3f77d8983aacfa076df42d235.source] kind = "hub" -[packages.0x8e26a6f8c31689519e618374376ee3dd.files] +[packages.0x597f8af3f77d8983aacfa076df42d235.files] LICENSE = "309f5aae946e4db157750e002fb179a74ed0fe27fce09a7be68a6977b14f205f" -"main.bend" = "a6aef5b409c071cf57573282aebd98b1761b332d43fe664446b9e4cbae17468d" +"README.md" = "46a600ac6912b9494efd19bbde29d3e69c51f1e46d8d3bae5fc05524e2e4ccda" +"main.bend" = "0ea32ddbd3b69a13f672855f2632bc4286586ba2dcf9abfe5669be0deb37f54f" +"src/fixed.bend" = "39ebdf10aad8572eab5a6d8a14e6973dfc13000620fc2081e1d9b027e6003948" +"src/lazy.bend" = "5e0ec859ceea76521a7a04c78edfe47dafe9b036166602af7f085079f6f7d7e5" +"src/lex.bend" = "6f1a48b79d03bcbc15d6e124a65289bfeaf0a5f26fcbda263d8ecfb2dc4a57d9" +"src/parse.bend" = "03be50cae0939f1695c3219ef007774e62f4b23066dd0bf3b450b95b5a358985" +"src/print.bend" = "6d9ad9d8cefc38ebea810a302237a4d0e0dfc9f45445463ce4d84b63206db872" +"src/pull.bend" = "2d94029387e5e1faa4bc3ac31bb1c725af50cf17d0815d23e77ed0c2cef82f77" +"src/value.bend" = "3e79221afa179cc29343ef60a1b2915c6f4d088674533870e6c52ee81b140789" +[packages.0x64697f57fea19681b5fa4f87014ce63d] +[packages.0x64697f57fea19681b5fa4f87014ce63d.source] +kind = "hub" +[packages.0x64697f57fea19681b5fa4f87014ce63d.files] +LICENSE = "309f5aae946e4db157750e002fb179a74ed0fe27fce09a7be68a6977b14f205f" +"README.md" = "7514b8422da7b423ba65207860fa150287eabd1efa9ba5d421f0be7d4fe7d8ab" +"main.bend" = "a3f8f2270d44244774463bcbd80057c46327ce9114680591ba41c3aba868fb23" +"src/args.bend" = "f71b842ef08f459e059e782fb8420fb333b1edb82471a794d3819d391b36e2f8" +"src/check.bend" = "a2525cc16e43de9f79860ef3b7d10774c10f76ace082651c1a17bfd979b161b5" +"src/cli.bend" = "640cee194e479152e907f8bde44746750c26e32cfe0310660be1f0a8b46c1da8" +[packages.0x868383407d284eb98ec06d42345da047] +[packages.0x868383407d284eb98ec06d42345da047.source] +kind = "hub" +[packages.0x868383407d284eb98ec06d42345da047.files] +LICENSE = "309f5aae946e4db157750e002fb179a74ed0fe27fce09a7be68a6977b14f205f" +"README.md" = "be1b31a34bd28860e21eec5d7227fd02ea5e9e6b7141463aa38efcfc640e5058" +"main.bend" = "197ed4a4cd0a7b70109a289f92f5874d67de13b42e71a61d260ea7704b78c40c" "src/answer.bend" = "cfeb97ada7d0708c49abae1164af3e988a32c7fbdfb6591c61ce148b46d0738d" "src/argv.bend" = "6a3a6e8669fb5dab77f843fdd778402593d898c52a0dcd8738b689d95ff35856" -"src/effect.bend" = "d0db20f66f1d55128b865d369a6bccfe8353dc05ec7f8b1b9576317ecaba8d8d" +"src/effect.bend" = "259a0c0abe5accc5e7f43b5441ef546c7286ea9c72077c3b85ac072c5240acda" "src/exec.c" = "7168d672ae23422a5e433267ff93a86a9033327a92de9bac17074971e5ed9969" "src/exec.js" = "70268064b34529d651b670fb180027703d15ec494f6ea9dd7dcfc878dbb30a74" -"src/file.bend" = "563413311583c2595e387557f2d2ba4a5d90ba830ff7e72315c53dcd6636a056" +"src/file.bend" = "55d44b7984aa05524dab7555af3530169f5df547ce5e73299e90fecbae16650e" "src/par.bend" = "c5c316830a377d4f6b5390e12e0dd886f00351d882e6e8803b3514491bf5964e" "src/par.c" = "765bfb48d00035513d1b9f674d2494cdbc773cd55994b573d7059ab92828d597" "src/par.js" = "33ff4eca5d524264d28da36a9caf0a8252036efd44b92358a4c07daeb3ba69c9" "src/start.c" = "13ef4a27c60062571b2cf4a6a7c6c8355b5edc45d90e03decefca964397a5fa4" "src/start.js" = "8ea49fe5324a2608342b4629b29d841a81d72ee8006869ac06971a0fb1aed53a" -[packages.0xa383b26a5a0ef35663b3615d7aedf9e3] -[packages.0xa383b26a5a0ef35663b3615d7aedf9e3.source] -kind = "hub" -[packages.0xa383b26a5a0ef35663b3615d7aedf9e3.files] -LICENSE = "309f5aae946e4db157750e002fb179a74ed0fe27fce09a7be68a6977b14f205f" -"main.bend" = "26caf7180930f49b03a58942ade84601970e3981b6ee10c08defc27a41966ee8" -"src/args.bend" = "5e1b2f9b04f8eba6ec1e691935a7ea7e52b0838463f797eb992888051fb0e626" -"src/check.bend" = "f6a1c1f703ab354338a6e88f05490059abde16126f1848e7fc9776322e79f5ff" -"src/cli.bend" = "5b86f8270ff4b94e3a413a1aa4910b97eafca1e202b8b49f993acbe7cf8d04d7" -[packages.0xa81e161008ecc2f297c0a3065cb9b188] -[packages.0xa81e161008ecc2f297c0a3065cb9b188.source] -kind = "hub" -[packages.0xa81e161008ecc2f297c0a3065cb9b188.files] -LICENSE = "309f5aae946e4db157750e002fb179a74ed0fe27fce09a7be68a6977b14f205f" -"main.bend" = "030530d356d712d66fc58daa6bf81c81379d3132547b7e7a42de436c374e9e27" -"src/lazy.bend" = "5e0ec859ceea76521a7a04c78edfe47dafe9b036166602af7f085079f6f7d7e5" -"src/lex.bend" = "2b6857aa4a69f79ccdbec71e8ccf906f668cb45bf6e5759ecef48a04b0a9fa17" -"src/parse.bend" = "03be50cae0939f1695c3219ef007774e62f4b23066dd0bf3b450b95b5a358985" -"src/print.bend" = "32a92e32f9e58cb028c59209c6aeb2b408f0510d199b31cff172c09bbb68fd6a" -"src/pull.bend" = "c682f4f968f78b10bf39351130aa48fc9ade47c01f5bb2b4b74a061df7afb141" -"src/value.bend" = "be1f4959ca09f749556f761fb491714d5f047350f1292513c8396caccea683da" [names] -"ezjson@1.2.0.0" = "0xa81e161008ecc2f297c0a3065cb9b188" -"shake@0.6.0.0" = "0xa383b26a5a0ef35663b3615d7aedf9e3" -"snap@1.4.0.0" = "0x8e26a6f8c31689519e618374376ee3dd" +"ezjson@1.5.0.0" = "0x597f8af3f77d8983aacfa076df42d235" +"shake@0.9.0.0" = "0x64697f57fea19681b5fa4f87014ce63d" +"snap@1.6.0.0" = "0x868383407d284eb98ec06d42345da047" diff --git a/ez.toml b/ez.toml index 88ee46d8..be92925d 100644 --- a/ez.toml +++ b/ez.toml @@ -3,14 +3,14 @@ name = "bolt" entry = "main.bend" [deps] [deps.ezjson] -hash = "0xa81e161008ecc2f297c0a3065cb9b188" -hub = "ezjson@1.2.0.0" +hash = "0x597f8af3f77d8983aacfa076df42d235" +hub = "ezjson@1.5.0.0" entry = "main.bend" [deps.snap] -hash = "0x8e26a6f8c31689519e618374376ee3dd" -hub = "snap@1.4.0.0" +hash = "0x868383407d284eb98ec06d42345da047" +hub = "snap@1.6.0.0" entry = "main.bend" [deps.shake] -hash = "0xa383b26a5a0ef35663b3615d7aedf9e3" -hub = "shake@0.6.0.0" +hash = "0x64697f57fea19681b5fa4f87014ce63d" +hub = "shake@0.9.0.0" entry = "main.bend" diff --git a/laws/CliAcceptsDocumentedForms.bend b/laws/CliAcceptsDocumentedForms.bend index 016c829e..e631d068 100644 --- a/laws/CliAcceptsDocumentedForms.bend +++ b/laws/CliAcceptsDocumentedForms.bend @@ -8,7 +8,7 @@ # laws/CliVersionExits.bend import Base import ../src/args.bend as Args -import shake@0.6.0.0/main.bend as Shake +import shake@0.9.0.0/main.bend as Shake import ./defs/CliWordKinds.bend as D1 # whether every word is plain diff --git a/laws/CliDashHelp.bend b/laws/CliDashHelp.bend index 8b132641..5ffd7e49 100644 --- a/laws/CliDashHelp.bend +++ b/laws/CliDashHelp.bend @@ -1,6 +1,6 @@ import Base import ../src/args.bend as Args -import shake@0.6.0.0/main.bend as Shake +import shake@0.9.0.0/main.bend as Shake # LAW: a line that asks for `--help` prints the usage of the command path it # asks about to stdout and exits 0, the page `bolt help` prints for that diff --git a/laws/CliVersion.bend b/laws/CliVersion.bend index 9c14eef1..11d4107d 100644 --- a/laws/CliVersion.bend +++ b/laws/CliVersion.bend @@ -2,7 +2,7 @@ import Base import ../src/args.bend as Args import ../src/version.bend as Ver import ../src/build_rev.bend as Rev -import shake@0.6.0.0/main.bend as Shake +import shake@0.9.0.0/main.bend as Shake import ./defs/CliWordKinds.bend as D1 # LAW: `bolt --version` prints bolt, then the release and the commit, and diff --git a/laws/CliVersionExits.bend b/laws/CliVersionExits.bend index 260ed876..dfaff1de 100644 --- a/laws/CliVersionExits.bend +++ b/laws/CliVersionExits.bend @@ -2,7 +2,7 @@ import Base import ../src/args.bend as Args import ../src/version.bend as Ver import ../src/build_rev.bend as Rev -import shake@0.6.0.0/main.bend as Shake +import shake@0.9.0.0/main.bend as Shake # LAW: every argv that parses with `--version` set prints bolt, then the # release and the commit, and exits 0, whatever else it names diff --git a/laws/LspAnswersEachRequestOnce.bend b/laws/LspAnswersEachRequestOnce.bend index 2d0a77d0..66e99314 100644 --- a/laws/LspAnswersEachRequestOnce.bend +++ b/laws/LspAnswersEachRequestOnce.bend @@ -1,7 +1,7 @@ # Each request gets exactly one response with the same id, in order; an # unknown request gets -32601; an unknown notification gets nothing. import Base -import ezjson@1.2.0.0/src/value.bend as J +import ezjson@1.5.0.0/src/value.bend as J import ../src/lsp/server.bend as Server import ./defs/MessageTurns.bend as D1 diff --git a/laws/LspPositionsUseNegotiatedEncoding.bend b/laws/LspPositionsUseNegotiatedEncoding.bend index e7917a81..615d29c4 100644 --- a/laws/LspPositionsUseNegotiatedEncoding.bend +++ b/laws/LspPositionsUseNegotiatedEncoding.bend @@ -1,7 +1,7 @@ # Positions are in the encoding the client negotiated. import Base -import ezjson@1.2.0.0/main.bend as Ezjson -import ezjson@1.2.0.0/src/value.bend as J +import ezjson@1.5.0.0/main.bend as Ezjson +import ezjson@1.5.0.0/src/value.bend as J import ../src/lsp/server.bend as Server import ../src/lsp/proto.bend as Proto import ../src/lsp/enc.bend as Enc diff --git a/laws/LspRepliesFollowTheProtocol.bend b/laws/LspRepliesFollowTheProtocol.bend index 89102666..2da9fda3 100644 --- a/laws/LspRepliesFollowTheProtocol.bend +++ b/laws/LspRepliesFollowTheProtocol.bend @@ -26,8 +26,8 @@ # - A file URI's path is the URI without `file://`, its `%XX` read with # 0-9, a-f and A-F as the hex digits. import Base -import ezjson@1.2.0.0/main.bend as Ezjson -import ezjson@1.2.0.0/src/value.bend as J +import ezjson@1.5.0.0/main.bend as Ezjson +import ezjson@1.5.0.0/src/value.bend as J import ../src/lsp/frame.bend as Frame import ../src/lsp/report.bend as Rep import ../src/syntax/outline.bend as Outline diff --git a/laws/LspRepliesListEveryEntry.bend b/laws/LspRepliesListEveryEntry.bend index 8ecd1a19..24212e18 100644 --- a/laws/LspRepliesListEveryEntry.bend +++ b/laws/LspRepliesListEveryEntry.bend @@ -7,8 +7,8 @@ # which binder or use sits at or behind a token, an entry's way down the # semantic index. import Base -import ezjson@1.2.0.0/main.bend as Ezjson -import ezjson@1.2.0.0/src/value.bend as J +import ezjson@1.5.0.0/main.bend as Ezjson +import ezjson@1.5.0.0/src/value.bend as J import ../src/lsp/frame.bend as Frame import ../src/lsp/report.bend as Rep import ../src/syntax/outline.bend as Outline diff --git a/laws/LspRequestsReadTheProtocol.bend b/laws/LspRequestsReadTheProtocol.bend index 2e49c2c3..f5c51457 100644 --- a/laws/LspRequestsReadTheProtocol.bend +++ b/laws/LspRequestsReadTheProtocol.bend @@ -16,8 +16,8 @@ # - The semantic token legend uses the spec's own token type names, in the # order the server numbers them. import Base -import ezjson@1.2.0.0/main.bend as Ezjson -import ezjson@1.2.0.0/src/value.bend as J +import ezjson@1.5.0.0/main.bend as Ezjson +import ezjson@1.5.0.0/src/value.bend as J import ../src/lsp/enc.bend as Enc import ../src/lsp/semantic.bend as Semantic import ../src/lsp/server.bend as Server diff --git a/laws/defs/MessageTurns.bend b/laws/defs/MessageTurns.bend index c9b4d617..8b0916cf 100644 --- a/laws/defs/MessageTurns.bend +++ b/laws/defs/MessageTurns.bend @@ -1,6 +1,6 @@ # dispatching messages into replies, one turn at a time import Base -import ezjson@1.2.0.0/src/value.bend as J +import ezjson@1.5.0.0/src/value.bend as J import ../../src/lsp/server.bend as Server # dispatch diff --git a/proofs/CliAcceptsDocumentedForms.bend b/proofs/CliAcceptsDocumentedForms.bend index 01199d89..715f4f50 100644 --- a/proofs/CliAcceptsDocumentedForms.bend +++ b/proofs/CliAcceptsDocumentedForms.bend @@ -1,7 +1,7 @@ # proofs of laws/CliAcceptsDocumentedForms.bend import Base import ../src/args.bend as Args -import shake@0.6.0.0/main.bend as Shake +import shake@0.9.0.0/main.bend as Shake import ../laws/CliAcceptsDocumentedForms.bend as Laws import ./lemmas/CliHelpExit.bend as M1 diff --git a/proofs/LspAnswersEachRequestOnce.bend b/proofs/LspAnswersEachRequestOnce.bend index f79ecf26..c71bc82d 100644 --- a/proofs/LspAnswersEachRequestOnce.bend +++ b/proofs/LspAnswersEachRequestOnce.bend @@ -1,6 +1,6 @@ # proofs of laws/LspAnswersEachRequestOnce.bend import Base -import ezjson@1.2.0.0/src/value.bend as J +import ezjson@1.5.0.0/src/value.bend as J import ../src/lsp/server.bend as Server import ../laws/LspAnswersEachRequestOnce.bend as Laws import ../laws/defs/MessageTurns.bend as D1 diff --git a/proofs/LspPositionsUseNegotiatedEncoding.bend b/proofs/LspPositionsUseNegotiatedEncoding.bend index aaefedca..91dfb821 100644 --- a/proofs/LspPositionsUseNegotiatedEncoding.bend +++ b/proofs/LspPositionsUseNegotiatedEncoding.bend @@ -1,6 +1,6 @@ # proofs of laws/LspPositionsUseNegotiatedEncoding.bend import Base -import ezjson@1.2.0.0/main.bend as Ezjson +import ezjson@1.5.0.0/main.bend as Ezjson import ../src/lsp/server.bend as Server import ../src/lsp/proto.bend as Proto import ../src/lsp/enc.bend as Enc diff --git a/proofs/LspRepliesFollowTheProtocol.bend b/proofs/LspRepliesFollowTheProtocol.bend index 3cc007ff..84361f76 100644 --- a/proofs/LspRepliesFollowTheProtocol.bend +++ b/proofs/LspRepliesFollowTheProtocol.bend @@ -1,8 +1,8 @@ # proofs of laws/LspRepliesFollowTheProtocol.bend: each reply by evaluation; # a choice by rewriting it with what the law assumes, or case by case import Base -import ezjson@1.2.0.0/main.bend as Ezjson -import ezjson@1.2.0.0/src/value.bend as J +import ezjson@1.5.0.0/main.bend as Ezjson +import ezjson@1.5.0.0/src/value.bend as J import ../src/lsp/frame.bend as Frame import ../src/syntax/bind.bend as Bind import ../src/config.bend as Config diff --git a/proofs/LspRepliesListEveryEntry.bend b/proofs/LspRepliesListEveryEntry.bend index af841ef6..79a46c5f 100644 --- a/proofs/LspRepliesListEveryEntry.bend +++ b/proofs/LspRepliesListEveryEntry.bend @@ -1,7 +1,7 @@ # proofs of laws/LspRepliesListEveryEntry.bend import Base -import ezjson@1.2.0.0/main.bend as Ezjson -import ezjson@1.2.0.0/src/value.bend as J +import ezjson@1.5.0.0/main.bend as Ezjson +import ezjson@1.5.0.0/src/value.bend as J import ../src/lsp/frame.bend as Frame import ../src/lsp/report.bend as Rep import ../src/syntax/outline.bend as Outline diff --git a/proofs/lemmas/CliHelpExit.bend b/proofs/lemmas/CliHelpExit.bend index 1f798c56..68902376 100644 --- a/proofs/lemmas/CliHelpExit.bend +++ b/proofs/lemmas/CliHelpExit.bend @@ -1,7 +1,7 @@ # the help form of the command line and its exit import Base import ../../src/args.bend as Args -import shake@0.6.0.0/main.bend as Shake +import shake@0.9.0.0/main.bend as Shake import ../../laws/CliAcceptsDocumentedForms.bend as L1 def L1.cli_help_exits(av, ee, ps, h, h_help): diff --git a/proofs/lemmas/CliVersionExit.bend b/proofs/lemmas/CliVersionExit.bend index 249431cc..aee9f955 100644 --- a/proofs/lemmas/CliVersionExit.bend +++ b/proofs/lemmas/CliVersionExit.bend @@ -3,7 +3,7 @@ import Base import ../../src/args.bend as Args import ../../src/version.bend as Ver import ../../src/build_rev.bend as Rev -import shake@0.6.0.0/main.bend as Shake +import shake@0.9.0.0/main.bend as Shake import ../../laws/CliVersionExits.bend as L1 def L1.cli_version_exits(av, m, h, h_ver): diff --git a/src/args.bend b/src/args.bend index 43f8dfb2..65e1b6ec 100644 --- a/src/args.bend +++ b/src/args.bend @@ -19,7 +19,7 @@ # trusts one: the words a compiled bolt's argv holds are the runtime's (its # options, between `+RTS` and `-RTS`, never reach it), which no law reaches. import Base -import shake@0.6.0.0/main.bend as Shake +import shake@0.9.0.0/main.bend as Shake import ./version.bend as Ver import ./build_rev.bend as Rev import ./lazy/lazy.bend as Lazy diff --git a/src/lsp/bench/request.bend b/src/lsp/bench/request.bend index 5b2e40a6..fc0e7a25 100644 --- a/src/lsp/bench/request.bend +++ b/src/lsp/bench/request.bend @@ -7,8 +7,8 @@ import Base import ../../syntax/outline.bend as Outline import ../../syntax/word.bend as Word -import ezjson@1.2.0.0/main.bend as Ezjson -import ezjson@1.2.0.0/src/value.bend as J +import ezjson@1.5.0.0/main.bend as Ezjson +import ezjson@1.5.0.0/src/value.bend as J # the document a hover is answered against def source() -> String: diff --git a/src/lsp/enc.bend b/src/lsp/enc.bend index a3db546c..d886cdb6 100644 --- a/src/lsp/enc.bend +++ b/src/lsp/enc.bend @@ -8,8 +8,8 @@ # hash, is trusted to parse and print JSON correctly; it proves that itself. import Base import ../lazy/lazy.bend as Lazy -import ezjson@1.2.0.0/main.bend as Ezjson -import ezjson@1.2.0.0/src/value.bend as J +import ezjson@1.5.0.0/main.bend as Ezjson +import ezjson@1.5.0.0/src/value.bend as J # the encodings the server speaks type Enc is Data: diff --git a/src/lsp/proto.bend b/src/lsp/proto.bend index 1c723f2b..6870d3fc 100644 --- a/src/lsp/proto.bend +++ b/src/lsp/proto.bend @@ -1,7 +1,7 @@ # lsp/proto: the messages the server sends, and the little it reads of a URI. import Base -import ezjson@1.2.0.0/main.bend as Ezjson -import ezjson@1.2.0.0/src/value.bend as J +import ezjson@1.5.0.0/main.bend as Ezjson +import ezjson@1.5.0.0/src/value.bend as J import ./frame.bend as Frame import ./report.bend as Rep import ../syntax/outline.bend as Outline diff --git a/src/lsp/server.bend b/src/lsp/server.bend index ab5df456..5af67ddf 100644 --- a/src/lsp/server.bend +++ b/src/lsp/server.bend @@ -8,8 +8,8 @@ # ` reads them (src/lint/plan.bend's graph) on open and save and kept # for the changes between. import Base -import ezjson@1.2.0.0/main.bend as Ezjson -import ezjson@1.2.0.0/src/value.bend as J +import ezjson@1.5.0.0/main.bend as Ezjson +import ezjson@1.5.0.0/src/value.bend as J import ./proto.bend as Proto import ./docs.bend as Docs import ./nav.bend as Nav diff --git a/tests/bare.bend b/tests/bare.bend index 668379ee..62fdcd21 100644 --- a/tests/bare.bend +++ b/tests/bare.bend @@ -1,7 +1,7 @@ # bolt from nothing: the binary people run, built by `bend` and nothing else. # # `bend main.bend -o bin/bolt.bin` is the entire build. shake, ezjson and -# snap are imported by hub name (`shake@0.6.0.0/...`), so bend fetches them +# snap are imported by hub name (`shake@0.9.0.0/...`), so bend fetches them # from the hub itself: this test runs it with an empty HOME and no BEND_LIB -- # no ez, no nix, no clones. `ez` is a convenience over that one line and never # a prerequisite, in either direction: a project that depends on bolt needs no @@ -19,7 +19,7 @@ # it, and it is the slow one, because the compile it drives is a whole build of # bolt. import Base -import snap@1.4.0.0/main.bend as Snap +import snap@1.6.0.0/main.bend as Snap # `ok name` when the two strings are equal, `FAIL name` when they are not def eq_str(name: String, got: String, want: String) -> IO(Unit):