diff options
| author | aarne <aarne@cs.chalmers.se> | 2008-10-01 13:13:10 +0000 |
|---|---|---|
| committer | aarne <aarne@cs.chalmers.se> | 2008-10-01 13:13:10 +0000 |
| commit | 307042a6a1863854920da7eaae6fbc588457221c (patch) | |
| tree | e3f0d32b7dfa854854a7edbe2abec15337b977e1 /examples/tutorial | |
| parent | 8fbdf3e57c84fbfa6b84cab351c9f2b97bd0ce8e (diff) | |
refreshed the tutorial
Diffstat (limited to 'examples/tutorial')
| -rw-r--r-- | examples/tutorial/semantics/SemBase.hs | 3 | ||||
| -rw-r--r-- | examples/tutorial/semantics/Top.hs | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/examples/tutorial/semantics/SemBase.hs b/examples/tutorial/semantics/SemBase.hs index 24073894b..b682010e1 100644 --- a/examples/tutorial/semantics/SemBase.hs +++ b/examples/tutorial/semantics/SemBase.hs @@ -1,6 +1,6 @@ module SemBase where -import GSyntax +import Base import Logic -- translation of Base syntax to Logic @@ -8,7 +8,6 @@ import Logic iS :: GS -> Prop iS s = case s of GPredAP np ap -> iNP np (iAP ap) - GConjS c s t -> iConj c (iS s) (iS t) iNP :: GNP -> (Exp -> Prop) -> Prop iNP np p = case np of diff --git a/examples/tutorial/semantics/Top.hs b/examples/tutorial/semantics/Top.hs index 6027b238c..51d5fbb99 100644 --- a/examples/tutorial/semantics/Top.hs +++ b/examples/tutorial/semantics/Top.hs @@ -1,16 +1,16 @@ module Main where -import GSyntax +import Base import SemBase import Logic -import GF.GFCC.API +import PGF main :: IO () main = do - gr <- file2grammar "base.gfcc" + gr <- file2grammar "Base.pgf" loop gr -loop :: MultiGrammar -> IO () +loop :: PGF -> IO () loop gr = do s <- getLine let t:_ = parse gr "BaseEng" "S" s |