summaryrefslogtreecommitdiff
path: root/examples/query/small
diff options
context:
space:
mode:
Diffstat (limited to 'examples/query/small')
-rw-r--r--examples/query/small/Query.gf4
-rw-r--r--examples/query/small/QueryEng.gf8
-rw-r--r--examples/query/small/QueryFin.gf16
-rw-r--r--examples/query/small/QuerySwe.gf10
-rw-r--r--examples/query/small/tests.gfs36
5 files changed, 58 insertions, 16 deletions
diff --git a/examples/query/small/Query.gf b/examples/query/small/Query.gf
index 1efa3277f..14bca9e53 100644
--- a/examples/query/small/Query.gf
+++ b/examples/query/small/Query.gf
@@ -57,7 +57,6 @@ fun
ACalled : [Individual] -> Activity ;
-
-- the test lexicon
cat
@@ -67,7 +66,8 @@ fun
Employed : Org -> Property ;
Work : Org -> Activity ;
- HaveTitle : JobTitle -> Org -> Activity ;
+ HaveTitle : JobTitle -> Activity ;
+ HaveTitleOrg : JobTitle -> Org -> Activity ;
Organization : Kind ;
Place : Kind ;
diff --git a/examples/query/small/QueryEng.gf b/examples/query/small/QueryEng.gf
index 6117c9b3c..c2db9880a 100644
--- a/examples/query/small/QueryEng.gf
+++ b/examples/query/small/QueryEng.gf
@@ -43,7 +43,7 @@ lin
QWhere s = mkUtt (mkQS (mkQCl where_IAdv s)) ;
QInfo s =
let
- info : NP = mkNP (all_NP | (mkNP information_N)) (mkAdv about_Prep s) ;
+ info : NP = mkNP all_Predet (mkNP (mkNP information_N) (mkAdv about_Prep s)) ;
in
mkUtt (mkImp (mkVP give_V3 (mkNP i_Pron) info))
| mkUtt info ;
@@ -127,7 +127,11 @@ lin
mkVP (mkV2 (mkV "work") at_Prep) i
| mkVP (mkV2 (mkV "collaborate") in_Prep) i ;
- HaveTitle t i =
+ HaveTitle t =
+ mkVP (mkAP (mkA2 (mkA "employed") as_Prep) (mkNP t))
+ | mkVP (mkV2 (mkV "work") as_Prep) (mkNP t) ;
+
+ HaveTitleOrg t i =
mkVP (mkVP (mkAP (mkA2 (mkA "employed") as_Prep) (mkNP t))) (mkAdv at_Prep i)
| mkVP (mkVP (mkV2 (mkV "work") as_Prep) (mkNP t)) (mkAdv at_Prep i) ;
-- | mkVP (mkVP have_V2 (mkNP the_Det (mkCN (mkN2 (mkN "title")) (mkNP t)))) (mkAdv at_Prep i) ;
diff --git a/examples/query/small/QueryFin.gf b/examples/query/small/QueryFin.gf
index f248f9a50..3ffda3bdf 100644
--- a/examples/query/small/QueryFin.gf
+++ b/examples/query/small/QueryFin.gf
@@ -43,7 +43,7 @@ lin
AProp s p = mkUtt (mkCl s p) ;
AAct s p = mkUtt (mkCl s p) ;
- SAll k = mkNP all_Predet (mkNP thePl_Det k) ; ---- | mkNP thePl_Det k ;
+ SAll k = mkNP all_Predet (mkNP thePl_Det k) ;
SOne k = mkNP n1_Numeral k ;
SIndef k = mkNP someSg_Det k ;
SPlural k = mkNP aPl_Det k ;
@@ -56,11 +56,8 @@ lin
KRelKind k r s = mkCN k (mkRS (mkRCl that_RP (mkVP (mkNP aPl_Det (GenCN s r.cn))))) ;
KRelPair k r = G.ConjCN and_Conj (G.BaseCN k (GenCN these_NP r.cn)) ;
- KProp p k =
- mkCN p k ;
---- | mkCN k (mkRS (mkRCl that_RP (mkVP p))) ;
- KAct p k =
- mkCN k (mkRS (mkRCl that_RP p)) ;
+ KProp p k = mkCN p k ;
+ KAct p k = mkCN k (mkRS (mkRCl that_RP p)) ;
KRel r = r.cn ;
IName n = n ;
@@ -106,7 +103,8 @@ lin
Work i = mkVP (mkV2 (mkV "työskennellä") in_Prep) i ;
- HaveTitle t i = mkVP (mkVP (mkNP t)) (mkAdv in_Prep i) ;
+ HaveTitle t = mkVP have_V2 (mkNP the_Det (mkCN (mkN "asema") (mkNP the_Det t))) ;
+ HaveTitleOrg t i = mkVP (mkVP have_V2 (mkNP the_Det (mkCN (mkN "asema") (mkNP the_Det t)))) (mkAdv in_Prep i) ;
Organization = mkCN (mkN "organisaatio" "organisaatioita") ;
Place = mkCN (mkN "paikka") ;
@@ -114,9 +112,9 @@ lin
Location = mkRelation (mkN "sijainti") ;
Region = mkRelation (mkN "alue") ;
- Subregion = mkRelation (mkN "alue") ;
+ Subregion = mkRelation (mkN "osa") ;
RName = mkRelation (mkN "nimi" "nimiä") ;
- RNickname = mkRelation (mkN "lempinimi" "lempinimiä") ;
+ RNickname = mkRelation (mkN "lisänimi" "lisänimiä") ;
-- JobTitles
JobTitle1 = mkCN (mkN "'JobTitle1") ;
diff --git a/examples/query/small/QuerySwe.gf b/examples/query/small/QuerySwe.gf
index 1dde65a3a..b928093ab 100644
--- a/examples/query/small/QuerySwe.gf
+++ b/examples/query/small/QuerySwe.gf
@@ -46,7 +46,7 @@ lin
QWhere s = mkUtt (mkQS (mkQCl where_IAdv s)) ;
QInfo s =
let
- info : NP = mkNP (all_NP | (mkNP information_N)) (mkAdv about_Prep s) ;
+ info : NP = mkNP all_Predet (mkNP (mkNP information_N) (mkAdv about_Prep s)) ;
in
mkUtt (mkImp (mkVP give_V3 (mkNP i_Pron) info))
| mkUtt info ;
@@ -75,7 +75,7 @@ lin
KRelKind k r s =
mkCN k (mkRS (mkRCl that_RP (mkVP (mkNP aPl_Det (mkCN r.cn (mkAdv r.prep s)))))) ;
- KRelPair k r = mkCN k (mkAdv with_Prep (sina r.cn)) ;
+ KRelPair k r = mkCN k (mkAdv with_Prep (mkNP (mkQuant they_Pron) plNum r.cn)) ;
KProp p k =
mkCN p k
| mkCN k (mkRS (mkRCl that_RP (mkVP p))) ;
@@ -127,7 +127,11 @@ lin
mkVP (mkV2 (mkV "jobba") at_Prep) i
| mkVP (mkV2 (mkV "arbeta") in_Prep) i ;
- HaveTitle t i =
+ HaveTitle t =
+ mkVP (mkAP (mkA2 (mkA "anställd") as_Prep) (mkNP t))
+ | mkVP (mkV2 (mkV "jobba") as_Prep) (mkNP t) ;
+
+ HaveTitleOrg t i =
mkVP (mkVP (mkAP (mkA2 (mkA "anställd") as_Prep) (mkNP t))) (mkAdv at_Prep i)
| mkVP (mkVP (mkV2 (mkV "jobba") as_Prep) (mkNP t)) (mkAdv at_Prep i) ;
-- | mkVP (mkVP have_V2 (mkNP the_Det (mkCN (mkN2 (mkN "titel" "titlar") po) (mkNP t)))) (mkAdv at_Prep i) ;
diff --git a/examples/query/small/tests.gfs b/examples/query/small/tests.gfs
new file mode 100644
index 000000000..3c80fc99b
--- /dev/null
+++ b/examples/query/small/tests.gfs
@@ -0,0 +1,36 @@
+l -treebank MQuery (QSet (SAll Person))
+l -treebank MQuery (QSet (SAll (KRel Location)))
+l -treebank MQuery (QSet (SAll Organization))
+l -treebank MQuery (QInfo (SInd (IName (NOrg Organization1))))
+l -treebank MQuery (QInfo (SInd (IName (NPers Person1))))
+l -treebank MQuery (QInfo (SInd (IName (NLoc Location1))))
+l -treebank MQuery (QSet (SInd (IName (NOrg Organization1))))
+l -treebank MQuery (QSet (SInd (IName (NPers Person1))))
+l -treebank MQuery (QSet (SInd (IName (NLoc Location1))))
+l -treebank MQuery (QInfo (SAll Person))
+l -treebank MQuery (QInfo (SAll (KRel Location)))
+l -treebank MQuery (QInfo (SAll Organization))
+l -treebank MQuery (QSet (SAll (KRelSet Subregion (SAll (KRel Location)))))
+l -treebank MQuery (QSet (SAll (KRelKind (KRel Location) Subregion (SOther (KRel Location)))))
+l -treebank MQuery (QSet (SAll (KRelSet Subregion (SInd (IName (NLoc Location1))))))
+l -treebank MQuery (QSet (SPlural (KProp (Located Location1) Organization)))
+l -treebank MQuery (QSet (SPlural (KProp (Located Location1) Person)))
+l -treebank MQuery (QSet (SPlural (KProp (Located Location1) (KRel Location))))
+l -treebank MQuery (QWhere (SInd (IName (NLoc Location1))))
+l -treebank MQuery (QWhere (SInd (IName (NOrg Organization1))))
+l -treebank MQuery (QWhere (SInd (IName (NPers Person1))))
+l -treebank MQuery (QSet (SAll (KRelPair Organization Location)))
+l -treebank MQuery (QWhere (SAll Organization))
+l -treebank MQuery (QWhere (SAll Person))
+l -treebank MQuery (QWhere (SAll (KRel Location)))
+l -treebank MQuery (QSet (SPlural (KRelPair (KRel Region) Subregion)))
+l -treebank MQuery (QSet (SAll (KAct (HaveTitleOrg JobTitle1 Organization1) Person))) ---
+l -treebank MQuery (QSet (SAll (KAct (Work Organization1) Person)))
+l -treebank MQuery (QSet (SAll (KRelSet RNickname (SInd (IName (NPers Person1))))))
+l -treebank MQuery (QSet (SAll (KRelSet RNickname (SInd (IName (NLoc Location1))))))
+l -treebank MQuery (QSet (SAll (KRelSet RNickname (SInd (IName (NOrg Organization1))))))
+l -treebank MQuery (QCalled (IName (NPers Person1)))
+l -treebank MQuery (QCalled (IName (NLoc Location1)))
+l -treebank MQuery (QCalled (IName (NOrg Organization1)))
+l -treebank MQuery (QSet (SAll (KAct (HaveTitle JobTitle1) Person))) ---
+
generated by cgit v1.2.3 (git 2.39.1) at 2026-05-20 07:31:11 +0000