GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-23 19:42:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

restored the use of conjunctCase in romance

Browse Source
This commit is contained in:
aarne
2011-08-31 11:56:09 +00:00
parent 38db834a65
commit 40022d7af9
6 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/src/catalan/DiffCat.gf
View File

@@ -50,9 +50,9 @@ oper
_ => prepCase c ++ artDef g Sg (CPrep P_de) _ => prepCase c ++ artDef g Sg (CPrep P_de)
} ; } ;
conjunctCase : NPForm -> NPForm = \c -> case c of { conjunctCase : Case -> Case = \c -> case c of {
Ton Nom | Aton Nom => Ton Nom ; Nom => Nom ;
_ => Ton Acc _ => Acc
} ; } ;
auxVerb : VType -> (VF => Str) = \_ -> haver_V.s ; auxVerb : VType -> (VF => Str) = \_ -> haver_V.s ;

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

@@ -47,10 +47,7 @@ instance DiffFre of DiffRomance = open CommonRomance, PhonoFre, Prelude in {
_ => prepCase c ++ artDef g Sg (CPrep P_de) _ => prepCase c ++ artDef g Sg (CPrep P_de)
} ; } ;
conjunctCase : NPForm -> NPForm = \c -> case c of { conjunctCase : Case -> Case = \c -> c ;
Aton k => Ton k ;
_ => c
} ;
auxVerb : VType -> (VF => Str) = \vtyp -> case vtyp of { auxVerb : VType -> (VF => Str) = \vtyp -> case vtyp of {
VHabere => avoir_V.s ; VHabere => avoir_V.s ;

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

@@ -62,9 +62,9 @@ instance DiffIta of DiffRomance = open CommonRomance, PhonoIta, BeschIta, Prelud
_ => prepCase c ++ artDef g Sg (CPrep P_di) _ => prepCase c ++ artDef g Sg (CPrep P_di)
} ; } ;
conjunctCase : NPForm -> NPForm = \c -> case c of { conjunctCase : Case -> Case = \c -> case c of {
Ton Nom | Aton Nom => Ton Nom ; Nom => Nom ;
_ => Ton Acc _ => Acc
} ; } ;
auxVerb : VType -> (VF => Str) = \vtyp -> case vtyp of { auxVerb : VType -> (VF => Str) = \vtyp -> case vtyp of {

4
lib/src/romance/ConjunctionRomance.gf
View File

@@ -32,11 +32,11 @@ incomplete concrete ConjunctionRomance of Conjunction =
ConsAdv = consrSS comma ; ConsAdv = consrSS comma ;
BaseNP x y = { BaseNP x y = {
s1 = \\c => (x.s ! c).ton ; s1 = \\c => (x.s ! c).ton ;
s2 = \\c => (y.s ! c).ton ; ----e (conjunctCase c) ; s2 = \\c => (y.s ! conjunctCase c).ton ; ----e (conjunctCase c) ;
a = conjAgr x.a y.a a = conjAgr x.a y.a
} ; } ;
ConsNP x xs = { ConsNP x xs = {
s1 = \\c => (x.s ! c).ton ++ comma ++ xs.s1 ! c ; ----e (conjunctCase c) ; s1 = \\c => (x.s ! c).ton ++ comma ++ xs.s1 ! conjunctCase c ; ----e (conjunctCase c) ;
s2 = \\c => xs.s2 ! c ; ----e (conjunctCase c) ; s2 = \\c => xs.s2 ! c ; ----e (conjunctCase c) ;
a = conjAgr x.a xs.a a = conjAgr x.a xs.a
} ; } ;

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

@@ -34,7 +34,7 @@ interface DiffRomance = open CommonRomance, Prelude in {
-- Whether a preposition is repeated in conjunction -- Whether a preposition is repeated in conjunction
-- (Fre "la somme de 3 et de 4", Ita "la somma di 3 e 4"). -- (Fre "la somme de 3 et de 4", Ita "la somma di 3 e 4").
oper conjunctCase : NPForm -> NPForm ; oper conjunctCase : Case -> Case ;
-- How infinitives and clitics are placed relative to each other -- How infinitives and clitics are placed relative to each other
-- (Fre "la voir", Ita "vederla"). The $Bool$ is used for indicating -- (Fre "la voir", Ita "vederla"). The $Bool$ is used for indicating

6
lib/src/spanish/DiffSpa.gf
View File

@@ -47,9 +47,9 @@ instance DiffSpa of DiffRomance = open CommonRomance, PhonoSpa, BeschSpa, Prelud
} ; } ;
-} -}
conjunctCase : NPForm -> NPForm = \c -> case c of { conjunctCase : Case -> Case = \c -> case c of {
Ton Nom | Aton Nom => Ton Nom ; Nom => Nom ;
_ => Ton Acc _ => Acc
} ; } ;
auxVerb : VType -> (VF => Str) = \_ -> haber_V.s ; auxVerb : VType -> (VF => Str) = \_ -> haber_V.s ;