From 4fd6d6b0c4a1c4817c203c77f054499f186a7801 Mon Sep 17 00:00:00 2001 From: "virk.shafqat" Date: Thu, 29 Mar 2012 09:06:24 +0000 Subject: [PATCH] extraParadigmsHin --- lib/src/hindi/ParadigmsHin.gf | 20 +++++++++++++++++--- lib/src/hindustani/SentenceHindustani.gf | 2 +- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/lib/src/hindi/ParadigmsHin.gf b/lib/src/hindi/ParadigmsHin.gf index c24025086..cbea78561 100644 --- a/lib/src/hindi/ParadigmsHin.gf +++ b/lib/src/hindi/ParadigmsHin.gf @@ -76,6 +76,8 @@ oper } ; mkIrregA : Str -> A = \str -> makeIrregA str ; + mkA2 : A -> Str -> A2 ; + mkA2 a str = a ** {c2=str ; lock_A2 = <>} ; --2 Verbs @@ -95,6 +97,9 @@ oper mkV3 v p q = v ** { c2 = p ; c3 = q ; lock_V3 = <>} ; mkV2V : V -> Str -> Str -> Bool -> V2V ; mkV2V v s1 s2 b = v ** {isAux = b ; c1 = s1 ; c2 = s2 ; lock_V2V = <>} ; + dirV2 : V -> V2 = \v -> v ** {c2 = {s = [] ; c = VTrans} ; lock_V2 = <>} ; + dirdirV3 : V -> V3 ; + dirdirV3 v = v ** { c2 = [] ; c3 = [] ; lock_V3 = <>} ; -- compund verbs compoundV = overload { @@ -157,15 +162,23 @@ oper lin Conj (sd2 x y ** {n = n}) ; -- mkV0 : V -> V0 ; --- mkVS : V -> VS ; + mkVS : V -> VS; -- e.g drna + mkVS v = v ; -- mkV2S : V -> Prep -> V2S ; - mkVV : V -> VV = \v -> lin VV (v ** {isAux = False}); + mkVV : V -> VV = -- e.g cahna + \v -> lin VV (v ** {isAux = False}); + mkAdA : Str -> AdA ; +-- mkAdv x = lin Adv (ss x) ; +-- mkAdV x = lin AdV (ss x) ; + mkAdA x = lin AdA (ss x) ; +-- mkAdN x = lin AdN (ss x) ; -- mkV2V : V -> Prep -> Prep -> V2V ; -- mkVA : V -> VA ; -- mkV2A : V -> Prep -> V2A ; --- mkVQ : V -> VQ ; + mkVQ : V -> VQ ; -- e.g janna + mkVQ v = v ; -- mkV2Q : V -> Prep -> V2Q ; -- -- mkAS : A -> AS ; @@ -179,6 +192,7 @@ oper -- V0 : Type ; -- AS, A2S, AV, A2V : Type ; -- +-- ----. ----2 Definitions of paradigms ---- diff --git a/lib/src/hindustani/SentenceHindustani.gf b/lib/src/hindustani/SentenceHindustani.gf index affedc3ea..87e34b5c1 100644 --- a/lib/src/hindustani/SentenceHindustani.gf +++ b/lib/src/hindustani/SentenceHindustani.gf @@ -99,7 +99,7 @@ incomplete concrete SentenceHindustani of Sentence = } ; AdvS a s = {s = a.s ! Masc ++ s.s} ; - ExtAdvS a s = {s = a.s ! Masc ++ s.s} ; ---- with comma? added by AR 5/3/2012 + ExtAdvS a s = {s = a.s ! Masc ++ "," ++ s.s} ; RelS s r = {s = s.s ++ r.s ! agrP3 Masc Sg} ; SSubjS s sj s = { s = s.s ++ sj.s ++ s.s};