resources and new instantiation syntax

This commit is contained in:
aarne
2005-02-04 19:17:57 +00:00
parent 0ace2a1a4b
commit 0796338380
48 changed files with 1699 additions and 1006 deletions

View File

@@ -79,12 +79,12 @@ oper
mkVerb : (_,_,_,_,_,_ : Str) -> Verbum =
\spise,spiser,spises,spiste,spist,spis -> {s = table {
VI (Inf v) => mkVoice v spise ;
VF (Pres m Act) => spiser ;
VF (Pres m Pass) => spises ;
VF (Pret m v) => mkVoice v spiste ;
VF (Pres Act) => spiser ;
VF (Pres Pass) => spises ;
VF (Pret v) => mkVoice v spiste ;
VI (Supin v) => mkVoice v spist ;
VI (PtPret c) => mkCase spist ! c ;
VF Imper => spis
VI (PtPret _ c) => mkCase spist ! c ; ---- GenNum
VF (Imper v) => mkVoice v spis
}
} ;

View File

@@ -22,17 +22,6 @@ instance SyntaxNor of SyntaxScand = TypesNor **
<Def, _> => Weak
} ;
deponentVerb : Verb -> Verb = \finna -> {
s = table {
VF (Pres m _) => finna.s ! VF (Pres m Pass) ;
VF (Pret m _) => finna.s ! VF (Pret m Pass) ;
VI (Inf _) => finna.s ! VI (Inf Pass) ;
VI (Supin _) => finna.s ! VI (Supin Pass) ;
v => finna.s ! v --- Imper !
} ;
s1 = finna.s1
} ;
verbFinnas : Verb =
deponentVerb (mkVerb "finne" "finner" "finnes" "fant" "funnet" "finn" ** {s1 = []}) ;
verbVara = mkVerb "være" "er" nonExist "var" "vært" "vær" ** {s1 = []} ;
@@ -112,10 +101,6 @@ instance SyntaxNor of SyntaxScand = TypesNor **
mkDeterminerSgGender3 : Str -> Str -> Str -> SpeciesP -> Determiner = \en,ei,ett ->
mkDeterminerSgGender (table {Utr Masc => en ; Utr NoMasc => ei ; Neutr => ett}) ;
adjPastPart : Verb -> Adjective = \verb -> {
s = \\af,c => verb.s1 ++ verb.s ! VI (PtPret c) ---- af
} ;
reflPron : Number -> Person -> Str = \n,p -> case <n,p> of {
<Sg,P1> => "meg" ;
<Sg,P2> => "deg" ;

View File

@@ -25,14 +25,5 @@ oper
param
AdjFormPos = Strong GenNum | Weak ;
VFin =
Pres Mode Voice
| Pret Mode Voice
| Imper ; --- no passive
VInf =
Inf Voice
| Supin Voice
| PtPret Case ; ---- number and gender
}