From 85ad81743e5187226557dc0a59ec632899382a00 Mon Sep 17 00:00:00 2001 From: aarne Date: Tue, 9 Oct 2007 08:58:48 +0000 Subject: [PATCH] added TryX modules for trying out resource API --- lib/resource-1.0/Makefile | 6 ++++-- lib/resource-1.0/api/TryDan.gf | 3 +++ lib/resource-1.0/api/TryEng.gf | 3 +++ lib/resource-1.0/api/TryFin.gf | 3 +++ lib/resource-1.0/api/TryFre.gf | 3 +++ lib/resource-1.0/api/TryGer.gf | 3 +++ lib/resource-1.0/api/TryIta.gf | 3 +++ lib/resource-1.0/api/TryNor.gf | 3 +++ lib/resource-1.0/api/TryRus.gf | 3 +++ lib/resource-1.0/api/TrySpa.gf | 3 +++ lib/resource-1.0/api/TrySwe.gf | 3 +++ lib/resource-1.0/danish/ParadigmsDan.gf | 6 +++--- lib/resource-1.0/doc/synopsis-browse.txt | 5 +++++ lib/resource-1.0/doc/synopsis.html | 13 ++++++++----- lib/resource-1.0/german/ParadigmsGer.gf | 6 +++--- lib/resource-1.0/italian/ParadigmsIta.gf | 14 +++++++------- lib/resource-1.0/norwegian/ParadigmsNor.gf | 6 +++--- lib/resource-1.0/spanish/ParadigmsSpa.gf | 11 ++++------- lib/resource-1.0/swedish/ParadigmsSwe.gf | 6 +++--- 19 files changed, 70 insertions(+), 33 deletions(-) create mode 100644 lib/resource-1.0/api/TryDan.gf create mode 100644 lib/resource-1.0/api/TryEng.gf create mode 100644 lib/resource-1.0/api/TryFin.gf create mode 100644 lib/resource-1.0/api/TryFre.gf create mode 100644 lib/resource-1.0/api/TryGer.gf create mode 100644 lib/resource-1.0/api/TryIta.gf create mode 100644 lib/resource-1.0/api/TryNor.gf create mode 100644 lib/resource-1.0/api/TryRus.gf create mode 100644 lib/resource-1.0/api/TrySpa.gf create mode 100644 lib/resource-1.0/api/TrySwe.gf diff --git a/lib/resource-1.0/Makefile b/lib/resource-1.0/Makefile index 6bda48d25..e7dd483cc 100644 --- a/lib/resource-1.0/Makefile +++ b/lib/resource-1.0/Makefile @@ -59,8 +59,9 @@ alltenses: $(GFCC) api/Syntax???.gf cp -p api/Constructors*.gfc api/Constructors*.gfr ../alltenses cp -p api/Syntax*.gfc api/Syntax*.gfr ../alltenses + $(GFCC) api/Try???.gf $(GFCC) -path=alltenses:prelude:api:api/toplevel api/toplevel/OverLangEng.gf - mv api/toplevel/Over*.gfc ../alltenses + mv api/toplevel/Over*.gfc api/Try*.gf? ../alltenses langs: echo "s ;; pm | wf langs.gfcm" | $(GFCA) -path=present:prelude ../present/Lang???.gfc $(RTSS) @@ -101,8 +102,9 @@ present: chmod $(GFCCP) -path=api:present:prelude api/Syntax???.gf mv api/Constructors*.gfc api/Constructors*.gfr ../present mv api/Syntax*.gfc api/Syntax*.gfr ../present + $(GFCCP) -path=api:present:prelude api/Try???.gf $(GFCCP) -path=present:prelude:api:api/toplevel api/toplevel/OverLangEng.gf - mv api/toplevel/Over*.gfc ../present + mv api/toplevel/Over*.gfc api/Try???.gf? ../present mathematical: diff --git a/lib/resource-1.0/api/TryDan.gf b/lib/resource-1.0/api/TryDan.gf new file mode 100644 index 000000000..f92e7285d --- /dev/null +++ b/lib/resource-1.0/api/TryDan.gf @@ -0,0 +1,3 @@ +--# -path=.:alltenses:prelude + +resource TryDan = SyntaxDan, LexiconDan, ParadigmsDan - [mkAdv] ; diff --git a/lib/resource-1.0/api/TryEng.gf b/lib/resource-1.0/api/TryEng.gf new file mode 100644 index 000000000..83a997531 --- /dev/null +++ b/lib/resource-1.0/api/TryEng.gf @@ -0,0 +1,3 @@ +--# -path=.:alltenses:prelude + +resource TryEng = SyntaxEng, LexiconEng, ParadigmsEng - [mkAdv] ; diff --git a/lib/resource-1.0/api/TryFin.gf b/lib/resource-1.0/api/TryFin.gf new file mode 100644 index 000000000..75ea25130 --- /dev/null +++ b/lib/resource-1.0/api/TryFin.gf @@ -0,0 +1,3 @@ +--# -path=.:alltenses:prelude + +resource TryFin = SyntaxFin, LexiconFin-[mkOrd], ParadigmsFin - [mkAdv] ; diff --git a/lib/resource-1.0/api/TryFre.gf b/lib/resource-1.0/api/TryFre.gf new file mode 100644 index 000000000..b12983510 --- /dev/null +++ b/lib/resource-1.0/api/TryFre.gf @@ -0,0 +1,3 @@ +--# -path=.:alltenses:prelude + +resource TryFre = SyntaxFre, LexiconFre, ParadigmsFre - [mkAdv] ; diff --git a/lib/resource-1.0/api/TryGer.gf b/lib/resource-1.0/api/TryGer.gf new file mode 100644 index 000000000..7b4d0ddb5 --- /dev/null +++ b/lib/resource-1.0/api/TryGer.gf @@ -0,0 +1,3 @@ +--# -path=.:alltenses:prelude + +resource TryGer = SyntaxGer, LexiconGer, ParadigmsGer - [mkAdv] ; diff --git a/lib/resource-1.0/api/TryIta.gf b/lib/resource-1.0/api/TryIta.gf new file mode 100644 index 000000000..ff91189bc --- /dev/null +++ b/lib/resource-1.0/api/TryIta.gf @@ -0,0 +1,3 @@ +--# -path=.:alltenses:prelude + +resource TryIta = SyntaxIta, LexiconIta, ParadigmsIta - [mkAdv,in_Prep] ; diff --git a/lib/resource-1.0/api/TryNor.gf b/lib/resource-1.0/api/TryNor.gf new file mode 100644 index 000000000..43c9bab63 --- /dev/null +++ b/lib/resource-1.0/api/TryNor.gf @@ -0,0 +1,3 @@ +--# -path=.:alltenses:prelude + +resource TryNor = SyntaxNor, LexiconNor, ParadigmsNor - [mkAdv] ; diff --git a/lib/resource-1.0/api/TryRus.gf b/lib/resource-1.0/api/TryRus.gf new file mode 100644 index 000000000..cb2058ceb --- /dev/null +++ b/lib/resource-1.0/api/TryRus.gf @@ -0,0 +1,3 @@ +--# -path=.:alltenses:prelude + +resource TryRus = SyntaxRus, LexiconRus, ParadigmsRus - [mkAdv] ; diff --git a/lib/resource-1.0/api/TrySpa.gf b/lib/resource-1.0/api/TrySpa.gf new file mode 100644 index 000000000..06e74933b --- /dev/null +++ b/lib/resource-1.0/api/TrySpa.gf @@ -0,0 +1,3 @@ +--# -path=.:alltenses:prelude + +resource TrySpa = SyntaxSpa, LexiconSpa, ParadigmsSpa - [mkAdv] ; diff --git a/lib/resource-1.0/api/TrySwe.gf b/lib/resource-1.0/api/TrySwe.gf new file mode 100644 index 000000000..7d8dd3b16 --- /dev/null +++ b/lib/resource-1.0/api/TrySwe.gf @@ -0,0 +1,3 @@ +--# -path=.:alltenses:prelude + +resource TrySwe = SyntaxSwe, LexiconSwe, ParadigmsSwe - [mkAdv] ; diff --git a/lib/resource-1.0/danish/ParadigmsDan.gf b/lib/resource-1.0/danish/ParadigmsDan.gf index 15abc7946..c1433514c 100644 --- a/lib/resource-1.0/danish/ParadigmsDan.gf +++ b/lib/resource-1.0/danish/ParadigmsDan.gf @@ -271,12 +271,12 @@ oper mkAV : A -> AV ; mkA2V : A -> Prep -> A2V ; --- Notice: categories $V2S, V2V, V2A, V2Q$ are in v 1.0 treated +-- 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$. -- $V0$ is just $V$. - V0, V2S, V2V, V2A, V2Q : Type ; + V0, V2S, V2V, V2Q : Type ; AS, A2S, AV, A2V : Type ; --. @@ -443,7 +443,7 @@ oper mkA2V v p = mkA2 v p ** {lock_A = <>} ; V0 : Type = V ; - V2S, V2V, V2Q, V2A : Type = V2 ; + V2S, V2V, V2Q : Type = V2 ; AS, A2S, AV : Type = A ; A2V : Type = A2 ; diff --git a/lib/resource-1.0/doc/synopsis-browse.txt b/lib/resource-1.0/doc/synopsis-browse.txt index cc3826b76..afc00d6f5 100644 --- a/lib/resource-1.0/doc/synopsis-browse.txt +++ b/lib/resource-1.0/doc/synopsis-browse.txt @@ -10,6 +10,11 @@ To try out inflection paradigms: > i -path=alltenses:prelude -retain alltenses/ParadigmsGer.gfr > cc mkN "Farbe" ``` +To try out overloaded syntax, test lexicon, and inflection paradigms: +``` + > i -path=alltenses:prelude -retain alltenses/TryGer.gfr + > cc mkCl (mkNP this_QuantSg (mkN "Farbe")) (mkA "dunkel") +``` To look for a syntax tree in the overload API by parsing: ``` > i -path=alltenses:prelude alltenses/OverLangEng.gfc diff --git a/lib/resource-1.0/doc/synopsis.html b/lib/resource-1.0/doc/synopsis.html index 8d3dda15d..1dfd7af9f 100644 --- a/lib/resource-1.0/doc/synopsis.html +++ b/lib/resource-1.0/doc/synopsis.html @@ -3786,7 +3786,7 @@ source http://www.cs.chalmers.se/~aar Number -Prep +--Prep Type @@ -4505,10 +4505,6 @@ source http://www.cs.chalmers.se/~aar Number -Prep -Type - - accusative Prep @@ -4964,6 +4960,13 @@ To try out inflection paradigms: > cc mkN "Farbe"

