extending romance, bug fixes in scandinavian

This commit is contained in:
aarne
2005-02-23 20:13:54 +00:00
parent afcc53fb92
commit d669e538d6
9 changed files with 90 additions and 93 deletions

View File

@@ -11,15 +11,9 @@ instance SyntaxSwe of SyntaxScand = TypesSwe **
oper
extCommNounMasc : Subst -> CommNoun = \sb ->
{s = \\n,b,c => sb.s ! SF n b c ;
g = NUtr Masc
} ;
npMan : NounPhrase = nameNounPhrase (mkProperName "man" (NUtr Masc)) ;
npDet : NounPhrase = nameNounPhrase (mkProperName "det" NNeutr) ;
mkAdjForm : Species -> Number -> NounGender -> AdjFormPos = \b,n,g ->
case <b,n> of {
<Indef,Sg> => Strong (ASg (genNoun g)) ;
@@ -119,13 +113,13 @@ instance SyntaxSwe of SyntaxScand = TypesSwe **
progressiveVerbPhrase : VerbPhrase -> VerbGroup =
complVerbVerb
(mkVerb "hålla" "håller" "håll" "höll" "hållit" "hållen" **
(mkVerbPart "hålla" "håller" "håll" "höll" "hållit" "hållen" "på" **
{isAux = False}) ;
progressiveClause : NounPhrase -> VerbPhrase -> Clause = \np,vp ->
predVerbGroupClause np
(complVerbVerb
(mkVerb "hålla" "håller" "håll" "höll" "hållit" "hållen" **
(mkVerbPart "hålla" "håller" "håll" "höll" "hållit" "hållen" "på" **
{isAux = False}) ---- ;{s3 = ["på att"]})
vp) ;

View File

@@ -20,7 +20,7 @@ lin
Finnish = extAdjective (aFin "finsk") ;
Happy = aFin "lycklig" ;
Married = extAdjective (aAbstrakt "gift") ** {s2 = "med"} ;
Man = extCommNounMasc man_1144 ;
Man = extCommNoun man_1144 ;
Bar = extCommNoun (sSak "bar") ;
Bottle = extCommNoun (sApa "flask") ;
Woman = extCommNoun (sApa "kvinn") ;
@@ -44,7 +44,7 @@ lin
SwitchOff = mkDirectVerb (vLeka "stäng" ** {s1 = "av"}) ;
Mother = mkFun (extCommNoun mor_1) "till" ;
Uncle = mkFun (extCommNounMasc farbror_8) "till" ;
Uncle = mkFun (extCommNoun farbror_8) "till" ;
Connection = mkFun (extCommNoun (sVarelse "förbindelse")) "från" **
{s3 = "till"} ;