mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-05-24 02:12:50 -06:00
added Question.AdvIAdv and correcponding entry of mkIAdv in API
This commit is contained in:
@@ -30,6 +30,10 @@ abstract Question = Cat ** {
|
|||||||
|
|
||||||
PrepIP : Prep -> IP -> IAdv ; -- with whom
|
PrepIP : Prep -> IP -> IAdv ; -- with whom
|
||||||
|
|
||||||
|
-- They can be modified with other adverbs.
|
||||||
|
|
||||||
|
AdvIAdv : IAdv -> Adv -> IAdv ; -- where in Paris
|
||||||
|
|
||||||
-- Interrogative complements to copulas can be both adverbs and
|
-- Interrogative complements to copulas can be both adverbs and
|
||||||
-- pronouns.
|
-- pronouns.
|
||||||
|
|
||||||
|
|||||||
@@ -767,7 +767,10 @@ incomplete resource Constructors = open Grammar in {
|
|||||||
-- In addition to the interrogative adverbs defined in the $Structural$ lexicon, they
|
-- In addition to the interrogative adverbs defined in the $Structural$ lexicon, they
|
||||||
-- can be formed as prepositional phrases from interrogative pronouns.
|
-- can be formed as prepositional phrases from interrogative pronouns.
|
||||||
|
|
||||||
mkIAdv : Prep -> IP -> IAdv ; -- 1. in which city --# notminimal
|
mkIAdv : overload { --# notminimal
|
||||||
|
mkIAdv : Prep -> IP -> IAdv ; -- 1. in which city --# notminimal
|
||||||
|
mkIAdv : IAdv -> Adv -> IAdv ; -- 2. where in Paris --# notminimal
|
||||||
|
} ; --# notminimal
|
||||||
|
|
||||||
-- More interrogative adverbs are given in $Structural$.
|
-- More interrogative adverbs are given in $Structural$.
|
||||||
|
|
||||||
@@ -1435,7 +1438,11 @@ incomplete resource Constructors = open Grammar in {
|
|||||||
who_IP : IP = whoSg_IP ;
|
who_IP : IP = whoSg_IP ;
|
||||||
which_IDet : IDet = whichSg_IDet ; --# notminimal
|
which_IDet : IDet = whichSg_IDet ; --# notminimal
|
||||||
|
|
||||||
mkIAdv : Prep -> IP -> IAdv = PrepIP ; --# notminimal
|
mkIAdv = overload { --# notminimal
|
||||||
|
mkIAdv : Prep -> IP -> IAdv = PrepIP ; -- 1. in which city --# notminimal
|
||||||
|
mkIAdv : IAdv -> Adv -> IAdv = AdvIAdv ; -- 2. where in Paris --# notminimal
|
||||||
|
} ; --# notminimal
|
||||||
|
|
||||||
|
|
||||||
mkRCl = overload { --# notminimal
|
mkRCl = overload { --# notminimal
|
||||||
mkRCl : Cl -> RCl -- such that John loves her --# notminimal
|
mkRCl : Cl -> RCl -- such that John loves her --# notminimal
|
||||||
|
|||||||
@@ -59,5 +59,7 @@ concrete QuestionBul of Question = CatBul ** open ResBul, Prelude in {
|
|||||||
nonEmpty = num.nonEmpty
|
nonEmpty = num.nonEmpty
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
|
AdvIAdv i a = {s = i.s ++ a.s} ;
|
||||||
|
|
||||||
CompIP ip = {s = ip.s ! RSubj} ;
|
CompIP ip = {s = ip.s ! RSubj} ;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -49,6 +49,8 @@ concrete QuestionEng of Question = CatEng ** open ResEng, Prelude in {
|
|||||||
n = num.n
|
n = num.n
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
|
AdvIAdv i a = ss (i.s ++ a.s) ;
|
||||||
|
|
||||||
CompIAdv a = a ;
|
CompIAdv a = a ;
|
||||||
CompIP p = ss (p.s ! Nom) ;
|
CompIP p = ss (p.s ! Nom) ;
|
||||||
|
|
||||||
|
|||||||
@@ -90,6 +90,8 @@ concrete QuestionFin of Question = CatFin ** open ResFin, Prelude in {
|
|||||||
isNum = isn
|
isNum = isn
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
|
AdvIAdv i a = {s = i.s ++ a.s} ;
|
||||||
|
|
||||||
CompIAdv a = {s = \\_ => a.s} ;
|
CompIAdv a = {s = \\_ => a.s} ;
|
||||||
CompIP ip = {s = \\_ => ip.s ! NPCase Nom} ;
|
CompIP ip = {s = \\_ => ip.s ! NPCase Nom} ;
|
||||||
|
|
||||||
|
|||||||
@@ -93,6 +93,8 @@ concrete QuestionGer of Question = CatGer ** open ResGer in {
|
|||||||
n = n
|
n = n
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
|
AdvIAdv i a = {s = i.s ++ a.s} ;
|
||||||
|
|
||||||
CompIAdv a = {s = \\_ => a.s} ;
|
CompIAdv a = {s = \\_ => a.s} ;
|
||||||
|
|
||||||
CompIP ip = {s = \\_ => ip.s ! Nom} ;
|
CompIP ip = {s = \\_ => ip.s ! Nom} ;
|
||||||
|
|||||||
@@ -69,6 +69,8 @@ lin
|
|||||||
-- PrepIP : Prep -> IP -> IAdv ; -- with whom
|
-- PrepIP : Prep -> IP -> IAdv ; -- with whom
|
||||||
PrepIP prep ip = { s = prep.s ++ ip.dep !prep.c};
|
PrepIP prep ip = { s = prep.s ++ ip.dep !prep.c};
|
||||||
|
|
||||||
|
AdvIAdv i a = {s = i.s ++ a.s} ;
|
||||||
|
|
||||||
-- CompIAdv : IAdv -> IComp ; -- where (is it)
|
-- CompIAdv : IAdv -> IComp ; -- where (is it)
|
||||||
CompIAdv ia = ia;
|
CompIAdv ia = ia;
|
||||||
|
|
||||||
|
|||||||
@@ -93,6 +93,7 @@ incomplete concrete QuestionRomance of Question =
|
|||||||
n = n
|
n = n
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
|
AdvIAdv i a = {s = i.s ++ a.s} ;
|
||||||
|
|
||||||
CompIAdv a = {s = \\_ => a.s} ;
|
CompIAdv a = {s = \\_ => a.s} ;
|
||||||
|
|
||||||
|
|||||||
@@ -100,7 +100,7 @@ concrete QuestionRon of Question =
|
|||||||
n = n
|
n = n
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
|
AdvIAdv i a = {s = i.s ++ a.s} ;
|
||||||
|
|
||||||
CompIAdv a = {s = \\_ => a.s} ;
|
CompIAdv a = {s = \\_ => a.s} ;
|
||||||
|
|
||||||
|
|||||||
@@ -67,6 +67,8 @@ concrete QuestionRus of Question = CatRus ** open ResRus, Prelude in {
|
|||||||
c = kakoj.c
|
c = kakoj.c
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
|
AdvIAdv i a = {s = i.s ++ a.s} ;
|
||||||
|
|
||||||
CompIAdv a = a ;
|
CompIAdv a = a ;
|
||||||
CompIP ip = {s = ip.s ! PF Nom No NonPoss} ;
|
CompIP ip = {s = ip.s ! PF Nom No NonPoss} ;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -93,6 +93,8 @@ incomplete concrete QuestionScand of Question =
|
|||||||
det = idet.det
|
det = idet.det
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
|
AdvIAdv i a = {s = i.s ++ a.s} ;
|
||||||
|
|
||||||
CompIAdv a = {s = \\_ => a.s} ;
|
CompIAdv a = {s = \\_ => a.s} ;
|
||||||
CompIP ip = {s = \\_ => ip.s ! nominative} ;
|
CompIP ip = {s = \\_ => ip.s ! nominative} ;
|
||||||
|
|
||||||
|
|||||||
@@ -67,6 +67,8 @@ concrete QuestionUrd of Question = CatUrd ** open ResUrd, Prelude in {
|
|||||||
n = num.n
|
n = num.n
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
|
AdvIAdv i a = {s = i.s ++ a.s} ;
|
||||||
|
|
||||||
CompIAdv a = a ;
|
CompIAdv a = a ;
|
||||||
CompIP p = ss (p.s ! Dir) ;
|
CompIP p = ss (p.s ! Dir) ;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user