GitHub/gf-rgl
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-rgl.git synced 2026-05-27 17:08:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

fixed imperative prefix

Browse Source
This commit is contained in:
Laurette Marais
2022-05-10 08:21:22 +02:00
parent 8b05843585
commit f58d0358cc
2 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/zulu/ResZul.gf
View File

@@ -1204,6 +1204,11 @@ resource ResZul = open Prelude,Predef,ParamX in {
-- FutTense => subjConcLookup ! agr ! SC ++BIND++ "zobe" -- FutTense => subjConcLookup ! agr ! SC ++BIND++ "zobe"
-- } ; -- } ;
impPref : Polarity -> Str = \pol -> case pol of {
Pos => [] ;
Neg => "u" ++BIND++ "nga"
} ;
icomp_pref : VForm -> Agr -> Str = \vform,agr -> icomp_pref : VForm -> Agr -> Str = \vform,agr ->
let let
neg1 = icompNeg1 vform ; neg1 = icompNeg1 vform ;

53
src/zulu/SentenceZul.gf
View File

@@ -118,39 +118,38 @@ concrete SentenceZul of Sentence = CatZul ** open Prelude,ResZul,ParamX in {
subj = np.s!NFull ; subj = np.s!NFull ;
vform_main = VFIndic MainCl p t ; vform_main = VFIndic MainCl p t ;
in in
subj impPref p
++ (imp_verb_prefix vp p t np.agr)
++ vp.s!MainCl!np.agr!p!t ++ vp.s!MainCl!np.agr!p!t
++ vp.iadv ++ vp.iadv
++ vp.comp ++ vp.comp
++ vp.advs ++ vp.advs
} ; } ;
imp_verb_prefix : VP -> Polarity -> BasicTense -> Agr -> Str = \vp,p,t,agr -> -- imp_verb_prefix : VP -> Polarity -> BasicTense -> Agr -> Str = \vp,p,t,agr ->
let -- let
-- vow = case <vp.hasComp,vp.r,p,t> of { -- -- vow = case <vp.hasComp,vp.r,p,t> of {
vow = case <vp.hasComp,p,t,vp.r> of { -- vow = case <vp.hasComp,p,t,vp.r> of {
<False,Pos,PresTense,RC> => False ; -- force the compiler to understand the table -- <False,Pos,PresTense,RC> => False ; -- force the compiler to understand the table
<False,Pos,PresTense,_> => False ; -- long form ya -- <False,Pos,PresTense,_> => False ; -- long form ya
--
<_,_,PresTense,RC> => False ; -- <_,_,PresTense,RC> => False ;
<_,_,PresTense,_> => True ; -- <_,_,PresTense,_> => True ;
-- <_,Pos,PerfTense,RC> => False ; -- -- <_,Pos,PerfTense,RC> => False ;
-- <_,Pos,PerfTense,_> => True ; -- -- <_,Pos,PerfTense,_> => True ;
<_,_,PastTense,RC> => False ; -- <_,_,PastTense,RC> => False ;
<_,_,PastTense,_> => True ; -- <_,_,PastTense,_> => True ;
<_,_,RemPastTense,RC> => False ; -- <_,_,RemPastTense,RC> => False ;
<_,_,RemPastTense,_> => True ; -- <_,_,RemPastTense,_> => True ;
<_,_,_,_> => False -- <_,_,_,_> => False
} ; -- } ;
vform = VFIndic MainCl p t -- vform = VFIndic MainCl p t
in -- in
(negPref vform) -- (negPref vform)
-- ++ (exclSePref vform_main) -- -- ++ (exclSePref vform_main)
++ (subjConc vform agr vow) -- ++ (subjConc vform agr vow)
-- ++ (negPref2 vform_main) -- -- ++ (negPref2 vform_main)
-- ++ (tensePref vform) -- -- ++ (tensePref vform)
; -- ;
cl_with_verb_predicate : NP -> VP -> { s : Polarity => BasicTense => Str } = \np,vp -> { cl_with_verb_predicate : NP -> VP -> { s : Polarity => BasicTense => Str } = \np,vp -> {
s = \\p,t => s = \\p,t =>