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

fixed naming conflicts in resource

Browse Source
This commit is contained in:
aarne
2007-06-17 22:52:27 +00:00
parent 3adf824e8e
commit 6a2cbe19d2
21 changed files with 68337 additions and 68334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/resource-1.0/russian/ConjunctionRus.gf
View File

@@ -70,19 +70,22 @@ concrete ConjunctionRus of Conjunction =
oper
-- We have to define a calculus of numbers of persons. For numbers,
-- it is like the conjunction with $Pl$ corresponding to $False$.
conjNumber : Number -> Number -> Number = \m,n -> case <m,n> of {
<Sg,Sg> => Sg ;
_ => Pl
} ;
-- We have to define a calculus of numbers of persons. For numbers,
-- it is like the conjunction with $Pl$ corresponding to $False$.
--
-- The following are given in $ParamX$.
--
-- conjNumber : Number -> Number -> Number = \m,n -> case <m,n> of {
-- <Sg,Sg> => Sg ;
-- _ => Pl
-- } ;
-- For persons, we let the latter argument win ("либо ты, либо я пойду"
-- but "либо я, либо ты пойдешь"). This is not quite clear.
conjPerson : Person -> Person -> Person = \_,p ->
p ;
-- conjPerson : Person -> Person -> Person = \_,p ->
-- p ;
-- For pron, we let the latter argument win - "Маша или моя мама" (Nominative case)
-- but - "моей или Машина мама" (Genetive case) both corresponds to