mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-05-29 20:58:55 -06:00
started romance predication; some restructuring of modules; CheckGrammar value table bug fix
This commit is contained in:
@@ -1,12 +1,48 @@
|
||||
interface DiffRomance = open ResRomance, Prelude in {
|
||||
interface DiffRomance = open CommonRomance, Prelude in {
|
||||
|
||||
--2 Parameters.
|
||||
|
||||
--2 Constants whose definitions depend on language.
|
||||
|
||||
-- Prepositions that fuse with the article vary.
|
||||
|
||||
param
|
||||
|
||||
Prep ;
|
||||
VType ;
|
||||
|
||||
oper
|
||||
|
||||
dative : Case ;
|
||||
genitive : Case ;
|
||||
|
||||
prepCase : Case -> Str ;
|
||||
|
||||
partitive : Gender -> Case -> Str ;
|
||||
|
||||
reflPron : Number -> Person -> Str ;
|
||||
|
||||
artDef : Gender -> Number -> Case -> Str ;
|
||||
artIndef : Gender -> Number -> Case -> Str ;
|
||||
|
||||
auxVerb : VType -> (VF => Str) ;
|
||||
negation : Polarity => (Str * Str) ;
|
||||
copula : Verb ;
|
||||
|
||||
-- These needed above.
|
||||
|
||||
param
|
||||
Case = Nom | Acc | CPrep Prep ;
|
||||
|
||||
oper
|
||||
Verb = {s : VF => Str ; vtyp : VType} ;
|
||||
|
||||
}
|
||||
|
||||
{-
|
||||
|
||||
--2 Constants uniformly defined in terms of language-dependent constants
|
||||
|
||||
param
|
||||
|
||||
Case = Nom | Acc | CPrep Prep ;
|
||||
|
||||
@@ -14,17 +50,11 @@ param
|
||||
|
||||
RelForm = RSimple Case | RComplex Gender Number Case ;
|
||||
|
||||
VAux ;
|
||||
|
||||
oper
|
||||
|
||||
Compl : Type = {s : Str ; c : Case} ;
|
||||
|
||||
dative : Case ;
|
||||
genitive : Case ;
|
||||
|
||||
prepCase : Case -> Str ;
|
||||
|
||||
npform2case : NPForm -> Case = \p -> case p of {
|
||||
Ton x => x ;
|
||||
Aton x => x ;
|
||||
@@ -46,10 +76,51 @@ oper
|
||||
appCompl : Compl -> (NPForm => Str) -> Str = \comp,np ->
|
||||
comp.s ++ np ! Ton comp.c ;
|
||||
|
||||
artDef : Gender -> Number -> Case -> Str ;
|
||||
artIndef : Gender -> Number -> Case -> Str ;
|
||||
|
||||
partitive : Gender -> Case -> Str ;
|
||||
Verb = {s : VF => Str ; aux : VAux ; isRefl : Bool} ;
|
||||
{-
|
||||
predV : Verb -> VP = \verb ->
|
||||
let
|
||||
diath = case verb.vtype of {
|
||||
VPass => Pass ;
|
||||
_ => Act
|
||||
} ;
|
||||
vfin : Tense -> Str = \t -> verb.s ! vFin t diath ;
|
||||
vsup = verb.s ! VI (VSupin diath) ;
|
||||
vinf = verb.s ! VI (VInfin diath) ;
|
||||
|
||||
har : Tense -> Str = \t -> verbHave.s ! vFin t Act ;
|
||||
ha : Str = verbHave.s ! VI (VInfin Act) ;
|
||||
|
||||
vf : Str -> Str -> {fin,inf : Str} = \fin,inf -> {
|
||||
fin = fin ; inf = inf
|
||||
} ;
|
||||
|
||||
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)
|
||||
} ;
|
||||
VPImperat => vf (verb.s ! VF (VImper diath)) [] ;
|
||||
VPInfinit Simul => vf [] vinf ;
|
||||
VPInfinit Anter => vf [] (ha ++ vsup)
|
||||
} ;
|
||||
a1 : Polarity => Str = negation ;
|
||||
n2 : Agr => Str = \\a => case verb.vtype of {
|
||||
VRefl => reflPron a ;
|
||||
_ => []
|
||||
} ;
|
||||
a2 : Str = [] ;
|
||||
ext : Str = [] ;
|
||||
en2,ea2,eext : Bool = False -- indicate if the field exists
|
||||
} ;
|
||||
-}
|
||||
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user