Merge branch 'master' into charliesome/module-result

.hlint.yaml

@@ -19,6 +19,12 @@
 # Generalise map to fmap, ++ to <>
 - group: {name: generalise, enabled: true}
 
+# Change the severity of the default group to warning
+- warn: {group: {name: default}}
+
+# Ignore the highly noisy module export list hint
+- ignore: {name: Use module export list}
+
 # Ignore some builtin hints
 - ignore: {name: Use mappend}
 - ignore: {name: Redundant do}

.licenses/semantic/cabal/QuickCheck.txt

@@ -1,7 +1,7 @@
 ---
 type: cabal
 name: QuickCheck
-version: 2.10.1
+version: 2.11.3
 summary: Automatic testing of Haskell programs
 homepage: https://github.com/nick8325/quickcheck
 license: bsd-3-clause
@@ -34,4 +34,4 @@ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

.licenses/semantic/cabal/async.txt

@@ -1,7 +1,7 @@
 ---
 type: cabal
 name: async
-version: 2.1.1.1
+version: 2.2.1
 summary: Run IO operations asynchronously and wait for their results
 homepage: https://github.com/simonmar/async
 license: bsd-3-clause
@@ -35,4 +35,4 @@ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

.licenses/semantic/cabal/base-compat-batteries.txt

@@ -0,0 +1,27 @@
+---
+type: cabal
+name: base-compat-batteries
+version: 0.10.1
+summary: base-compat with extra batteries
+homepage: 
+license: mit
+---
+Copyright (c) 2012-2018 Simon Hengel <sol@typeful.net> and Ryan Scott <ryan.gl.scott@gmail.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

.licenses/semantic/cabal/base-compat.txt

@@ -1,12 +1,12 @@
 ---
 type: cabal
 name: base-compat
-version: 0.9.3
+version: 0.10.4
 summary: A compatibility layer for base
-homepage: https://github.com/haskell-compat/base-compat
+homepage: 
 license: mit
 ---
-Copyright (c) 2012-2017 Simon Hengel <sol@typeful.net> and Ryan Scott <ryan.gl.scott@gmail.com>
+Copyright (c) 2012-2018 Simon Hengel <sol@typeful.net> and Ryan Scott <ryan.gl.scott@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -24,4 +24,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE.

.licenses/semantic/cabal/base-prelude.txt

@@ -1,7 +1,7 @@
 ---
 type: cabal
 name: base-prelude
-version: 1.2.1
+version: '1.3'
 summary: The most complete prelude formed solely from the "base" package
 homepage: https://github.com/nikita-volkov/base-prelude
 license: mit
@@ -27,4 +27,4 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
 HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
+OTHER DEALINGS IN THE SOFTWARE.

.licenses/semantic/cabal/base.txt

@@ -1,7 +1,7 @@
 ---
 type: cabal
 name: base
-version: 4.10.1.0
+version: 4.11.1.0
 summary: Basic libraries
 homepage: 
 license: bsd-3-clause
@@ -88,4 +88,4 @@ the following license:
   version is clearly presented as such, and that it does not claim to
   be a definition of the Haskell 98 Foreign Function Interface.
 
------------------------------------------------------------------------------
+-----------------------------------------------------------------------------

.licenses/semantic/cabal/bifunctors.txt

@@ -1,7 +1,7 @@
 ---
 type: cabal
 name: bifunctors
-version: 5.5.2
+version: 5.5.3
 summary: Bifunctors
 homepage: https://github.com/ekmett/bifunctors/
 license: bsd-2-clause
@@ -31,4 +31,4 @@ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
 STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
 ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+POSSIBILITY OF SUCH DAMAGE.

.licenses/semantic/cabal/cmark-gfm.txt

@@ -1,7 +1,7 @@
 ---
 type: cabal
 name: cmark-gfm
-version: 0.1.3
+version: 0.1.4
 summary: Fast, accurate GitHub Flavored Markdown parser and renderer
 homepage: https://github.com/kivikakk/cmark-gfm-hs
 license: multiple
@@ -141,4 +141,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
+DEALINGS IN THE SOFTWARE.

.licenses/semantic/cabal/comonad.txt

@@ -1,7 +1,7 @@
 ---
 type: cabal
 name: comonad
-version: 5.0.3
+version: 5.0.4
 summary: Comonads
 homepage: https://github.com/ekmett/comonad/
 license: bsd-2-clause
@@ -32,4 +32,4 @@ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
 STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
 ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+POSSIBILITY OF SUCH DAMAGE.

.licenses/semantic/cabal/containers.txt

@@ -1,9 +1,9 @@
 ---
 type: cabal
 name: containers
-version: 0.5.10.2
+version: 0.5.11.0
 summary: Assorted concrete container types
-homepage: https://github.com/haskell/containers
+homepage: 
 license: bsd-3-clause
 ---
 The Glasgow Haskell Compiler License
@@ -36,4 +36,4 @@ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
+DAMAGE.

.licenses/semantic/cabal/directory.txt

@@ -1,13 +1,13 @@
 ---
 type: cabal
 name: directory
-version: 1.3.0.2
+version: 1.3.1.5
 summary: Platform-agnostic library for filesystem operations
-homepage: https://github.com/haskell/directory
+homepage: 
 license: bsd-3-clause
 ---
 This library (libraries/base) is derived from code from two
-sources:
+sources: 
 
   * Code from the GHC project which is largely (c) The University of
     Glasgow, and distributable under a BSD-style license (see below),
@@ -23,7 +23,7 @@ licenses are BSD-style or compatible.
 
 The Glasgow Haskell Compiler License
 
-Copyright 2004, The University Court of the University of Glasgow.
+Copyright 2004, The University Court of the University of Glasgow. 
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -31,14 +31,14 @@ modification, are permitted provided that the following conditions are met:
 
 - Redistributions of source code must retain the above copyright notice,
 this list of conditions and the following disclaimer.
-
+ 
 - Redistributions in binary form must reproduce the above copyright notice,
 this list of conditions and the following disclaimer in the documentation
 and/or other materials provided with the distribution.
-
+ 
 - Neither name of the University nor the names of its contributors may be
 used to endorse or promote products derived from this software without
-specific prior written permission.
+specific prior written permission. 
 
 THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY COURT OF THE UNIVERSITY OF
 GLASGOW AND THE CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
@@ -68,4 +68,4 @@ Haskell 98", is distributed under the following license:
   version is clearly presented as such, and that it does not claim to
   be a definition of the Haskell 98 Language.
 
------------------------------------------------------------------------------
+-----------------------------------------------------------------------------

.licenses/semantic/cabal/exceptions.txt

@@ -1,7 +1,7 @@
 ---
 type: cabal
 name: exceptions
-version: 0.8.3
+version: 0.10.0
 summary: Extensible optionally-pure exceptions
 homepage: https://github.com/ekmett/exceptions/
 license: bsd-3-clause
@@ -36,4 +36,4 @@ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
 STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
 ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+POSSIBILITY OF SUCH DAMAGE.

.licenses/semantic/cabal/fail.txt

@@ -1,38 +0,0 @@
----
-type: cabal
-name: fail
-version: 4.9.0.0
-summary: Forward-compatible MonadFail class
-homepage: https://prime.haskell.org/wiki/Libraries/Proposals/MonadFail
-license: bsd-3-clause
----
-Copyright (c) 2015, David Luposchainsky & Herbert Valerio Riedel
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-
-    * Neither the name of Herbert Valerio Riedel nor the names of other
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

.licenses/semantic/cabal/filepath.txt

@@ -1,12 +1,12 @@
 ---
 type: cabal
 name: filepath
-version: 1.4.1.2
+version: 1.4.2
 summary: Library for manipulating FilePaths in a cross platform way.
 homepage: https://github.com/haskell/filepath
 license: bsd-3-clause
 ---
-Copyright Neil Mitchell 2005-2017.
+Copyright Neil Mitchell 2005-2018.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -35,4 +35,4 @@ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

.licenses/semantic/cabal/foldl.txt

@@ -1,7 +1,7 @@
 ---
 type: cabal
 name: foldl
-version: 1.3.7
+version: 1.4.2
 summary: Composable, streaming, and efficient left folds
 homepage: 
 license: bsd-3-clause
@@ -29,4 +29,4 @@ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
 ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

.licenses/semantic/cabal/ghc-boot-th.txt

@@ -1,7 +1,7 @@
 ---
 type: cabal
 name: ghc-boot-th
-version: 8.2.2
+version: 8.4.3
 summary: Shared functionality between GHC and the @template-haskell@
 homepage: 
 license: bsd-3-clause
@@ -36,4 +36,4 @@ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
+DAMAGE.

.licenses/semantic/cabal/ghc-boot.txt

@@ -1,7 +1,7 @@
 ---
 type: cabal
 name: ghc-boot
-version: 8.2.2
+version: 8.4.3
 summary: Shared functionality between GHC and its boot libraries
 homepage: 
 license: bsd-3-clause
@@ -36,4 +36,4 @@ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
+DAMAGE.

.licenses/semantic/cabal/ghc-prim.txt

@@ -1,7 +1,7 @@
 ---
 type: cabal
 name: ghc-prim
-version: 0.5.1.1
+version: 0.5.2.0
 summary: GHC primitives
 homepage: 
 license: bsd-3-clause
@@ -66,5 +66,4 @@ Haskell 98", is distributed under the following license:
   including this Notice.  Modified versions of this Report may also be
   copied and distributed for any purpose, provided that the modified
   version is clearly presented as such, and that it does not claim to
-  be a definition of the Haskell 98 Language.
+  be a definition of the Haskell 98 Language.
-

.licenses/semantic/cabal/ghc-tcplugins-extra.txt

@@ -1,7 +1,7 @@
 ---
 type: cabal
 name: ghc-tcplugins-extra
-version: 0.2.5
+version: '0.3'
 summary: Utilities for writing GHC type-checker plugins
 homepage: https://github.com/clash-lang/ghc-tcplugins-extra
 license: bsd-2-clause
@@ -32,4 +32,4 @@ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

.licenses/semantic/cabal/ghc-typelits-extra.txt

@@ -1,7 +1,7 @@
 ---
 type: cabal
 name: ghc-typelits-extra
-version: 0.2.4
+version: 0.2.5
 summary: Additional type-level operations on GHC.TypeLits.Nat
 homepage: https://www.clash-lang.org/
 license: bsd-2-clause
@@ -32,4 +32,4 @@ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

.licenses/semantic/cabal/ghc-typelits-knownnat.txt

@@ -1,7 +1,7 @@
 ---
 type: cabal
 name: ghc-typelits-knownnat
-version: 0.4.2
+version: '0.5'
 summary: Derive KnownNat constraints from other KnownNat constraints
 homepage: https://clash-lang.org/
 license: bsd-2-clause
@@ -33,4 +33,4 @@ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

.licenses/semantic/cabal/ghc-typelits-natnormalise.txt

@@ -1,7 +1,7 @@
 ---
 type: cabal
 name: ghc-typelits-natnormalise
-version: 0.5.10
+version: 0.6.1
 summary: GHC typechecker plugin for types of kind GHC.TypeLits.Nat
 homepage: https://www.clash-lang.org/
 license: bsd-2-clause
@@ -32,4 +32,4 @@ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

