From 6bf31fa9ec67a91a114d294d847ea4ff19a4bd72 Mon Sep 17 00:00:00 2001 From: Inari Listenmaa Date: Thu, 18 Apr 2019 18:44:44 +0200 Subject: [PATCH] (Pes) misc small fixes and additions Co-Authored-By: Nasrin Mostofian --- src/persian/LexiconPes.gf | 2 +- src/persian/ResPes.gf | 10 ++++++---- src/persian/StructuralPes.gf | 2 +- src/persian/SymbolPes.gf | 4 ++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/persian/LexiconPes.gf b/src/persian/LexiconPes.gf index 5207e035c..28ca642ea 100644 --- a/src/persian/LexiconPes.gf +++ b/src/persian/LexiconPes.gf @@ -215,7 +215,7 @@ concrete LexiconPes of Lexicon = CatPes ** woman_N = mkN02 "زن" animate; wonder_VQ = compoundV "متعجب" beVerb ; wood_N = mkN01 "چوب" inanimate; - write_V2 = mkV2 (mkV "نوشتن" "نویس") "را" ; + write_V2 = mkV2 (mkV "نوشتن" "نویس") ; -- would need ra with a definite object, but better rule of thumb to go without ra /NM yellow_A = mkA "زرد" ; young_A = mkA "جوان""جوانانه" ; do_V2 = mkV2 (compoundV "انجام" giveVerb) "را"; diff --git a/src/persian/ResPes.gf b/src/persian/ResPes.gf index 22b3bbc1c..a9a06f4aa 100644 --- a/src/persian/ResPes.gf +++ b/src/persian/ResPes.gf @@ -131,11 +131,13 @@ oper predVc : (Verb ** {c2 : Compl}) -> VPHSlash = \verb -> predV verb ** vs verb.c2 ; - passV : Verb -> VPH = \v -> predV v ** { + passV : Verb -> VPH = \v -> passVP (predV v) ; + + passVP : VPH -> VPH = \vp -> vp ** { s = becomeVerb.s ; - prefix = case v.passive of { - Add => v.s ! PerfStem ++ v.prefix ; - Replace => v.prefix + prefix = case vp.passive of { + Add => vp.s ! PerfStem ++ vp.prefix ; + Replace => vp.prefix } ; } ; -- --------------------- diff --git a/src/persian/StructuralPes.gf b/src/persian/StructuralPes.gf index 6ecc2817f..e4d0c1fd9 100644 --- a/src/persian/StructuralPes.gf +++ b/src/persian/StructuralPes.gf @@ -26,7 +26,7 @@ concrete StructuralPes of Structural = CatPes ** either7or_DConj = sd2 "یا" "یا" ** {n = Sg} ; -- everybody_NP = R.indeclNP "هر کwی"; every_Det = mkDet "هر" Sg ; --- everything_NP = R.indeclNP ["هر XE"])); + everything_NP = DetCN (mkDet "همه" Sg) (UseN (mkN "چیز")) ; everywhere_Adv = ss ["هر جا"] ; few_Det = mkDet ["تعداد کمی"] Pl True; -- check for_Prep = mkPrep "برای" Ezafe ; diff --git a/src/persian/SymbolPes.gf b/src/persian/SymbolPes.gf index 59f02f6c7..26298aedc 100644 --- a/src/persian/SymbolPes.gf +++ b/src/persian/SymbolPes.gf @@ -24,8 +24,8 @@ concrete SymbolPes of Symbol = CatPes ** open Prelude, ResPes in { } ; SymbS sy = {s = \\_ => sy.s} ; - SymbNum sy = { s = sy.s ; n = Pl } ; - SymbOrd sy = { s = sy.s ++ "wN" ; n = Pl; isNum,isPre=False} ; + SymbNum sy = {s = sy.s ; n = Pl} ; + SymbOrd sy = {s = sy.s ; n = Sg ; isNum,isPre=False} ; lincat