HJScript 0.4.4 → 0.4.5

raw patch · 15 files changed

+19/−45 lines, 15 filesdep ~basePVP ok

version bump matches the API change (PVP)

Dependency ranges changed: base

API changes (from Hackage documentation)

+ HJScript: class IsHJScript a

+ HJScript: evalHJScript :: HJScript t -> (t, Block ())

+ HJScript: hjsInside :: HJScript t -> HJScript (t, Block ())

+ HJScript: newVarName :: HJScript String

+ HJScript: newVarNum :: HJScript Int

+ HJScript: outputBlock :: Block () -> HJScript ()

+ HJScript: outputStmt :: Stmt () -> HJScript ()

+ HJScript: runHJScript :: HJScript t -> HJState -> (t, HJState, Block ())

+ HJScript: toHJScript :: (IsHJScript a) => a -> HJScript ()

+ HJScript: type HJScript = XMLGenT HJScript'

+ HJScript: type HJScript' = StateT HJState (Writer (Block ()))

Files

HJScript.cabal +3/−2
src/HJScript.hs +3/−3
src/HJScript/Ajax.hs +1/−3
src/HJScript/Lang.hs +1/−3
src/HJScript/Monad.hs +1/−3
src/HJScript/Objects/ActiveXObject.hs +1/−3
src/HJScript/Objects/Array.hs +1/−3
src/HJScript/Objects/Boolean.hs +1/−3
src/HJScript/Objects/Date.hs +1/−3
src/HJScript/Objects/JQuery.hs +1/−3
src/HJScript/Objects/Math.hs +1/−3
src/HJScript/Objects/RegExp.hs +1/−3
src/HJScript/Objects/String.hs +1/−3
src/HJScript/Objects/XMLHttpRequest.hs +1/−3
src/HJScript/XMLGenerator.hs +1/−4

HJScript.cabal view

@@ -1,5 +1,5 @@ Name:             HJScript-Version:          0.4.4+Version:          0.4.5 License:          BSD3 Author:           Joel Bjornson, joel.bjornson@gmail.com,                   Niklas Broberg, nibro@cs.chalmers.se@@ -44,7 +44,8 @@ Other-Modules:    HJScript.Monad                    -Build-Depends:    base, HJavaScript >= 0.4.4, mtl, hsx >= 0.4.4+Cabal-Version:    >= 1.2.3+Build-Depends:    base <= 4, HJavaScript >= 0.4.4, mtl, hsx >= 0.4.4 Build-Type:       Simple Category:         Web, Language

src/HJScript.hs view

@@ -1,6 +1,4 @@-{-# OPTIONS_GHC -fglasgow-exts #-}-{-# OPTIONS_GHC -fallow-overlapping-instances #-}
-{-# OPTIONS_GHC -fallow-undecidable-instances #-}+{-# LANGUAGE OverlappingInstances, UndecidableInstances #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  HJScript
@@ -11,6 +9,7 @@ ----------------------------------------------------------------------------- module HJScript   (+    module HJScript.Monad,     module HJScript.Lang,
     module HJScript.XMLGenerator,
     module HJScript.Events,
@@ -23,6 +22,7 @@     module HJScript.Objects.String   ) where +import HJScript.Monad import HJScript.Lang import HJScript.XMLGenerator
 import HJScript.Events

src/HJScript/Ajax.hs view

@@ -1,6 +1,4 @@-{-# OPTIONS_GHC -fglasgow-exts #-}-{-# OPTIONS_GHC -fallow-overlapping-instances #-}
-{-# OPTIONS_GHC -fallow-undecidable-instances #-}+{-# LANGUAGE OverlappingInstances, UndecidableInstances #-}
 ----------------------------------------------------------------------------- -- Module      :  HJScript.Ajax -- Copyright   :  (c) Joel Björnson 2006

src/HJScript/Lang.hs view

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

src/HJScript/Monad.hs view

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

src/HJScript/Objects/ActiveXObject.hs view

@@ -1,6 +1,4 @@-{-# OPTIONS_GHC -fglasgow-exts #-}-{-# OPTIONS_GHC -fallow-overlapping-instances #-}
-{-# OPTIONS_GHC -fallow-undecidable-instances #-}+{-# LANGUAGE OverlappingInstances, UndecidableInstances #-}
 -----------------------------------------------------------------------------
 -- Module      :  HJScript.Objects.ActiveXObject
 -- Copyright   :  (c) Joel Björnson 2006

src/HJScript/Objects/Array.hs view

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

src/HJScript/Objects/Boolean.hs view

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

src/HJScript/Objects/Date.hs view

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

src/HJScript/Objects/JQuery.hs view

@@ -1,6 +1,4 @@-{-# OPTIONS_GHC -fglasgow-exts #-}-{-# OPTIONS_GHC -fallow-overlapping-instances #-}
-{-# OPTIONS_GHC -fallow-undecidable-instances #-}+{-# LANGUAGE OverlappingInstances, UndecidableInstances #-}
 module HJScript.Objects.JQuery where  import HJScript.Lang

src/HJScript/Objects/Math.hs view

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

src/HJScript/Objects/RegExp.hs view

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

src/HJScript/Objects/String.hs view

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

src/HJScript/Objects/XMLHttpRequest.hs view

@@ -1,6 +1,4 @@-{-# OPTIONS_GHC -fglasgow-exts #-}-{-# OPTIONS_GHC -fallow-overlapping-instances #-}
-{-# OPTIONS_GHC -fallow-undecidable-instances #-}+{-# LANGUAGE OverlappingInstances, UndecidableInstances #-}
 -----------------------------------------------------------------------------
 -- Module      :  HJScript.Objects.XMLHttpRequest 
 -- Copyright   :  (c) Joel Björnson 2006

src/HJScript/XMLGenerator.hs view

@@ -1,7 +1,4 @@-{-# OPTIONS_GHC -fglasgow-exts #-}-{-# OPTIONS_GHC -fallow-overlapping-instances #-}
-{-# OPTIONS_GHC -fallow-undecidable-instances #-}-+{-# LANGUAGE OverlappingInstances, UndecidableInstances #-}
 module HJScript.XMLGenerator (
 --        ToChildNodes(..), ToAttributeNode(..),