.licenses/semantic/cabal/ghc.txt

@@ -1,7 +1,7 @@
 ---
 type: cabal
 name: ghc
-version: 8.2.2
+version: 8.4.3
 summary: The GHC API
 homepage: https://www.haskell.org/ghc/
 license: bsd-3-clause
@@ -36,4 +36,4 @@ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
+DAMAGE.

.licenses/semantic/cabal/ghci.txt

@@ -1,7 +1,7 @@
 ---
 type: cabal
 name: ghci
-version: 8.2.2
+version: 8.4.3
 summary: The library supporting GHC's interactive interpreter
 homepage: 
 license: bsd-3-clause
@@ -36,4 +36,4 @@ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
+DAMAGE.

.licenses/semantic/cabal/hoopl.txt

@@ -1,41 +0,0 @@
----
-type: cabal
-name: hoopl
-version: 3.10.2.2
-summary: A library to support dataflow analysis and optimization
-homepage: https://github.com/haskell/hoopl
-license: bsd-3-clause
----
-Copyright (c) 2010, Jo<4A>o Dias, Simon Marlow, Simon Peyton Jones, and Norman Ramsey
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-
-Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-Neither the name of Tufts University nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-Neither the name of Microsoft nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

.licenses/semantic/cabal/http-client.txt

@@ -1,7 +1,7 @@
 ---
 type: cabal
 name: http-client
-version: 0.5.12.1
+version: 0.5.13.1
 summary: An HTTP client engine
 homepage: https://github.com/snoyberg/http-client
 license: mit
@@ -25,4 +25,4 @@ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
 COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
 IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

.licenses/semantic/cabal/integer-gmp.txt

@@ -1,9 +1,9 @@
 ---
 type: cabal
 name: integer-gmp
-version: 1.0.1.0
+version: 1.0.2.0
 summary: Integer library based on GMP
-homepage:
+homepage: 
 license: bsd-3-clause
 ---
 Copyright (c) 2014, Herbert Valerio Riedel
@@ -35,4 +35,4 @@ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

.licenses/semantic/cabal/invariant.txt

@@ -0,0 +1,31 @@
+---
+type: cabal
+name: invariant
+version: '0.5'
+summary: Haskell98 invariant functors
+homepage: https://github.com/nfrisby/invariant-functors
+license: bsd-2-clause
+---
+Copyright (c) 2012-2017, University of Kansas
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+  * Redistributions of source code must retain the above copyright notice, this
+    list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

.licenses/semantic/cabal/kan-extensions.txt

@@ -1,7 +1,7 @@
 ---
 type: cabal
 name: kan-extensions
-version: '5.1'
+version: '5.2'
 summary: Kan extensions, Kan lifts, the Yoneda lemma, and (co)density (co)monads
 homepage: https://github.com/ekmett/kan-extensions/
 license: bsd-3-clause
@@ -35,4 +35,4 @@ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
 STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
 ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+POSSIBILITY OF SUCH DAMAGE.

.licenses/semantic/cabal/keys.txt

@@ -1,7 +1,7 @@
 ---
 type: cabal
 name: keys
-version: '3.12'
+version: 3.12.1
 summary: Keyed functors and containers
 homepage: https://github.com/ekmett/keys/
 license: bsd-3-clause
@@ -35,4 +35,4 @@ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
 STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
 ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+POSSIBILITY OF SUCH DAMAGE.

.licenses/semantic/cabal/megaparsec.txt

@@ -0,0 +1,34 @@
+---
+type: cabal
+name: megaparsec
+version: 6.5.0
+summary: Monadic parser combinators
+homepage: https://github.com/mrkkrp/megaparsec
+license: bsd-2-clause
+---
+Copyright © 2015–2018 Megaparsec contributors<br>
+Copyright © 2007 Paolo Martini<br>
+Copyright © 1999–2000 Daan Leijen
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS “AS IS” AND ANY EXPRESS
+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
+NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

.licenses/semantic/cabal/mime-types.txt

@@ -1,7 +1,7 @@
 ---
 type: cabal
 name: mime-types
-version: 0.1.0.7
+version: 0.1.0.8
 summary: Basic mime-type handling types and functions
 homepage: https://github.com/yesodweb/wai
 license: mit
@@ -25,4 +25,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

.licenses/semantic/cabal/neat-interpolation.txt

@@ -1,7 +1,7 @@
 ---
 type: cabal
 name: neat-interpolation
-version: 0.3.2.1
+version: 0.3.2.2
 summary: A quasiquoter for neat and simple multiline text interpolation
 homepage: https://github.com/nikita-volkov/neat-interpolation
 license: mit

.licenses/semantic/cabal/network.txt

@@ -1,7 +1,7 @@
 ---
 type: cabal
 name: network
-version: 2.6.3.5
+version: 2.6.3.6
 summary: Low-level networking interface
 homepage: https://github.com/haskell/network
 license: bsd-3-clause
@@ -34,4 +34,4 @@ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
+DAMAGE.

.licenses/semantic/cabal/parser-combinators.txt

@@ -0,0 +1,36 @@
+---
+type: cabal
+name: parser-combinators
+version: 1.0.0
+summary: Lightweight package providing commonly useful parser combinators
+homepage: https://github.com/mrkkrp/parser-combinators
+license: bsd-3-clause
+---
+Copyright © 2017–2018 Mark Karpov
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+
+* Neither the name Mark Karpov nor the names of contributors may be used to
+  endorse or promote products derived from this software without specific
+  prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS “AS IS” AND ANY EXPRESS
+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
+NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

.licenses/semantic/cabal/parsers.txt

@@ -1,7 +1,7 @@
 ---
 type: cabal
 name: parsers
-version: 0.12.8
+version: 0.12.9
 summary: Parsing combinators
 homepage: https://github.com/ekmett/parsers/
 license: bsd-3-clause
@@ -35,4 +35,4 @@ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
 STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
 ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+POSSIBILITY OF SUCH DAMAGE.

.licenses/semantic/cabal/pretty.txt

@@ -1,7 +1,7 @@
 ---
 type: cabal
 name: pretty
-version: 1.1.3.3
+version: 1.1.3.6
 summary: Pretty-printing library
 homepage: https://github.com/haskell/pretty
 license: bsd-3-clause
@@ -14,7 +14,7 @@ Glasgow, and distributable under a BSD-style license (see below).
 
 The Glasgow Haskell Compiler License
 
-Copyright 2004, The University Court of the University of Glasgow.
+Copyright 2004, The University Court of the University of Glasgow. 
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -22,14 +22,14 @@ modification, are permitted provided that the following conditions are met:
 
 - Redistributions of source code must retain the above copyright notice,
 this list of conditions and the following disclaimer.
-
+ 
 - Redistributions in binary form must reproduce the above copyright notice,
 this list of conditions and the following disclaimer in the documentation
 and/or other materials provided with the distribution.
-
+ 
 - Neither name of the University nor the names of its contributors may be
 used to endorse or promote products derived from this software without
-specific prior written permission.
+specific prior written permission. 
 
 THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY COURT OF THE UNIVERSITY OF
 GLASGOW AND THE CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
@@ -44,4 +44,4 @@ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGE.
 
------------------------------------------------------------------------------
+-----------------------------------------------------------------------------

.licenses/semantic/cabal/process.txt

@@ -1,13 +1,13 @@
 ---
 type: cabal
 name: process
-version: 1.6.1.0
+version: 1.6.3.0
 summary: Process libraries
-homepage: https://github.com/haskell/process
+homepage: 
 license: bsd-3-clause
 ---
 This library (libraries/process) is derived from code from two
-sources:
+sources: 
 
   * Code from the GHC project which is largely (c) The University of
     Glasgow, and distributable under a BSD-style license (see below),
@@ -23,7 +23,7 @@ licenses are BSD-style or compatible.
 
 The Glasgow Haskell Compiler License
 
-Copyright 2004, The University Court of the University of Glasgow.
+Copyright 2004, The University Court of the University of Glasgow. 
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -31,14 +31,14 @@ modification, are permitted provided that the following conditions are met:
 
 - Redistributions of source code must retain the above copyright notice,
 this list of conditions and the following disclaimer.
-
+ 
 - Redistributions in binary form must reproduce the above copyright notice,
 this list of conditions and the following disclaimer in the documentation
 and/or other materials provided with the distribution.
-
+ 
 - Neither name of the University nor the names of its contributors may be
 used to endorse or promote products derived from this software without
-specific prior written permission.
+specific prior written permission. 
 
 THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY COURT OF THE UNIVERSITY OF
 GLASGOW AND THE CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
@@ -68,4 +68,4 @@ Haskell 98", is distributed under the following license:
   version is clearly presented as such, and that it does not claim to
   be a definition of the Haskell 98 Language.
 
------------------------------------------------------------------------------
+-----------------------------------------------------------------------------

.licenses/semantic/cabal/quickcheck-instances.txt

@@ -1,7 +1,7 @@
 ---
 type: cabal
 name: quickcheck-instances
-version: 0.3.16.1
+version: 0.3.18
 summary: Common quickcheck instances
 homepage: https://github.com/phadej/qc-instances
 license: bsd-3-clause
@@ -35,4 +35,4 @@ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

.licenses/semantic/cabal/recursion-schemes.txt

@@ -1,7 +1,7 @@
 ---
 type: cabal
 name: recursion-schemes
-version: 5.0.2
+version: 5.0.3
 summary: Generalized bananas, lenses and barbed wire
 homepage: https://github.com/ekmett/recursion-schemes/
 license: bsd-2-clause
@@ -31,4 +31,4 @@ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
 STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
 ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+POSSIBILITY OF SUCH DAMAGE.

.licenses/semantic/cabal/reducers.txt

@@ -1,7 +1,7 @@
 ---
 type: cabal
 name: reducers
-version: 3.12.2
+version: 3.12.3
 summary: Semigroups, specialized containers and a general map/reduce framework
 homepage: https://github.com/ekmett/reducers/
 license: bsd-3-clause
@@ -35,4 +35,4 @@ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
 STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
 ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+POSSIBILITY OF SUCH DAMAGE.

.licenses/semantic/cabal/reflection.txt

@@ -1,7 +1,7 @@
 ---
 type: cabal
 name: reflection
-version: 2.1.3
+version: 2.1.4
 summary: Reifies arbitrary terms into types that can be reflected back into terms
 homepage: https://github.com/ekmett/reflection
 license: bsd-3-clause
@@ -36,4 +36,4 @@ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

.licenses/semantic/cabal/semigroups.txt

@@ -1,7 +1,7 @@
 ---
 type: cabal
 name: semigroups
-version: 0.18.4
+version: 0.18.5
 summary: Anything that associates
 homepage: https://github.com/ekmett/semigroups/
 license: bsd-2-clause
@@ -31,4 +31,4 @@ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
 STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
 ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+POSSIBILITY OF SUCH DAMAGE.

.licenses/semantic/cabal/streaming-commons.txt

@@ -1,7 +1,7 @@
 ---
 type: cabal
 name: streaming-commons
-version: 0.1.19
+version: 0.2.1.0
 summary: Common lower-level functions needed by various streaming data libraries
 homepage: https://github.com/fpco/streaming-commons
 license: mit

.licenses/semantic/cabal/swagger2.txt

