Merge branch 'master' into rule-1

.github/workflows/ghc.yml

@@ -27,10 +27,24 @@ jobs:
         uses: actions/checkout@v4
 
       - name: 🧰 Setup Stack
-        uses: freckle/stack-action@v4
+        # FIXME use freckle/stack-action@v4 when https://github.com/freckle/stack-action/pull/31 is merged
+        uses: deemp/stack-action@main
         with:
           fast: ${{ github.ref_name != 'master' }}
 
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+
+      - uses: actions/setup-java@v4
+        with:
+          distribution: "zulu"
+          java-version: 21
+
+      - run: npm install -g [email protected]
+
+      - run: ./pipeline.sh
+
   haddock:
     needs: [build]
     if: ${{ github.ref_name == 'master' }}

.gitignore

@@ -1,3 +1,7 @@
+.eoc
+before.txt
+after.txt
+app.eo
 *.bak
 eo-phi-normalizer/src/Language/EO/Phi/Syntax/Lex.hs
 eo-phi-normalizer/src/Language/EO/Phi/Syntax/Par.hs

flake.nix

@@ -1,10 +1,24 @@
 {
-  inputs.flakes.url = "github:deemp/flakes";
+  inputs = {
+    flakes.url = "github:deemp/flakes";
+    eoc = {
+      url = "github:deemp/eoc";
+      flake = false;
+    };
+    # should be synchronized with
+    # https://github.com/objectionary/eoc/blob/116286a11aa538705c0f2b794abbdbcc6dec33ef/mvnw/.mvn/wrapper/maven-wrapper.properties#L18
+    maven-wrapper-jar = {
+      flake = false;
+      url = "https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar";
+    };
+  };
   outputs = inputs: inputs.flakes.makeFlake {
     inputs = {
       inherit (inputs.flakes.all)
-        haskell-tools codium drv-tools devshell
-        flakes-tools nixpkgs formatter workflows lima;
+        haskell-tools drv-tools devshell
+        flakes-tools nixpkgs formatter
+        slimlock;
+      inherit (inputs) eoc maven-wrapper-jar;
     };
     perSystem = { inputs, system }:
       let
@@ -14,8 +28,9 @@
         # --- Imports ---
 
         pkgs = inputs.nixpkgs.legacyPackages.${system};
+        inherit (pkgs) lib;
         inherit (inputs.devshell.lib.${system}) mkCommands mkRunCommands mkShell;
-        inherit (inputs.drv-tools.lib.${system}) withAttrs withMan withDescription mkShellApp man;
+        inherit (inputs.drv-tools.lib.${system}) mkShellApps;
         inherit (inputs.flakes-tools.lib.${system}) mkFlakesTools;
         inherit (inputs.haskell-tools.lib.${system}) toolsGHC;
 
@@ -69,7 +84,7 @@
           packages = ps: [ ps.${packageName} ];
         })
           hls cabal fourmolu justStaticExecutable
-          ghcid haskellPackages hpack stack;
+          ghcid ghc haskellPackages hpack stack;
 
         # --- Tools ---
 
@@ -80,6 +95,7 @@
           fourmolu
           cabal
           stack
+          pkgs.gh
           # `cabal` already has a `ghc` on its `PATH`,
           # so you may remove `ghc` from this list.
           # Then, you can access `ghc` like `cabal exec -- ghc --version`.
@@ -93,7 +109,30 @@
 
         # --- Packages ---
 
-        packages = {
+        packages = mkShellApps {
+          eoc = pkgs.buildNpmPackage rec {
+            name = "";
+            version = "0.15.1";
+            src = inputs.eoc;
+            npmDepsHash = "sha256-j6lfte6RhxRY5cRHcrtIHfZDe0lP1ovEukgHbHsGPb0=";
+            npmInstallFlags = [ "--omit=dev" ];
+            dontNpmBuild = true;
+
+            postPatch =
+              let path = "mvnw/.mvn/wrapper/maven-wrapper.jar"; in
+              ''
+                cp ${inputs.maven-wrapper-jar} ${path}
+                chmod +x ${path}
+              '';
+            meta = with pkgs.lib; {
+              description = "EO compiler";
+              homepage = "https://github.com/objectionary/eoc";
+              license = licenses.mit;
+            };
+          };
+
+          # 
+
           # --- Haskell package ---
 
           # This is a static executable with given runtime dependencies.
@@ -104,6 +143,17 @@
           };
 
           "${packageName}" = haskellPackages."${packageName}";
+
+          pipeline = {
+            runtimeInputs = [ stack pkgs.jdk21 packages.eoc pkgs.maven ];
+            text = ''
+              JAVA_HOME="${pkgs.jdk21.home}"
+              export JAVA_HOME
+              ${builtins.readFile ./pipeline.sh}
+            '';
+            description = "Run pipeline";
+            excludeShellChecks = [ "SC2139" ];
+          };
         };
 
         # --- Devshells ---
@@ -115,7 +165,7 @@
             bash.extra = "export LANG=C.utf8";
             commands =
               mkCommands "tools" tools
-              ++ mkRunCommands "packages" { inherit (packages) default; }
+              ++ mkRunCommands "packages" { inherit (packages) default pipeline; }
             ;
           };
         };

pipeline.sh

@@ -0,0 +1,62 @@
+mkdir -p pipeline
+cd pipeline
+
+shopt -s expand_aliases
+
+EO=0.34.2
+alias eo="eoc --parser=${EO}"
+
+cat > app.eo <<EOT
+[args] > app
+  QQ.io.stdout > @
+    "Hello, world!\n"
+EOT
+
+eo clean
+eo link
+eo --alone dataize app > before.txt
+
+eo phi
+
+# Now, you modify/normalize this file:
+IO=".eoc/phi/app.phi"
+I=".eoc/phi/app.bk.phi"
+mv "$IO" "$I"
+stack run normalize-phi < "$I" > "$IO" \
+  || {
+    printf "\n\nNormalizer failed"
+    printf "\n\n* EO expression:\n\n"
+    cat app.eo
+    printf "\n\n* Phi expression:\n\n"
+    cat "$I"
+    printf "\n\n* Error:\n\n"
+    cat "$IO"
+    exit 1
+  }
+
+printf "\n\nNormalizer succeeded!\n\n"
+printf "\n\n* Phi expression:\n\n"
+cat "$I"
+printf "\n\n* Normalized Phi expression:\n\n"
+cat "$IO"
+printf "\n\n* Diff:\n\n"
+diff "$I" "$IO"
+
+eo unphi
+
+cp .eoc/unphi/app.xmir .eoc/2-optimize/app.xmir
+
+eo print
+
+cp .eoc/print/app.eo app.eo
+
+eo clean
+eo link
+eo --alone dataize app > after.txt
+
+if [ "$(cat before.txt)" == "$(cat after.txt)" ]; then
+    echo 'SUCCESS'
+else
+    echo 'FAILURE'
+    exit 1
+fi