mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-04-09 04:59:31 -06:00
fixed SUMOEng with open instead of import for the Extension module
This commit is contained in:
@@ -1,30 +1,30 @@
|
||||
--# -path=.:englishExtended:abstract:common:
|
||||
concrete BasicEng of Basic = CatEng - [Text] ** open DictLangEng, DictEng, ParadigmsEng, ResEng, Coordination, Prelude, ParamBasic, NounEng in {
|
||||
concrete BasicEng of Basic = open CatEng, ExtensionEng, DictLangEng, DictEng, ParadigmsEng, ResEng, Coordination, Prelude, ParamBasic, ConjunctionEng, NounEng in {
|
||||
|
||||
lincat
|
||||
Class = CN ;
|
||||
El = NP ;
|
||||
Ind = NP ;
|
||||
Var = PN ;
|
||||
Class = CatEng.CN ;
|
||||
El = CatEng.NP ;
|
||||
Ind = CatEng.NP ;
|
||||
Var = CatEng.PN ;
|
||||
SubClass = {} ;
|
||||
Inherits = {} ;
|
||||
Desc = CN ;
|
||||
Formula = PolSentence;
|
||||
[El] = [NP];
|
||||
[Class] = [CN];
|
||||
Stmt = StmtS ;
|
||||
Desc = CatEng.CN ;
|
||||
Formula = ExtensionEng.PolSentence;
|
||||
[El] = ConjunctionEng.ListNP;
|
||||
[Class] =ExtensionEng.ListCN ;
|
||||
Stmt = ExtensionEng.StmtS ;
|
||||
|
||||
lin
|
||||
BaseClass = {s1,s2 = \\_,_ => "";
|
||||
g = Neutr;
|
||||
lock_ListCN=<>};
|
||||
ConsClass xs x = ConsCN xs x ;
|
||||
ConsClass xs x = ExtensionEng.ConsCN xs x ;
|
||||
|
||||
BaseEl c = {s1,s2 = \\_ => "";
|
||||
a = agrP3 Sg;
|
||||
lock_ListNP=<>};
|
||||
|
||||
ConsEl c xs x = ConsNP xs x ;
|
||||
ConsEl c xs x = ConjunctionEng.ConsNP xs x ;
|
||||
|
||||
and f1 f2 = {s = \\f,c => f1.s ! Indep ! c ++ "and" ++ f2.s ! Indep ! c; flag = NothingS; lock_PolSentence = <>};
|
||||
or f1 f2 = {s = \\f,c => f1.s ! Indep ! c ++ "or" ++ f2.s ! Indep ! c; flag = NothingS; lock_PolSentence = <>};
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
concrete MergeEng of Merge = BasicEng ** open DictLangEng, DictEng, ParadigmsEng, ResEng, ParamBasic in {
|
||||
concrete MergeEng of Merge = BasicEng ** open DictLangEng, DictEng, ParadigmsEng, ResEng, ParamBasic,ExtensionEng in {
|
||||
|
||||
lin
|
||||
-- single instances
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
concrete MidLevelOntologyEng of MidLevelOntology = MergeEng, ElementsEng ** open DictLangEng, DictEng, ParadigmsEng in {
|
||||
concrete MidLevelOntologyEng of MidLevelOntology = MergeEng, ElementsEng ** open DictLangEng, DictEng, ParadigmsEng,ExtensionEng in {
|
||||
|
||||
lin
|
||||
-- individual instances :
|
||||
|
||||
@@ -6,8 +6,7 @@
|
||||
-- which may be more suitable to open in applications.
|
||||
|
||||
abstract DictLang =
|
||||
Grammar,
|
||||
Extension
|
||||
** {
|
||||
Grammar
|
||||
** open Extension in {
|
||||
-- flags startcat=NP ;
|
||||
} ;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
--# -path=.:../../../lib/src/abstract:../../../lib/src/english:../../../lib/src/common
|
||||
|
||||
concrete DictLangEng of DictLang =
|
||||
GrammarEng,
|
||||
ExtensionEng ** {
|
||||
GrammarEng
|
||||
** open ExtensionEng in {
|
||||
|
||||
flags unlexer = text ; lexer = text ;
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
|
||||
-- other functions needed for parsing
|
||||
|
||||
abstract Extension = Cat ** {
|
||||
abstract Extension = {
|
||||
|
||||
|
||||
|
||||
@@ -9,6 +9,7 @@ cat
|
||||
PolSentence;
|
||||
StmtS ;
|
||||
[CN]{2};
|
||||
N; N2; A; V; V2; CN; NP; Cl; Pol; Prep; Conj; -- redefined from Cat
|
||||
fun
|
||||
|
||||
VerbToNounV2 : V2 -> N2 ; -- discovering
|
||||
@@ -21,7 +22,7 @@ sentToNoun : PolSentence -> NP ;
|
||||
UsePolSentence : Pol -> PolSentence -> StmtS ;
|
||||
|
||||
at_Prep : Prep ;
|
||||
per_Prep : Prep ;
|
||||
per_Prep : Prep ;
|
||||
O1 : NP ;
|
||||
O2 : NP ;
|
||||
O3 : NP ;
|
||||
|
||||
@@ -1,20 +1,33 @@
|
||||
concrete ExtensionEng of Extension = CatEng ** open MorphoEng, ResEng, ConjunctionEng, StructuralEng, Prelude, ParadigmsEng, Coordination, ParamBasic in {
|
||||
--# -path=.:RGLExt:alltenses:../../lib/src/english
|
||||
|
||||
concrete ExtensionEng of Extension = open CatEng, MorphoEng, ResEng, ConjunctionEng, StructuralEng, Prelude, ParadigmsEng, Coordination, ParamBasic in {
|
||||
|
||||
|
||||
lincat
|
||||
PolSentence = {s : SentForm => Polarity => Str ; flag : Flag};
|
||||
[CN] = {s1,s2 : Number => Case => Str ; g : Gender} ;
|
||||
StmtS = {s : Str};
|
||||
NP = CatEng.NP;
|
||||
CN = CatEng.CN;
|
||||
N = CatEng.N;
|
||||
N2 = CatEng.N2;
|
||||
A = CatEng.A;
|
||||
V = CatEng.V;
|
||||
V2 = CatEng.V2;
|
||||
Cl = CatEng.Cl;
|
||||
Pol = CatEng.Pol;
|
||||
Prep = CatEng.Prep;
|
||||
Conj = CatEng.Conj;
|
||||
lin
|
||||
|
||||
VerbToNounV2 vs = VerbToNoun vs ** {c2 = vs.c2};
|
||||
VerbToNounV2 vs = VerbToNoun vs ** {c2 = vs.c2; lock_N2=<>};
|
||||
|
||||
VerbToNoun v = {s = \\_,_ => v.s ! VPresPart;
|
||||
g = Masc};
|
||||
g = Masc; lock_N=<>};
|
||||
|
||||
VerbToGerundA v = {s = \\_ => v.s ! VPresPart};
|
||||
VerbToGerundA v = {s = \\_ => v.s ! VPresPart; lock_A=<>};
|
||||
|
||||
VerbToParticipeA v = {s = \\_ => v.s ! VPPart};
|
||||
VerbToParticipeA v = {s = \\_ => v.s ! VPPart; lock_A=<>};
|
||||
|
||||
mkPolSent cl = {s = \\f,b => case b of
|
||||
{Pos => cl.s ! Pres ! Simul ! CPos ! ODir;
|
||||
@@ -23,9 +36,9 @@ mkPolSent cl = {s = \\f,b => case b of
|
||||
lock_PolSentence = <>};
|
||||
|
||||
sentToNoun ps = {s = \\_ => "\"" ++ ps.s ! Indep ! Pos ++ "\"";
|
||||
a = agrP3 Sg};
|
||||
a = agrP3 Sg; lock_NP=<>};
|
||||
|
||||
ConjCN conj ss = conjunctDistrTable2 Number Case conj ss ** {g = ss.g};
|
||||
ConjCN conj ss = conjunctDistrTable2 Number Case conj ss ** {g = ss.g;lock_CN=<>};
|
||||
|
||||
BaseCN x y ={s1 = \\n,c => x.s ! n ! c ;
|
||||
s2 = \\n,c => y.s ! n ! c ;
|
||||
@@ -40,19 +53,19 @@ at_Prep = mkPrep "at" ;
|
||||
per_Prep = mkPrep "per" ;
|
||||
|
||||
O1 = {s = \\_ => "o1" ;
|
||||
a = agrP3 Sg};
|
||||
a = agrP3 Sg}**{lock_NP=<>};
|
||||
|
||||
O2 = {s = \\_ => "o2" ;
|
||||
a = agrP3 Sg};
|
||||
a = agrP3 Sg}**{lock_NP=<>};
|
||||
|
||||
O3 = {s = \\_ => "o3" ;
|
||||
a = agrP3 Sg};
|
||||
a = agrP3 Sg}**{lock_NP=<>};
|
||||
|
||||
O4 = {s = \\_ => "o4" ;
|
||||
a = agrP3 Sg};
|
||||
a = agrP3 Sg}**{lock_NP=<>};
|
||||
|
||||
O5 = {s = \\_ => "o5" ;
|
||||
a = agrP3 Sg};
|
||||
a = agrP3 Sg}**{lock_NP=<>};
|
||||
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user