GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-09 04:59:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

annotated Adv's in SentencesI to Syntax.Adv to avoid some clashes

Browse Source
This commit is contained in:
aarne
2013-05-20 06:40:40 +00:00
parent 517b8ff1ee
commit 3e30dd78ec
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
examples/phrasebook/SentencesI.gf
View File

@@ -27,7 +27,7 @@ incomplete concrete SentencesI of Sentences = Numeral **
Property = A ;
Object = NP ;
PrimObject = NP ;
Place = NPPlace ; -- {name : NP ; at : Adv ; to : Adv} ;
Place = NPPlace ; -- {name : NP ; at : Syntax.Adv ; to : Syntax.Adv} ;
PlaceKind = CNPlace ; -- {name : CN ; at : Prep ; to : Prep} ;
Currency = CN ;
Price = NP ;
@@ -37,12 +37,12 @@ incomplete concrete SentencesI of Sentences = Numeral **
Language = NP ;
Citizenship = A ;
Country = NP ;
Day = NPDay ; -- {name : NP ; point : Adv ; habitual : Adv} ;
Date = Adv ;
Day = NPDay ; -- {name : NP ; point : Syntax.Adv ; habitual : Syntax.Adv} ;
Date = Syntax.Adv ;
Name = NP ;
Number = Card ;
ByTransport = Adv ;
Transport = {name : CN ; by : Adv} ;
ByTransport = Syntax.Adv ;
Transport = {name : CN ; by : Syntax.Adv} ;
Superlative = Det ;
lin
MPhrase p = p ;
@@ -123,9 +123,9 @@ incomplete concrete SentencesI of Sentences = Numeral **
Too property = mkAP too_AdA (mkAP property) ;
PropQuality property = mkAP property ;
ThePlace kind = let dd = if_then_else Det kind.isPl thePl_Det theSg_Det
ThePlace kind = let dd : Det = if_then_else Det kind.isPl thePl_Det theSg_Det
in placeNP dd kind ;
APlace kind = let dd = if_then_else Det kind.isPl aPl_Det aSg_Det
APlace kind = let dd : Det = if_then_else Det kind.isPl aPl_Det aSg_Det
in placeNP dd kind ;
IMale, IFemale = mkPerson i_Pron ;
@@ -182,15 +182,15 @@ oper
prop = pro
} ;
NPDay : Type = {name : NP ; point : Adv ; habitual : Adv} ;
NPDay : Type = {name : NP ; point : Syntax.Adv ; habitual : Syntax.Adv} ;
mkNPDay : NP -> Adv -> Adv -> NPDay = \d,p,h ->
mkNPDay : NP -> Syntax.Adv -> Syntax.Adv -> NPDay = \d,p,h ->
{name = d ;
point = p ;
habitual = h
} ;
NPPlace : Type = {name : NP ; at : Adv ; to : Adv} ;
NPPlace : Type = {name : NP ; at : Syntax.Adv ; to : Syntax.Adv} ;
CNPlace : Type = {name : CN ; at : Prep ; to : Prep; isPl : Bool} ;
mkCNPlace : CN -> Prep -> Prep -> CNPlace = \p,i,t -> {