+To try out overloaded syntax, test lexicon, and inflection paradigms: +

+
+    > i -path=alltenses:prelude -retain alltenses/TryGer.gfr
+    > cc mkCl (mkNP this_QuantSg (mkN "Farbe")) (mkA "dunkel")
+
+

To look for a syntax tree in the overload API by parsing: 

diff --git a/lib/resource-1.0/german/ParadigmsGer.gf b/lib/resource-1.0/german/ParadigmsGer.gf
index 0211f94db..46149dcf0 100644
--- a/lib/resource-1.0/german/ParadigmsGer.gf
+++ b/lib/resource-1.0/german/ParadigmsGer.gf
@@ -258,12 +258,12 @@ mkV2 : overload {
   mkAV  : A -> AV ;
   mkA2V : A -> Prep -> A2V ;
 
--- Notice: categories $V2S, V2V, V2A, V2Q$ are in v 1.0 treated
+-- 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$.
 -- $V0$ is just $V$.
 
-  V0, V2S, V2V, V2A, V2Q : Type ;
+  V0, V2S, V2V, V2Q : Type ;
   AS, A2S, AV, A2V : Type ;
 
 
@@ -438,7 +438,7 @@ mkV2 : overload {
   mkVV v = v ** {isAux = False ; lock_VV = <>} ;
 
   V0 : Type = V ;
-  V2S, V2V, V2Q, V2A : Type = V2 ;
+  V2S, V2V, V2Q : Type = V2 ;
   AS, A2S, AV : Type = A ;
   A2V : Type = A2 ;
 
diff --git a/lib/resource-1.0/italian/ParadigmsIta.gf b/lib/resource-1.0/italian/ParadigmsIta.gf
index 01f3948d7..0d1baac8f 100644
--- a/lib/resource-1.0/italian/ParadigmsIta.gf
+++ b/lib/resource-1.0/italian/ParadigmsIta.gf
@@ -58,7 +58,7 @@ oper
 -- amalgamate with the following word (the 'genitive' "di" and the
 -- 'dative' "a").
 
-  Prep : Type ;
+  --Prep : Type ;
 
   accusative : Prep ;
   genitive   : Prep ;
@@ -291,16 +291,16 @@ oper
   singular = Sg ;
   plural = Pl ;
 
-  Prep = Compl ;
+  --Prep = Compl ;
   accusative = complAcc ;
   genitive = complGen ;
   dative = complDat ;
-  mkPrep p = {s = p ; c = Acc ; isDir = False} ;
+  mkPrep p = {s = p ; c = Acc ; isDir = False ; lock_Prep = <>} ;
 
-  con_Prep = {s = [] ; c = CPrep P_con ; isDir = False} ;
-  da_Prep = {s = [] ; c = CPrep P_da ; isDir = False} ;
-  in_Prep = {s = [] ; c = CPrep P_in ; isDir = False} ;
-  su_Prep = {s = [] ; c = CPrep P_su ; isDir = False} ;
+  con_Prep = {s = [] ; c = CPrep P_con ; isDir = False ; lock_Prep = <>} ;
+  da_Prep = {s = [] ; c = CPrep P_da ; isDir = False ; lock_Prep = <>} ;
+  in_Prep = {s = [] ; c = CPrep P_in ; isDir = False ; lock_Prep = <>} ;
+  su_Prep = {s = [] ; c = CPrep P_su ; isDir = False ; lock_Prep = <>} ;
 
   mk2N x y g = mkNounIrreg x y g ** {lock_N = <>} ;
   regN x = mkNomReg x ** {lock_N = <>} ;
diff --git a/lib/resource-1.0/norwegian/ParadigmsNor.gf b/lib/resource-1.0/norwegian/ParadigmsNor.gf
index 9b30b2877..5e37100ad 100644
--- a/lib/resource-1.0/norwegian/ParadigmsNor.gf
+++ b/lib/resource-1.0/norwegian/ParadigmsNor.gf
@@ -259,12 +259,12 @@ oper
   mkAV  : A -> AV ;
   mkA2V : A -> Prep -> A2V ;
 
--- Notice: categories $V2S, V2V, V2A, V2Q$ are in v 1.0 treated
+-- 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$.
 -- $V0$ is just $V$.
 
-  V0, V2S, V2V, V2A, V2Q : Type ;
+  V0, V2S, V2V, V2Q : Type ;
   AS, A2S, AV, A2V : Type ;
 
 
@@ -429,7 +429,7 @@ oper
   mkA2V v p = mkA2 v p ** {lock_A = <>} ;
 
   V0 : Type = V ;
-  V2S, V2V, V2Q, V2A : Type = V2 ;
+  V2S, V2V, V2Q : Type = V2 ;
   AS, A2S, AV : Type = A ;
   A2V : Type = A2 ;
 
diff --git a/lib/resource-1.0/spanish/ParadigmsSpa.gf b/lib/resource-1.0/spanish/ParadigmsSpa.gf
index f0757c6cf..a112c313f 100644
--- a/lib/resource-1.0/spanish/ParadigmsSpa.gf
+++ b/lib/resource-1.0/spanish/ParadigmsSpa.gf
@@ -57,8 +57,6 @@ oper
 -- amalgamate with the following word (the 'genitive' "de" and the
 -- 'dative' "a").
 
-  Prep : Type ;
-
   accusative : Prep ;
   genitive   : Prep ;
   dative     : Prep ;
@@ -293,11 +291,10 @@ oper
   singular = Sg ;
   plural = Pl ;
 
-  Prep = Compl ;
-  accusative = complAcc ;
-  genitive = complGen ;
-  dative = complDat ;
-  mkPrep p = {s = p ; c = Acc ; isDir = False} ;
+  accusative = complAcc ** {lock_Prep = <>} ;
+  genitive = complGen ** {lock_Prep = <>} ;
+  dative = complDat ** {lock_Prep = <>} ;
+  mkPrep p = {s = p ; c = Acc ; isDir = False ; lock_Prep = <>} ;
 
 
   mk2N x y g = mkNounIrreg x y g ** {lock_N = <>} ;
diff --git a/lib/resource-1.0/swedish/ParadigmsSwe.gf b/lib/resource-1.0/swedish/ParadigmsSwe.gf
index 6f7a28924..a6fc32419 100644
--- a/lib/resource-1.0/swedish/ParadigmsSwe.gf
+++ b/lib/resource-1.0/swedish/ParadigmsSwe.gf
@@ -283,12 +283,12 @@ oper
   mkAV  : A -> AV ;
   mkA2V : A -> Prep -> A2V ;
 
--- Notice: categories $V2S, V2V, V2A, V2Q$ are in v 1.0 treated
+-- 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$.
 -- $V0$ is just $V$.
 
-  V0, V2S, V2V, V2A, V2Q : Type ;
+  V0, V2S, V2V, V2Q : Type ;
   AS, A2S, AV, A2V : Type ;
 
 --.
@@ -596,7 +596,7 @@ oper
   mkV2A v p = mmkV2 v p ** {lock_V2A = <>} ;
 
   V0 : Type = V ;
-  V2S, V2V, V2Q, V2A : Type = V2 ;
+  V2S, V2V, V2Q : Type = V2 ;
   AS, A2S, AV : Type = A ;
   A2V : Type = A2 ;