1
0
forked from GitHub/gf-rgl

(Ara) fix pattern matching for geminate verbs in classes 1 and 7

This commit is contained in:
Inari Listenmaa
2019-01-01 17:42:35 +02:00
parent 33d20b15e4
commit 447126c713

View File

@@ -448,7 +448,7 @@ resource ParadigmsAra = open
\rootStr,vPerf,vImpf -> \rootStr,vPerf,vImpf ->
let root = mkRoot3 rootStr let root = mkRoot3 rootStr
in case rootStr of { in case rootStr of {
_ + "ّ" => v1geminate rootStr vPerf vImpf ; x@? + y@? + "ّ" => v1geminate (x+y+y) vPerf vImpf ;
? + #hamza + #weak => v1doubleweak root ; ? + #hamza + #weak => v1doubleweak root ;
? + ? + #weak => case vPerf of { ? + ? + #weak => case vPerf of {
i => v1defective_i root vImpf ; i => v1defective_i root vImpf ;
@@ -519,10 +519,10 @@ resource ParadigmsAra = open
v7 = v7 =
\rootStr -> \rootStr ->
let { let verb = case rootStr of {
fcl = mkRoot3 rootStr ; x@? + y@? + "ّ" => v7geminate (x+y+y) ;
v7fun = v7geminate ; -- TODO add rest _ => v7sound (mkRoot3 rootStr) }
} in lin V (v7fun fcl) ; in lin V verb ;
v8 = v8 =
\rootStr -> \rootStr ->
@@ -757,7 +757,7 @@ resource ParadigmsAra = open
mkVS = overload { mkVS = overload {
mkVS : V -> VS = \v -> lin VS (v ** {o = Subord; s2 = []}) ; mkVS : V -> VS = \v -> lin VS (v ** {o = Subord; s2 = []}) ;
mkVS : V -> Str -> VS = \v,s -> lin VS (v ** {o = Subord; s2 = s}) mkVS : V -> Str -> VS = \v,s -> lin VS (v ** {o = Subord; s2 = s})
} ; } ;
mkVQ v = lin VQ v ; mkVQ v = lin VQ v ;