msyds/gf-rgl
1
0
Fork 0
forked from GitHub/gf-rgl
Code Pull Requests Activity

Merge branch 'master' of https://github.com/GrammaticalFramework/GF

Browse Source
This commit is contained in:
Inari Listenmaa
2017-12-20 10:27:23 +01:00
parent 0e2cf3e9a3 3338c891bc
commit b8714eada0
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/german/ResGer.gf
View File

@@ -755,14 +755,14 @@ resource ResGer = ParamX ** open Prelude in {
infVP : Bool -> VP -> ((Agr => Str) * Str * Str * Str) = \isAux, vp -> let vps = useVP vp in infVP : Bool -> VP -> ((Agr => Str) * Str * Str * Str) = \isAux, vp -> let vps = useVP vp in
< <
\\agr => (vp.nn ! agr).p1 ++ (vp.nn ! agr).p2 ++ vp.a2, \\agr => (vp.nn ! agr).p1 ++ (vp.nn ! agr).p2 ++ vp.a2,
vp.a1 ! Pos ++ (vps.s ! (notB isAux) ! agrP3 Sg ! VPInfinit Simul).inf, vp.a1 ! Pos ++ vp.adj ++ (vps.s ! (notB isAux) ! agrP3 Sg ! VPInfinit Simul).inf,
vp.inf, vp.inf,
vp.ext vp.infExt ++ vp.ext
> ; > ;
useInfVP : Bool -> VP -> Str = \isAux,vp -> useInfVP : Bool -> VP -> Str = \isAux,vp ->
let vpi = infVP isAux vp in let vpi = infVP isAux vp in
vpi.p1 ! agrP3 Sg ++ vpi.p3 ++ vpi.p2 ; vpi.p1 ! agrP3 Sg ++ vpi.p3 ++ vpi.p2 ++ vpi.p4 ;
-- The nominative case is not used as reflexive, but defined here -- The nominative case is not used as reflexive, but defined here
-- so that we can reuse this in personal pronouns. -- so that we can reuse this in personal pronouns.

4
src/persian/SymbolPes.gf
View File

@@ -7,8 +7,8 @@ concrete SymbolPes of Symbol = CatPes ** open Prelude, ResPes in {
lin lin
-- SymbPN i = {s = \\_ => i.s ; g = Masc} ; -- SymbPN i = {s = \\_ => i.s ; g = Masc} ;
SymbPN i = {s = i.s ; animacy = Inanimate} ; -- "از" is removed for Phrasebook SymbPN i = {s = i.s ; animacy = Inanimate} ; -- "از" is removed for Phrasebook
IntPN i = {s = i.s ++ "از" ; animacy = Inanimate} ; IntPN i = {s = i.s ; animacy = Inanimate} ;
FloatPN i = {s = i.s ++ "از" ; animacy = Inanimate} ; FloatPN i = {s = i.s ; animacy = Inanimate} ;
NumPN i = {s = i.s ; animacy = Inanimate} ; NumPN i = {s = i.s ; animacy = Inanimate} ;
CNIntNP cn i = { CNIntNP cn i = {
s = \\ez => cn.s ! aEzafa ! Sg ++ i.s ; s = \\ez => cn.s ! aEzafa ! Sg ++ i.s ;