diff --git a/AUTHORS b/AUTHORS --- a/AUTHORS +++ b/AUTHORS @@ -1,19 +1,20 @@ -Daniel Gorin +# Please keep the list sorted. -Contributions from: -Evan Laforge -Gwern Branwen -Jean Philippe Bernardy Austin Seipp -Fernando Benavides -Pasqualino Titto Assini -Carl Howells -Daniel Wagner +Bertram Felgenhauer Bryan O'Sullivan +Carl Howells Conrad Parker -Mark Wright -Bertram Felgenhauer -Samuel Gélineau -Jens Petersen Corentin Dupont +Daniel Gorin +Daniel Martí +Daniel Wagner +Evan Laforge +Fernando Benavides +Gwern Branwen +Jean Philippe Bernardy +Jens Petersen +Mark Wright Nathaniel W. Filardo +Pasqualino Titto Assini +Samuel Gélineau diff --git a/CHANGELOG.markdown b/CHANGELOG.markdown deleted file mode 100644 --- a/CHANGELOG.markdown +++ /dev/null @@ -1,164 +0,0 @@ -0.4.2.3 -------- - - * It builds against 7.4.2 (not 7.4.1), so update the constraints. - - -0.4.2.2 -------- - - * Builds with ghc 7.10 - * Builds again with ghc 7.4 - * Drops dependency on utf8-string - - -0.4.2.1 -------- - - * Better error reporting (thanks to Corentin Dupont) - -0.4.2.0 -------- - - * Based on exceptions-0.6 - -0.4.1.0 -------- - - * Based on exceptions-0.4 - -0.4.0.0 -------- - * Compiles with ghc 7.8 - - * Fixed an issue where "P" was available as a qualified version of Prelude - (thanks to Samuel Gélineau) - - * Uses exceptions package instead of MonadCatchIO-mtl (API breakage expected) - - * No longer depends on haskell-src - - * Changelog should now appear in Hackage - - * Integrated unit tests with cabal - -0.3.3.7 -------- - * Fixed a race condition that would happen, for instance, when two process where run - one next to the other, making them, on some platforms, to get the same random number seed - (thanks to Mario Pastorelli and Samuel Gélineau) - - * Small fix in documentation (thanks to Daniil Frumin) - -0.3.3.6 -------- - * Works again on GHC 7.2.x (thanks to Björn Peemöller) - -0.3.3.5 -------- - * Works on GHC 7.4.6 - * Cleans up files for phantom modules that were left behind (thanks to Beltram Felgenhauer) - -0.3.3.4 -------- - * Works on GHC 7.4.1 - -0.3.3.3 -------- - * Works on GHC 7.2.1 - -0.3.3.2 -------- - * Supports GHC 7 - -0.3.3.1 -------- - * Instance declaration for Applicative (InterpreterT m) works with mtl-2 - (requires Applicative m, this shouldn't break anything...) - -0.3.3.0 -------- - * add unsafeRunInterpreterWithArgs - * check that only one instance of the interpreter is run at any time - -0.3.2.3 -------- - * Can be built against MonadCatchIO-mtl-0.3.x.x - -0.3.2.2 -------- - * Fixed a bug that would make expressions using heavy use of the layout - rule to fail to be interpreted (see parens) - -0.3.2.1 -------- - * hint.cabal includes version bounds for package ghc-mtl. This is to - avoid the accidental selection of the completely unrelated ghc-mtl - internal to ghc and, apparently, installed in the hackage server - -0.3.2.0 -------- - * Exports functions parens and isInterpretedModule - - * Experimental support for module annotations - - * Uses extensible-exceptions in order to provide a uniform interface - accross different ghc versions - - * Provides an Applicative instance for IntepreterT - - * Adds an option to configurate the searchPath - - -0.3.1.0 -------- - * No longer uses Language.Haskell.Extension due to configuration problems with Cabal. - Instead, it uses its own Language.Haskell.Interpreter.Extension module. - -0.3.0.0 -------- - * Updated API: - + InterpreterT monad transformer (Interpreter = InterpreterT IO) - + No more Sessions, use runInterpreter only once - + New options handling functions - - but observe that there is no setOptimizations equivalent; - since GHC does no optimization on interpreted code, this was actually - doing nothing - * Works with GHC 6.10 and 6.8 (untested with 6.6) - -0.2.5 ------ - * setImportsQ added (modules can be imported both qualified and unqualified) - -0.2.4.1 -------- - * BUGFIX: No longer fails on expressions ending in a -- comment - -0.2.4 ------ - * setInstalledModsAreInScopeQualified added - * Now depends on ghc-paths (no longer needs a custom cabal script) - -0.2.2 ------ - * setOptimizations added - * Module Language.Haskell.Interpreter.GHC.Unsafe added - (contains unsafeSetGhcOption) - * unit tests now based on HUnit - -0.2.1 ------ - * BUGFIX: Module reloading was broken under 6.8 - * GHC.GhcExceptions are catched and turned into InterpreterErrors - -0.2.0.1 -------- - * Adds the requirement cabal-version < 1.3 - -0.2 ---- - - * Works also with GHC 6.8 and 6.6 - * Added the getModuleExports function - * withSession function throws a dynamic exception instead of returning Either Error a - * Requires Cabal 1.2.x diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,149 @@ +### 0.4.3 + + * New maintainer and source code repo + +### 0.4.2.3 + + * It builds against 7.4.2 (not 7.4.1), so update the constraints. + +### 0.4.2.2 + + * Builds with ghc 7.10 + * Builds again with ghc 7.4 + * Drops dependency on utf8-string + +### 0.4.2.1 + + * Better error reporting (thanks to Corentin Dupont) + +### 0.4.2.0 + + * Based on exceptions-0.6 + +### 0.4.1.0 + + * Based on exceptions-0.4 + +### 0.4.0.0 + + * Compiles with ghc 7.8 + * Fixed an issue where "P" was available as a qualified version of Prelude + (thanks to Samuel Gélineau) + * Uses exceptions package instead of MonadCatchIO-mtl (API breakage expected) + * No longer depends on haskell-src + * Changelog should now appear in Hackage + * Integrated unit tests with cabal + +### 0.3.3.7 + + * Fixed a race condition that would happen, for instance, when two process where run + one next to the other, making them, on some platforms, to get the same random number seed + (thanks to Mario Pastorelli and Samuel Gélineau) + * Small fix in documentation (thanks to Daniil Frumin) + +### 0.3.3.6 + + * Works again on GHC 7.2.x (thanks to Björn Peemöller) + +### 0.3.3.5 + + * Works on GHC 7.4.6 + * Cleans up files for phantom modules that were left behind (thanks to Beltram Felgenhauer) + +### 0.3.3.4 + + * Works on GHC 7.4.1 + +### 0.3.3.3 + + * Works on GHC 7.2.1 + +### 0.3.3.2 + + * Supports GHC 7 + +### 0.3.3.1 + + * Instance declaration for Applicative (InterpreterT m) works with mtl-2 + (requires Applicative m, this shouldn't break anything...) + +### 0.3.3.0 + + * Add unsafeRunInterpreterWithArgs + * Check that only one instance of the interpreter is run at any time + +### 0.3.2.3 + + * Can be built against MonadCatchIO-mtl-0.3.x.x + +### 0.3.2.2 + + * Fixed a bug that would make expressions using heavy use of the layout + rule to fail to be interpreted (see parens) + +### 0.3.2.1 + + * hint.cabal includes version bounds for package ghc-mtl. This is to + avoid the accidental selection of the completely unrelated ghc-mtl + internal to ghc and, apparently, installed in the hackage server + +### 0.3.2.0 + + * Exports functions parens and isInterpretedModule + * Experimental support for module annotations + * Uses extensible-exceptions in order to provide a uniform interface + accross different ghc versions + * Provides an Applicative instance for IntepreterT + * Adds an option to configurate the searchPath + +### 0.3.1.0 + + * No longer uses Language.Haskell.Extension due to configuration problems with Cabal. + Instead, it uses its own Language.Haskell.Interpreter.Extension module. + +### 0.3.0.0 + + * Updated API: + + InterpreterT monad transformer (Interpreter = InterpreterT IO) + + No more Sessions, use runInterpreter only once + + New options handling functions + - but observe that there is no setOptimizations equivalent; + since GHC does no optimization on interpreted code, this was actually + doing nothing + * Works with GHC 6.10 and 6.8 (untested with 6.6) + +### 0.2.5 + + * setImportsQ added (modules can be imported both qualified and unqualified) + +### 0.2.4.1 + + * BUGFIX: No longer fails on expressions ending in a -- comment + +### 0.2.4 + + * setInstalledModsAreInScopeQualified added + * Now depends on ghc-paths (no longer needs a custom cabal script) + +### 0.2.2 + + * setOptimizations added + * Module Language.Haskell.Interpreter.GHC.Unsafe added + (contains unsafeSetGhcOption) + * Unit tests now based on HUnit + +### 0.2.1 + + * BUGFIX: Module reloading was broken under 6.8 + * GHC.GhcExceptions are catched and turned into InterpreterErrors + +### 0.2.0.1 + + * Adds the requirement cabal-version < 1.3 + +### 0.2 + + * Works also with GHC 6.8 and 6.6 + * Added the getModuleExports function + * withSession function throws a dynamic exception instead of returning Either Error a + * Requires Cabal 1.2.x diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -1,27 +1,27 @@ -Copyright 2007, Daniel Gorin. All rights reserved. +Copyright (c) 2007 The Hint Authors. All rights reserved. Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - -2. 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. +modification, are permitted provided that the following conditions are +met: -3. Neither the name of the author nor the names of its contributors may be - used to endorse or promote products derived from this software without - specific prior written permission. + * 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 the copyright holder 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 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. +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. diff --git a/README b/README deleted file mode 100644 --- a/README +++ /dev/null @@ -1,31 +0,0 @@ -=== Description === - -This library defines an Interpreter monad. It allows to load Haskell -modules, browse them, type-check and evaluate strings with Haskell -expressions and even coerce them into values. The library is -thread-safe and type-safe (even the coercion of expressions to -values). - -It is, esentially, a huge subset of the GHC API wrapped in a simpler -API. - - -=== Documentation === - -The library cames with haddock documentation you can build -(see above). Also, check examples/example.hs to see a simple but -comprehensive example (it must be run from the examples -directory, since it expects to find the SomeModule.hs file -located there). - -=== Contact === - -Bug-reports, questions, suggestions and patches are all welcome. - -To get a copy of the darcs repository: - -darcs get http://hub.darcs.net/jcpetruzza/hint - - -If you report an issue, please send me an email as well, since -otherwise I get no notifications... diff --git a/README.md b/README.md new file mode 100644 --- /dev/null +++ b/README.md @@ -0,0 +1,16 @@ +# hint + +[![Build Status](https://travis-ci.org/mvdan/hint.svg?branch=master)](https://travis-ci.org/mvdan/hint) + +This library defines an Interpreter monad. It allows to load Haskell +modules, browse them, type-check and evaluate strings with Haskell +expressions and even coerce them into values. The library is thread-safe +and type-safe (even the coercion of expressions to values). + +It is, esentially, a huge subset of the GHC API wrapped in a simpler +API. + +### Example + +Check [example.hs](examples/example.hs) to see a simple but +comprehensive example (it must be run from the `examples` directory). diff --git a/hint.cabal b/hint.cabal --- a/hint.cabal +++ b/hint.cabal @@ -1,5 +1,5 @@ name: hint -version: 0.4.2.3 +version: 0.4.3 description: This library defines an @Interpreter@ monad. It allows to load Haskell modules, browse them, type-check and evaluate strings with Haskell @@ -8,27 +8,27 @@ values). It is, essentially, a huge subset of the GHC API wrapped in a simpler - API. + API. synopsis: Runtime Haskell interpreter (GHC API wrapper) category: Language, Compilers/Interpreters license: BSD3 license-file: LICENSE -author: Daniel Gorin -maintainer: jcpetruzza@gmail.com -homepage: http://hub.darcs.net/jcpetruzza/hint +author: The Hint Authors +maintainer: mvdan@mvdan.cc +homepage: https://github.com/mvdan/hint cabal-version: >= 1.9.2 build-type: Simple -extra-source-files: README +extra-source-files: README.md AUTHORS - CHANGELOG.markdown + CHANGELOG.md examples/example.hs examples/SomeModule.hs source-repository head - type: darcs - location: http://hub.darcs.net/jcpetruzza/hint + type: git + location: https://github.com/mvdan/hint Test-Suite unit-tests type: exitcode-stdio-1.0 diff --git a/src/Hint/CompatPlatform.hs b/src/Hint/CompatPlatform.hs --- a/src/Hint/CompatPlatform.hs +++ b/src/Hint/CompatPlatform.hs @@ -23,7 +23,7 @@ #if defined(mingw32_HOST_OS) || defined(__MINGW32__) --- This function is not yet in the win32 package, so we have to +-- This function is not yet in the win32 package, so we have to -- roll down our own definition. -- -- Credit goes where it is deserved: diff --git a/src/Language/Haskell/Interpreter.hs b/src/Language/Haskell/Interpreter.hs --- a/src/Language/Haskell/Interpreter.hs +++ b/src/Language/Haskell/Interpreter.hs @@ -3,7 +3,7 @@ -- Module : Language.Haskell.Interpreter -- License : BSD-style -- --- Maintainer : jcpetruzza@gmail.com +-- Maintainer : mvdan@mvdan.cc -- Stability : experimental -- Portability : non-portable (GHC API) --