hsp 0.4.5 → 0.5.0

raw patch · 3 files changed

+6/−7 lines, 3 filesdep ~HJScriptdep ~hsx

Dependency ranges changed: HJScript, hsx

Files

hsp.cabal +2/−2
src/HSP/Monad.hs +1/−3
src/HSP/XMLGenerator.hs +3/−2

hsp.cabal view

@@ -1,5 +1,5 @@ Name:                   hsp-Version:                0.4.5+Version:                0.5.0 License:                BSD3 License-File:           LICENSE Author:                 Niklas Broberg, Joel Bjornson@@ -20,7 +20,7 @@                         For details on usage, please see the website, and the author's thesis. Homepage:               http://code.google.com/p/hsp -Build-Depends:          base >3 && < 4, mtl, harp, hsx>=0.4.4, HJScript>=0.4.4+Build-Depends:          base >3 && < 4, mtl, harp, hsx>=0.7.0, HJScript>=0.5.0 Build-Type:             Simple Cabal-Version:          >= 1.2.3 Tested-With:            GHC==6.8.3

src/HSP/Monad.hs view

@@ -1,6 +1,4 @@-{-# OPTIONS_GHC -fallow-overlapping-instances #-}-{-# OPTIONS_GHC -fallow-undecidable-instances #-}-{-# OPTIONS_GHC -fglasgow-exts #-}+{-# LANGUAGE OverlappingInstances, UndecidableInstances #-} ----------------------------------------------------------------------------- -- | -- Module      :  HSP.Data

src/HSP/XMLGenerator.hs view

@@ -32,6 +32,7 @@  newtype HSX.Attribute (HSPT' m) = HSPAttr Attribute 
  newtype HSX.Child     (HSPT' m) = HSPChild XML
  xmlToChild = HSPChild
+ pcdataToChild = HSX.xmlToChild . pcdata
  genElement = element
  genEElement = eElement
 
@@ -106,8 +107,8 @@ --instance Monad m => IsXMLs m String where
 -- toXMLs s = return [pcdata s]
 
-instance Monad m => EmbedAsChild (HSPT' m) String where
- asChild = asChild . pcdata
+-- instance Monad m => EmbedAsChild (HSPT' m) String where
+--  asChild = asChild . pcdata
 
 instance Monad m => EmbedAsChild (HSPT' m) Char where
  asChild = asChild . (:[])