diff --git a/next-lib/src/romanian/BeschRon.gf b/next-lib/src/romanian/BeschRon.gf index ec9c98cb6..4511833ac 100644 --- a/next-lib/src/romanian/BeschRon.gf +++ b/next-lib/src/romanian/BeschRon.gf @@ -20,23 +20,6 @@ oper mkRV : Verbe -> V = \ve -> {s = ve ; lock_V = <>} ; -- the smart paradigm covers (60-70% cases for a reasonably big database) -- (statistical tests also needed) -oper regV : Str -> Verbe = \s -> -case s of -{ x + ("chea"|"ghea") => mkV61 s ; - x + "ea" => mkV69 s ; - x + "ca" => mkV8 s ; - x + "ga" => mkV9 s ; - x + "eia" => mkV11 s; - x + "ia" => mkV10 s; - x + "a" => mkV6 s ; - x + "e" => mkV79 s ; - x + "ui" => mkV121 s ; - x + "ii" => mkV120 s ; - x + "i" => mkV119 s ; - x + "î" => mkV141 s -}; - -oper mkV : Str -> V = \s -> mkNV (regV s) ; oper conj : Str -> Verbe = mkV6 ; diff --git a/next-lib/src/romanian/ParadigmsRon.gf b/next-lib/src/romanian/ParadigmsRon.gf index 57735c093..b3b493ca8 100644 --- a/next-lib/src/romanian/ParadigmsRon.gf +++ b/next-lib/src/romanian/ParadigmsRon.gf @@ -11,7 +11,8 @@ resource ParadigmsRon = (Predef=Predef), Prelude, MorphoRon, - CatRon in { + CatRon, + BeschRon in { flags optimize=all ; @@ -308,6 +309,28 @@ prefA a = {s = a.s ; isPre = True ; lock_A = <>} ; mkAdA x = ss x ** {lock_AdA = <>} ; +--Verbs : + +oper regV : Str -> Verbe = \s -> +case s of +{ x + ("chea"|"ghea") => mkV61 s ; + x + "ea" => mkV69 s ; + x + "ca" => mkV8 s ; + x + "ga" => mkV9 s ; + x + "eia" => mkV11 s; + x + "ia" => mkV10 s; + x + "a" => mkV6 s ; + x + "e" => mkV79 s ; + x + "ui" => mkV121 s ; + x + "ii" => mkV120 s ; + x + "i" => mkV119 s ; + x + "î" => mkV141 s +}; + +oper mkV : Str -> V = \s -> mkNV (regV s) ; + + + mkV2S : V -> Prep -> V2S ; -- mkVV : V -> VV ; mkV2V : V -> Prep -> Prep -> V2V ; diff --git a/next-lib/src/romanian/ResRon.gf b/next-lib/src/romanian/ResRon.gf index 945344d6c..08887f2c8 100644 --- a/next-lib/src/romanian/ResRon.gf +++ b/next-lib/src/romanian/ResRon.gf @@ -28,10 +28,10 @@ param param Size = sg | less20 | pl ; - Case = Acc | Dat | Gen ; + -- Case = Acc | Dat | Gen ; -- Adjectives are inflected in number, gender, have specific form for enclitic determined ---article, and specific forms for Nom-Accusative/Dative-Genitive/Voccative +--article, and specific forms for Nominative-Accusative/Dative-Genitive/Voccative AForm = AF Gender Number Species ACase | AA ; @@ -49,6 +49,11 @@ param CardOrd = NCard Gender | NOrd Gender; + + + + + --3 Verbs