Merge branch 'main' into FixPredLogic

.devcontainer/DockerfileUpstream

@@ -58,8 +58,8 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh
 ENV PATH="${WDIR}/.cabal/bin:${WDIR}/.ghcup/bin:${PATH}:${WDIR}/.local/bin:${PATH}"
 
 ARG GHC=8.10.7
-ARG CABAL=3.10.1.0
-ARG HLS=2.0.0.1
+ARG CABAL=3.6.2.0
+ARG HLS=2.2.0.0
 ARG STACK=2.11.1
 
 # install GHC and cabal
@@ -99,11 +99,7 @@ ENV PATH="${WDIR}/.cabal/bin:${WDIR}/.ghcup/bin:${WDIR}/.local/bin:${PATH}"
 COPY ./package.yaml ${WDIR}/package.yaml
 COPY ./stack.yaml ${WDIR}/stack.yaml
 
-RUN groupadd --gid $USER_GID $USERNAME && \
-    useradd -ms /bin/bash -K MAIL_DIR=/dev/null --uid $USER_UID --gid $USER_GID -m $USERNAME && \
-    echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME && \
-    chmod 0440 /etc/sudoers.d/$USERNAME
-
+RUN stack setup ${GHC}
 ENV DEBIAN_FRONTEND=dialog
 
 ENTRYPOINT ["/bin/bash"]

.devcontainer/README.md

@@ -0,0 +1,26 @@
+# On the use of the ampersand .devcontainer stuff
+
+## Purpose
+
+The purpose of the .devcontainer is to provide a common development environment for the Haskellers among the developers of Ampersand.
+
+## What is in this directory
+
+`DockerfileUpstream` is a Dockerfile to build an image. That image should be [available at dockerhub](https://hub.docker.com/repository/docker/ampersandtarski/ampersand-devcontainer/general).
+`devcontainer.json` contains the information to properly launch a remote container for the developer.
+
+## Usage
+
+To use this devcontainer, simply open vscode in the Ampersand workspace. It should ask to reopen in a container. The first time might take quite a while, but it is worth the wait. All Haskell goodies will be at your fingertips.
+
+## Maintenance of the upstream image
+
+NB: This action is currently done by Han, no need for other people to do so. It can be seen as regular maintenance of the image
+
+Sometimes there are updates of the Haskell toolchain we use. For instance whenever a new version of the Haskell Language Server is made available, the `DockerfileUpstream` should be updated accordingly. Then, the new image should be built and published at dockerhub. To do so, go to the ampersand root directory and run the following commands:
+
+```
+docker build -f .devcontainer/DockerfileUpstream -t ampersandtarski/ampersand-devcontainer:latest .
+docker push ampersandtarski/ampersand-devcontainer:latest
+
+```

.devcontainer/devcontainer.json

@@ -6,10 +6,12 @@
     "context": "..",
     "dockerfile": "Dockerfile"
   },
+  "postStartCommand": "stack build",
   "customizations": {
     "vscode": {
       "extensions": [
         "haskell.haskell",
+        "justusadam.language-haskell",
         "phoityne.phoityne-vscode",
         "eriksik2.vscode-ghci",
         "jcanero.hoogle-vscode",

ArchitectureAndDesign/Syntax/Pre 2010 version/ADL_V1.0.ebnf

@@ -4,12 +4,12 @@ Context         ::= 'CONTEXT' Id
                     Declaration  |
                     ConceptDef   |
                     KeyDef       |
-                    Service      |
+                    Interface      |
                     Plug         |
                     Explain      |
                     Population  
                     )* 'ENDCONTEXT'
-Explain        ::= 'EXPLAIN' (( ('CONCEPT'|'RULE'|'KEY'|'PATTERN'|'SERVICE'|'CONTEXT') Id)|'RELATION' Relation Sign)
+Explain        ::= 'EXPLAIN' (( ('CONCEPT'|'RULE'|'KEY'|'PATTERN'|'INTERFACE'|'CONTEXT') Id)|'RELATION' Relation Sign)
                    ('IN' ('DUTCH' | 'ENGLISH'))?
                    ('REF' String)? ExplainString
 Population      ::= 'POPULATION' Relation Sign? 'CONTAINS' Content
@@ -35,7 +35,7 @@ LabelProps      ::= Id ('{' Id (',' (Id Id*))* '}')? ':'
 ConceptDef      ::= 'CONCEPT' Id String String?
 KeyDef          ::= 'KEY' LabelProps Concept '(' (LabelProps? Term)(',' (LabelProps? Term))* ')'
 Plug            ::= ('SQLPLUG' | 'PHPPLUG') Obj
-Service         ::= 'SERVICE' ('(' (Relation Sign?) (',' (Relation Sign?))* ')')?
+Interface       ::= 'INTERFACE' ('(' (Relation Sign?) (',' (Relation Sign?))* ')')?
                     ('{' (Id ) (','?  Id)*'}')?
                     (':' Expr)
                     ('=' '[' (Obj (',' Obj)*)? ']')?

ReleaseNotes.md

@@ -5,7 +5,7 @@
 * [Issue #1419](https://github.com/AmpersandTarski/Ampersand/issues/1419) added a test, to be activated in the regression after resolving #1419.
 * [Issue #1420](https://github.com/AmpersandTarski/Ampersand/issues/1420) added a test, to be activated in the regression after resolving #1420.
 * [Issue #1421](https://github.com/AmpersandTarski/Ampersand/issues/1421) added easier development through Docker image at dockerhub: [ampersandtarski/ampersand-devcontainer](https://hub.docker.com/repository/docker/ampersandtarski/ampersand-devcontainer/general). Also fixes https://github.com/AmpersandTarski/Ampersand/issues/1359
-
+* Development of Ampersand generator can now be done with codespaces.
 ## v4.7.6 (26 february 2023)
 
 ## v4.7.5 (25 february 2023)
@@ -224,7 +224,7 @@ New CI workflow for releases to be pushed automatically to DockerHub with semver
 
 ## v3.16.0 (8 april 2019) (few days before scedule)
 
-- New switch: --daemon. This enables automatic checking of your scripts as you type. Very nice in combination with the vscode extension [Ampersand (ADL) language support](https://marketplace.visualstudio.com/items?itemName=AmpersandTarski.language-ampersand).
+- New switch: --daemon. This enables automatic checking of your scripts as you type. Very nice in combination with the vscode extension [Ampersand language support](https://marketplace.visualstudio.com/items?itemName=AmpersandTarski.language-ampersand).
 - [Issue #920](https://github.com/AmpersandTarski/Ampersand/issues/920) Warnings are generated for concepts/relations with names that are equal except for the caseing.
 
 ## v3.15.0 (15 march 2019)