GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-05-19 16:12:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

some fixes with Romance clitics and imperatives

Browse Source
This commit is contained in:
aarne
2013-02-20 15:27:54 +00:00
parent 5a54596fe8
commit 48204048d3
7 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/src/french/DiffFre.gf
View File

@@ -122,7 +122,7 @@ instance DiffFre of DiffRomance = open CommonRomance, PhonoFre, Prelude in {
num = if_then_else Number b Pl n ; num = if_then_else Number b Pl n ;
verb = vp.s.s ! vImper num p ; verb = vp.s.s ! vImper num p ;
neg = vp.neg ! pol ; neg = vp.neg ! pol ;
clpr = <vp.clit1 ++ vp.clit2, False> ; ---- TODO: True if clit clpr = <vp.clit1 ++ vp.clit2, False> ; ---- TODO: True if clit
compl = vp.comp ! agr ++ vp.ext ! pol compl = vp.comp ! agr ++ vp.ext ! pol
in in
case pol of { case pol of {

2
lib/src/french/IrregFre.gf
View File

@@ -33,7 +33,7 @@ lin
asseoir_V2 = v_besch49 "asseoir" ** {vtyp = VHabere ; lock_V2 = <> ; c2 = complAcc} ; asseoir_V2 = v_besch49 "asseoir" ** {vtyp = VHabere ; lock_V2 = <> ; c2 = complAcc} ;
astreindre_V2 = v_besch57 "astreindre" ** {vtyp = VHabere ; lock_V2 = <> ; c2 = complAcc} ; astreindre_V2 = v_besch57 "astreindre" ** {vtyp = VHabere ; lock_V2 = <> ; c2 = complAcc} ;
atteindre_V2 = v_besch57 "atteindre" ** {vtyp = VHabere ; lock_V2 = <> ; c2 = complAcc} ; atteindre_V2 = v_besch57 "atteindre" ** {vtyp = VHabere ; lock_V2 = <> ; c2 = complAcc} ;
attendre_V2 = v_besch53 "attendre" ** {vtyp = VHabere ; lock_V2 = <> ; c2 = complDat} ; attendre_V2 = v_besch53 "attendre" ** {vtyp = VHabere ; lock_V2 = <> ; c2 = complAcc} ; --- Dat?
avoir_V2 = v_besch1 "avoir" ** {vtyp = VHabere ; lock_V2 = <> ; c2 = complAcc} ; avoir_V2 = v_besch1 "avoir" ** {vtyp = VHabere ; lock_V2 = <> ; c2 = complAcc} ;
battre_V2 = v_besch55 "battre" ** {vtyp = VHabere ; lock_V2 = <> ; c2 = complAcc} ; battre_V2 = v_besch55 "battre" ** {vtyp = VHabere ; lock_V2 = <> ; c2 = complAcc} ;
boire_V2 = v_besch69 "boire" ** {vtyp = VHabere ; lock_V2 = <> ; c2 = complAcc} ; boire_V2 = v_besch69 "boire" ** {vtyp = VHabere ; lock_V2 = <> ; c2 = complAcc} ;

2
lib/src/french/LexiconFre.gf
View File

@@ -200,7 +200,7 @@ lin
understand_V2 = comprendre_V2 ; understand_V2 = comprendre_V2 ;
university_N = regGenN "université" feminine ; university_N = regGenN "université" feminine ;
village_N = regGenN "village" masculine ; village_N = regGenN "village" masculine ;
wait_V2 = attendre_V2 ; ---- dative? wait_V2 = attendre_V2 ;
walk_V = regV "marcher" ; walk_V = regV "marcher" ;
warm_A = regA "chaud" ; warm_A = regA "chaud" ;
war_N = regGenN "guerre" masculine ; war_N = regGenN "guerre" masculine ;

4
lib/src/italian/DiffIta.gf
View File

@@ -115,11 +115,11 @@ instance DiffIta of DiffRomance = open CommonRomance, PhonoIta, BeschIta, Prelud
agr = {g = g ; n = n ; p = pe} ; agr = {g = g ; n = n ; p = pe} ;
clpr = <vp.clit1 ++ vp.clit2,[],False> ; ---- TODO: True is clit clpr = <vp.clit1 ++ vp.clit2,[],False> ; ---- TODO: True is clit
verb = case <n,pol,pe> of { verb = case <n,pol,pe> of {
<Sg,RNeg False,P2> => vp.s.s ! VInfin clpr.p3 ; ---- ! aag ; <Sg, RNeg False, P2> => vp.s.s ! VInfin clpr.p3 ; ---- ! aag ;
_ => vp.s.s ! vImper n pe _ => vp.s.s ! vImper n pe
} ; } ;
neg = vp.neg ! pol ; neg = vp.neg ! pol ;
compl = clpr.p1 ++ vp.comp ! agr ++ vp.ext ! pol compl = vp.comp ! agr ++ vp.ext ! pol
in in
neg.p1 ++ verb ++ bindIf clpr.p3 ++ clpr.p1 ++ compl ; neg.p1 ++ verb ++ bindIf clpr.p3 ++ clpr.p1 ++ compl ;
---- TODO non mi mangi ---- TODO non mi mangi

2
lib/src/italian/LexiconIta.gf
View File

@@ -200,7 +200,7 @@ lin
understand_V2 = dirV2 (regV "capire") ; understand_V2 = dirV2 (regV "capire") ;
university_N = regN "università" ; university_N = regN "università" ;
village_N = regN "paese" ; village_N = regN "paese" ;
wait_V2 = mkV2 (regV "aspettare") ParadigmsIta.dative ; wait_V2 = mkV2 (regV "aspettare") ;
walk_V = regV "camminare" ; walk_V = regV "camminare" ;
warm_A = regADeg "caldo" ; warm_A = regADeg "caldo" ;
war_N = regN "guerra" ; war_N = regN "guerra" ;

2
lib/src/romance/CommonRomance.gf
View File

@@ -134,7 +134,7 @@ oper
<Sg,P2> => VImper SgP2 ; <Sg,P2> => VImper SgP2 ;
<Pl,P1> => VImper PlP1 ; <Pl,P1> => VImper PlP1 ;
<Pl,P2> => VImper PlP2 ; <Pl,P2> => VImper PlP2 ;
_ => VInfin False _ => VFin (VPres Conjunct) n p
} ; } ;
{- {-

2
lib/src/romance/DiffRomance.gf
View File

@@ -96,7 +96,7 @@ interface DiffRomance = open CommonRomance, Prelude in {
auxPassive : Verb ; auxPassive : Verb ;
--2 Contants needed in type signatures above --2 Constants needed in type signatures above
param param
Case = Nom | Acc | CPrep Prepos ; Case = Nom | Acc | CPrep Prepos ;