From f7f6953050639b211509d3d4e922375d52f424c6 Mon Sep 17 00:00:00 2001 From: "kr.angelov" Date: Tue, 30 Aug 2011 17:29:13 +0000 Subject: [PATCH] few more fixes in the NLG grammar --- examples/nlg/{LogicEng.gf => LogicCnc.gf} | 2 +- examples/nlg/NLG.gf | 4 ++-- examples/nlg/NLGEng.gf | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename examples/nlg/{LogicEng.gf => LogicCnc.gf} (87%) diff --git a/examples/nlg/LogicEng.gf b/examples/nlg/LogicCnc.gf similarity index 87% rename from examples/nlg/LogicEng.gf rename to examples/nlg/LogicCnc.gf index b1ff655eb..b9a2013c9 100644 --- a/examples/nlg/LogicEng.gf +++ b/examples/nlg/LogicCnc.gf @@ -1,5 +1,5 @@ --# -path=present -concrete LogicEng of Logic = open (Eng=GrammarEng), ParadigmsEng, ResEng in { +concrete LogicCnc of Logic = { lincat Ind = {s : Str}; diff --git a/examples/nlg/NLG.gf b/examples/nlg/NLG.gf index 594911a68..d3afc73cf 100644 --- a/examples/nlg/NLG.gf +++ b/examples/nlg/NLG.gf @@ -58,7 +58,7 @@ fun CompNP : ({np} : (Ind -> Prop) -> Prop) -> NP np -> Comp (\x -> np (\y -> eq x y)) ; - UsePN : (i : Ind) -> PN i -> NP (\f -> f i) ; + UsePN : ({i} : Ind) -> PN i -> NP (\f -> f i) ; DetCN : ({det} : (Ind -> Prop) -> (Ind -> Prop) -> Prop) -> ({cn} : Ind -> Prop) -> @@ -110,6 +110,6 @@ fun ({p} : Prop -> Prop) -> Pol p -> Cl cl -> S (p cl); - UttS : ({s} : Prop) -> S s -> Utt; + UttS : (s : Prop) -> S s -> Utt; } diff --git a/examples/nlg/NLGEng.gf b/examples/nlg/NLGEng.gf index f1bd64881..731e05a3d 100644 --- a/examples/nlg/NLGEng.gf +++ b/examples/nlg/NLGEng.gf @@ -1,5 +1,5 @@ --# -path=present -concrete NLGEng of NLG = LogicEng ** open (Eng=GrammarEng), ParadigmsEng, ResEng in { +concrete NLGEng of NLG = LogicCnc ** open (Eng=GrammarEng), ParadigmsEng, ResEng in { lincat Det = Eng.Det;