Merge pull request #1513 from AmpersandTarski/feature-transitive-clos…

…ure-Issue137

Feature transitive closure issue137

.github/workflows/ci2.yml

@@ -44,24 +44,24 @@ jobs:
       - name: Set up Mariadb 🧰
         uses: shogo82148/actions-setup-mysql@v1
         with:
-          mysql-version: "mariadb-10.6"
+          mysql-version: "mariadb-11.5"
       - name: Build and test 🏗 🧪
         uses: freckle/stack-action@v5 # stack-action does all these steps: dependencies, build, test.
         with:
           stack-build-arguments: "--copy-bins --flag ampersand:buildAll"
           upgrade-stack: false
           cache-save-always: true
 
-  build-and-test-macOS:
-    name: Build and test on macOS  🏗 🧪
+  build-and-test-macOS-13:
+    name: Build and test on macos-13  🏗 🧪
     runs-on: macos-13
     steps:
       - name: Checkout project contents 📡
         uses: actions/checkout@v4
       - name: Set up Mariadb 🧰
         uses: shogo82148/actions-setup-mysql@v1
         with:
-          mysql-version: "mariadb-10.6"
+          mysql-version: "mariadb-11.5"
       # See issue https://github.com/freckle/stack-action/issues/80 for why we need to install stack and php as well
       ## run: curl -sSL https://get.haskellstack.org/ | sh
       - run: brew install php
@@ -71,7 +71,7 @@ jobs:
           stack-build-arguments: "--copy-bins --flag ampersand:buildAll"
 
   build-and-test-windows:
-    name: Build and test on Windows 🏗 🧪
+    name: Build and test on windows-2022 🏗 🧪
     runs-on: windows-2022
     steps:
       - name: Checkout project contents 📡
@@ -88,7 +88,7 @@ jobs:
       - name: Set up Mariadb 🧰
         uses: shogo82148/actions-setup-mysql@v1
         with:
-          mysql-version: "mariadb-10.6"
+          mysql-version: "mariadb-11.5"
       - name: Setup PHP 🧰
         uses: shivammathur/setup-php@v2
         with:

.github/workflows/release.yml

@@ -154,7 +154,7 @@ jobs:
       - name: Set up Mariadb 🧰
         uses: shogo82148/actions-setup-mysql@v1
         with:
-          mysql-version: "mariadb-10.6"
+          mysql-version: "mariadb-11.5"
       - name: build without test 🏗 🧪
         uses: freckle/stack-action@v5 # stack-action does all these steps: dependencies, build, test.
         with:
