From 27a60479b6cf8d6e8b0bce9510aac59dc463c390 Mon Sep 17 00:00:00 2001 From: aarne Date: Thu, 19 Jun 2014 15:55:39 +0000 Subject: [PATCH] a couple of fixes in Phrasebook ; should compile now --- examples/phrasebook/SentencesLav.gf | 4 ++-- examples/phrasebook/SentencesPol.gf | 2 +- examples/phrasebook/WordsChi.gf | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/phrasebook/SentencesLav.gf b/examples/phrasebook/SentencesLav.gf index 29c00ad68..33d34b99d 100644 --- a/examples/phrasebook/SentencesLav.gf +++ b/examples/phrasebook/SentencesLav.gf @@ -1,5 +1,5 @@ concrete SentencesLav of Sentences = NumeralLav ** SentencesI - [ - Language, + LAnguage, PLanguage, NPNationality, mkNPNationality, @@ -24,7 +24,7 @@ open in { lincat - Language = NPLanguage ; + LAnguage = NPLanguage ; lin PLanguage x = mkPhrase (mkUtt x.lang) ; diff --git a/examples/phrasebook/SentencesPol.gf b/examples/phrasebook/SentencesPol.gf index 66a6c473e..00815e6bc 100644 --- a/examples/phrasebook/SentencesPol.gf +++ b/examples/phrasebook/SentencesPol.gf @@ -17,7 +17,7 @@ concrete SentencesPol of Sentences = lincat Day = { name,hab,adv:Str } ; - Language = A ; + LAnguage = A ; Citizenship = { prop:A; citizenMSg:Str; citizenMPl:Str; citizenF:Str} ; Nationality = { lang: A; prop: A; country: NP; citizenMSg:Str; citizenMPl:Str; citizenF:Str } ; Transport = { cn:CN; verb:Str} ; diff --git a/examples/phrasebook/WordsChi.gf b/examples/phrasebook/WordsChi.gf index 1f825dfef..130d19b2b 100644 --- a/examples/phrasebook/WordsChi.gf +++ b/examples/phrasebook/WordsChi.gf @@ -208,7 +208,7 @@ SuperlPlace sup p = placeNP sup p ; HowFar place = lin QS {s = place.name.s ++ R.word "有多远"} ; -HowFarFrom x y = lin QS {s = y.name.s ++ "从" ++ x.name.s ++ R.word "有多远"} ; ---- +HowFarFrom x y = lin QS {s = "从" ++ x.name.s ++ "到" ++ y.name.s ++ R.word "有多远"} ; ---- -- HowFarFromBy x y t = -- mkQS (mkQCl howFar.how (mkCl (mkNP y.name howFar.far)