@@ -1,7 +1,7 @@
 ---
 type: cabal
 name: swagger2
-version: 2.1.6
+version: 2.2.2
 summary: Swagger 2.0 data model
 homepage: https://github.com/GetShopTV/swagger2
 license: bsd-3-clause
@@ -32,5 +32,4 @@ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
 SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-

.licenses/semantic/cabal/template-haskell.txt

@@ -1,12 +1,11 @@
 ---
 type: cabal
 name: template-haskell
-version: 2.12.0.0
+version: 2.13.0.0
 summary: Support library for Template Haskell
-homepage:
+homepage: 
 license: bsd-3-clause
 ---
-
 The Glasgow Haskell Compiler License
 
 Copyright 2002-2007, The University Court of the University of Glasgow.
@@ -37,4 +36,4 @@ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
+DAMAGE.

.licenses/semantic/cabal/temporary.txt

@@ -1,7 +1,7 @@
 ---
 type: cabal
 name: temporary
-version: 1.2.1.1
+version: '1.3'
 summary: Portable temporary file and directory support
 homepage: https://github.com/feuerbach/temporary
 license: bsd-3-clause
@@ -32,4 +32,4 @@ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
 DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
 IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

.licenses/semantic/cabal/terminfo.txt

@@ -1,7 +1,7 @@
 ---
 type: cabal
 name: terminfo
-version: 0.4.1.0
+version: 0.4.1.1
 summary: Haskell bindings to the terminfo library.
 homepage: https://github.com/judah/terminfo
 license: bsd-2-clause
@@ -28,4 +28,4 @@ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
 SERVICES; LOSS OF USE, DATA OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

.licenses/semantic/cabal/th-abstraction.txt

@@ -1,7 +1,7 @@
 ---
 type: cabal
 name: th-abstraction
-version: 0.2.6.0
+version: 0.2.8.0
 summary: Nicer interface for reified information about data types
 homepage: https://github.com/glguy/th-abstraction
 license: isc
@@ -18,4 +18,4 @@ FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
 INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
 OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
 TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-THIS SOFTWARE.
+THIS SOFTWARE.

.licenses/semantic/cabal/transformers-base.txt

@@ -1,7 +1,7 @@
 ---
 type: cabal
 name: transformers-base
-version: 0.4.4
+version: 0.4.5.2
 summary: Lift computations from the bottom of a transformer stack
 homepage: https://github.com/mvv/transformers-base
 license: bsd-3-clause
@@ -9,16 +9,16 @@ license: bsd-3-clause
 Copyright (c) 2011, Mikhail Vorozhtsov, Bas van Dijk
 All rights reserved.
 
-Redistribution and use in source and binary forms, with or without
+Redistribution and use in source and binary forms, with or without 
 modification, are permitted provided that the following conditions are met:
 
-- Redistributions of source code must retain the above copyright notice,
+- Redistributions of source code must retain the above copyright notice, 
   this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
+- Redistributions in binary form must reproduce the above copyright 
-  notice, this list of conditions and the following disclaimer in the
+  notice, this list of conditions and the following disclaimer in the 
   documentation and/or other materials provided with the distribution.
-- Neither the names of the copyright owners nor the names of the
+- Neither the names of the copyright owners nor the names of the 
-  contributors may be used to endorse or promote products derived
+  contributors may be used to endorse or promote products derived 
   from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
@@ -31,5 +31,4 @@ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-

.licenses/semantic/cabal/transformers-compat.txt

@@ -1,9 +1,8 @@
 ---
 type: cabal
 name: transformers-compat
-version: 0.5.1.4
+version: 0.6.2
-summary: A small compatibility shim exposing the new types from transformers 0.3 and
+summary: A small compatibility shim for the transformers library
-  0.4 to older Haskell platforms.
 homepage: https://github.com/ekmett/transformers-compat/
 license: bsd-3-clause
 ---
@@ -36,4 +35,4 @@ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
 STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
 ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+POSSIBILITY OF SUCH DAMAGE.

.licenses/semantic/cabal/transformers.txt

@@ -1,9 +1,9 @@
 ---
 type: cabal
 name: transformers
-version: 0.5.2.0
+version: 0.5.5.0
 summary: Concrete functor and monad transformers
-homepage: https://hub.darcs.net/ross/transformers
+homepage: 
 license: bsd-3-clause
 ---
 The Glasgow Haskell Compiler License
@@ -36,4 +36,4 @@ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
+DAMAGE.

.licenses/semantic/cabal/turtle.txt

@@ -1,7 +1,7 @@
 ---
 type: cabal
 name: turtle
-version: 1.5.8
+version: 1.5.10
 summary: Shell programming, Haskell-style
 homepage: 
 license: bsd-3-clause
@@ -29,4 +29,4 @@ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
 ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

proto/code_analysis.proto

@@ -32,7 +32,7 @@ service CodeAnalysis {
   // Calculate an import graph for a project.
   rpc GraphImports (ImportGraphRequest) returns (ImportGraphResponse);
 
-  // rpc GraphCalls (CallGraphRequest) returns (CallGraphResponse);
+  rpc GraphCalls (CallGraphRequest) returns (CallGraphResponse);
 
   // Check health & status of the service.
   rpc CheckHealth (HealthCheckRequest) returns (HealthCheckResponse);
@@ -71,12 +71,21 @@ message SummarizeDiffResponse {
   repeated ParseError errors = 2;
 }
 
+message CallGraphRequest {
+  Project project = 1;
+}
+
+message CallGraphResponse {
+  AdjacencyList graph = 1;
+  DebugInfo error_info = 2;
+}
+
 message ImportGraphRequest {
   Project project = 1;
 }
 
 message ImportGraphResponse {
-  ImportGraph graph = 1;
+  AdjacencyList graph = 1;
   DebugInfo error_info = 2;
 }
 

proto/types.proto

@@ -42,7 +42,7 @@ message ErrorSite {
   SrcLoc errorLocation = 2;
 }
 
-message ImportGraph {
+message AdjacencyList {
   repeated Vertex graphVertices = 1;
   repeated Edge graphEdges = 2;
 }

semantic.cabal

@@ -77,7 +77,7 @@ library
                      , Data.Functor.Both
                      , Data.Functor.Classes.Generic
                      , Data.Graph
-                     , Data.Graph.Adjacency.Import
+                     , Data.Graph.Adjacency
                      , Data.Graph.Vertex
                      , Data.JSON.Fields
                      , Data.Language
@@ -289,6 +289,7 @@ test-suite test
                      , Diffing.Algorithm.RWS.Spec
                      , Diffing.Algorithm.SES.Spec
                      , Diffing.Interpreter.Spec
+                     , Graphing.Calls.Spec
                      , Integration.Spec
                      , Matching.Go.Spec
                      , Numeric.Spec
@@ -301,6 +302,7 @@ test-suite test
                      , SpecHelpers
                      , Test.Hspec.LeanCheck
   build-depends:       aeson
+                     , algebraic-graphs
                      , array
                      , async
                      , base

src/Analysis/Abstract/Caching.hs

@@ -105,7 +105,6 @@ convergingModules recur m = do
       withOracle prevCache (gatherM (const ()) (recur m)))
   TermEvaluator (address =<< runTermEvaluator (maybe empty scatter (cacheLookup c cache)))
 
-
 -- | Iterate a monadic action starting from some initial seed until the results converge.
 --
 --   This applies the Kleene fixed-point theorem to finitize a monotone action. cf https://en.wikipedia.org/wiki/Kleene_fixed-point_theorem

src/Analysis/Abstract/Graph.hs

@@ -49,7 +49,7 @@ graphingTerms :: ( Element Syntax.Identifier syntax
                  , Member (Reader ModuleInfo) effects
                  , Member (Env (Hole (Located address))) effects
                  , Member (State (Graph Vertex)) effects
-                 , term ~ Term (Sum syntax) ann
+                 , Base term ~ TermF (Sum syntax) ann
                  )
               => SubtermAlgebra (Base term) term (TermEvaluator term (Hole (Located address)) value effects a)
               -> SubtermAlgebra (Base term) term (TermEvaluator term (Hole (Located address)) value effects a)

src/Control/Abstract/Environment.hs

@@ -31,8 +31,8 @@ import Prologue
 getEnv :: Member (Env address) effects => Evaluator address value effects (Environment address)
 getEnv = send GetEnv
 
--- | Replace the environment.
+-- | Replace the environment. This is only for use in Analysis.Abstract.Caching.
-putEnv :: Member (Env address) effects => (Environment address) -> Evaluator address value effects ()
+putEnv :: Member (Env address) effects => Environment address -> Evaluator address value effects ()
 putEnv = send . PutEnv
 
 -- | Replace the environment for a computation
@@ -66,7 +66,7 @@ bindAll = foldr ((>>) . uncurry bind) (pure ()) . Env.pairs
 
 -- | Run an action in a new local scope.
 locally :: forall address value effects a . Member (Env address) effects => Evaluator address value effects a -> Evaluator address value effects a
-locally = send . Locally @address . lowerEff
+locally = send . Locally @_ @_ @address . lowerEff
 
 close :: Member (Env address) effects => Set Name -> Evaluator address value effects (Environment address)
 close = send . Close

src/Control/Abstract/Roots.hs

@@ -7,15 +7,12 @@ module Control.Abstract.Roots
 
 import Control.Abstract.Evaluator
 import Data.Abstract.Live
-import Prologue
-
 
 -- | Value types, e.g. closures, which can root a set of addresses.
 class ValueRoots address value where
   -- | Compute the set of addresses rooted by a given value.
   valueRoots :: value -> Live address
 
-
 -- | Retrieve the local 'Live' set.
 askRoots :: Member (Reader (Live address)) effects => Evaluator address value effects (Live address)
 askRoots = ask

src/Data/Abstract/Cache.hs

@@ -32,6 +32,9 @@ cacheSet key value = Cache . Monoidal.insert key value . unCache
 cacheInsert :: Cacheable term address cell value => Configuration term address cell value -> Cached address cell value -> Cache term address cell value -> Cache term address cell value
 cacheInsert = curry cons
 
+-- | Return all 'Configuration's in the provided cache.
+cacheKeys :: Cache term address cell value -> [Configuration term address cell value]
+cacheKeys = Monoidal.keys . unCache
 
 instance (Show term, Show address, Show (cell value), Show value) => Show (Cache term address cell value) where
   showsPrec d = showsUnaryWith showsPrec "Cache" d . map (second toList) . Monoidal.pairs . unCache

src/Data/Abstract/Declarations.hs

@@ -1,7 +1,6 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving, UndecidableInstances #-}
 module Data.Abstract.Declarations  where
 
-import Data.Abstract.FreeVariables
 import Data.Abstract.Name
 import Data.Sum
 import Data.Term
@@ -12,19 +11,21 @@ class Declarations syntax where
   declaredName = const Nothing
 
 class Declarations1 syntax where
-  -- | Lift a function mapping each element to its set of free variables through a containing structure, collecting the results into a single set.
+  -- | Lift a function mapping each element to its declared name (if any) through a containing structure. This can be used to define the declared name for a composite piece of syntax in terms of the declared name of one of its components.
-  liftDeclaredName :: (a -> [Name]) -> syntax a -> Maybe Name
+  --
+  -- Note that not all syntax will have a declared name; in general it’s reserved for syntax where the user has provided a single, unambiguous name for whatever term is being introduced. Examples would be (non-anonymous) functions, methods, and classes; but not (generally) literals or blocks of imperative statements.
+  liftDeclaredName :: (a -> Maybe Name) -> syntax a -> Maybe Name
   liftDeclaredName _ _ = Nothing
 
 instance Declarations t => Declarations (Subterm t a) where
   declaredName = declaredName . subterm
 
-deriving instance (Declarations1 syntax, FreeVariables1 syntax) => Declarations (Term syntax ann)
+deriving instance Declarations1 syntax => Declarations (Term syntax ann)
 
-instance (FreeVariables recur, Declarations1 syntax) => Declarations (TermF syntax ann recur) where
+instance (Declarations recur, Declarations1 syntax) => Declarations (TermF syntax ann recur) where
-  declaredName = liftDeclaredName freeVariables . termFOut
+  declaredName = liftDeclaredName declaredName . termFOut
 
-instance (Apply Declarations1 fs) => Declarations1 (Sum fs) where
+instance Apply Declarations1 fs => Declarations1 (Sum fs) where
   liftDeclaredName f = apply @Declarations1 (liftDeclaredName f)
 
 instance Declarations1 []

src/Data/Abstract/Environment.hs

@@ -142,5 +142,8 @@ addresses = fromAddresses . map snd . flatPairs
 
 instance Lower (Environment address) where lowerBound = Environment (lowerBound :| [])
 
+-- N.B. this show instance drops some information to avoid generating
+-- an infinite string in certain cases. As such, two unequal
+-- environments may produce equal outputs over Show.
 instance Show address => Show (Environment address) where
   showsPrec d = showsUnaryWith showsPrec "Environment" d . flatPairs

src/Data/Abstract/Evaluatable.hs

@@ -52,15 +52,15 @@ class (Show1 constr, Foldable constr) => Evaluatable constr where
           , Member (Env address) effects
           , Member (Exc (LoopControl address)) effects
           , Member (Exc (Return address)) effects
-          , Member Fresh effects
           , Member (Modules address) effects
           , Member (Reader ModuleInfo) effects
           , Member (Reader PackageInfo) effects
           , Member (Reader Span) effects
           , Member (Resumable (EnvironmentError address)) effects
+          , Member (Resumable (Unspecialized value)) effects
           , Member (Resumable EvalError) effects
           , Member (Resumable ResolutionError) effects
-          , Member (Resumable (Unspecialized value)) effects
+          , Member Fresh effects
           , Member Trace effects
           )
        => SubtermAlgebra constr term (Evaluator address value effects (ValueRef address))
