claferwiki 0.3.6.1 → 0.3.7

raw patch · 5 files changed

+13/−10 lines, 5 filesdep −pandoc-typesdep ~claferdep ~gitit

Dependencies removed: pandoc-types

Dependency ranges changed: clafer, gitit

Files

• Makefile +1/−0
• README.md +3/−3
• claferwiki.cabal +3/−4
• claferwiki.sh +1/−1
• src/Network/Gitit/Plugin/ClaferWiki.hs +5/−2

@@ -3,6 +3,7 @@ 
 init:
 	cabal sandbox init --sandbox=../.clafertools-cabal-sandbox
+	cabal install pandoc-1.13.1 -fhighlighting -fhttps
 	cabal install --only-dependencies
 	
 install:

@@ -1,7 +1,7 @@ Clafer Wiki
 ===========
 
-v0.3.6.1
+v0.3.7
 
 **ClaferWiki** is a wiki system integrated with [Clafer compiler](https://github.com/gsdlab/clafer). [Clafer](http://clafer.org) is a lightweight yet powerful structural modeling language. ClaferWiki allows for embedding Clafer model fragments in wiki pages and provides model authoring support including code highlighting, parse and semantic error reporting, hyperlinking from identifier use to its definition, and graphical view rendering. 
 
@@ -31,7 +31,7 @@ 
 Regardless of the installation method, the following are required:
 
-* [Clafer compiler](https://github.com/gsdlab/clafer/) v0.3.6.1.
+* [Clafer compiler](https://github.com/gsdlab/clafer/) v0.3.7.
 * [The Haskell Platform](http://hackage.haskell.org/platform) v2013.2.0.0.
   * Cabal >= 1.18
   * alternatively, GHC v7.6.3.
@@ -42,7 +42,7 @@ 
 1. `cabal update`
 2. `cabal install claferwiki`
-3. `cd <cabal's lib or share folder>`  (`C:\Users\<user>\AppData\Roaming\cabal\i386-windows-ghc-7.6.3\claferwiki-0.3.6.1` on Windows or `.cabal/share/x86_64-linux-ghc-7.6.3/claferwiki-0.3.6.1/` on Linux)
+3. `cd <cabal's lib or share folder>`  (`C:\Users\<user>\AppData\Roaming\cabal\i386-windows-ghc-7.6.3\claferwiki-0.3.7` on Windows or `.cabal/share/x86_64-linux-ghc-7.6.3/claferwiki-0.3.7/` on Linux)
   * execute `make install to=<target directory>`
   * this will copy the wiki files
 

@@ -1,5 +1,5 @@ Name:           claferwiki
-version:        0.3.6.1
+version:        0.3.7
 stability:      experimental
 author:         Michał Antkiewicz, Chris Walker, Luke Michael Brown
 maintainer:     Michał Antkiewicz <mantkiew@gsd.uwaterloo.ca>
@@ -42,10 +42,9 @@                    MissingH >= 1.2.1.0,
                    SHA >= 1.6.4,
                    utf8-string >= 0.3.7,
-                   pandoc-types == 1.10.*,
-                   gitit == 0.10.3.1,
+                   gitit == 0.10.5.1,
 
-                   clafer == 0.3.6.1
+                   clafer == 0.3.7
   hs-source-dirs:  src
   ghc-options:     -Wall -fno-warn-unused-do-bind -fno-warn-orphans
   exposed-modules:

@@ -1,5 +1,5 @@ echo "-----------------------------------------"
-echo "| ClaferWiki v0.3.6.1                   |"
+echo "| ClaferWiki v0.3.7                     |"
 echo "| https://github.com/gsdlab/claferwiki/ |"
 echo "| By Michal Antkiewicz, Chris Walker    |"
 echo "| Generative Software Development Lab   |"

@@ -1,3 +1,4 @@+{-# LANGUAGE OverloadedStrings #-}
 {-
  Copyright (C) 2012-2014 Michal Antkiewicz, Chris Walker <http://gsd.uwaterloo.ca>
 
@@ -19,6 +20,7 @@  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  SOFTWARE.
 -}
+{-# LANGUAGE NamedFieldPuns #-}
 -- | A plugin for Gitit which integrates the Clafer compiler and links to other
 -- Clafer web tools: <http://https://github.com/gsdlab/ClaferIDE ClaferIDE>,
 -- <http://https://github.com/gsdlab/ClaferConfigurator ClaferConfigurator>, and
@@ -131,8 +133,9 @@ 		extractOutput :: Either [ClaferErr] (Map.Map ClaferMode CompilerResult) -> ClaferMode -> String
 		extractOutput (Right compilerResultMap) claferMode = 
 			case (Map.lookup claferMode compilerResultMap) of
-				Just CompilerResult{outputCode = output} -> output
-				Nothing -> "Error: No " ++ show claferMode ++ " output!"
+				Just CompilerResult{ outputCode } -> outputCode
+				Just NoCompilerResult{ reason } -> "Error: No " ++ show claferMode ++ " output. Reason:" ++ reason
+				Nothing -> "Error: No " ++ show claferMode ++ " output."
 		extractOutput (Left err) _ = highlightErrors fragmentedModel err
 
 		selfContained htmlCode =