a couple of fixes in Phrasebook ; should compile now

This commit is contained in:
aarne
2014-06-19 15:55:39 +00:00
parent f743217a54
commit 5c7586bb78
3 changed files with 4 additions and 4 deletions

View File

@@ -1,5 +1,5 @@
concrete SentencesLav of Sentences = NumeralLav ** SentencesI - [ concrete SentencesLav of Sentences = NumeralLav ** SentencesI - [
Language, LAnguage,
PLanguage, PLanguage,
NPNationality, NPNationality,
mkNPNationality, mkNPNationality,
@@ -24,7 +24,7 @@ open
in { in {
lincat lincat
Language = NPLanguage ; LAnguage = NPLanguage ;
lin lin
PLanguage x = mkPhrase (mkUtt x.lang) ; PLanguage x = mkPhrase (mkUtt x.lang) ;

View File

@@ -17,7 +17,7 @@ concrete SentencesPol of Sentences =
lincat lincat
Day = { name,hab,adv:Str } ; Day = { name,hab,adv:Str } ;
Language = A ; LAnguage = A ;
Citizenship = { prop:A; citizenMSg:Str; citizenMPl:Str; citizenF:Str} ; Citizenship = { prop:A; citizenMSg:Str; citizenMPl:Str; citizenF:Str} ;
Nationality = { lang: A; prop: A; country: NP; citizenMSg:Str; citizenMPl:Str; citizenF:Str } ; Nationality = { lang: A; prop: A; country: NP; citizenMSg:Str; citizenMPl:Str; citizenF:Str } ;
Transport = { cn:CN; verb:Str} ; Transport = { cn:CN; verb:Str} ;

View File

@@ -208,7 +208,7 @@ SuperlPlace sup p = placeNP sup p ;
HowFar place = lin QS {s = place.name.s ++ R.word "有多远"} ; 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 = -- HowFarFromBy x y t =
-- mkQS (mkQCl howFar.how (mkCl (mkNP y.name howFar.far) -- mkQS (mkQCl howFar.how (mkCl (mkNP y.name howFar.far)