@@ -154,24 +154,24 @@ instance HasPrelude 'PHP
 
 instance HasPrelude 'Python where
   definePrelude _ =
-    define "print" builtInPrint
+    define (name "print") builtInPrint
 
 instance HasPrelude 'Ruby where
   definePrelude _ = do
-    define "puts" builtInPrint
+    define (name "puts") builtInPrint
 
-    defineClass "Object" [] $ do
+    defineClass (name "Object") [] $ do
-      define "inspect" (lambda (const (box (string "<object>"))))
+      define (name "inspect") (lambda (const (box (string "<object>"))))
 
 instance HasPrelude 'TypeScript where
   definePrelude _ =
-    defineNamespace "console" $ do
+    defineNamespace (name "console") $ do
-      define "log" builtInPrint
+      define (name "log") builtInPrint
 
 instance HasPrelude 'JavaScript where
   definePrelude _ = do
-    defineNamespace "console" $ do
+    defineNamespace (name "console") $ do
-      define "log" builtInPrint
+      define (name "log") builtInPrint
 
 -- Postludes
 
@@ -206,7 +206,7 @@ instance HasPostlude 'JavaScript where
 
 -- | The type of error thrown when failing to evaluate a term.
 data EvalError return where
-  FreeVariablesError :: [Name] -> EvalError Name
+  NoNameError :: EvalError Name
   -- Indicates that our evaluator wasn't able to make sense of these literals.
   IntegerFormatError  :: Text -> EvalError Integer
   FloatFormatError    :: Text -> EvalError Scientific
@@ -218,7 +218,7 @@ deriving instance Eq (EvalError return)
 deriving instance Show (EvalError return)
 
 instance Eq1 EvalError where
-  liftEq _ (FreeVariablesError a) (FreeVariablesError b)   = a == b
+  liftEq _ NoNameError        NoNameError                  = True
   liftEq _ DefaultExportError DefaultExportError           = True
   liftEq _ (ExportError a b) (ExportError c d)             = (a == c) && (b == d)
   liftEq _ (IntegerFormatError a) (IntegerFormatError b)   = a == b

src/Data/Abstract/FreeVariables.hs

@@ -9,7 +9,7 @@ import           Prologue
 -- | Types which can contain unbound variables.
 class FreeVariables term where
   -- | The set of free variables in the given value.
-  freeVariables :: term -> [Name]
+  freeVariables :: term -> Set Name
 
 
 -- | A lifting of 'FreeVariables' to type constructors of kind @* -> *@.
@@ -17,20 +17,11 @@ class FreeVariables term where
 --   'Foldable' types requiring no additional semantics to the set of free variables (e.g. types which do not bind any variables) can use (and even derive, with @-XDeriveAnyClass@) the default implementation.
 class FreeVariables1 syntax where
   -- | Lift a function mapping each element to its set of free variables through a containing structure, collecting the results into a single set.
-  liftFreeVariables :: (a -> [Name]) -> syntax a -> [Name]
+  liftFreeVariables :: (a -> Set Name) -> syntax a -> Set Name
-  default liftFreeVariables :: (Foldable syntax) => (a -> [Name]) -> syntax a -> [Name]
+  default liftFreeVariables :: (Foldable syntax) => (a -> Set Name) -> syntax a -> Set Name
   liftFreeVariables = foldMap
 
--- | Lift the 'freeVariables' method through a containing structure.
+instance FreeVariables t => FreeVariables (Subterm t a) where
-freeVariables1 :: (FreeVariables1 t, FreeVariables a) => t a -> [Name]
-freeVariables1 = liftFreeVariables freeVariables
-
-freeVariable :: FreeVariables term => term -> Either [Name] Name
-freeVariable term = case freeVariables term of
-  [n] -> Right n
-  xs -> Left xs
-
-instance (FreeVariables t) => FreeVariables (Subterm t a) where
   freeVariables = freeVariables . subterm
 
 deriving instance FreeVariables1 syntax => FreeVariables (Term syntax ann)
@@ -38,10 +29,10 @@ deriving instance FreeVariables1 syntax => FreeVariables (Term syntax ann)
 instance (FreeVariables recur, FreeVariables1 syntax) => FreeVariables (TermF syntax ann recur) where
   freeVariables = liftFreeVariables freeVariables
 
-instance (FreeVariables1 syntax) => FreeVariables1 (TermF syntax ann) where
+instance FreeVariables1 syntax => FreeVariables1 (TermF syntax ann) where
   liftFreeVariables f (In _ s) = liftFreeVariables f s
 
-instance (Apply FreeVariables1 fs) => FreeVariables1 (Sum fs) where
+instance Apply FreeVariables1 fs => FreeVariables1 (Sum fs) where
   liftFreeVariables f = apply @FreeVariables1 (liftFreeVariables f)
 
 instance FreeVariables1 []

src/Data/Abstract/ModuleTable.hs

@@ -15,7 +15,6 @@ module Data.Abstract.ModuleTable
 
 import Data.Abstract.Module
 import qualified Data.Map as Map
-import Data.Semigroup
 import GHC.Generics (Generic1)
 import Prelude hiding (lookup)
 import Prologue

src/Data/Abstract/Name.hs

@@ -15,9 +15,8 @@ import qualified Data.Char as Char
 import           Data.Text (Text)
 import qualified Data.Text as Text
 import qualified Data.Text.Lazy as LT
-import           Data.String
 import           Prologue
-import Proto3.Suite
+import           Proto3.Suite
 import qualified Proto3.Wire.Decode as Decode
 import qualified Proto3.Wire.Encode as Encode
 
@@ -32,7 +31,7 @@ instance HasDefault Name where
 
 instance Primitive Name where
   encodePrimitive num (Name text) = Encode.text num (LT.fromStrict text)
-  encodePrimitive num (I index) = Encode.int num index
+  encodePrimitive num (I index)   = Encode.int num index
   decodePrimitive = Name . LT.toStrict <$> Decode.text <|> I <$> Decode.int
   primType _ = Bytes
 
@@ -55,9 +54,6 @@ formatName (I i)       = Text.pack $ '_' : (alphabet !! a) : replicate n 'ʹ'
   where alphabet = ['a'..'z']
         (n, a) = i `divMod` length alphabet
 
-instance IsString Name where
-  fromString = Name . Text.pack
-
 -- $
 -- >>> I 0
 -- "_a"

src/Data/Abstract/Value/Abstract.hs

