summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorbringert <unknown>2005-03-08 16:38:12 +0000
committerbringert <unknown>2005-03-08 16:38:12 +0000
commiteefced4abe9b45dbd284c639d8b8943977ba2107 (patch)
tree98f1f826ed6258aca85db121188341e792554cc8 /examples
parenta1aa9c01e6065874e5a67f908334cdbc3bf53ea1 (diff)
Use Phr for S linearization.
Diffstat (limited to 'examples')
-rw-r--r--examples/stoneage/Stoneage.gf2
-rw-r--r--examples/stoneage/StoneageEng.gf2
-rw-r--r--examples/stoneage/StoneageResEng.gf9
-rw-r--r--examples/stoneage/StoneageResSwe.gf11
-rw-r--r--examples/stoneage/StoneageSwe.gf2
5 files changed, 14 insertions, 12 deletions
diff --git a/examples/stoneage/Stoneage.gf b/examples/stoneage/Stoneage.gf
index 69687ca09..df1f85c79 100644
--- a/examples/stoneage/Stoneage.gf
+++ b/examples/stoneage/Stoneage.gf
@@ -6,7 +6,7 @@ cat
CN ;
fun
-
+
-- Actions with an object
Drink : NP -> NP -> S ;
diff --git a/examples/stoneage/StoneageEng.gf b/examples/stoneage/StoneageEng.gf
index d67e9c1c6..170ab193b 100644
--- a/examples/stoneage/StoneageEng.gf
+++ b/examples/stoneage/StoneageEng.gf
@@ -4,7 +4,7 @@ concrete StoneageEng of Stoneage
StoneageResEng in {
lincat
- S = S ;
+ S = Phr ;
NP = NP ;
N = N;
CN = CN ;
diff --git a/examples/stoneage/StoneageResEng.gf b/examples/stoneage/StoneageResEng.gf
index 7ea912902..5f747eae8 100644
--- a/examples/stoneage/StoneageResEng.gf
+++ b/examples/stoneage/StoneageResEng.gf
@@ -1,11 +1,12 @@
resource StoneageResEng = open ResourceEng, ParadigmsEng in {
oper
- PresV : V -> NP -> S = \v,s -> PresCl (SPredV s v) ;
- PresV2 : V2 -> NP -> NP -> S = \v,s,o -> PresCl (SPredV2 s v o) ;
- PresVasV2 : V -> NP -> NP -> S = \ v -> PresV2 (dirV2 v) ;
+ PresV : V -> NP -> Phr = \v,s -> PresCl (SPredV s v) ;
+ PresV2 : V2 -> NP -> NP -> Phr = \v,s,o -> PresCl (SPredV2 s v o) ;
+ PresVasV2 : V -> NP -> NP -> Phr = \ v -> PresV2 (dirV2 v) ;
- PresCl : Cl -> S = UseCl (PosTP TPresent ASimul) ;
+ PresCl : Cl -> Phr =
+ \c -> { s = (UseCl (PosTP TPresent ASimul) c).s } ** {lock_Phr = <>} ;
ModPosA : ADeg -> CN -> CN = \a -> ModAP (PositADeg a) ;
ModA : A -> CN -> CN = \a -> ModAP (UseA a) ;
diff --git a/examples/stoneage/StoneageResSwe.gf b/examples/stoneage/StoneageResSwe.gf
index 8d303d875..75952c438 100644
--- a/examples/stoneage/StoneageResSwe.gf
+++ b/examples/stoneage/StoneageResSwe.gf
@@ -1,11 +1,12 @@
-resource StoneageResSwe = open ResourceSwe, ParadigmsSwe in {
+resource StoneageResSwe = open ResourceSwe, SyntaxSwe, ParadigmsSwe in {
oper
- PresV : V -> NP -> S = \v,s -> PresCl (SPredV s v) ;
- PresV2 : V2 -> NP -> NP -> S = \v,s,o -> PresCl (SPredV2 s v o) ;
- PresVasV2 : V -> NP -> NP -> S = \ v -> PresV2 (dirV2 v) ;
+ PresV : V -> NP -> Phr = \v,s -> PresCl (SPredV s v) ;
+ PresV2 : V2 -> NP -> NP -> Phr = \v,s,o -> PresCl (SPredV2 s v o) ;
+ PresVasV2 : V -> NP -> NP -> Phr = \ v -> PresV2 (dirV2 v) ;
- PresCl : Cl -> S = UseCl (PosTP TPresent ASimul) ;
+ PresCl : Cl -> Phr =
+ \c -> defaultSentence (UseCl (PosTP TPresent ASimul) c) ** {lock_Phr = <>} ;
ModPosA : ADeg -> CN -> CN = \a -> ModAP (PositADeg a) ;
ModA : A -> CN -> CN = \a -> ModAP (UseA a) ;
diff --git a/examples/stoneage/StoneageSwe.gf b/examples/stoneage/StoneageSwe.gf
index 8ee2b13ae..31c830ee0 100644
--- a/examples/stoneage/StoneageSwe.gf
+++ b/examples/stoneage/StoneageSwe.gf
@@ -3,7 +3,7 @@ concrete StoneageSwe of Stoneage
= open SyntaxSwe, ResourceSwe, SwadeshLexSwe, StoneageResSwe in {
lincat
- S = S ;
+ S = Phr ;
NP = NP ;
N = N;
CN = CN ;