Vendor disco and polysemy

Author: HeinrichApfelmus

cabal.project

@@ -1,4 +1,7 @@
-packages: .
+packages:
+  .
+  vendor/disco
+  vendor/polysemy
 
 allow-newer:
   disco:base

disco-live.cabal

@@ -16,13 +16,12 @@ maintainer:      byorgey@gmail.com
 copyright:       Disco team 2025-2026 (see LICENSE)
 extra-doc-files:
   README.md
+tested-with:         GHC ==9.12.2
 
 source-repository head
   type:     git
   location: https://github.com/disco-lang/disco.git
 
-tested-with:         GHC ==9.12.2
-
 executable disco-live
   -- Compiler options that are necessary for the WASM backend.
   ghc-options:
@@ -37,7 +36,8 @@ executable disco-live
   build-depends:
     , ghc-experimental ^>=0.1 || (>=9.1000 && <9.1300)
     , base         >=4.8     && <4.22
---    , disco        >=0.2     && <0.3
+    , disco        == 0.2.1
+    , polysemy     == 1.9.2.1
     , text         >=2.0.2   && <2.2
 
   other-modules:

src/Eval.hs

@@ -2,8 +2,13 @@ module Eval
     ( eval
     ) where
 
+import Disco.Parser
+    ( term
+    , runParser
+    )
+
 {-----------------------------------------------------------------------------
     Rendering Logic
 ------------------------------------------------------------------------------}
 eval :: String -> String
-eval name = reverse name
+eval = show . runParser term "<interactive>"

vendor/disco/CHANGELOG.md

@@ -0,0 +1,98 @@
+* 0.2 (22 January 2025)
+
+  - Allow `><` as syntax for product types
+  - Use syntax `T` and `F` for booleans
+  - New `:table` command
+  - Suggest alternate variable names based on edit distance
+  - Fix crash when computing `0^(-1)`
+  - `min` and `max` are now prefix instead of infix
+  - Display multiple example types for things with nontrivial polymorphism (#388)
+  - Randomness primitives (Justin Grubbs, #390)
+  - Automatic memoization (Justin Grubbs, #394)
+  - Remove decimal output
+  - Function pattern coverage checking (Colin Phillips, #434)
+  - A lot more documentation, including the start of a "gentle
+    introduction"
+  - Add support for GHC 9.10 and drop 9.4
+  - Better parser for `:load` (#430)
+  - Better test result reporting (#428)
+
+* 0.1.6 (16 December 2023)
+
+  - A bunch more documentation
+  - Allow `!=` as a synonym for `/=`
+  - Allow `=<` and `=>` as aliases for `<=` and `>=`, respectively
+  - Better reporting of test results
+  - Load standard library modules immediately on startup
+  - `:doc` now works for case expressions, wildcard patterns, `unit`
+    and `Unit`
+  - Allow optional commas on either side of an ellipsis (#361)
+  - Propositions can be combined with binary operators (thanks to
+    @cally-cmd)
+
+* 0.1.5 (12 March 2022)
+
+  - Syntax errors in function definitions now result in much more
+    helpful error messages.  Before, it would just complain about
+    something being wrong with the '=' sign.
+    ([#346](https://github.com/disco-lang/disco/issues/346))
+
+* 0.1.4 (10 March 2022)
+
+  - New features or syntax
+      - `if` and `when` are now synonyms
+
+  - Bug fixes
+      - Only allow constructing sets and bags with element types
+        that can be compared ([#306](https://github.com/disco-lang/disco/issues/306))
+
+  - UI
+      - Test results are now printed in the same order in which
+        they were declared
+
+* 0.1.3.1 (5 March 2022)
+
+  - Fix [#340](https://github.com/disco-lang/disco/issues/340): disco
+    no longer crashes when encountering an undefined name at runtime,
+    but prints a nice error message instead.
+
+* 0.1.3.0 (3 March 2022)
+
+  - New features or syntax
+      - `∈` now works as a synonym for `elem`
+      - add `→` and `↔` as synonyms for `->`, `<->`
+
+  - Additional documentation for `|~|`, `power`
+
+  - UI
+      - `--help`, `--version`, and the welcome message now all report
+        the current version number
+      - Typechecking errors now report the name of the thing being
+        typechecked when the failure occurred
+      - The values of top-level expressions are now printed when
+        `:load`ing
+
+* 0.1.2.0 (12 February 2022)
+
+  - New features or syntax
+      - Add `String` type synonym
+      - New `iff` / `<->` operator
+      - New Cartesian product operator `><`
+      - `|~|` notation now denotes container size in addition to
+        absolute value
+
+  - Documentation
+      - `:doc` command now works on many more things
+      - A lot of additional documentation and some improved error
+        messages
+
+  - A few small bug fixes related to parsing
+
+* 0.1.1.0 (21 January 2022)
+
+  - `->`, `/\`, `\/` syntax for implies, and, or
+  - `truthtable.disco` example
+  - Coinductively check user-defined types for qualifiers (#317)
+  - Additional documentation
+
+* 0.1.0.0 (17 January 2022): initial release

vendor/disco/CODE_OF_CONDUCT.md

@@ -0,0 +1,130 @@
+
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+`byorgey@gmail.com`.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.
+