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

added V2V, V2S, V2Q to all langs so that they compile, but not always the Compl rules

Browse Source
This commit is contained in:
aarne
2008-04-16 14:12:03 +00:00
parent 49c7d3221b
commit c781185e51
13 changed files with 47 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/resource/arabic/CatAra.gf
View File

@@ -84,6 +84,7 @@ concrete CatAra of Cat = CommonX - [Utt] ** open ResAra, Prelude, ParamX in {
V, VS, VQ, VA = ResAra.Verb ; -- = {s : VForm => Str} ;
V2, V2A = ResAra.Verb ** {c2 : Str} ;
V2V, V2S, V2Q = ResAra.Verb ** {c2 : Str} ; --- AR
V3 = ResAra.Verb ** {c2, c3 : Str} ;
-- VV = {s : VVForm => Str ; isAux : Bool} ;

16
lib/resource/arabic/ParadigmsAra.gf
View File

@@ -172,12 +172,12 @@ resource ParadigmsAra = open
mkAV : A -> AV ;
mkA2V : A -> Str -> A2V ;
-- Notice: categories $V2S, V2V, V2A, V2Q$ are in v 1.0 treated
-- just as synonyms of $V2$, and the second argument is given
-- as an adverb. Likewise $AS, A2S, AV, A2V$ are just $A$.
-- Notice: categories $AS, A2S, AV, A2V$ are just $A$,
-- and the second argument is given
-- as an adverb. Likewise
-- $V0$ is just $V$.
V0, V2S, V2V, V2A, V2Q : Type ;
V0 : Type ;
AS, A2S, AV, A2V : Type ;
@@ -447,16 +447,16 @@ resource ParadigmsAra = open
mkVQ v = v ** {lock_VQ = <>} ;
V0 : Type = V ;
V2S, V2V, V2Q, V2A : Type = V2 ;
---- V2S, V2V, V2Q, V2A : Type = V2 ;
AS, A2S, AV : Type = A ;
A2V : Type = A2 ;
mkV0 v = v ** {lock_V = <>} ;
mkV2S v p = mkV2 v p ** {lock_V2 = <>} ;
mkV2V v p t = mkV2 v p ** {s4 = t ; lock_V2 = <>} ;
mkV2S v p = mkV2 v p ** {lock_V2S = <>} ;
mkV2V v p t = mkV2 v p ** {s4 = t ; lock_V2V = <>} ;
mkVA v = v ** {lock_VA = <>} ;
mkV2A v p = mkV2 v p ** {lock_V2A = <>} ;
mkV2Q v p = mkV2 v p ** {lock_V2 = <>} ;
mkV2Q v p = mkV2 v p ** {lock_V2Q = <>} ;
mkAS v = v ** {lock_A = <>} ;
mkA2S v p = mkA2 v p ** {lock_A = <>} ;

3
lib/resource/bulgarian/CatBul.gf
View File

@@ -100,6 +100,7 @@ concrete CatBul of Cat = open ResBul, Prelude, (R = ParamX) in {
V, VS, VQ, VA = Verb ;
V2, V2A = Verb ** {c2 : Preposition} ;
V2V, V2S, V2Q = Verb ** {c2 : Preposition} ; --- AR
V3 = Verb ** {c2, c3 : Preposition} ;
VV = Verb ;
@@ -123,4 +124,4 @@ concrete CatBul of Cat = open ResBul, Prelude, (R = ParamX) in {
TCond = {s = []} ** {t = R.Cond} ; --# notpresent
ASimul = {s = []} ** {a = R.Simul} ;
AAnter = {s = []} ** {a = R.Anter} ; --# notpresent
}
}

3
lib/resource/catalan/ParadigmsCat.gf
View File

@@ -266,7 +266,7 @@ oper
---- as an adverb. Likewise $AS, A2S, AV, A2V$ are just $A$.
---- $V0$ is just $V$.
--
V0, V2S, V2V, V2Q : Type ;
V0 : Type ;
AS, A2S, AV, A2V : Type ;
--
--
@@ -368,7 +368,6 @@ oper
dirdirV3 v = dirV3 v dative ;
--
-- V0 : Type = V ;
V2S, V2V, V2Q : Type = V2 ;
AS, AV : Type = A ;
-- A2S, A2V : Type = A2 ;
--

3
lib/resource/finnish/CatFin.gf
View File

@@ -77,9 +77,10 @@ concrete CatFin of Cat = CommonX ** open ResFin, Prelude in {
-- Open lexical classes, e.g. Lexicon
V, VS, VQ = Verb1 ; -- = {s : VForm => Str ; sc : Case} ;
V2, VA = Verb1 ** {c2 : Compl} ;
V2, VA, V2Q, V2S = Verb1 ** {c2 : Compl} ;
V2A = Verb1 ** {c2, c3 : Compl} ;
VV = Verb1 ; ---- infinitive form
V2V = Verb1 ** {c2 : Compl} ; ---- infinitive form
V3 = Verb1 ** {c2, c3 : Compl} ;
A = {s : Degree => AForm => Str} ;

15
lib/resource/finnish/ParadigmsFin.gf
View File

@@ -205,12 +205,12 @@ oper
mkAV : A -> AV ;
mkA2V : A -> Prep -> A2V ;
-- Notice: categories $V2S, V2V, V2Q$ are in v 1.0 treated
-- just as synonyms of $V2$, and the second argument is given
-- as an adverb. Likewise $AS, A2S, AV, A2V$ are just $A$.
-- Notice: categories $AS, A2S, AV, A2V$ are just $A$,
-- and the second argument is given
-- as an adverb. Likewise
-- $V0$ is just $V$.
V0, V2S, V2V, V2Q : Type ;
V0 : Type ;
AS, A2S, AV, A2V : Type ;
--.
@@ -567,16 +567,15 @@ oper
mkVQ v = v ** {lock_VQ = <>} ;
V0 : Type = V ;
V2S, V2V, V2Q : Type = V2 ;
AS, A2S, AV : Type = A ;
A2V : Type = A2 ;
mkV0 v = v ** {lock_V = <>} ;
-- mkV2S v p = mk2V2 v p ** {lock_V2 = <>} ;
-- mkV2V v p = mk2V2 v p ** {lock_V2 = <>} ;
mkV2S v p = mk2V2 v p ** {lock_V2S = <>} ;
mkV2V v p = mk2V2 v p ** {lock_V2V = <>} ;
mkVA v p = v ** {c2 = p ; lock_VA = <>} ;
mkV2A v p q = v ** {c2 = p ; c3 = q ; lock_V2A = <>} ;
-- mkV2Q v p = mk2V2 v p ** {lock_V2 = <>} ;
mkV2Q v p = mk2V2 v p ** {lock_V2Q = <>} ;
mkAS v = v ** {lock_A = <>} ;
mkA2S v p = mkA2 v p ** {lock_A = <>} ;

10
lib/resource/french/ParadigmsFre.gf
View File

@@ -275,12 +275,11 @@ oper
mkAV : A -> Prep -> AV ;
mkA2V : A -> Prep -> Prep -> A2V ;
-- Notice: categories $V2S, V2V, V2Q$ are in v 1.0 treated
-- just as synonyms of $V2$, and the second argument is given
-- as an adverb. Likewise $AS, A2S, AV, A2V$ are just $A$.
-- Notice: categories $AS, A2S, AV, A2V$ are just $A$,
-- and the second argument is given as an adverb. Likewise
-- $V0$ is just $V$.
V0, V2S, V2V, V2Q : Type ;
V0 : Type ;
AS, A2S, AV, A2V : Type ;
--.
@@ -382,7 +381,6 @@ oper
} ;
V0 : Type = V ;
V2S, V2V, V2Q : Type = V2 ;
AS, AV : Type = A ;
A2S, A2V : Type = A2 ;
@@ -392,7 +390,7 @@ oper
mkVV v = v ** {c2 = complAcc ; lock_VV = <>} ;
deVV v = v ** {c2 = complGen ; lock_VV = <>} ;
aVV v = v ** {c2 = complDat ; lock_VV = <>} ;
mkV2V v p t = mmkV2 v p ** {c3 = t.p1 ; s3 = p.p2 ; lock_V2V = <>} ;
mkV2V v p q = mmkV3 v p q ** {lock_V2V = <>} ;
mkVA v = v ** {lock_VA = <>} ;
mkV2A v p q = mmkV3 v p q ** {lock_V2A = <>} ;
mkVQ v = v ** {lock_VQ = <>} ;

3
lib/resource/german/CatGer.gf
View File

@@ -69,7 +69,8 @@ concrete CatGer of Cat =
V, VS, VQ, VA = ResGer.Verb ; -- = {s : VForm => Str} ;
VV = Verb ** {isAux : Bool} ;
V2, V2A = Verb ** {c2 : Preposition} ;
V2, V2A, V2S, V2Q = Verb ** {c2 : Preposition} ;
V2V = Verb ** {c2 : Preposition ; isAux : Bool} ;
V3 = Verb ** {c2, c3 : Preposition} ;
A = {s : Degree => AForm => Str} ;

15
lib/resource/german/ParadigmsGer.gf
View File

@@ -258,12 +258,11 @@ mkV2 : overload {
mkAV : A -> AV ;
mkA2V : A -> Prep -> A2V ;
-- Notice: categories $V2S, V2V, V2Q$ are in v 1.0 treated
-- just as synonyms of $V2$, and the second argument is given
-- as an adverb. Likewise $AS, A2S, AV, A2V$ are just $A$.
-- Notice: categories $AS, A2S, AV, A2V$ are just $A$,
-- and the second argument is given as an adverb. Likewise
-- $V0$ is just $V$.
V0, V2S, V2V, V2Q : Type ;
V0 : Type ;
AS, A2S, AV, A2V : Type ;
@@ -438,16 +437,16 @@ mkV2 : overload {
mkVV v = v ** {isAux = False ; lock_VV = <>} ;
V0 : Type = V ;
V2S, V2V, V2Q : Type = V2 ;
-- V2S, V2V, V2Q : Type = V2 ;
AS, A2S, AV : Type = A ;
A2V : Type = A2 ;
mkV0 v = v ** {lock_V = <>} ;
mkV2S v p = prepV2 v p ** {lock_V2 = <>} ;
mkV2V v p = prepV2 v p ** {lock_V2 = <>} ;
mkV2S v p = prepV2 v p ** {lock_V2S = <>} ;
mkV2V v p = prepV2 v p ** {isAux = False ; lock_V2V = <>} ;
mkVA v = v ** {lock_VA = <>} ;
mkV2A v p = prepV2 v p ** {lock_V2A = <>} ;
mkV2Q v p = prepV2 v p ** {lock_V2 = <>} ;
mkV2Q v p = prepV2 v p ** {lock_V2Q = <>} ;
mkAS v = v ** {lock_A = <>} ;
mkA2S v p = mkA2 v p ** {lock_A = <>} ;

11
lib/resource/italian/ParadigmsIta.gf
View File

@@ -268,12 +268,12 @@ oper
mkAV : A -> Prep -> AV ;
mkA2V : A -> Prep -> Prep -> A2V ;
-- Notice: categories $V2S, V2V, V2Q$ are in v 1.0 treated
-- just as synonyms of $V2$, and the second argument is given
-- as an adverb. Likewise $AS, A2S, AV, A2V$ are just $A$.
-- Notice: categories $AS, A2S, AV, A2V$ are just $A$,
-- and the second argument is given
-- as an adverb. Likewise
-- $V0$ is just $V$.
V0, V2S, V2V, V2Q : Type ;
V0 : Type ;
AS, A2S, AV, A2V : Type ;
@@ -386,7 +386,6 @@ oper
dirdirV3 v = dirV3 v dative ;
V0 : Type = V ;
V2S, V2V, V2Q : Type = V2 ;
AS, AV : Type = A ;
A2S, A2V : Type = A2 ;
@@ -396,7 +395,7 @@ oper
mkVV v = v ** {c2 = complAcc ; lock_VV = <>} ;
deVV v = v ** {c2 = complGen ; lock_VV = <>} ;
aVV v = v ** {c2 = complDat ; lock_VV = <>} ;
mkV2V v p t = mk2V2 v p ** {c3 = t.p1 ; s3 = p.p2 ; lock_V2V = <>} ;
mkV2V v p t = mkV3 v p t ** {lock_V2V = <>} ;
mkVA v = v ** {lock_VA = <>} ;
mkV2A v p q = mkV3 v p q ** {lock_V2A = <>} ;
mkVQ v = v ** {lock_VQ = <>} ;

4
lib/resource/romance/CatRomance.gf
View File

@@ -77,8 +77,8 @@ incomplete concrete CatRomance of Cat =
-- Open lexical classes, e.g. Lexicon
V, VQ, VA = Verb ;
V2, VV = Verb ** {c2 : Compl} ;
V2A, V3 = Verb ** {c2,c3 : Compl} ;
V2, VV, V2S, V2Q = Verb ** {c2 : Compl} ;
V3, V2A, V2V = Verb ** {c2,c3 : Compl} ;
VS = Verb ** {m : Polarity => Mood} ;
A = {s : Degree => AForm => Str ; isPre : Bool} ;

1
lib/resource/russian/CatRus.gf
View File

@@ -81,6 +81,7 @@ concrete CatRus of Cat = CommonX ** open ResRus, Prelude in {
V, VS, VV, VQ, VA = Verbum ; -- = {s : VerbForm => Str ; asp : Aspect } ;
V2, V2A = Verbum ** Complement ;
V2V, V2S, V2Q = Verbum ** Complement ; --- AR
V3 = Verbum ** Complement** {s4 : Str; c2: Case} ;
-- VV = {s : VVForm => Str ; isAux : Bool} ;

11
lib/resource/spanish/ParadigmsSpa.gf
View File

@@ -269,12 +269,12 @@ oper
mkAV : A -> Prep -> AV ;
mkA2V : A -> Prep -> Prep -> A2V ;
-- Notice: categories $V2S, V2V, V2Q$ are in v 1.0 treated
-- just as synonyms of $V2$, and the second argument is given
-- as an adverb. Likewise $AS, A2S, AV, A2V$ are just $A$.
-- Notice: categories $AS, A2S, AV, A2V$ are just $A$,
-- and the second argument is given
-- as an adverb. Likewise
-- $V0$ is just $V$.
V0, V2S, V2V, V2Q : Type ;
V0 : Type ;
AS, A2S, AV, A2V : Type ;
@@ -383,7 +383,6 @@ oper
dirdirV3 v = dirV3 v dative ;
V0 : Type = V ;
V2S, V2V, V2Q : Type = V2 ;
AS, AV : Type = A ;
A2S, A2V : Type = A2 ;
@@ -393,7 +392,7 @@ oper
mkVV v = v ** {c2 = complAcc ; lock_VV = <>} ;
deVV v = v ** {c2 = complGen ; lock_VV = <>} ;
aVV v = v ** {c2 = complDat ; lock_VV = <>} ;
mkV2V v p t = mk2V2 v p ** {c3 = t.p1 ; s3 = p.p2 ; lock_V2V = <>} ;
mkV2V v p t = mkV3 v p t ** {lock_V2V = <>} ;
mkVA v = v ** {lock_VA = <>} ;
mkV2A v p q = mkV3 v p q ** {lock_V2A = <>} ;
mkVQ v = v ** {lock_VQ = <>} ;