Merge pull request #11 from simonbyrne/sb/nested-where

Allow multiple where statements

.github/workflows/ci.yml

@@ -0,0 +1,39 @@
+name: CI
+on:
+  - pull_request
+jobs:
+  test:
+    name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        version:
+          - '1.0'
+          - '1.4'
+          - '1.5'
+          - 'nightly'
+        os:
+          - ubuntu-latest
+          - macOS-latest
+          - windows-latest
+        arch:
+          - x64
+    steps:
+      - uses: actions/checkout@v2
+      - uses: julia-actions/setup-julia@v1
+        with:
+          version: ${{ matrix.version }}
+          arch: ${{ matrix.arch }}
+      - uses: actions/cache@v1
+        env:
+          cache-name: cache-artifacts
+        with:
+          path: ~/.julia/artifacts
+          key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
+          restore-keys: |
+            ${{ runner.os }}-test-${{ env.cache-name }}-
+            ${{ runner.os }}-test-
+            ${{ runner.os }}-
+      - uses: julia-actions/julia-buildpkg@latest
+      - uses: julia-actions/julia-runtest@latest

.gitignore

@@ -0,0 +1 @@
+Manifest.toml

Project.toml

@@ -1,7 +1,13 @@
 name = "KeywordDispatch"
 uuid = "5888135b-5456-5c80-a1b6-c91ef8180460"
 authors = ["Simon Byrne <simonbyrne@gmail.com>"]
-version = "0.3.0"
+version = "0.3.1"
 
-[deps]
+[compat]
+julia = "1.0"
+
+[extras]
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+
+[targets]
+test = ["Test"]

src/KeywordDispatch.jl

@@ -54,7 +54,7 @@ argtype(x::Expr) = x.head == :(::) ? x.args[end] : error("unexpected expression
 function unwrap_where(expr)
     stack = Any[]
     while expr isa Expr && expr.head == :where
-        push!(stack, expr.args[2])
+        append!(stack, expr.args[2:end])
         expr = expr.args[1]
     end
     expr, stack

test/runtests.jl

@@ -251,3 +251,15 @@ end
 
     @test f(alpha=0,beta=0) == 3
 end
+
+@testset "multiple where clauses" begin
+    # based on https://github.com/simonbyrne/KeywordDispatch.jl/issues/9
+    @kwdispatch f(x::T) where {T}
+
+    @kwmethod f(x::T; y::TI) where {T, TI <: Vector{T}} = y
+
+    @test f(1.0,y=[1.0,2.0]) == [1.0,2.0]
+    @test f(1,y=[1,2]) == [1,2]
+
+    @test_throws KeywordMethodError f(1,y=[1.0,2.0])
+end