forked from GitHub/gf-core
bug fixes in swe paradigms
This commit is contained in:
@@ -1,3 +1,4 @@
|
|||||||
--# -path=.:../../prelude
|
--# -path=.:../../prelude
|
||||||
|
|
||||||
|
---- abstract Resource = Rules, Verbphrase ** {} ;
|
||||||
abstract Resource = Rules, Clause, Structural ** {} ;
|
abstract Resource = Rules, Clause, Structural ** {} ;
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
--# -path=.:../abstract:../../prelude
|
--# -path=.:../abstract:../../prelude
|
||||||
|
|
||||||
concrete ResourceEng of Resource = RulesEng, ClauseEng, StructuralEng ** {} ;
|
concrete ResourceEng of Resource = RulesEng, ClauseEng, StructuralEng ** {} ;
|
||||||
|
---- concrete ResourceEng of Resource = RulesEng, VerbphraseEng ** {} ;
|
||||||
|
|||||||
@@ -31,7 +31,8 @@ oper
|
|||||||
let
|
let
|
||||||
l = last bil ;
|
l = last bil ;
|
||||||
b = Predef.tk 2 bil ;
|
b = Predef.tk 2 bil ;
|
||||||
ar = Predef.dp 2 bilar
|
ar = Predef.dp 2 bilar ;
|
||||||
|
bile = Predef.tk 2 bilar
|
||||||
in
|
in
|
||||||
case ar of {
|
case ar of {
|
||||||
"or" => case l of {
|
"or" => case l of {
|
||||||
@@ -40,14 +41,21 @@ oper
|
|||||||
"o" => mkNoun bil (bil + "n") bilar (bilar + "na") ;
|
"o" => mkNoun bil (bil + "n") bilar (bilar + "na") ;
|
||||||
_ => mkNoun bil (bil + "en") bilar (bilar + "na")
|
_ => mkNoun bil (bil + "en") bilar (bilar + "na")
|
||||||
} ;
|
} ;
|
||||||
"ar" => ifTok Subst (Predef.tk 2 bilar) bil
|
"ar" => ifTok Subst bil bilar
|
||||||
|
(decl5Noun bil)
|
||||||
|
(ifTok Subst bile bil
|
||||||
(decl2Noun bil)
|
(decl2Noun bil)
|
||||||
(case l of {
|
(case l of {
|
||||||
"e" => decl2Noun bil ;
|
"e" => decl2Noun bil ; -- pojke-pojkar
|
||||||
_ => mkNoun bil (bil + "n") bilar (bilar + "na")
|
_ => mkNoun bil (bile + "en") bilar (bilar + "na") -- mun-munnar
|
||||||
}
|
}
|
||||||
) ;
|
)
|
||||||
"er" => decl3Noun bil ;
|
) ;
|
||||||
|
"er" => case l of {
|
||||||
|
"e" => sVarelse (init bil) ;
|
||||||
|
"å" => sNivå bil ;
|
||||||
|
_ => mkNoun bil (bil + "en") (bilar) (bilar + "na")
|
||||||
|
} ;
|
||||||
"en" => ifTok Subst bil bilar (sLik bil) (sRike bil) ; -- ben-ben
|
"en" => ifTok Subst bil bilar (sLik bil) (sRike bil) ; -- ben-ben
|
||||||
_ => ifTok Subst bil bilar (
|
_ => ifTok Subst bil bilar (
|
||||||
case Predef.dp 3 bil of {
|
case Predef.dp 3 bil of {
|
||||||
@@ -77,6 +85,7 @@ oper
|
|||||||
decl2Noun : Str -> Subst = \bil ->
|
decl2Noun : Str -> Subst = \bil ->
|
||||||
case last bil of {
|
case last bil of {
|
||||||
"e" => sPojke (init bil) ;
|
"e" => sPojke (init bil) ;
|
||||||
|
"o" | "u" | "y" => mkNoun bil (bil + "n") (bil + "ar") (bil + "arna") ;
|
||||||
_ => mkNoun bil (bil + "en") (bil + "ar") (bil + "arna")
|
_ => mkNoun bil (bil + "en") (bil + "ar") (bil + "arna")
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
--# -path=.:../scandinavian:../abstract:../../prelude
|
--# -path=.:../scandinavian:../abstract:../../prelude
|
||||||
|
|
||||||
|
---- concrete ResourceSwe of Resource = RulesSwe, VerbphraseSwe ** {} ;
|
||||||
concrete ResourceSwe of Resource = RulesSwe, StructuralSwe, ClauseSwe ** {} ;
|
concrete ResourceSwe of Resource = RulesSwe, StructuralSwe, ClauseSwe ** {} ;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user