liboleg 2010.1.6 → 2010.1.6.1
raw patch · 2 files changed
+10/−7 lines, 2 filesdep +CC-delcontdep ~basePVP: minor bump suggested
API additions: PVP suggests at least a minor version bump
Dependencies added: CC-delcont
Dependency ranges changed: base
API changes (from Hackage documentation)
+ Language.Symantics1: And :: T -> T -> T
+ Language.Symantics1: Exi_over_Uni :: QuantOrder
+ Language.Symantics1: Exists :: Varname -> T -> T
+ Language.Symantics1: Forall :: Varname -> T -> T
+ Language.Symantics1: Imply :: T -> T -> T
+ Language.Symantics1: Ind :: String -> E
+ Language.Symantics1: LString :: a -> LString a
+ Language.Symantics1: Love :: E -> E -> T
+ Language.Symantics1: Man :: E -> T
+ Language.Symantics1: See :: E -> E -> T
+ Language.Symantics1: SemEnv :: Prompt r T -> Prompt r T -> QuantOrder -> Prompt r (Int -> CC r T) -> SemEnv r
+ Language.Symantics1: SemM :: (ReaderT (SemEnv r) (CC r) a) -> SemM r a
+ Language.Symantics1: Uni_over_Exi :: QuantOrder
+ Language.Symantics1: Woman :: E -> T
+ Language.Symantics1: app :: (Monad m) => m (a -> m b) -> m a -> m b
+ Language.Symantics1: bill :: (Abstract c) => c (I c NP)
+ Language.Symantics1: ccat :: LString String -> LString String -> LString String
+ Language.Symantics1: class Abstract c
+ Language.Symantics1: data E
+ Language.Symantics1: data N
+ Language.Symantics1: data NP
+ Language.Symantics1: data QuantOrder
+ Language.Symantics1: data S
+ Language.Symantics1: data SM
+ Language.Symantics1: data SemEnv r
+ Language.Symantics1: data T
+ Language.Symantics1: dot :: (Abstract c) => c (I c S) -> c (I c SM)
+ Language.Symantics1: every :: (Abstract c) => c (I c N) -> c (I c NP)
+ Language.Symantics1: genvar :: SemM r Varname
+ Language.Symantics1: instance (Show a) => Show (LString a)
+ Language.Symantics1: instance Abstract (SemM r)
+ Language.Symantics1: instance Abstract LString
+ Language.Symantics1: instance Monad (SemM r)
+ Language.Symantics1: instance Show E
+ Language.Symantics1: instance Show T
+ Language.Symantics1: john :: (Abstract c) => c (I c NP)
+ Language.Symantics1: love :: (Abstract c) => c (I c NP) -> c (I c NP) -> c (I c S)
+ Language.Symantics1: man :: (Abstract c) => c (I c N)
+ Language.Symantics1: newtype LString a
+ Language.Symantics1: newtype SemM r a
+ Language.Symantics1: pcnt :: SemEnv r -> Prompt r (Int -> CC r T)
+ Language.Symantics1: pexi :: SemEnv r -> Prompt r T
+ Language.Symantics1: puni :: SemEnv r -> Prompt r T
+ Language.Symantics1: quant_order :: SemEnv r -> QuantOrder
+ Language.Symantics1: runSem :: QuantOrder -> (forall r. SemM r T) -> T
+ Language.Symantics1: see :: (Abstract c) => c (I c NP) -> c (I c NP) -> c (I c S)
+ Language.Symantics1: shiftP :: Prompt r b -> ((a -> CC r b) -> CC r b) -> CC r a
+ Language.Symantics1: some :: (Abstract c) => c (I c N) -> c (I c NP)
+ Language.Symantics1: type Varname = String
+ Language.Symantics1: unSem :: SemM r a -> SemEnv r -> CC r a
+ Language.Symantics1: woman :: (Abstract c) => c (I c N)
Files
- Language/Symantics1.hs +5/−4
- liboleg.cabal +5/−3
Language/Symantics1.hs view
@@ -2,7 +2,7 @@ {-# LANGUAGE Rank2Types, GeneralizedNewtypeDeriving #-} {-# LANGUAGE NoMonomorphismRestriction, EmptyDataDecls #-} --- This is the Haskell version of symantics1.ml, for comparison+-- | This is the Haskell version of symantics1.ml, for comparison -- ACG with a more expressive semantic lexicon that includes -- multi-prompt delimited continuations and the notion of evaluation. -- Types are considered as a mere approximation rather than@@ -10,12 +10,13 @@ -- -- * <http://okmij.org/ftp/gengo/index.html#CAG> --- module Language.Symantics1 where -- Part of the Dybvig, Sabry, Peyton-Jones' library -- for multi-prompt delimited control-import CC_Frame -- ed. I don't know where this is.+-- import CC_Frame -- ed. Oleg uses CC_Frame, available in the CC-delcont package now+--+import Control.Monad.CC import Control.Monad.Reader -- The abstract form, to be interpreted in several ways.@@ -209,7 +210,7 @@ shiftP :: Prompt r b -> ((a -> CC r b) -> CC r b) -> CC r a-shiftP p f = letSubCont p $ \sk -> +shiftP p f = withSubCont p $ \sk -> pushPrompt p (f (\v -> pushPrompt p (pushSubCont sk (return v))))
liboleg.cabal view
@@ -1,5 +1,5 @@ name: liboleg-version: 2010.1.6+version: 2010.1.6.1 license: BSD3 license-file: LICENSE author: Oleg Kiselyov@@ -14,11 +14,12 @@ library build-depends:- base < 4,+ base >= 2 && < 4, containers, mtl, unix,- template-haskell+ template-haskell,+ CC-delcont exposed-modules: Data.FDList@@ -53,6 +54,7 @@ Language.CPS Language.CB98 Language.LinearLC+ Language.Symantics1 Language.TTF Language.TTFdB Language.TDPE