From b96beb587c11fcfbce86ce2d62351600cf6cad1b Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Sat, 2 Jul 2022 05:38:27 -0400
Subject: More traditional names for unquoting macros.
---
documentation/bookmark/game/storytelling.md | 2 +
.../source/program/licentia/license/addendum.lux | 2 +-
licentia/source/program/licentia/output.lux | 16 +-
lux-cl/source/program.lux | 10 +-
lux-js/source/program.lux | 4 +-
lux-lua/source/program.lux | 30 +-
lux-mode/lux-mode.el | 4 +-
lux-php/source/program.lux | 10 +-
lux-python/source/program.lux | 24 +-
lux-r/source/program.lux | 10 +-
lux-ruby/source/program.lux | 6 +-
lux-scheme/source/program.lux | 6 +-
stdlib/source/documentation/lux.lux | 30 +-
stdlib/source/documentation/lux/abstract.lux | 4 +-
.../documentation/lux/abstract/predicate.lux | 42 --
stdlib/source/documentation/lux/control.lux | 5 +-
.../documentation/lux/control/concatenative.lux | 8 +-
.../source/documentation/lux/control/function.lux | 6 +-
.../lux/control/function/predicate.lux | 42 ++
.../documentation/lux/control/parser/analysis.lux | 4 +-
.../documentation/lux/control/parser/code.lux | 6 +-
.../documentation/lux/control/parser/json.lux | 6 +-
.../documentation/lux/control/parser/synthesis.lux | 4 +-
.../documentation/lux/control/parser/text.lux | 6 +-
.../documentation/lux/control/parser/type.lux | 2 +-
.../lux/control/security/capability.lux | 51 +-
.../documentation/lux/control/security/policy.lux | 122 ++---
.../documentation/lux/data/collection/array.lux | 5 +-
.../documentation/lux/data/collection/bits.lux | 10 +-
.../lux/data/collection/dictionary.lux | 9 +-
.../lux/data/collection/dictionary/ordered.lux | 7 +-
.../documentation/lux/data/collection/list.lux | 9 +-
.../lux/data/collection/list/property.lux | 9 +-
.../documentation/lux/data/collection/queue.lux | 8 +-
.../lux/data/collection/queue/priority.lux | 8 +-
.../documentation/lux/data/collection/sequence.lux | 8 +-
.../documentation/lux/data/collection/stream.lux | 7 +-
stdlib/source/documentation/lux/data/color.lux | 7 +-
.../source/documentation/lux/data/color/named.lux | 5 +-
.../source/documentation/lux/data/format/json.lux | 2 +-
.../documentation/lux/data/text/encoding.lux | 2 +-
.../documentation/lux/data/text/unicode/block.lux | 2 +-
stdlib/source/documentation/lux/extension.lux | 3 +-
stdlib/source/documentation/lux/ffi.jvm.lux | 10 +-
stdlib/source/documentation/lux/ffi.old.lux | 2 +-
stdlib/source/documentation/lux/macro.lux | 14 +-
stdlib/source/documentation/lux/macro/syntax.lux | 2 +-
stdlib/source/documentation/lux/math/number.lux | 2 +-
.../source/documentation/lux/math/number/frac.lux | 6 +-
.../source/documentation/lux/math/number/i64.lux | 4 +-
.../source/documentation/lux/math/number/int.lux | 4 +-
.../source/documentation/lux/math/number/nat.lux | 4 +-
.../source/documentation/lux/math/number/rev.lux | 4 +-
stdlib/source/documentation/lux/meta.lux | 10 +-
stdlib/source/documentation/lux/meta/type.lux | 167 ++++++
.../source/documentation/lux/meta/type/check.lux | 79 +++
.../source/documentation/lux/meta/type/dynamic.lux | 32 ++
.../documentation/lux/meta/type/implicit.lux | 53 ++
stdlib/source/documentation/lux/meta/type/poly.lux | 26 +
.../documentation/lux/meta/type/primitive.lux | 120 +++++
.../documentation/lux/meta/type/quotient.lux | 45 ++
.../documentation/lux/meta/type/refinement.lux | 54 ++
.../documentation/lux/meta/type/resource.lux | 98 ++++
stdlib/source/documentation/lux/meta/type/unit.lux | 89 ++++
.../documentation/lux/meta/type/variance.lux | 25 +
stdlib/source/documentation/lux/static.lux | 4 +-
stdlib/source/documentation/lux/time.lux | 2 +-
stdlib/source/documentation/lux/type.lux | 167 ------
stdlib/source/documentation/lux/type/check.lux | 79 ---
stdlib/source/documentation/lux/type/dynamic.lux | 32 --
stdlib/source/documentation/lux/type/implicit.lux | 53 --
stdlib/source/documentation/lux/type/poly.lux | 26 -
stdlib/source/documentation/lux/type/primitive.lux | 120 -----
stdlib/source/documentation/lux/type/quotient.lux | 45 --
.../source/documentation/lux/type/refinement.lux | 54 --
stdlib/source/documentation/lux/type/resource.lux | 98 ----
stdlib/source/documentation/lux/type/unit.lux | 89 ----
stdlib/source/documentation/lux/type/variance.lux | 25 -
stdlib/source/documentation/lux/world/console.lux | 4 +-
stdlib/source/documentation/lux/world/file.lux | 4 +-
.../source/documentation/lux/world/file/watch.lux | 8 +-
.../documentation/lux/world/net/http/client.lux | 6 +-
.../documentation/lux/world/net/http/status.lux | 2 +-
.../lux/world/output/video/resolution.lux | 2 +-
stdlib/source/documentation/lux/world/shell.lux | 4 +-
stdlib/source/format/lux/data/text.lux | 4 +-
stdlib/source/library/lux.lux | 328 ++++++------
stdlib/source/library/lux/abstract/comonad.lux | 20 +-
stdlib/source/library/lux/abstract/enum.lux | 2 +-
stdlib/source/library/lux/abstract/monad.lux | 20 +-
.../source/library/lux/abstract/monad/indexed.lux | 28 +-
.../source/library/lux/control/concatenative.lux | 26 +-
.../library/lux/control/concurrency/async.lux | 2 +-
.../library/lux/control/concurrency/atom.lux | 2 +-
.../library/lux/control/concurrency/semaphore.lux | 2 +-
stdlib/source/library/lux/control/continuation.lux | 2 +-
stdlib/source/library/lux/control/exception.lux | 22 +-
.../library/lux/control/function/contract.lux | 14 +-
.../source/library/lux/control/function/inline.lux | 20 +-
.../source/library/lux/control/function/mutual.lux | 72 +--
stdlib/source/library/lux/control/io.lux | 4 +-
stdlib/source/library/lux/control/lazy.lux | 2 +-
stdlib/source/library/lux/control/maybe.lux | 14 +-
stdlib/source/library/lux/control/pipe.lux | 58 +--
stdlib/source/library/lux/control/remember.lux | 6 +-
.../library/lux/control/security/capability.lux | 18 +-
.../source/library/lux/control/security/policy.lux | 6 +-
stdlib/source/library/lux/control/try.lux | 20 +-
.../library/lux/data/collection/dictionary.lux | 2 +-
.../lux/data/collection/dictionary/ordered.lux | 2 +-
stdlib/source/library/lux/data/collection/list.lux | 62 +--
.../library/lux/data/collection/sequence.lux | 8 +-
.../source/library/lux/data/collection/stream.lux | 8 +-
stdlib/source/library/lux/data/collection/tree.lux | 4 +-
.../source/library/lux/data/format/css/class.lux | 2 +-
stdlib/source/library/lux/data/format/css/id.lux | 2 +-
.../library/lux/data/format/css/property.lux | 4 +-
.../source/library/lux/data/format/css/query.lux | 4 +-
.../library/lux/data/format/css/selector.lux | 4 +-
.../source/library/lux/data/format/css/value.lux | 22 +-
stdlib/source/library/lux/data/format/html.lux | 2 +-
stdlib/source/library/lux/data/format/json.lux | 14 +-
stdlib/source/library/lux/data/format/tar.lux | 12 +-
stdlib/source/library/lux/data/text.lux | 6 +-
stdlib/source/library/lux/data/text/regex.lux | 114 ++--
stdlib/source/library/lux/debug.lux | 40 +-
stdlib/source/library/lux/documentation.lux | 112 ++--
stdlib/source/library/lux/extension.lux | 24 +-
stdlib/source/library/lux/ffi.jvm.lux | 578 ++++++++++-----------
stdlib/source/library/lux/ffi.lux | 210 ++++----
stdlib/source/library/lux/ffi.old.lux | 210 ++++----
stdlib/source/library/lux/ffi.php.lux | 106 ++--
stdlib/source/library/lux/ffi.scm.lux | 56 +-
stdlib/source/library/lux/ffi/export.js.lux | 2 +-
stdlib/source/library/lux/ffi/export.jvm.lux | 30 +-
stdlib/source/library/lux/ffi/export.lua.lux | 2 +-
stdlib/source/library/lux/ffi/export.py.lux | 2 +-
stdlib/source/library/lux/ffi/export.rb.lux | 4 +-
stdlib/source/library/lux/locale/language.lux | 2 +-
stdlib/source/library/lux/locale/territory.lux | 2 +-
stdlib/source/library/lux/macro.lux | 8 +-
stdlib/source/library/lux/macro/context.lux | 36 +-
stdlib/source/library/lux/macro/local.lux | 8 +-
stdlib/source/library/lux/macro/pattern.lux | 46 +-
stdlib/source/library/lux/macro/syntax.lux | 28 +-
stdlib/source/library/lux/macro/syntax/check.lux | 6 +-
.../library/lux/macro/syntax/declaration.lux | 2 +-
.../source/library/lux/macro/syntax/definition.lux | 14 +-
stdlib/source/library/lux/macro/template.lux | 11 +-
stdlib/source/library/lux/math.lux | 14 +-
stdlib/source/library/lux/math/infix.lux | 4 +-
stdlib/source/library/lux/math/modulus.lux | 2 +-
stdlib/source/library/lux/math/number/complex.lux | 4 +-
stdlib/source/library/lux/math/number/ratio.lux | 4 +-
stdlib/source/library/lux/meta.lux | 4 +-
stdlib/source/library/lux/meta/location.lux | 14 +-
stdlib/source/library/lux/meta/type.lux | 54 +-
stdlib/source/library/lux/meta/type/dynamic.lux | 16 +-
stdlib/source/library/lux/meta/type/implicit.lux | 20 +-
stdlib/source/library/lux/meta/type/poly.lux | 40 +-
stdlib/source/library/lux/meta/type/primitive.lux | 26 +-
stdlib/source/library/lux/meta/type/quotient.lux | 22 +-
stdlib/source/library/lux/meta/type/refinement.lux | 22 +-
stdlib/source/library/lux/meta/type/resource.lux | 38 +-
stdlib/source/library/lux/meta/type/unit.lux | 10 +-
stdlib/source/library/lux/meta/type/unit/scale.lux | 12 +-
stdlib/source/library/lux/program.lux | 36 +-
stdlib/source/library/lux/static.lux | 14 +-
stdlib/source/library/lux/target/common_lisp.lux | 16 +-
stdlib/source/library/lux/target/js.lux | 16 +-
stdlib/source/library/lux/target/jvm/bytecode.lux | 4 +-
.../lux/target/jvm/bytecode/instruction.lux | 2 +-
stdlib/source/library/lux/target/jvm/class.lux | 4 +-
stdlib/source/library/lux/target/jvm/constant.lux | 4 +-
stdlib/source/library/lux/target/jvm/field.lux | 2 +-
stdlib/source/library/lux/target/jvm/method.lux | 2 +-
stdlib/source/library/lux/target/jvm/modifier.lux | 10 +-
.../source/library/lux/target/jvm/reflection.lux | 4 +-
stdlib/source/library/lux/target/jvm/type.lux | 4 +-
.../library/lux/target/jvm/type/category.lux | 2 +-
stdlib/source/library/lux/target/jvm/type/lux.lux | 2 +-
.../library/lux/target/jvm/type/reflection.lux | 2 +-
stdlib/source/library/lux/target/lua.lux | 8 +-
stdlib/source/library/lux/target/php.lux | 8 +-
stdlib/source/library/lux/target/python.lux | 8 +-
stdlib/source/library/lux/target/r.lux | 8 +-
stdlib/source/library/lux/target/ruby.lux | 10 +-
stdlib/source/library/lux/target/scheme.lux | 14 +-
stdlib/source/library/lux/test.lux | 24 +-
stdlib/source/library/lux/time/instant.lux | 2 +-
stdlib/source/library/lux/time/year.lux | 2 +-
.../lux/tool/compiler/language/lux/analysis.lux | 6 +-
.../compiler/language/lux/analysis/inference.lux | 4 +-
.../lux/tool/compiler/language/lux/generation.lux | 4 +-
.../tool/compiler/language/lux/phase/analysis.lux | 14 +-
.../compiler/language/lux/phase/analysis/case.lux | 6 +-
.../language/lux/phase/analysis/complex.lux | 2 +-
.../language/lux/phase/extension/analysis/jvm.lux | 16 +-
.../lux/phase/extension/declaration/jvm.lux | 12 +-
.../lux/phase/extension/generation/jvm/host.lux | 6 +-
.../lux/phase/generation/common_lisp/runtime.lux | 30 +-
.../language/lux/phase/generation/extension.lux | 30 +-
.../language/lux/phase/generation/js/runtime.lux | 38 +-
.../language/lux/phase/generation/jvm/value.lux | 2 +-
.../language/lux/phase/generation/lua/runtime.lux | 38 +-
.../language/lux/phase/generation/php/runtime.lux | 40 +-
.../lux/phase/generation/python/runtime.lux | 40 +-
.../language/lux/phase/generation/r/runtime.lux | 32 +-
.../language/lux/phase/generation/ruby/runtime.lux | 52 +-
.../lux/phase/generation/scheme/runtime.lux | 32 +-
.../lux/tool/compiler/language/lux/syntax.lux | 40 +-
.../source/library/lux/tool/compiler/reference.lux | 2 +-
stdlib/source/library/lux/world/console.lux | 4 +-
stdlib/source/library/lux/world/db/jdbc.lux | 2 +-
stdlib/source/library/lux/world/db/jdbc/input.lux | 2 +-
stdlib/source/library/lux/world/db/jdbc/output.lux | 2 +-
stdlib/source/library/lux/world/db/sql.lux | 2 +-
stdlib/source/library/lux/world/environment.lux | 10 +-
stdlib/source/library/lux/world/file.lux | 60 +--
stdlib/source/library/lux/world/shell.lux | 8 +-
stdlib/source/parser/lux/data/binary.lux | 2 +-
stdlib/source/parser/lux/meta/type.lux | 4 +-
.../source/polytypic/lux/abstract/equivalence.lux | 98 ++--
stdlib/source/polytypic/lux/abstract/functor.lux | 40 +-
stdlib/source/polytypic/lux/data/format/json.lux | 162 +++---
stdlib/source/program/aedifex.lux | 2 +-
stdlib/source/program/aedifex/format.lux | 46 +-
stdlib/source/program/aedifex/runtime.lux | 4 +-
.../specification/compositor/analysis/type.lux | 4 +-
.../specification/compositor/generation/case.lux | 2 +-
.../specification/compositor/generation/common.lux | 10 +-
.../compositor/generation/primitive.lux | 2 +-
stdlib/source/test/aedifex/artifact/extension.lux | 2 +-
stdlib/source/test/aedifex/command/build.lux | 4 +-
.../source/test/aedifex/dependency/resolution.lux | 2 +-
stdlib/source/test/aedifex/hash.lux | 6 +-
stdlib/source/test/aedifex/runtime.lux | 2 +-
stdlib/source/test/lux.lux | 60 +--
stdlib/source/test/lux/control/concatenative.lux | 6 +-
stdlib/source/test/lux/control/parser.lux | 8 +-
stdlib/source/test/lux/control/remember.lux | 8 +-
stdlib/source/test/lux/data/binary.lux | 16 +-
stdlib/source/test/lux/data/collection/list.lux | 2 +-
.../source/test/lux/data/collection/set/multi.lux | 2 +-
.../test/lux/data/collection/set/ordered.lux | 4 +-
stdlib/source/test/lux/data/collection/tree.lux | 2 +-
stdlib/source/test/lux/data/color.lux | 6 +-
stdlib/source/test/lux/data/color/named.lux | 6 +-
stdlib/source/test/lux/data/format/json.lux | 6 +-
stdlib/source/test/lux/data/format/tar.lux | 6 +-
stdlib/source/test/lux/data/format/xml.lux | 4 +-
stdlib/source/test/lux/data/text.lux | 12 +-
stdlib/source/test/lux/data/text/encoding.lux | 6 +-
stdlib/source/test/lux/data/text/escape.lux | 4 +-
stdlib/source/test/lux/data/text/regex.lux | 8 +-
stdlib/source/test/lux/data/text/unicode/block.lux | 6 +-
stdlib/source/test/lux/data/text/unicode/set.lux | 2 +-
stdlib/source/test/lux/debug.lux | 16 +-
stdlib/source/test/lux/documentation.lux | 10 +-
stdlib/source/test/lux/extension.lux | 20 +-
stdlib/source/test/lux/ffi.js.lux | 4 +-
stdlib/source/test/lux/ffi.jvm.lux | 4 +-
stdlib/source/test/lux/ffi.lua.lux | 4 +-
stdlib/source/test/lux/ffi.old.lux | 8 +-
stdlib/source/test/lux/ffi.py.lux | 4 +-
stdlib/source/test/lux/ffi.rb.lux | 4 +-
stdlib/source/test/lux/ffi/export.jvm.lux | 22 +-
stdlib/source/test/lux/locale/language.lux | 6 +-
stdlib/source/test/lux/locale/territory.lux | 6 +-
stdlib/source/test/lux/macro.lux | 28 +-
stdlib/source/test/lux/macro/local.lux | 7 +-
stdlib/source/test/lux/macro/syntax.lux | 2 +-
stdlib/source/test/lux/macro/template.lux | 6 +-
stdlib/source/test/lux/math.lux | 8 +-
stdlib/source/test/lux/math/logic/continuous.lux | 2 +-
stdlib/source/test/lux/math/modular.lux | 2 +-
stdlib/source/test/lux/math/number.lux | 6 +-
stdlib/source/test/lux/math/number/frac.lux | 4 +-
stdlib/source/test/lux/math/number/int.lux | 4 +-
stdlib/source/test/lux/math/number/nat.lux | 4 +-
stdlib/source/test/lux/math/number/ratio.lux | 2 +-
stdlib/source/test/lux/math/number/rev.lux | 6 +-
stdlib/source/test/lux/meta/code.lux | 8 +-
stdlib/source/test/lux/meta/type.lux | 8 +-
stdlib/source/test/lux/meta/type/check.lux | 4 +-
stdlib/source/test/lux/meta/type/resource.lux | 8 +-
stdlib/source/test/lux/meta/type/unit.lux | 4 +-
stdlib/source/test/lux/meta/type/unit/scale.lux | 4 +-
stdlib/source/test/lux/static.lux | 2 +-
stdlib/source/test/lux/target/js.lux | 16 +-
stdlib/source/test/lux/target/lua.lux | 10 +-
stdlib/source/test/lux/target/python.lux | 40 +-
stdlib/source/test/lux/target/ruby.lux | 8 +-
stdlib/source/test/lux/time.lux | 2 +-
stdlib/source/test/lux/time/duration.lux | 2 +-
.../lux/tool/compiler/language/lux/analysis.lux | 6 +-
.../compiler/language/lux/analysis/coverage.lux | 6 +-
.../compiler/language/lux/analysis/inference.lux | 6 +-
.../tool/compiler/language/lux/analysis/module.lux | 18 +-
.../compiler/language/lux/analysis/pattern.lux | 2 +-
.../tool/compiler/language/lux/phase/analysis.lux | 154 +++---
.../compiler/language/lux/phase/analysis/case.lux | 244 ++++-----
.../language/lux/phase/analysis/complex.lux | 2 +-
.../language/lux/phase/analysis/function.lux | 10 +-
.../language/lux/phase/analysis/simple.lux | 2 +-
.../language/lux/phase/extension/analysis/lux.lux | 2 +-
.../compiler/language/lux/phase/synthesis/loop.lux | 8 +-
.../language/lux/phase/synthesis/primitive.lux | 4 +-
.../language/lux/phase/synthesis/variable.lux | 2 +-
.../test/lux/tool/compiler/language/lux/syntax.lux | 2 +-
.../lux/tool/compiler/language/lux/synthesis.lux | 2 +-
.../lux/tool/compiler/meta/archive/registry.lux | 8 +-
.../test/lux/tool/compiler/meta/cache/module.lux | 2 +-
stdlib/source/test/lux/tool/compiler/meta/cli.lux | 8 +-
.../source/test/lux/tool/compiler/meta/context.lux | 2 +-
stdlib/source/test/lux/tool/compiler/reference.lux | 2 +-
stdlib/source/test/lux/tool/compiler/version.lux | 2 +-
stdlib/source/test/lux/world/input/keyboard.lux | 8 +-
stdlib/source/test/lux/world/net/http/client.lux | 6 +-
stdlib/source/test/lux/world/net/http/status.lux | 6 +-
stdlib/source/unsafe/lux/data/binary.lux | 58 +--
stdlib/source/unsafe/lux/data/collection/array.lux | 114 ++--
322 files changed, 3649 insertions(+), 3698 deletions(-)
delete mode 100644 stdlib/source/documentation/lux/abstract/predicate.lux
create mode 100644 stdlib/source/documentation/lux/control/function/predicate.lux
create mode 100644 stdlib/source/documentation/lux/meta/type.lux
create mode 100644 stdlib/source/documentation/lux/meta/type/check.lux
create mode 100644 stdlib/source/documentation/lux/meta/type/dynamic.lux
create mode 100644 stdlib/source/documentation/lux/meta/type/implicit.lux
create mode 100644 stdlib/source/documentation/lux/meta/type/poly.lux
create mode 100644 stdlib/source/documentation/lux/meta/type/primitive.lux
create mode 100644 stdlib/source/documentation/lux/meta/type/quotient.lux
create mode 100644 stdlib/source/documentation/lux/meta/type/refinement.lux
create mode 100644 stdlib/source/documentation/lux/meta/type/resource.lux
create mode 100644 stdlib/source/documentation/lux/meta/type/unit.lux
create mode 100644 stdlib/source/documentation/lux/meta/type/variance.lux
delete mode 100644 stdlib/source/documentation/lux/type.lux
delete mode 100644 stdlib/source/documentation/lux/type/check.lux
delete mode 100644 stdlib/source/documentation/lux/type/dynamic.lux
delete mode 100644 stdlib/source/documentation/lux/type/implicit.lux
delete mode 100644 stdlib/source/documentation/lux/type/poly.lux
delete mode 100644 stdlib/source/documentation/lux/type/primitive.lux
delete mode 100644 stdlib/source/documentation/lux/type/quotient.lux
delete mode 100644 stdlib/source/documentation/lux/type/refinement.lux
delete mode 100644 stdlib/source/documentation/lux/type/resource.lux
delete mode 100644 stdlib/source/documentation/lux/type/unit.lux
delete mode 100644 stdlib/source/documentation/lux/type/variance.lux
diff --git a/documentation/bookmark/game/storytelling.md b/documentation/bookmark/game/storytelling.md
index a48a67c64..2bde03394 100644
--- a/documentation/bookmark/game/storytelling.md
+++ b/documentation/bookmark/game/storytelling.md
@@ -1,5 +1,7 @@
# Reference
+0. []()
+0. [Approaching a Pedagogy of Game Writing](https://www.youtube.com/watch?v=24HHIKOA1ZA)
0. [I Beg You, Please Cripple Your Characters](https://www.youtube.com/watch?v=DGe6ehr0dxs)
0. [Press Y to Cry: Generating Emotions in Videogame Narrative](https://www.youtube.com/watch?v=_lp0libfp5M)
0. [How James Bond Can Improve Your Dungeons & Dragons Game (Ep. 213)](https://www.youtube.com/watch?v=QRJXiRbXEek)
diff --git a/licentia/source/program/licentia/license/addendum.lux b/licentia/source/program/licentia/license/addendum.lux
index fb8be25b6..f5dfb922b 100644
--- a/licentia/source/program/licentia/license/addendum.lux
+++ b/licentia/source/program/licentia/license/addendum.lux
@@ -17,7 +17,7 @@
(def .public (output value)
(-> Addendum Text)
- (`` (format (~~ (with_template [
]
+ (`` (format (,, (with_template [ ]
[(if
($.block ($.section [#$.title
#$.content ]))
diff --git a/licentia/source/program/licentia/output.lux b/licentia/source/program/licentia/output.lux
index 7645b2cb4..0f05937e2 100644
--- a/licentia/source/program/licentia/output.lux
+++ b/licentia/source/program/licentia/output.lux
@@ -47,7 +47,7 @@
(def .public (grant termination)
(-> Termination Text)
- (`` (format (~~ (with_template [ ]
+ (`` (format (,, (with_template [ ]
[($.block ($.section [#$.title
#$.content ]))]
@@ -69,7 +69,7 @@
(def .public limitation
Text
- (`` (format (~~ (with_template [ ]
+ (`` (format (,, (with_template [ ]
[($.block ($.section [#$.title
#$.content ]))]
@@ -84,7 +84,7 @@
(def .public assurance
Text
- (`` (format (~~ (with_template [ ]
+ (`` (format (,, (with_template [ ]
[($.block ($.section [#$.title
#$.content ]))]
@@ -96,7 +96,7 @@
(def .public (liability value)
(-> Liability Text)
- (`` (format (~~ (with_template [ ]
+ (`` (format (,, (with_template [ ]
[(if
($.block ($.section [#$.title
#$.content ]))
@@ -124,7 +124,7 @@
(def .public (distribution distribution)
(-> Distribution Text)
- (`` (format (~~ (with_template [ ]
+ (`` (format (,, (with_template [ ]
[(if
($.block ($.section [#$.title
#$.content ]))
@@ -145,7 +145,7 @@
(def .public (commercial value)
(-> Commercial Text)
- (`` (format (~~ (with_template [ ]
+ (`` (format (,, (with_template [ ]
[(if
($.block ($.section [#$.title
#$.content ]))
@@ -172,7 +172,7 @@
{.#None}
[false ""])]
- (`` (format (~~ (with_template [ ]
+ (`` (format (,, (with_template [ ]
[(if
($.block ($.section [#$.title
#$.content ]))
@@ -214,7 +214,7 @@
(def .public (miscellaneous identified?)
(-> Bit Text)
- (`` (format (~~ (with_template [ ]
+ (`` (format (,, (with_template [ ]
[(if
($.block ($.section [#$.title
#$.content ]))
diff --git a/lux-cl/source/program.lux b/lux-cl/source/program.lux
index ea7d96647..1d145eded 100644
--- a/lux-cl/source/program.lux
+++ b/lux-cl/source/program.lux
@@ -172,10 +172,10 @@
(let [to_sub (is (-> Any org/armedbear/lisp/LispObject)
(function (_ sub_value)
(let [sub_value (as java/lang/Object sub_value)]
- (`` (<| (~~ (with_template [ ]
+ (`` (<| (,, (with_template [ ]
[(case (ffi.is sub_value)
{.#Some sub_value}
- (`` (|> sub_value (~~ (template.splice ))))
+ (`` (|> sub_value (,, (template.splice ))))
{.#None})]
@@ -204,7 +204,7 @@
(as java/lang/Long)
java/lang/Number::intValue))
- (~~ (with_template []
+ (,, (with_template []
[(org/armedbear/lisp/LispObject
[] ( self [idx int])
org/armedbear/lisp/LispObject
@@ -254,10 +254,10 @@
(def (read host_object)
(Reader org/armedbear/lisp/LispObject)
- (`` (<| (~~ (with_template [ ]
+ (`` (<| (,, (with_template [ ]
[(case (ffi.is host_object)
{.#Some host_object}
- (`` (|> host_object (~~ (template.splice ))))
+ (`` (|> host_object (,, (template.splice ))))
{.#None})]
diff --git a/lux-js/source/program.lux b/lux-js/source/program.lux
index 72e08d9f5..6d13abf41 100644
--- a/lux-js/source/program.lux
+++ b/lux-js/source/program.lux
@@ -400,7 +400,7 @@
(exception.except ..undefined_has_no_lux_representation [])
{.#None})
- (~~ (with_template []
+ (,, (with_template []
[(case (ffi.is js_object)
{.#Some js_object}
{try.#Success js_object}
@@ -408,7 +408,7 @@
{.#None})]
[java/lang/Boolean] [java/lang/String]))
- (~~ (with_template [ ]
+ (,, (with_template [ ]
[(case (ffi.is js_object)
{.#Some js_object}
{try.#Success ( js_object)}
diff --git a/lux-lua/source/program.lux b/lux-lua/source/program.lux
index f904a2416..7b13d2d9d 100644
--- a/lux-lua/source/program.lux
+++ b/lux-lua/source/program.lux
@@ -230,7 +230,7 @@
Translator
(`` (<| (if (ffi.null? host_object)
(exception.except ..nil_has_no_lux_representation []))
- (~~ (with_template [ ]
+ (,, (with_template [ ]
[(case (ffi.as host_object)
{.#Some typed_object}
(|> typed_object )
@@ -266,7 +266,7 @@
(def (function/* arity)
(-> Nat Code)
- (` (.-> (~+ (list.repeated arity (` .Any)))
+ (` (.-> (,* (list.repeated arity (` .Any)))
.Any)))
(def input/*
@@ -285,7 +285,7 @@
(-> Nat (List Code))
(|>> ..input/*
(list#each (function (_ $input)
- (list $input (` (..read (~ $input))))))
+ (list $input (` (..read (, $input))))))
list#conjoint))
(def (apply/* to_host self parameters abstraction)
@@ -299,11 +299,11 @@
(pattern (list))
(in self)
- (~~ (with_template []
- [(pattern (list (~~ (static.literals function.identity (..input/* )))))
- (in (to_host ((as (~~ (static.literal function.identity (..function/* )))
+ (,, (with_template []
+ [(pattern (list (,, (static.literals function.identity (..input/* )))))
+ (in (to_host ((as (,, (static.literal function.identity (..function/* )))
lux_function)
- (~~ (static.literals function.identity (..input/* ))))))]
+ (,, (static.literals function.identity (..input/* ))))))]
[1]
[2]
@@ -312,10 +312,10 @@
[5]
))
- (pattern (list.partial (~~ (static.literals function.identity (..input/* 5))) input/+))
- (again ((as (~~ (static.literal function.identity (..function/* 5)))
+ (pattern (list.partial (,, (static.literals function.identity (..input/* 5))) input/+))
+ (again ((as (,, (static.literal function.identity (..function/* 5)))
lux_function)
- (~~ (static.literals function.identity (..input/* 5))))
+ (,, (static.literals function.identity (..input/* 5))))
input/+)
)))))))
@@ -336,16 +336,16 @@
(<| (..return %)
self))
- (~~ (with_template []
+ (,, (with_template []
[(net/sandius/rembulan/runtime/LuaFunction
[] (invoke self [% net/sandius/rembulan/runtime/ExecutionContext
- (~~ (static.literals function.identity (..declaration/* )))])
+ (,, (static.literals function.identity (..declaration/* )))])
void
"throws" [net/sandius/rembulan/runtime/ResolvedControlThrowable]
(<| (..return %)
(apply/* to_host
(ffi.is net/sandius/rembulan/runtime/LuaFunction self)
- (list (~~ (static.literals function.identity (..input/* ))))
+ (list (,, (static.literals function.identity (..input/* ))))
lux_function)))]
[1]
@@ -782,7 +782,7 @@
(with_expansions [ (these (def (to_host it)
(-> Any java/lang/Object)
- (`` (<| (~~ (with_template [ ]
+ (`` (<| (,, (with_template [ ]
[(case (ffi.as (as java/lang/Object it))
{.#Some it}
(as java/lang/Object
@@ -884,7 +884,7 @@
(`` (program: [service cli.service]
(let [context (context.lua (cli.target service))]
(do io.monad
- [(~~ (for @.old [baggage platform]
+ [(,, (for @.old [baggage platform]
@.jvm [baggage platform]
@.lua platform))
..platform]
diff --git a/lux-mode/lux-mode.el b/lux-mode/lux-mode.el
index f3b36dd27..00ed0293f 100644
--- a/lux-mode/lux-mode.el
+++ b/lux-mode/lux-mode.el
@@ -384,8 +384,8 @@ Called by `imenu--generic-function'."
(data//implicit (altRE "implicitly" "a/an" "a" "an"))
(data//collection (altRE "list" "sequence" "tree"))
;; Code
- (code//quotation (altRE "`" "`'" "'" "~" "~\\+" "~!" "~'"))
- (code//super-quotation (altRE "``" "~~"))
+ (code//quotation (altRE "`" "`'" "'" "," ",\\*" ",!" ",'"))
+ (code//super-quotation (altRE "``" ",,"))
(code//template (altRE "with_template" "template"))
;; Miscellaneous
(jvm-host (altRE "import" "export" "class" "interface" "object" "do_to" "synchronized" "class_for"))
diff --git a/lux-php/source/program.lux b/lux-php/source/program.lux
index 88ac83d11..64cdb5d4b 100644
--- a/lux-php/source/program.lux
+++ b/lux-php/source/program.lux
@@ -170,7 +170,7 @@
[(ffi.interface
(getValue [] java/lang/Object))
- (`` (ffi.import (~~ (template.symbol ["program/" ]))
+ (`` (ffi.import (,, (template.symbol ["program/" ]))
"[1]::[0]"
(getValue [] java/lang/Object)))]
@@ -246,7 +246,7 @@
[] (valueOfIndex self [trace php/runtime/env/TraceInfo
index php/runtime/Memory])
php/runtime/Memory
- (`` (<| (~~ (with_template [ ]
+ (`` (<| (,, (with_template [ ]
[(case (ffi.as index)
{.#Some index}
( trace ( index) self)
@@ -379,7 +379,7 @@
(def (read host_object)
Reader
- (`` (<| (~~ (with_template [ ]
+ (`` (<| (,, (with_template [ ]
[(case (ffi.as host_object)
{.#Some _}
{try.#Success }
@@ -389,10 +389,10 @@
[php/runtime/memory/FalseMemory false]
[php/runtime/memory/TrueMemory true]
))
- (~~ (with_template [ ]
+ (,, (with_template [ ]
[(case (ffi.as host_object)
{.#Some value}
- (`` (|> value (~~ (template.splice ))))
+ (`` (|> value (,, (template.splice ))))
{.#None})]
diff --git a/lux-python/source/program.lux b/lux-python/source/program.lux
index 029d9d4f0..bafdc790a 100644
--- a/lux-python/source/program.lux
+++ b/lux-python/source/program.lux
@@ -208,10 +208,10 @@
(def (read host_object)
Translator
- (`` (<| (~~ (with_template [ ]
+ (`` (<| (,, (with_template [ ]
[(case (ffi.as (as host_object))
{.#Some host_object}
- {try.#Success (`` (|> host_object (~~ (template.spliced ))))}
+ {try.#Success (`` (|> host_object (,, (template.spliced ))))}
_)]
@@ -230,7 +230,7 @@
[org/python/core/PyArray [org/python/core/PyArray::getArray]]
[[java/lang/Object] [(|>)]]
))
- (~~ (with_template [ ]
+ (,, (with_template [ ]
[(case (ffi.as host_object)
{.#Some host_object}
(<| (as org/python/core/PyObject) host_object)
@@ -245,7 +245,7 @@
(def (function/? arity)
(-> Nat Code)
- (` (.-> (~+ (list.repeated arity (` .Any))) .Any)))
+ (` (.-> (,* (list.repeated arity (` .Any))) .Any)))
(def (inputs/? arity)
(-> Nat (List Text))
@@ -273,10 +273,10 @@
(pattern (list))
(as org/python/core/PyObject self)
- (~~ (with_template []
- [(pattern (list (~~ (static.literals code.local (inputs/? )))))
- (to_host ((as (~~ (static.literal function.identity (function/? ))) it)
- (~~ (static.literals code.local (inputs/? )))))]
+ (,, (with_template []
+ [(pattern (list (,, (static.literals code.local (inputs/? )))))
+ (to_host ((as (,, (static.literal function.identity (function/? ))) it)
+ (,, (static.literals code.local (inputs/? )))))]
[1]
[2]
@@ -287,10 +287,10 @@
[7]
[8]))
- (pattern (list.partial (~~ (static.literals code.local (inputs/? 8)))
+ (pattern (list.partial (,, (static.literals code.local (inputs/? 8)))
input/+))
- (again ((as (~~ (static.literal function.identity (function/? 8))) it)
- (~~ (static.literals code.local (inputs/? 8))))
+ (again ((as (,, (static.literal function.identity (function/? 8))) it)
+ (,, (static.literals code.local (inputs/? 8))))
input/+))))))))))))
(def object_class
@@ -337,7 +337,7 @@
(def (to_host it)
(-> Any org/python/core/PyObject)
- (`` (<| (~~ (with_template [ ]
+ (`` (<| (,, (with_template [ ]
[(case (ffi.as (as java/lang/Object it))
{.#Some it}
(as org/python/core/PyObject
diff --git a/lux-r/source/program.lux b/lux-r/source/program.lux
index 7b379d027..376b2a598 100644
--- a/lux-r/source/program.lux
+++ b/lux-r/source/program.lux
@@ -194,10 +194,10 @@
(let [... to_sub (is (-> Any org/armedbear/lisp/LispObject)
... (function (_ sub_value)
... (let [sub_value (as java/lang/Object sub_value)]
- ... (`` (<| (~~ (with_template [ ]
+ ... (`` (<| (,, (with_template [ ]
... [(case (ffi.as sub_value)
... {.#Some sub_value}
- ... (`` (|> sub_value (~~ (template.splice ))))
+ ... (`` (|> sub_value (,, (template.splice ))))
... {.#None})]
... [[java/lang/Object] [host_value]]
@@ -262,7 +262,7 @@
... ("lux io log" (..%%code ))
_jvm_this))
- (~~ (with_template [