state in progress

Author: schlichtanders

.github/workflows/CompatHelper.yml

@@ -3,14 +3,43 @@ on:
   schedule:
     - cron: 0 0 * * *
   workflow_dispatch:
+permissions:
+  contents: write
+  pull-requests: write
 jobs:
   CompatHelper:
     runs-on: ubuntu-latest
     steps:
-      - name: Pkg.add("CompatHelper")
-        run: julia -e 'using Pkg; Pkg.add("CompatHelper")'
-      - name: CompatHelper.main()
+      - name: Check if Julia is already available in the PATH
+        id: julia_in_path
+        run: which julia
+        continue-on-error: true
+      - name: Install Julia, but only if it is not already available in the PATH
+        uses: julia-actions/setup-julia@v1
+        with:
+          version: '1'
+          # arch: ${{ runner.arch }}
+        if: steps.julia_in_path.outcome != 'success'
+      - name: "Add the General registry via Git"
+        run: |
+          import Pkg
+          ENV["JULIA_PKG_SERVER"] = ""
+          Pkg.Registry.add("General")
+        shell: julia --color=yes {0}
+      - name: "Install CompatHelper"
+        run: |
+          import Pkg
+          name = "CompatHelper"
+          uuid = "aa819f21-2bde-4658-8897-bab36330d9b7"
+          version = "3"
+          Pkg.add(; name, uuid, version)
+        shell: julia --color=yes {0}
+      - name: "Run CompatHelper"
+        run: |
+          import CompatHelper
+          CompatHelper.main()
+        shell: julia --color=yes {0}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           COMPATHELPER_PRIV: ${{ secrets.DOCUMENTER_KEY }}
-        run: julia -e 'using CompatHelper; CompatHelper.main()'
+          # COMPATHELPER_PRIV: ${{ secrets.COMPATHELPER_PRIV }}

CHANGELOG.md

@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Changed
+- Compat compat now includes version 4
 
 ## [1.1.1] - 2021-07-27
 ### Added

Project.toml

@@ -10,16 +10,17 @@ Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"
 ExprParsers = "c5caad1f-83bd-4ce8-ac8e-4b29921e994e"
 Monadic = "4a6f0533-cc52-4fcf-a409-c6c05775ac80"
 Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
+SimpleMatch = "a3ae8450-d22f-11e9-3fe0-77240e25996f"
 TypeClasses = "addcc920-e0cf-11e8-30b7-0fb08706b574"
 
 [compat]
-Compat = "2.1, 3"
+Compat = "2.1, 3, 4"
 DataTypesBasic = "1.0, 2"
 ExprParsers = "1"
-julia = "1.6"
 Monadic = "1"
-Reexport = "1"
+Reexport = "0.2, 1"
 TypeClasses = "1.1"
+julia = "1.6"
 
 [extras]
 Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"

src/core.jl

@@ -22,21 +22,21 @@ is handled independently on its own
 struct Eff{Effectful, Fs}
   effectful::Effectful
   cont::Continuation{Fs}
+end
+
+function Eff(effectful::E, cont::Continuation{Tuple{}}) where E<:NoEffect
+  # also run this if isempty(cont) to stop infinite recursion
+  # (which happens otherwise because empty cont results returns noeffect for convenience)
+  Eff{E, Tuple{}}(effectful, cont)
+end
 
-  function Eff(effectful::T, cont::Continuation{Fs}) where {T, Fs}
-    if !isempty(cont) && effectful isa NoEffect
-      # Evaluate NoEffect directly to make sure, we don't have a chain of NoEffect function accumulating
-      # e.g. with ContextManager this could lead to things not being evaluated, while the syntax suggest
-      # everything is evaluated, and hence the ContextManager may finalize resource despite they are still used.
-      cont(effectful.value)
-
-    else
-      # also run this if isempty(cont) to stop infinite recursion
-      # (which happens otherwise because empty cont results returns noeffect for convenience)
-      new{T, Fs}(effectful, cont)
-    end
-  end
+function Eff(effectful::NoEffect, cont::Continuation{Fs}) where Fs
+  # Evaluate NoEffect directly to make sure, we don't have a chain of NoEffect function accumulating
+  # e.g. with ContextManager this could lead to things not being evaluated, while the syntax suggest
+  # everything is evaluated, and hence the ContextManager may finalize resource despite they are still used.
+  cont(effectful.value)
 end
+
 Eff(effectful) = Eff(effectful, Continuation())
 
 function Base.show(io::IO, eff::Eff)
@@ -60,16 +60,17 @@ effect(eff::Eff) = eff  # if we find a Eff effect, we just directly use it
 # Functionalities for Continuation
 # --------------------------------
 
+function (c::Continuation{Tuple{}})(value)
+  # mapping empty continuation is the same as wrapping into noeffect
+  noeffect(value)
+end
 function (c::Continuation)(value)
-  if isempty(c)
-    noeffect(value)
-  else
-    first_func = c.functions[1]
-    rest = c.functions[2:end]
-    eff = first_func(value)
-    Eff(eff.effectful, Continuation(eff.cont.functions..., rest...))
-  end
+  first_func = Base.first(c.functions)
+  rest = Base.tail(c.functions)
+  eff = first_func(value)
+  Eff(eff.effectful, Continuation(eff.cont.functions..., rest...))
 end
+
 Base.isempty(c::Continuation) = Base.isempty(c.functions)
 Base.map(f, c::Continuation) = Continuation(c.functions..., noeffect ∘ f)
 

test/Project.toml

@@ -0,0 +1,7 @@
+[deps]
+BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
+DataTypesBasic = "83eed652-29e8-11e9-12da-a7c29d64ffc9"
+ExtensibleEffects = "67377c25-f533-4d0b-9328-1721380cc1f1"
+JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b"
+TypeClasses = "addcc920-e0cf-11e8-30b7-0fb08706b574"
+TypeClasses2 = "addcc920-e0cf-11e8-30b7-0fb08706b575"