mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-05-21 17:12:50 -06:00
a couple of fixes in Phrasebook ; should compile now
This commit is contained in:
@@ -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) ;
|
||||||
|
|||||||
@@ -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} ;
|
||||||
|
|||||||
@@ -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)
|
||||||
|
|||||||
Reference in New Issue
Block a user