forked from GitHub/gf-rgl
(Ara) small bugfixes
This commit is contained in:
@@ -28,7 +28,7 @@ concrete QuestionAra of Question = CatAra ** open ResAra, ParamX, Prelude, VerbA
|
||||
---- IL guessed
|
||||
-- : IComp -> NP -> QCl
|
||||
QuestIComp ic np =
|
||||
let vp = kaan (CompNP np) ;
|
||||
let vp = UseComp (CompNP np) ;
|
||||
ip : ResAra.IP = np ** { -- NP's s is already present in VP, we only want its agr
|
||||
s = \\_,_,_,_ => ic.s ! pgn2gn np.a.pgn } ;
|
||||
in QuestVP ip vp ;
|
||||
|
||||
@@ -569,8 +569,15 @@ v1defective_i : Root3 -> Vowel -> Verb = \bqy,vowImpf -> -- IL (conjugation 1d4)
|
||||
|
||||
v1doubleweak : Root3 -> Verb = \r'y ->
|
||||
let ry = r'y ** {c = ""} ;
|
||||
vforms : DefForms = \\x => rmSukun (v1DefForms_perfA ry a ! x) ; -- only remove the first sukun
|
||||
in verbDoubleDef vforms i ; -- sukun in suffixes is removed in verbDoubleDef
|
||||
vforms_doubleweak : DefForms = \\x => rmSukun (v1DefForms_perfA ry a ! x) ; -- only remove the first sukun
|
||||
vforms_weak : DefForms = v1DefForms_perfA r'y a ;
|
||||
vforms = table { 0 => vforms_weak ! 0 ; -- all perfect forms
|
||||
1 => vforms_weak ! 1 ;
|
||||
2 => vforms_weak ! 2 ;
|
||||
3 => vforms_weak ! 3 ;
|
||||
4 => vforms_weak ! 4 ;
|
||||
x => vforms_doubleweak ! x } ;
|
||||
in verbDoubleDef vforms a ; -- sukun in suffixes is removed in verbDoubleDef
|
||||
|
||||
|
||||
patDef1 : Vowel => Pattern =
|
||||
|
||||
Reference in New Issue
Block a user