@@ -48,8 +48,8 @@ instance ( Member (Allocator address Abstract) effects
 instance ( Member (Allocator address Abstract) effects
          , Member (Env address) effects
          , Member (Exc (Return address)) effects
-         , Member Fresh effects
          , Member NonDet effects
+         , Member Fresh effects
          )
       => AbstractValue address Abstract effects where
   array _ = pure Abstract

src/Data/Abstract/Value/Type.hs

@@ -2,6 +2,7 @@
 module Data.Abstract.Value.Type
   ( Type (..)
   , TypeError (..)
+  , TypeMap
   , runTypes
   , runTypesWith
   , unify
@@ -108,6 +109,7 @@ runTypesWith :: ( Effectful m
              -> m effects a
 runTypesWith with = runTypeMap . runTypeErrorWith with
 
+-- TODO: change my name?
 newtype TypeMap = TypeMap { unTypeMap :: Map.Map TName Type }
 
 emptyTypeMap :: TypeMap

src/Data/Functor/Both.hs

@@ -8,7 +8,6 @@ module Data.Functor.Both
 
 import Data.Bifunctor.Join as X
 import Data.Functor.Classes
-import Data.Semigroup
 
 -- | A computation over both sides of a pair.
 type Both = Join (,)

src/Data/Functor/Classes/Generic.hs

@@ -13,7 +13,6 @@ module Data.Functor.Classes.Generic
 
 import Data.Functor.Classes
 import Data.List (intersperse)
-import Data.Semigroup
 import GHC.Generics
 import Text.Show (showListWith)
 

src/Data/Graph/Adjacency.hs

@@ -1,12 +1,12 @@
 {-# LANGUAGE DeriveAnyClass, LambdaCase, ScopedTypeVariables #-}
 
-module Data.Graph.Adjacency.Import
+module Data.Graph.Adjacency
-  ( ImportGraph (..)
+  ( AdjacencyList (..)
   , Edge (..)
   , Tag
   , Vertex (..)
   , VertexType (..)
-  , graphToImportGraph
+  , graphToAdjacencyList
   , importGraphToGraph
   , tagGraph
   , isCoherent
@@ -57,7 +57,7 @@ instance PB.Primitive VertexType where
     (PB.Enumerated (Right r)) -> pure r
     other                     -> Prelude.fail ("VertexType decodeMessageField: unexpected value" <> show other)
 
--- | A tag used on each vertext of a 'Graph' to convert to an 'ImportGraph'.
+-- | A tag used on each vertext of a 'Graph' to convert to an 'AdjacencyList'.
 type Tag = Word64
 
 -- | A protobuf-compatible vertex type, with a unique 'Tag' identifier.
@@ -73,16 +73,16 @@ data Edge = Edge { edgeFrom :: Tag, edgeTo :: Tag }
   deriving (Eq, Ord, Show, Generic, Hashable, PB.Named, PB.Message)
 
 -- | An adjacency list-representation of a graph. You generally build these by calling
--- 'graphToImportGraph' on an algebraic 'Graph'. This representation is less efficient and
+-- 'graphToAdjacencyList' on an algebraic 'Graph'. This representation is less efficient and
 -- fluent than an ordinary 'Graph', but is more amenable to serialization.
-data ImportGraph = ImportGraph
+data AdjacencyList = AdjacencyList
   { graphVertices :: PB.NestedVec Vertex
   , graphEdges    :: PB.NestedVec Edge
   } deriving (Eq, Ord, Show, Generic, PB.Named, PB.Message)
 
 -- | Convert an algebraic graph to an adjacency list.
-graphToImportGraph :: Graph V.Vertex -> ImportGraph
+graphToAdjacencyList :: Graph V.Vertex -> AdjacencyList
-graphToImportGraph = taggedGraphToImportGraph . tagGraph . simplify
+graphToAdjacencyList = taggedGraphToAdjacencyList . tagGraph . simplify
 
 -- * Internal interface stuff
 
@@ -99,8 +99,8 @@ data Acc = Acc [Vertex] (HashSet Edge)
 -- to build a 'Graph', avoiding inefficient vector concatenation.
 -- Time complexity, given V vertices and E edges, is at least O(2V + 2E + (V * E * log E)),
 -- plus whatever overhead converting the graph to 'AdjacencyMap' may entail.
-taggedGraphToImportGraph :: Graph (V.Vertex, Tag) -> ImportGraph
+taggedGraphToAdjacencyList :: Graph (V.Vertex, Tag) -> AdjacencyList
-taggedGraphToImportGraph = accumToAdj . adjMapToAccum . adjacencyMap . toGraph . simplify
+taggedGraphToAdjacencyList = accumToAdj . adjMapToAccum . adjacencyMap . toGraph . simplify
   where adjMapToAccum :: Map (V.Vertex, Tag) (Set (V.Vertex, Tag)) -> Acc
         adjMapToAccum = Map.foldlWithKey go (Acc [] mempty)
 
@@ -108,8 +108,8 @@ taggedGraphToImportGraph = accumToAdj . adjMapToAccum . adjacencyMap . toGraph .
         go (Acc vs es) (v, from) edges = Acc (vertexToPB v from : vs) (Set.foldr' (add . snd) es edges)
           where add = HashSet.insert . Edge from
 
-        accumToAdj :: Acc -> ImportGraph
+        accumToAdj :: Acc -> AdjacencyList
-        accumToAdj (Acc vs es) = ImportGraph (fromList vs) (fromList (toList es))
+        accumToAdj (Acc vs es) = AdjacencyList (fromList vs) (fromList (toList es))
 
         vertexToPB :: V.Vertex -> Tag -> Vertex
         vertexToPB s = Vertex t (V.vertexName s) where
@@ -134,10 +134,10 @@ tagGraph = unwrap . traverse go where
       modify' (HashMap.insert v next)
       pure (v, next)
 
--- | This is the reverse of 'graphToImportGraph'. Don't use this outside of a testing context.
+-- | This is the reverse of 'graphToAdjacencyList'. Don't use this outside of a testing context.
--- N.B. @importGraphToGraph . graphToImportGraph@ is 'id', but @graphToImportGraph . importGraphToGraph@ is not.
+-- N.B. @importGraphToGraph . graphToAdjacencyList@ is 'id', but @graphToAdjacencyList . importGraphToGraph@ is not.
-importGraphToGraph :: ImportGraph -> Graph V.Vertex
+importGraphToGraph :: AdjacencyList -> Graph V.Vertex
-importGraphToGraph (ImportGraph vs es) = simplify built
+importGraphToGraph (AdjacencyList vs es) = simplify built
   where built = allEdges <> vertices unreferencedVertices
 
         allEdges :: Graph V.Vertex
@@ -162,7 +162,7 @@ importGraphToGraph (ImportGraph vs es) = simplify built
 
 
 -- | For debugging: returns True if all edges reference a valid vertex tag.
-isCoherent :: ImportGraph -> Bool
+isCoherent :: AdjacencyList -> Bool
-isCoherent (ImportGraph vs es) = all edgeValid es where
+isCoherent (AdjacencyList vs es) = all edgeValid es where
   edgeValid (Edge a b) = HashSet.member a allTags && HashSet.member b allTags
   allTags = HashSet.fromList (toList (vertexTag <$> vs))

src/Data/Map/Monoidal.hs

@@ -8,6 +8,7 @@ module Data.Map.Monoidal
 , insert
 , filterWithKey
 , pairs
+, keys
 , module Reducer
 ) where
 
@@ -37,6 +38,8 @@ insert key value = Map . Map.insert key value . unMap
 filterWithKey :: (key -> value -> Bool) -> Map key value -> Map key value
 filterWithKey f = Map . Map.filterWithKey f . unMap
 
+keys :: Map key value -> [key]
+keys = map fst . pairs
 
 pairs :: Map key value -> [(key, value)]
 pairs = Map.toList . unMap

src/Data/Semigroup/App.hs

@@ -5,7 +5,6 @@ module Data.Semigroup.App
 ) where
 
 import Control.Applicative
-import Data.Semigroup
 
 -- $setup
 -- >>> import Test.QuickCheck

src/Data/Syntax.hs

@@ -5,12 +5,16 @@ module Data.Syntax where
 import Data.Abstract.Evaluatable
 import Data.Aeson (ToJSON(..), object)
 import Data.AST
+import Data.Char (toLower)
 import Data.JSON.Fields
 import Data.Range
 import Data.Record
+import qualified Data.Set as Set
 import Data.Span
 import Data.Sum
 import Data.Term
+import GHC.Types (Constraint)
+import GHC.TypeLits
 import Diffing.Algorithm hiding (Empty)
 import Prelude
 import Prologue
@@ -18,12 +22,9 @@ import qualified Assigning.Assignment as Assignment
 import qualified Data.Error as Error
 import Proto3.Suite.Class
 import Proto3.Wire.Types
-import GHC.Types (Constraint)
-import GHC.TypeLits
 import qualified Proto3.Suite.DotProto as Proto
 import qualified Proto3.Wire.Encode as Encode
 import qualified Proto3.Wire.Decode as Decode
-import Data.Char (toLower)
 
 -- Combinators
 
@@ -166,7 +167,7 @@ instance Evaluatable Identifier where
   eval (Identifier name) = pure (LvalLocal name)
 
 instance FreeVariables1 Identifier where
-  liftFreeVariables _ (Identifier x) = pure x
+  liftFreeVariables _ (Identifier x) = Set.singleton x
 
 instance Declarations1 Identifier where
   liftDeclaredName _ (Identifier x) = pure x

src/Data/Syntax/Declaration.hs

@@ -4,13 +4,13 @@ module Data.Syntax.Declaration where
 import qualified Data.Abstract.Environment as Env
 import           Data.Abstract.Evaluatable
 import           Data.JSON.Fields
-import qualified Data.Set as Set (fromList)
+import qualified Data.Set as Set
 import           Diffing.Algorithm
 import           Prologue
 import           Proto3.Suite.Class
 
 data Function a = Function { functionContext :: ![a], functionName :: !a, functionParameters :: ![a], functionBody :: !a }
-  deriving (Eq, Ord, Show, Foldable, Traversable, Functor, Generic1, Hashable1, Mergeable, FreeVariables1, Declarations1, ToJSONFields1, Named1, Message1)
+  deriving (Eq, Ord, Show, Foldable, Traversable, Functor, Generic1, Hashable1, Mergeable, ToJSONFields1, Named1, Message1)
 
 instance Diffable Function where
   equivalentBySubterm = Just . functionName
@@ -24,18 +24,21 @@ instance Show1 Function where liftShowsPrec = genericLiftShowsPrec
 
 instance Evaluatable Function where
   eval Function{..} = do
-    name <- either (throwEvalError . FreeVariablesError) pure (freeVariable $ subterm functionName)
+    name <- maybeM (throwEvalError NoNameError) (declaredName (subterm functionName))
-    (_, addr) <- letrec name (closure (paramNames functionParameters) (Set.fromList (freeVariables functionBody)) (subtermAddress functionBody))
+    (_, addr) <- letrec name (closure (paramNames functionParameters) (freeVariables functionBody) (subtermAddress functionBody))
     bind name addr
     pure (Rval addr)
-    where paramNames = foldMap (freeVariables . subterm)
+    where paramNames = foldMap (maybeToList . declaredName . subterm)
 
-instance Declarations a => Declarations (Function a) where
+instance Declarations1 Function where
-  declaredName Function{..} = declaredName functionName
+  liftDeclaredName declaredName = declaredName . functionName
+
+instance FreeVariables1 Function where
+  liftFreeVariables freeVariables f@Function{..} = foldMap freeVariables f `Set.difference` foldMap freeVariables functionParameters
 
 
 data Method a = Method { methodContext :: ![a], methodReceiver :: !a, methodName :: !a, methodParameters :: ![a], methodBody :: !a }
-  deriving (Eq, Ord, Show, Foldable, Traversable, Functor, Generic1, Hashable1, Mergeable, FreeVariables1, Declarations1, ToJSONFields1, Named1, Message1)
+  deriving (Eq, Ord, Show, Foldable, Traversable, Functor, Generic1, Hashable1, Mergeable, ToJSONFields1, Named1, Message1)
 
 instance Eq1 Method where liftEq = genericLiftEq
 instance Ord1 Method where liftCompare = genericLiftCompare
@@ -48,11 +51,17 @@ instance Diffable Method where
 -- local environment.
 instance Evaluatable Method where
   eval Method{..} = do
-    name <- either (throwEvalError . FreeVariablesError) pure (freeVariable $ subterm methodName)
+    name <- maybeM (throwEvalError NoNameError) (declaredName (subterm methodName))
-    (_, addr) <- letrec name (closure (paramNames methodParameters) (Set.fromList (freeVariables methodBody)) (subtermAddress methodBody))
+    (_, addr) <- letrec name (closure (paramNames methodParameters) (freeVariables methodBody) (subtermAddress methodBody))
     bind name addr
     pure (Rval addr)
-    where paramNames = foldMap (freeVariables . subterm)
+    where paramNames = foldMap (maybeToList . declaredName . subterm)
+
+instance Declarations1 Method where
+  liftDeclaredName declaredName = declaredName . methodName
+
+instance FreeVariables1 Method where
+  liftFreeVariables freeVariables m@Method{..} = foldMap freeVariables m `Set.difference` foldMap freeVariables methodParameters
 
 
 -- | A method signature in TypeScript or a method spec in Go.
@@ -162,7 +171,7 @@ instance Show1 Class where liftShowsPrec = genericLiftShowsPrec
 
 instance Evaluatable Class where
   eval Class{..} = do
-    name <- either (throwEvalError . FreeVariablesError) pure (freeVariable $ subterm classIdentifier)
+    name <- maybeM (throwEvalError NoNameError) (declaredName (subterm classIdentifier))
     supers <- traverse subtermAddress classSuperclasses
     (_, addr) <- letrec name $ do
       void $ subtermValue classBody
@@ -244,7 +253,7 @@ instance Show1 TypeAlias where liftShowsPrec = genericLiftShowsPrec
 -- TODO: Implement Eval instance for TypeAlias
 instance Evaluatable TypeAlias where
   eval TypeAlias{..} = do
-    name <- either (throwEvalError . FreeVariablesError) pure (freeVariable (subterm typeAliasIdentifier))
+    name <- maybeM (throwEvalError NoNameError) (declaredName (subterm typeAliasIdentifier))
     v <- subtermValue typeAliasKind
     addr <- lookupOrAlloc name
     assign addr v

src/Data/Syntax/Statement.hs

@@ -99,7 +99,7 @@ instance Show1 Let where liftShowsPrec = genericLiftShowsPrec
 
 instance Evaluatable Let where
   eval Let{..} = do
-    name <- either (throwEvalError . FreeVariablesError) pure (freeVariable $ subterm letVariable)
+    name <- maybeM (throwEvalError NoNameError) (declaredName (subterm letVariable))
     addr <- snd <$> letrec name (subtermValue letValue)
     Rval <$> locally (bind name addr *> subtermAddress letBody)
 

src/Language/Go/Syntax.hs

@@ -84,7 +84,7 @@ instance Show1 QualifiedImport where liftShowsPrec = genericLiftShowsPrec
 instance Evaluatable QualifiedImport where
   eval (QualifiedImport importPath aliasTerm) = do
     paths <- resolveGoImport importPath
-    alias <- either (throwEvalError . FreeVariablesError) pure (freeVariable $ subterm aliasTerm)
+    alias <- maybeM (throwEvalError NoNameError) (declaredName (subterm aliasTerm))
     void . letrec' alias $ \addr -> do
       makeNamespace alias addr Nothing $ for_ paths $ \p -> do
         traceResolve (unPath importPath) p

src/Language/PHP/Assignment.hs

@@ -489,6 +489,9 @@ namespaceNameAsPrefix = symbol NamespaceNameAsPrefix *> children (term namespace
 namespaceName :: Assignment Term
 namespaceName = makeTerm <$> symbol NamespaceName <*> children (Syntax.NamespaceName <$> someTerm' name)
 
+namespaceName' :: Assignment (NonEmpty Term)
+namespaceName' = symbol NamespaceName *> children (someTerm' name)
+
 updateExpression :: Assignment Term
 updateExpression = makeTerm <$> symbol UpdateExpression <*> children (Syntax.Update <$> term expression)
 
@@ -704,7 +707,7 @@ traitAliasAsClause :: Assignment Term
 traitAliasAsClause = makeTerm <$> symbol TraitAliasAsClause <*> children (Syntax.AliasAs <$> term (classConstantAccessExpression <|> name) <*> (term visibilityModifier <|> emptyTerm) <*> (term name <|> emptyTerm))
 
 namespaceDefinition :: Assignment Term
-namespaceDefinition = makeTerm <$> symbol NamespaceDefinition <*> children (Syntax.Namespace <$> (term namespaceName <|> emptyTerm) <*> (term compoundStatement <|> emptyTerm))
+namespaceDefinition = makeTerm <$> symbol NamespaceDefinition <*> children (Syntax.Namespace <$> (toList <$> namespaceName' <|> pure []) <*> (term compoundStatement <|> emptyTerm))
 
 namespaceUseDeclaration :: Assignment Term
 namespaceUseDeclaration = makeTerm <$> symbol NamespaceUseDeclaration <*> children (Syntax.NamespaceUseDeclaration <$>

src/Language/PHP/Syntax.hs

@@ -362,7 +362,7 @@ instance Ord1 NamespaceUseGroupClause where liftCompare = genericLiftCompare
 instance Show1 NamespaceUseGroupClause where liftShowsPrec = genericLiftShowsPrec
 instance Evaluatable NamespaceUseGroupClause
 
-data Namespace a = Namespace { namespaceName :: a, namespaceBody :: a }
+data Namespace a = Namespace { namespaceName :: [a], namespaceBody :: a }
   deriving (Declarations1, Diffable, Eq, Foldable, FreeVariables1, Functor, Generic1, Hashable1, Mergeable, Ord, Show, ToJSONFields1, Traversable)
 
 instance Eq1 Namespace where liftEq = genericLiftEq
@@ -370,16 +370,20 @@ instance Ord1 Namespace where liftCompare = genericLiftCompare
 instance Show1 Namespace where liftShowsPrec = genericLiftShowsPrec
 
 instance Evaluatable Namespace where
-  eval Namespace{..} = rvalBox =<< go (freeVariables (subterm namespaceName))
+  eval Namespace{..} = rvalBox =<< go (declaredName . subterm <$> namespaceName)
     where
       -- Each namespace name creates a closure over the subsequent namespace closures
-      go (name:x:xs) = letrec' name $ \addr ->
+      go (n:x:xs) = do
-        go (x:xs) <* makeNamespace name addr Nothing (pure ())
+        name <- maybeM (throwResumable NoNameError) n
+        letrec' name $ \addr ->
+          go (x:xs) <* makeNamespace name addr Nothing (pure ())
       -- The last name creates a closure over the namespace body.
-      go names = do
+      go [n] = do
-        name <- maybeM (throwEvalError (FreeVariablesError [])) (listToMaybe names)
+        name <- maybeM (throwResumable NoNameError) n
         letrec' name $ \addr ->
           subtermValue namespaceBody *> makeNamespace name addr Nothing (pure ())
+      -- The absence of names implies global scope, cf http://php.net/manual/en/language.namespaces.definitionmultiple.php
+      go [] = subtermValue namespaceBody
 
 data TraitDeclaration a = TraitDeclaration { traitName :: a, traitStatements :: [a] }
   deriving (Declarations1, Diffable, Eq, Foldable, FreeVariables1, Functor, Generic1, Hashable1, Mergeable, Ord, Show, ToJSONFields1, Traversable)

src/Language/Python/Syntax.hs

@@ -168,7 +168,7 @@ instance Evaluatable QualifiedAliasedImport where
     for_ (NonEmpty.init modulePaths) require
 
     -- Evaluate and import the last module, aliasing and updating the environment
-    alias <- either (throwEvalError . FreeVariablesError) pure (freeVariable $ subterm aliasTerm)
+    alias <- maybeM (throwEvalError NoNameError) (declaredName (subterm aliasTerm))
     rvalBox =<< letrec' alias (\addr -> do
       let path = NonEmpty.last modulePaths
       unit <$ makeNamespace alias addr Nothing (void (bindAll . fst =<< require path)))

src/Language/Ruby/Syntax.hs

@@ -1,4 +1,4 @@
-{-# LANGUAGE DeriveAnyClass, DuplicateRecordFields #-}
+{-# LANGUAGE DeriveAnyClass, DuplicateRecordFields, TupleSections #-}
 module Language.Ruby.Syntax where
 
 import           Control.Monad (unless)
@@ -81,7 +81,7 @@ doRequire :: ( AbstractValue address value effects
 doRequire path = do
   result <- lookupModule path
   case result of
-    Nothing       -> flip (,) (boolean True) . fst <$> load path
+    Nothing       -> (, boolean True) . fst <$> load path
     Just (env, _) -> pure (env, boolean False)
 
 
@@ -132,7 +132,7 @@ instance Show1 Class where liftShowsPrec = genericLiftShowsPrec
 instance Evaluatable Class where
   eval Class{..} = do
     super <- traverse subtermAddress classSuperClass
-    name <- either (throwEvalError . FreeVariablesError) pure (freeVariable $ subterm classIdentifier)
+    name <- maybeM (throwEvalError NoNameError) (declaredName (subterm classIdentifier))
     rvalBox =<< letrec' name (\addr ->
       makeNamespace name addr super (void (subtermAddress classBody)))
 
@@ -145,7 +145,7 @@ instance Show1 Module where liftShowsPrec = genericLiftShowsPrec
 
 instance Evaluatable Module where
   eval (Module iden xs) = do
-    name <- either (throwEvalError . FreeVariablesError) pure (freeVariable $ subterm iden)
+    name <- maybeM (throwEvalError NoNameError) (declaredName (subterm iden))
     rvalBox =<< letrec' name (\addr ->
       makeNamespace name addr Nothing (void (eval xs)))
 

src/Language/TypeScript/Syntax.hs

@@ -189,7 +189,7 @@ instance Show1 JavaScriptRequire where liftShowsPrec = genericLiftShowsPrec
 instance Evaluatable JavaScriptRequire where
   eval (JavaScriptRequire aliasTerm importPath) = do
     modulePath <- resolveWithNodejsStrategy importPath javascriptExtensions
-    alias <- either (throwEvalError . FreeVariablesError) pure (freeVariable $ subterm aliasTerm)
+    alias <- maybeM (throwEvalError NoNameError) (declaredName (subterm aliasTerm))
     rvalBox =<< evalRequire modulePath alias
 
 
@@ -203,7 +203,7 @@ instance Show1 QualifiedAliasedImport where liftShowsPrec = genericLiftShowsPrec
 instance Evaluatable QualifiedAliasedImport where
   eval (QualifiedAliasedImport aliasTerm importPath) = do
     modulePath <- resolveWithNodejsStrategy importPath typescriptExtensions
-    alias <- either (throwEvalError . FreeVariablesError) pure (freeVariable $ subterm aliasTerm)
+    alias <- maybeM (throwEvalError NoNameError) (declaredName (subterm aliasTerm))
     rvalBox =<< evalRequire modulePath alias
 
 newtype SideEffectImport a = SideEffectImport { sideEffectImportFrom :: ImportPath }
@@ -268,10 +268,10 @@ instance Show1 DefaultExport where liftShowsPrec = genericLiftShowsPrec
 
 instance Evaluatable DefaultExport where
   eval (DefaultExport term) = do
-    v <- subtermValue term
     case declaredName term of
       Just name -> do
         addr <- lookupOrAlloc name
+        v <- subtermValue term
         assign addr v
         export name name Nothing
         bind name addr
@@ -674,7 +674,7 @@ instance Show1 Module where liftShowsPrec = genericLiftShowsPrec
 
 instance Evaluatable Module where
   eval (Module iden xs) = do
-    name <- either (throwEvalError . FreeVariablesError) pure (freeVariable $ subterm iden)
+    name <- maybeM (throwEvalError NoNameError) (declaredName (subterm iden))
     rvalBox =<< letrec' name (\addr ->
       makeNamespace name addr Nothing (void (eval xs)))
 
@@ -688,7 +688,7 @@ instance Show1 InternalModule where liftShowsPrec = genericLiftShowsPrec
 
 instance Evaluatable InternalModule where
   eval (InternalModule iden xs) = do
-    name <- either (throwEvalError . FreeVariablesError) pure (freeVariable $ subterm iden)
+    name <- maybeM (throwEvalError NoNameError) (declaredName (subterm iden))
     rvalBox =<< letrec' name (\addr ->
       makeNamespace name addr Nothing (void (eval xs)))
 
@@ -739,7 +739,7 @@ instance Declarations a => Declarations (AbstractClass a) where
 
 instance Evaluatable AbstractClass where
   eval AbstractClass{..} = do
-    name <- either (throwEvalError . FreeVariablesError) pure (freeVariable $ subterm abstractClassIdentifier)
+    name <- maybeM (throwEvalError NoNameError) (declaredName (subterm abstractClassIdentifier))
     supers <- traverse subtermAddress classHeritage
     (v, addr) <- letrec name $ do
       void $ subtermValue classBody

src/Semantic/Config.hs

@@ -1,3 +1,5 @@
+{-# LANGUAGE LambdaCase #-}
+
 module Semantic.Config where
 
 import           Network.BSD
@@ -82,16 +84,18 @@ withTelemetry config action =
 
 withLoggerFromConfig :: Config -> (LogQueue -> IO c) -> IO c
 withLoggerFromConfig Config{..} = withLogger opts configMaxTelemetyQueueSize
-  where opts = LogOptions {
+  where opts = LogOptions { logOptionsLevel     = optionsLogLevel configOptions
-      logOptionsLevel     = optionsLogLevel configOptions
+                          , logOptionsFormatter = configLogFormatter
-    , logOptionsFormatter = configLogFormatter
+                          , logOptionsContext   = logOptionsContext' configIsTerminal
-    , logOptionsContext   =
+                          }
-      [ ("app", configAppName)
+        logOptionsContext' = \case
-      , ("pid", show configProcessID)
+                            False -> [ ("app", configAppName)
-      , ("hostname", configHostName)
+                                     , ("pid", show configProcessID)
-      , ("sha", buildSHA)
+                                     , ("hostname", configHostName)
-      ] <> [("request_id", x) | x <- toList (optionsRequestID configOptions) ]
+                                     , ("sha", buildSHA)
-    }
+                                     ] <> [("request_id", x) | x <- toList (optionsRequestID configOptions) ]
+                            _ -> []
+
 
 withHaystackFromConfig :: Config -> Haystack.ErrorLogger -> (HaystackQueue -> IO c) -> IO c
 withHaystackFromConfig Config{..} errorLogger =

src/Semantic/Graph.hs

@@ -1,11 +1,11 @@
 {-# LANGUAGE GADTs, ScopedTypeVariables, TypeOperators #-}
 module Semantic.Graph
 ( runGraph
+, runCallGraph
 , runImportGraph
 , GraphType(..)
 , Graph
 , Vertex
-, GraphEff(..)
 , ImportGraphEff(..)
 , style
 , parsePackage
@@ -17,10 +17,14 @@ module Semantic.Graph
 , resumingAddressError
 , resumingValueError
 , resumingEnvironmentError
+, resumingTypeError
 ) where
 
+
 import Prelude hiding (readFile)
 
+import           Analysis.Abstract.Caching
+import           Analysis.Abstract.Collecting
 import           Analysis.Abstract.Graph as Graph
 import           Control.Abstract
 import           Control.Monad.Effect (reinterpret)
@@ -29,15 +33,21 @@ import           Data.Abstract.Evaluatable
 import           Data.Abstract.Module
 import qualified Data.Abstract.ModuleTable as ModuleTable
 import           Data.Abstract.Package as Package
+import           Data.Abstract.Value.Abstract
+import           Data.Abstract.Value.Type
 import           Data.Abstract.Value.Concrete (Value, ValueError (..), runValueErrorWith)
 import           Data.Graph
 import           Data.Project
 import           Data.Record
+import qualified Data.Syntax as Syntax
 import           Data.Term
 import           Data.Text (pack)
+import           Language.Haskell.HsColour
+import           Language.Haskell.HsColour.Colourise
 import           Parsing.Parser
-import           Prologue hiding (MonadError (..))
+import           Prologue hiding (MonadError (..), TypeError (..))
 import           Semantic.Task as Task
+import           Text.Show.Pretty (ppShow)
 
 data GraphType = ImportGraph | CallGraph
 
@@ -55,52 +65,51 @@ runGraph ImportGraph _ project
 runGraph CallGraph includePackages project
   | SomeAnalysisParser parser lang <- someAnalysisParser (Proxy :: Proxy AnalysisClasses) (projectLanguage project) = do
     package <- parsePackage parser project
-    modules <- runImportGraph lang package
+    modules <- topologicalSort <$> runImportGraph lang package
-    let analyzeTerm = withTermSpans . graphingTerms
+    runCallGraph lang includePackages modules package
-        analyzeModule = (if includePackages then graphingPackages else id) . graphingModules
+
-        extractGraph (_, (_, (graph, _))) = simplify graph
+runCallGraph :: ( HasField ann Span
-        runGraphAnalysis
+                , Element Syntax.Identifier syntax
-          = runState lowerBound
+                , Base term ~ TermF (Sum syntax) (Record ann)
-          . runFresh 0
+                , Ord term
-          . resumingLoadError
+                , Corecursive term
-          . resumingUnspecialized
+                , Declarations term
-          . resumingEnvironmentError
+                , Evaluatable (Base term)
-          . resumingEvalError
+                , FreeVariables term
-          . resumingResolutionError
+                , HasPrelude lang
-          . resumingAddressError
+                , HasPostlude lang
-          . resumingValueError
+                , Member Trace effs
-          . runTermEvaluator @_ @_ @(Value (Hole (Located Precise)) (GraphEff _ effs))
+                , Recursive term
-          . graphing
+                , Effects effs
-          . runReader (packageInfo package)
+                )
-          . runReader lowerBound
+             => Proxy lang
-          . runReader lowerBound
+             -> Bool
-          . raiseHandler (runModules (ModuleTable.modulePaths (packageModules package)))
+             -> [Module term]
-    extractGraph <$> runEvaluator (runGraphAnalysis (evaluate lang analyzeModule analyzeTerm (topologicalSort modules)))
+             -> Package term
+             -> Eff effs (Graph Vertex)
+runCallGraph lang includePackages modules package = do
+  let analyzeTerm = withTermSpans . graphingTerms . cachingTerms
+      analyzeModule = (if includePackages then graphingPackages else id) . convergingModules . graphingModules
+      extractGraph (_, (_, (graph, _))) = simplify graph
+      runGraphAnalysis
+        = runState (lowerBound @(Heap (Hole (Located Monovariant)) All Abstract))
+        . runFresh 0
+        . resumingLoadError
+        . resumingUnspecialized
+        . resumingEnvironmentError
+        . resumingEvalError
+        . resumingResolutionError
+        . resumingAddressError
+        . runTermEvaluator @_ @(Hole (Located Monovariant)) @Abstract
+        . graphing
+        . caching @[]
+        . runReader (packageInfo package)
+        . runReader (lowerBound @Span)
+        . providingLiveSet
+        . runReader (lowerBound @(ModuleTable (NonEmpty (Module (ModuleResult (Hole (Located Monovariant)))))))
+        . raiseHandler (runModules (ModuleTable.modulePaths (packageModules package)))
+  extractGraph <$> runEvaluator (runGraphAnalysis (evaluate lang analyzeModule analyzeTerm modules))
 
--- | The full list of effects in flight during the evaluation of terms. This, and other @newtype@s like it, are necessary to type 'Value', since the bodies of closures embed evaluators. This would otherwise require cycles in the effect list (i.e. references to @effects@ within @effects@ itself), which the typechecker forbids.
-newtype GraphEff address outerEffects a = GraphEff
-  { runGraphEff :: Eff (  Exc (LoopControl address)
-                       ': Exc (Return address)
-                       ': Env address
-                       ': Allocator address (Value address (GraphEff address outerEffects))
-                       ': Reader ModuleInfo
-                       ': Modules address
-                       ': Reader (ModuleTable (NonEmpty (Module (ModuleResult address))))
-                       ': Reader Span
-                       ': Reader PackageInfo
-                       ': State (Graph Vertex)
-                       ': Resumable (ValueError address (GraphEff address outerEffects))
-                       ': Resumable (AddressError address (Value address (GraphEff address outerEffects)))
-                       ': Resumable ResolutionError
-                       ': Resumable EvalError
-                       ': Resumable (EnvironmentError address)
-                       ': Resumable (Unspecialized (Value address (GraphEff address outerEffects)))
-                       ': Resumable (LoadError address)
-                       ': Fresh
-                       ': State (Heap address Latest (Value address (GraphEff address outerEffects)))
-                       ': outerEffects
-                       ) a
-  }
 
 
 runImportGraph :: forall effs lang term.
@@ -176,7 +185,7 @@ parsePackage parser project@Project{..} = do
   p <- parseModules parser project
   resMap <- Task.resolutionMap project
   let pkg = Package.fromModules n p resMap
-  pkg <$ trace ("project: " <> show (() <$ pkg))
+  pkg <$ trace ("project: " <> prettyShow (() <$ pkg))
 
   where
     n = name (projectName project)
@@ -201,34 +210,34 @@ withTermSpans :: ( HasField fields Span
 withTermSpans recur term = withCurrentSpan (getField (termFAnnotation term)) (recur term)
 
 resumingResolutionError :: (Applicative (m effects), Effectful m, Member Trace effects, Effects effects) => m (Resumable ResolutionError ': effects) a -> m effects a
-resumingResolutionError = runResolutionErrorWith (\ err -> trace ("ResolutionError:" <> show err) *> case err of
+resumingResolutionError = runResolutionErrorWith (\ err -> trace ("ResolutionError: " <> prettyShow err) *> case err of
   NotFoundError nameToResolve _ _ -> pure  nameToResolve
   GoImportError pathToResolve     -> pure [pathToResolve])
 
 resumingLoadError :: (Member Trace effects, AbstractHole address, Effects effects) => Evaluator address value (Resumable (LoadError address) ': effects) a -> Evaluator address value effects a
 resumingLoadError = runLoadErrorWith (\ (ModuleNotFound path) -> trace ("LoadError: " <> path) $> (lowerBound, hole))
 
-resumingEvalError :: (Member Trace effects, Effects effects) => Evaluator address value (Resumable EvalError ': effects) a -> Evaluator address value effects a
+resumingEvalError :: (Member Fresh effects, Member Trace effects, Effects effects) => Evaluator address value (Resumable EvalError ': effects) a -> Evaluator address value effects a
-resumingEvalError = runEvalErrorWith (\ err -> trace ("EvalError" <> show err) *> case err of
+resumingEvalError = runEvalErrorWith (\ err -> trace ("EvalError:" <> prettyShow err) *> case err of
-  DefaultExportError{}     -> pure ()
+  DefaultExportError{}  -> pure ()
-  ExportError{}            -> pure ()
+  ExportError{}         -> pure ()
-  IntegerFormatError{}     -> pure 0
+  IntegerFormatError{}  -> pure 0
-  FloatFormatError{}       -> pure 0
+  FloatFormatError{}    -> pure 0
-  RationalFormatError{}    -> pure 0
+  RationalFormatError{} -> pure 0
-  FreeVariablesError names -> pure (fromMaybeLast "unknown" names))
+  NoNameError           -> gensym)
 
 resumingUnspecialized :: (Member Trace effects, AbstractHole value, Effects effects) => Evaluator address value (Resumable (Unspecialized value) ': effects) a -> Evaluator address value effects a
-resumingUnspecialized = runUnspecializedWith (\ err@(Unspecialized _) -> trace ("Unspecialized:" <> show err) $> hole)
+resumingUnspecialized = runUnspecializedWith (\ err@(Unspecialized _) -> trace ("Unspecialized: " <> prettyShow err) $> hole)
 
 resumingAddressError :: (AbstractHole value, Lower (Cell address value), Member Trace effects, Show address, Effects effects) => Evaluator address value (Resumable (AddressError address value) ': effects) a -> Evaluator address value effects a
-resumingAddressError = runAddressErrorWith (\ err -> trace ("AddressError:" <> show err) *> case err of
+resumingAddressError = runAddressErrorWith (\ err -> trace ("AddressError: " <> prettyShow err) *> case err of
   UnallocatedAddress _   -> pure lowerBound
   UninitializedAddress _ -> pure hole)
 
 resumingValueError :: (Member Trace effects, Show address, Effects effects) => Evaluator address (Value address body) (Resumable (ValueError address body) ': effects) a -> Evaluator address (Value address body) effects a
-resumingValueError = runValueErrorWith (\ err -> trace ("ValueError" <> show err) *> case err of
+resumingValueError = runValueErrorWith (\ err -> trace ("ValueError: " <> prettyShow err) *> case err of
   CallError val     -> pure val
-  StringError val   -> pure (pack (show val))
+  StringError val   -> pure (pack (prettyShow val))
   BoolError{}       -> pure True
   BoundsError{}     -> pure hole
   IndexError{}      -> pure hole
@@ -245,3 +254,17 @@ resumingEnvironmentError :: (AbstractHole address, Effects effects) => Evaluator
 resumingEnvironmentError
   = runState []
   . reinterpret (\ (Resumable (FreeVariable name)) -> modify' (name :) $> hole)
+
+resumingTypeError :: ( Alternative (m address Type (State TypeMap ': effects))
+                     , Effects effects
+                     , Effectful (m address Type)
+                     , Member Trace effects
+                     )
+                  => m address Type (Resumable TypeError ': State TypeMap ': effects) a
+                  -> m address Type effects a
+resumingTypeError = runTypesWith (\err -> trace ("TypeError: " <> prettyShow err) *> case err of
+  UnificationError l r -> pure l <|> pure r
+  InfiniteType _ r -> pure r)
+
+prettyShow :: Show a => a -> String
+prettyShow = hscolour TTY defaultColourPrefs False False "" False . ppShow

src/Semantic/Util.hs

@@ -102,6 +102,16 @@ evalTypeScriptProject = justEvaluating <=< evaluateProject (Proxy :: Proxy 'Lang
 
 typecheckGoFile = checking <=< evaluateProjectWithCaching (Proxy :: Proxy 'Language.Go) goParser Language.Go
 
+callGraphRubyProject paths = runTaskWithOptions debugOptions $ do
+  let proxy = Proxy @'Language.Ruby
+  let lang = Language.Ruby
+  blobs <- catMaybes <$> traverse readFile (flip File lang <$> paths)
+  package <- parsePackage rubyParser (Project (takeDirectory (maybe "/" fst (uncons paths))) blobs lang [])
+  modules <- topologicalSort <$> runImportGraph proxy package
+  x <- runCallGraph proxy False modules package
+  pure (x, modules)
+
+
 -- Evaluate a project consisting of the listed paths.
 evaluateProject proxy parser lang paths = withOptions debugOptions $ \ config logger statter ->
   evaluateProject' (TaskConfig config logger statter) proxy parser lang paths

src/Serializing/DOT.hs

@@ -9,7 +9,6 @@ import Algebra.Graph.Export hiding ((<+>))
 import Algebra.Graph.Export.Dot hiding (export)
 import Data.List
 import Data.String
-import Prologue
 
 -- | Serialize a graph to DOT format.
 --

test/Diffing/Algorithm/RWS/Spec.hs

@@ -12,8 +12,8 @@ import Data.Term
 import Data.These
 import Diffing.Algorithm
 import Diffing.Algorithm.RWS
-import Test.Hspec
 import Test.Hspec.LeanCheck
+import SpecHelpers
 
 spec :: Spec
 spec = parallel $ do

test/Diffing/Interpreter/Spec.hs

@@ -14,6 +14,7 @@ import Test.Hspec (Spec, describe, it, parallel)
 import Test.Hspec.Expectations.Pretty
 import Test.Hspec.LeanCheck
 import Test.LeanCheck.Core
+import SpecHelpers
 
 spec :: Spec
 spec = parallel $ do

test/Graphing/Calls/Spec.hs

@@ -0,0 +1,47 @@
+{-# LANGUAGE PackageImports #-}
+
+module Graphing.Calls.Spec ( spec ) where
+
+import Prelude hiding (readFile)
+import Prologue
+import SpecHelpers hiding (readFile)
+
+import Algebra.Graph
+import Data.List (uncons)
+
+import           "semantic" Data.Graph (Graph (..), topologicalSort)
+import           Data.Graph.Vertex
+import qualified Data.Language as Language
+import           Semantic.Config (defaultOptions)
+import           Semantic.Graph
+import           Semantic.IO
+
+callGraphPythonProject paths = runTaskWithOptions defaultOptions $ do
+  let proxy = Proxy @'Language.Python
+  let lang = Language.Python
+  blobs <- catMaybes <$> traverse readFile (flip File lang <$> paths)
+  package <- parsePackage pythonParser (Project (takeDirectory (maybe "/" fst (uncons paths))) blobs lang [])
+  modules <- topologicalSort <$> runImportGraph proxy package
+  runCallGraph proxy False modules package
+
+spec :: Spec
+spec = describe "call graphing" $ do
+
+  let needs r n = unGraph r `shouldSatisfy` hasVertex (Variable n)
+
+  it "should work for a simple example" $ do
+    res <- callGraphPythonProject ["test/fixtures/python/graphing/simple/simple.py"]
+    res `needs` "magnus"
+
+  it "should evaluate both sides of an if-statement" $ do
+    res <- callGraphPythonProject ["test/fixtures/python/graphing/conditional/conditional.py"]
+    res `needs` "merle"
+    res `needs` "taako"
+
+  it "should continue even when a type error is encountered" $ do
+    res <- callGraphPythonProject ["test/fixtures/python/graphing/typeerror/typeerror.py"]
+    res `needs` "lup"
+
+  it "should continue when an unbound variable is encountered" $ do
+    res <- callGraphPythonProject ["test/fixtures/python/graphing/unbound/unbound.py"]
+    res `needs` "lucretia"

test/Semantic/IO/Spec.hs

@@ -83,11 +83,11 @@ spec = parallel $ do
         TS.ts_parser_loop_until_cancelled p nullPtr nullPtr 0
         pure True
 
-      res <- timeout 1500 (wait churn)
+      res <- timeout 2500 (wait churn)
       res `shouldBe` Nothing
 
       TS.ts_parser_set_enabled p (CBool 0)
-      done <- timeout 1500 (wait churn)
+      done <- timeout 2500 (wait churn)
 
       done `shouldBe` (Just True)
 

test/Spec.hs

@@ -16,6 +16,7 @@ import qualified Data.Term.Spec
 import qualified Diffing.Algorithm.RWS.Spec
 import qualified Diffing.Algorithm.SES.Spec
 import qualified Diffing.Interpreter.Spec
+import qualified Graphing.Calls.Spec
 import qualified Integration.Spec
 import qualified Matching.Go.Spec
 import qualified Numeric.Spec
@@ -52,6 +53,7 @@ main = do
       describe "Diffing.Algorithm.RWS" Diffing.Algorithm.RWS.Spec.spec
       describe "Diffing.Algorithm.SES" Diffing.Algorithm.SES.Spec.spec
       describe "Diffing.Interpreter" Diffing.Interpreter.Spec.spec
+      describe "Graphing.Calls" Graphing.Calls.Spec.spec
       describe "Matching" Matching.Go.Spec.spec
       describe "Numeric" Numeric.Spec.spec
       describe "Rendering.TOC" Rendering.TOC.Spec.spec

test/SpecHelpers.hs

@@ -1,3 +1,5 @@
+{-# OPTIONS_GHC -fno-warn-orphans #-}
+
 module SpecHelpers
 ( module X
 , runBuilder
@@ -44,6 +46,7 @@ import Data.Record as X
 import Data.Semilattice.Lower as X
 import Data.Source as X
 import Data.Span as X
+import Data.String
 import Data.Sum
 import Data.Term as X
 import Parsing.Parser as X
@@ -75,6 +78,11 @@ import Control.Exception (displayException)
 
 runBuilder = toStrict . toLazyByteString
 
+-- | This orphan instance is so we don't have to insert @name@ calls
+-- in dozens and dozens of environment specs.
+instance IsString Name where
+  fromString = name . fromString
+
 -- | Returns an s-expression formatted diff for the specified FilePath pair.
 diffFilePaths :: TaskConfig -> Both FilePath -> IO ByteString
 diffFilePaths (TaskConfig config logger statter) paths = readFilePair paths >>= runTaskWithConfig config logger statter . runDiff SExpressionDiffRenderer . pure >>= either (die . displayException) (pure . runBuilder)

test/Test/Hspec/LeanCheck.hs

@@ -47,8 +47,8 @@ instance Example Property where
       Left e
         | Just (LeanCheckException messages e') <- fromException e -> throw (addMessages messages e')
         | otherwise -> throw e
-      Right (Just messages) -> pure $ Failure Nothing (Reason (concat messages))
+      Right (Just messages) -> pure $ Result "" (Failure Nothing (Reason (concat messages)))
-      Right Nothing -> pure Success
+      Right Nothing -> pure $ Result "" Success
     where addMessages messages (HUnit.HUnitFailure loc r) = HUnit.HUnitFailure loc $ case r of
             HUnit.Reason s -> HUnit.Reason (intercalate "\n" messages ++ "\n" ++ s)
             HUnit.ExpectedButGot Nothing expected actual -> HUnit.ExpectedButGot (Just (concat messages)) expected actual

test/fixtures/javascript/analysis/exports/lib.js

@@ -0,0 +1,6 @@
+export function square(x) {
+    return x * x;
+}
+export function area(x, y) {
+  return x * y;
+}

test/fixtures/javascript/analysis/exports/main.js

@@ -0,0 +1,3 @@
+import { square, area } from 'lib';
+console.log(square(11)); // 121
+console.log(area(4, 3)); // 12

test/fixtures/python/graphing/conditional/conditional.py

@@ -0,0 +1,8 @@
+cond = True
+
+if cond:
+    def merle(): pass
+    merle()
+else:
+    def taako(): pass
+    taako()

test/fixtures/python/graphing/simple/simple.py

@@ -0,0 +1,4 @@
+def magnus():
+    return "string"
+
+magnus()

test/fixtures/python/graphing/typeerror/typeerror.py

@@ -0,0 +1,5 @@
+var = 1 + "thing"
+
+def lup(): pass
+
+lup()