@@ -168,15 +168,15 @@ jobs:
           path: /home/runner/.local/bin/*
 
   build-without-test-macOS:
-    name: Build without test on macOS  🏗 🧪
-    runs-on: macos-13
+    name: Build without test on macos-12  🏗 🧪
+    runs-on: macos-12
     steps:
       - name: Checkout project contents 📡
         uses: actions/checkout@v4
       - name: Set up Mariadb 🧰
         uses: shogo82148/actions-setup-mysql@v1
         with:
-          mysql-version: "mariadb-10.6"
+          mysql-version: "mariadb-11.5"
       # See issue https://github.com/freckle/stack-action/issues/80 for why we need to install stack and php as well
       ## - run: curl -sSL https://get.haskellstack.org/ | sh
       - run: brew install php
@@ -193,7 +193,7 @@ jobs:
           path: /Users/runner/.local/bin/*
 
   build-without-test-windows:
-    name: build without test on Windows 🏗 🧪
+    name: build without test on windows-2022 🏗 🧪
     runs-on: windows-2022
     steps:
       - name: Checkout project contents 📡
@@ -210,7 +210,7 @@ jobs:
       - name: Set up Mariadb 🧰
         uses: shogo82148/actions-setup-mysql@v1
         with:
-          mysql-version: "mariadb-10.6"
+          mysql-version: "mariadb-11.5"
       - name: Setup PHP 🧰
         uses: shivammathur/setup-php@v2
         with:

.github/workflows/releasenotes.yml

@@ -19,7 +19,7 @@ jobs:
       # The checkout step is needed since the enforcer relies on local git commands
       - uses: actions/checkout@v4
 
-      - uses: dangoslen/changelog-enforcer@v2
+      - uses: dangoslen/changelog-enforcer@v3
         with:
           changeLogPath: ReleaseNotes.md
           missingUpdateErrorMessage: "Every pull request MUST include a description of the change in the ReleaseNotes.md file"

ReleaseNotes.md

@@ -3,6 +3,8 @@
 ## Unreleased
 
 - [Issue #1482](https://github.com/AmpersandTarski/Ampersand/issues/1482) Fix technical debd from merging Ampersand 4 into Ampersand 5
+- [Issue #137](https://github.com/AmpersandTarski/Ampersand/issues/137) We now support transitive closures 
+- [Issue #1512](https://github.com/AmpersandTarski/Ampersand/issues/1512) Remove old and broken code for generating uml
 
 ## v5.2.2 (9 september 2024)
 

ampersand.cabal

@@ -114,7 +114,6 @@ extra-source-files:
     testing/Sentinel/Tests/ShouldSucceed/OnlyValidation/Ticket580.adl
     testing/Sentinel/Tests/ShouldSucceed/OnlyValidation/ViewAnnotationCheck.adl
     testing/Sentinel/Tests/ShouldSucceed/testinfo.yaml
-    testing/StillUnsupported/Bug335_Kl0Kl1.adl
     testing/StillUnsupported/Issue1127.adl
     testing/StillUnsupported/Issue1127.xlsx
     testing/StillUnsupported/Issue1397-1.adl
@@ -284,6 +283,7 @@ extra-source-files:
     testing/Travis/testcases/prototype/shouldSucceed/ARM-Test12.adl
     testing/Travis/testcases/prototype/shouldSucceed/ARM_Test10.adl
     testing/Travis/testcases/prototype/shouldSucceed/BroadTableTest.adl
+    testing/Travis/testcases/prototype/shouldSucceed/Bug335_Kl0Kl1.adl
     testing/Travis/testcases/prototype/shouldSucceed/Bug435.adl
     testing/Travis/testcases/prototype/shouldSucceed/CP23xBug1.adl
     testing/Travis/testcases/prototype/shouldSucceed/CP23xBug2.adl
@@ -466,7 +466,6 @@ library
       Ampersand.FSpec.Crud
       Ampersand.FSpec.FSpec
       Ampersand.FSpec.FSpecAux
-      Ampersand.FSpec.GenerateUML
       Ampersand.FSpec.Motivations
       Ampersand.FSpec.SQL
       Ampersand.FSpec.ShowHS
@@ -551,7 +550,6 @@ library
       Ampersand.Commands.Proof
       Ampersand.Commands.Proto
       Ampersand.Commands.Test
-      Ampersand.Commands.Uml
       Ampersand.Commands.Validate
       Ampersand.Daemon.Daemon
       Ampersand.Daemon.Escape
@@ -574,7 +572,6 @@ library
       Ampersand.Options.ProofOptsParser
       Ampersand.Options.ProtoOptsParser
       Ampersand.Options.TestOptsParser
-      Ampersand.Options.UmlOptsParser
       Ampersand.Options.ValidateOptsParser
       Ampersand.Output.PredLogic
       Ampersand.Types.Config
@@ -592,12 +589,10 @@ library
   build-depends:
       HStringTemplate
     , QuickCheck
-    , SpreadsheetML
     , aeson
     , aeson-pretty
     , ansi-terminal
     , base
-    , bytestring
     , casing
     , conduit
     , containers
@@ -611,7 +606,6 @@ library
     , generic-deriving
     , graphviz
     , hashable
-    , http-conduit
     , hxt
     , lens
     , mtl
@@ -620,21 +614,15 @@ library
     , pandoc-crossref
     , pandoc-types
     , parsec
-    , prettyprinter
-    , prettyprinter-ansi-terminal
     , process
     , quickcheck-instances
     , rio
-    , salve
     , simple-sql-parser
-    , split
     , terminal-size
-    , texmath
     , text
     , text1
     , time
     , transformers
-    , typed-process
     , uri-encode
     , wl-pprint
     , xlsx
@@ -663,13 +651,11 @@ executable ampPreProc
   build-depends:
       HStringTemplate
     , QuickCheck
-    , SpreadsheetML
     , aeson
     , aeson-pretty
     , ampersand
     , ansi-terminal
     , base
-    , bytestring
     , casing
     , conduit
     , containers
@@ -683,7 +669,6 @@ executable ampPreProc
     , generic-deriving
     , graphviz
     , hashable
-    , http-conduit
     , hxt
     , lens
     , mtl
@@ -692,21 +677,15 @@ executable ampPreProc
     , pandoc-crossref
     , pandoc-types
     , parsec
-    , prettyprinter
-    , prettyprinter-ansi-terminal
     , process
     , quickcheck-instances
     , rio
-    , salve
     , simple-sql-parser
-    , split
     , terminal-size
-    , texmath
     , text
     , text1
     , time
     , transformers
-    , typed-process
     , uri-encode
     , wl-pprint
     , xlsx
@@ -738,13 +717,11 @@ executable ampersand
       Cabal
     , HStringTemplate
     , QuickCheck
-    , SpreadsheetML
     , aeson
     , aeson-pretty
     , ampersand
     , ansi-terminal
     , base
-    , bytestring
     , casing
     , conduit
     , containers
@@ -758,7 +735,6 @@ executable ampersand
     , generic-deriving
     , graphviz
     , hashable
-    , http-conduit
     , hxt
     , lens
     , mtl
@@ -767,21 +743,15 @@ executable ampersand
     , pandoc-crossref
     , pandoc-types
     , parsec
-    , prettyprinter
-    , prettyprinter-ansi-terminal
     , process
     , quickcheck-instances
     , rio
-    , salve
     , simple-sql-parser
-    , split
     , terminal-size
-    , texmath
     , text
     , text1
     , time
     , transformers
-    , typed-process
     , uri-encode
     , wl-pprint
     , xlsx
@@ -811,13 +781,11 @@ test-suite ampersand-test
   build-depends:
       HStringTemplate
     , QuickCheck
-    , SpreadsheetML
     , aeson
     , aeson-pretty
     , ampersand
     , ansi-terminal
     , base
-    , bytestring
     , casing
     , conduit
     , containers
@@ -831,7 +799,6 @@ test-suite ampersand-test
     , generic-deriving
     , graphviz
     , hashable
-    , http-conduit
     , hxt
     , lens
     , mtl
@@ -840,21 +807,15 @@ test-suite ampersand-test
     , pandoc-crossref
     , pandoc-types
     , parsec
-    , prettyprinter
-    , prettyprinter-ansi-terminal
     , process
     , quickcheck-instances
     , rio
-    , salve
     , simple-sql-parser
-    , split
     , terminal-size
-    , texmath
     , text
     , text1
     , time
     , transformers
-    , typed-process
     , uri-encode
     , wl-pprint
     , xlsx

commands.md

@@ -67,8 +67,6 @@ even more complex than it already was.
           Generate an .xlsx file containing the populations of your script.
   * ***--proofs*** `proofs`
           generate derivations, for testing the generation of rules.
-  * ***--uml*** `uml`
-          Generate a data model in UML 2.0 style.
   * ***--validate*** `validate`
           Compare results of rule evaluation in Haskell and SQL, for
           testing the semantics of terms. This requires command line php with

docs/reference-material/syntax-of-ampersand.md

@@ -460,8 +460,8 @@ The following operators are available to build expressions:
   - complement: `-`
 - Unary operators \(post-operator\)
   - conversion \(flip\): `~`
-  - Reflexive, transitive closure: `*` \(Kleene star\) --currently not implemented
-  - transitive closure: `+` \(Kleene plus\) --currently not implemented
+  - Reflexive, transitive closure: `*` \(Kleene star\) 
+  - transitive closure: `+` \(Kleene plus\)
 
 ###### MEANING\*
 

docs/reference-material/terms.md

@@ -81,8 +81,8 @@ When coding in Ampersand, these operators are typed with characters on the keybo
 | diamond                      |  `<>` |      $$\Diamond$$      |                                            |
 | relational product           |  `!`  |       $$\dagger$$      | associative                                |
 | cartesian product            |  `#`  |       $$\times$$       | deprecated                                 |
-| reflexive transitive closure |  `*`  |          $$∗$$         | in code: not implemented; in math: Postfix |
-| transitive closure           |  `+`  |          $$+$$         | in code: not implemented; in math: Postfix |
+| reflexive transitive closure |  `*`  |          $$∗$$         |                                            |
+| transitive closure           |  `+`  |          $$+$$         |                                            |
 
 ## Semantics