GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-05-25 02:38:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

resource specialized to present tense ; preprocessor flag

Browse Source
This commit is contained in:
aarne
2006-02-25 18:59:32 +00:00
parent af0dfe0921
commit 9b0036457c
57 changed files with 6560 additions and 6493 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/resource-1.0/scandinavian/CommonScand.gf
View File

@@ -38,13 +38,15 @@ param
VFin =
VPres Voice
| VPret Voice
| VImper Voice ;
| VPret Voice --# notpresent
| VImper Voice
;
VInf =
VInfin Voice
| VSupin Voice
| VPtPret AFormPos Case ;
| VSupin Voice --# notpresent
| VPtPret AFormPos Case
;
VPForm =
VPFinite Tense Anteriority
@@ -89,7 +91,7 @@ oper
vFin : Tense -> Voice -> VForm = \t,v -> case t of {
Pres => VF (VPres v) ;
Past => VF (VPret v) ;
Past => VF (VPret v) ; --# notpresent
_ => VI (VInfin v) --- not to be used?
} ;
@@ -141,10 +143,10 @@ oper
s = table {
VF (VPres Act) => finner ;
VF (VPres Pass) => mkVoice Pass finn ;
VF (VPret v) => mkVoice v fann ;
VF (VPret v) => mkVoice v fann ; --# notpresent
VF (VImper v) => mkVoice v finn ;
VI (VInfin v) => mkVoice v finna ;
VI (VSupin v) => mkVoice v funnit ;
VI (VSupin v) => mkVoice v funnit ; --# notpresent
VI (VPtPret a c)=> mkCase c (mkAdjPos a funnen funnet funna funna)
} ;
vtype = VAct

24
lib/resource-1.0/scandinavian/ResScand.gf
View File

@@ -24,7 +24,7 @@ interface ResScand = DiffScand ** open CommonScand, Prelude in {
_ => Act
} ;
vfin : Tense -> Str = \t -> verb.s ! vFin t diath ;
vsup = verb.s ! VI (VSupin diath) ;
vsup = verb.s ! VI (VSupin diath) ; --# notpresent
vinf = verb.s ! VI (VInfin diath) ;
har : Tense -> Str = \t -> verbHave.s ! vFin t Act ;
@@ -37,18 +37,20 @@ interface ResScand = DiffScand ** open CommonScand, Prelude in {
in {
s = table {
VPFinite t Simul => case t of {
Pres | Past => vf (vfin t) [] ;
Fut => vf auxFut vinf ;
Cond => vf auxCond vinf
} ;
VPFinite t Anter => case t of {
Pres | Past => vf (har t) vsup ;
Fut => vf auxFut (ha ++ vsup) ;
Cond => vf auxCond (ha ++ vsup)
-- Pres | Past => vf (vfin t) [] ; -- the general rule
Past => vf (vfin t) [] ; --# notpresent
Fut => vf auxFut vinf ; --# notpresent
Cond => vf auxCond vinf ; --# notpresent
Pres => vf (vfin t) []
} ;
VPFinite t Anter => case t of { --# notpresent
Pres | Past => vf (har t) vsup ; --# notpresent
Fut => vf auxFut (ha ++ vsup) ; --# notpresent
Cond => vf auxCond (ha ++ vsup) --# notpresent
} ; --# notpresent
VPImperat => vf (verb.s ! VF (VImper diath)) [] ;
VPInfinit Simul => vf [] vinf ;
VPInfinit Anter => vf [] (ha ++ vsup)
VPInfinit Anter => vf [] (ha ++ vsup) ; --# notpresent
VPInfinit Simul => vf [] vinf
} ;
a1 : Polarity => Str = negation ;
n2 : Agr => Str = \\a => case verb.vtype of {