Attempto complete up to spec

This commit is contained in:
aarne
2008-11-15 20:08:09 +00:00
parent b13c62f71b
commit d67c87b7d8
14 changed files with 71 additions and 13 deletions

View File

@@ -1378,6 +1378,13 @@ incomplete resource Constructors = open Grammar in {
= AdvIP
} ;
mkIDet = overload {
mkIDet : IQuant -> Num -> IDet -- which (songs)
= \i,nu -> IdetQuant i nu ;
mkIDet : IQuant -> IDet -- which (song)
= \i -> IdetQuant i NumSg ;
} ;
whichSg_IDet : IDet = IdetQuant which_IQuant NumSg ;
whichPl_IDet : IDet = IdetQuant which_IQuant NumPl ;

View File

@@ -9,5 +9,7 @@ oper
{s = x ; lock_Subj = <>} ;
mkNP : Str -> Number -> NP = \s,n ->
regNP s n ** {lock_NP = <>} ;
mkIDet : Str -> Number -> IDet = \s,n ->
{s = s ; n = n ; lock_IDet = <>} ;
}

View File

@@ -10,4 +10,7 @@ oper
mkSubjSubj : Str -> Subj = \x ->
{s = x ; m = Conjunct ; lock_Subj = <>} ;
mkIQuant : Str -> IQuant = \s ->
{s = \\_,_,c => prepCase c ++ s ; lock_IQuant = <>} ;
}

View File

@@ -7,5 +7,7 @@ oper
{s1 = x ; s2 = y ; n = n ; lock_Conj = <>} ;
mkSubj : Str -> Subj = \x ->
{s = x ; lock_Subj = <>} ;
mkIQuant : Str -> IQuant = \s ->
{s = \\_,_,_ => s ; lock_IQuant = <>} ;
}

View File

@@ -1,11 +1,19 @@
--# -path=.:../scandinavian:../common:../abstract
resource MakeStructuralSwe = open CatSwe, ParadigmsSwe, MorphoSwe, Prelude in {
resource MakeStructuralSwe = open CatSwe, ParadigmsSwe,
(P=ParadigmsSwe), MorphoSwe, Prelude in {
oper
mkConj : Str -> Str -> Number -> Conj = \x,y,n ->
mkConj : Str -> Str -> P.Number -> Conj = \x,y,n ->
{s1 = x ; s2 = y ; n = n ; lock_Conj = <>} ;
mkSubj : Str -> Subj = \x ->
{s = x ; lock_Subj = <>} ;
mkIQuant : Str -> Str -> Str -> DetSpecies -> IQuant = \vilken,vilket,vilka,d ->
{s = table (P.Number)
[table (P.Gender) [vilken;vilket] ; table (P.Gender) [vilka;vilka]] ;
det = d ; lock_IQuant = <>} ;
dDefIndef : DetSpecies = DDef Indef ;
---- other DetSpecies
}