From e6fe9fc07af1b8fef18e91dbe26d19039a0e917a Mon Sep 17 00:00:00 2001 From: aarne Date: Wed, 7 Dec 2005 22:27:16 +0000 Subject: [PATCH] English Ord to Order --- lib/resource-1.0/english/CatEng.gf | 6 +++--- lib/resource-1.0/english/ParamEng.gf | 2 +- lib/resource-1.0/english/ResEng.gf | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/resource-1.0/english/CatEng.gf b/lib/resource-1.0/english/CatEng.gf index 2cc48064b..4a92bdf53 100644 --- a/lib/resource-1.0/english/CatEng.gf +++ b/lib/resource-1.0/english/CatEng.gf @@ -9,14 +9,14 @@ concrete CatEng of Cat = open ResEng, Prelude, (R = ParamX) in { QS = {s : QForm => Str} ; RS = {s : Agr => Str} ; - Cl = {s : Tense => Anteriority => Polarity => Ord => Str} ; - Slash = {s : Tense => Anteriority => Polarity => Ord => Str} ** {c2 : Str} ; + Cl = {s : Tense => Anteriority => Polarity => Order => Str} ; + Slash = {s : Tense => Anteriority => Polarity => Order => Str} ** {c2 : Str} ; QCl = {s : Tense => Anteriority => Polarity => QForm => Str} ; RCl = {s : Tense => Anteriority => Polarity => Agr => Str} ; VP = { - s : Tense => Anteriority => Polarity => Ord => Agr => {fin, inf : Str} ; + s : Tense => Anteriority => Polarity => Order => Agr => {fin, inf : Str} ; s2 : Agr => Str } ; diff --git a/lib/resource-1.0/english/ParamEng.gf b/lib/resource-1.0/english/ParamEng.gf index 48c8af9ba..63a541530 100644 --- a/lib/resource-1.0/english/ParamEng.gf +++ b/lib/resource-1.0/english/ParamEng.gf @@ -29,7 +29,7 @@ resource ParamEng = ParamX ** { -- The order of sentence is needed already in $VP$. - Ord = ODir | OQuest ; + Order = ODir | OQuest ; --2 For $Adjective$ diff --git a/lib/resource-1.0/english/ResEng.gf b/lib/resource-1.0/english/ResEng.gf index a91ca2ece..a3d249b3c 100644 --- a/lib/resource-1.0/english/ResEng.gf +++ b/lib/resource-1.0/english/ResEng.gf @@ -99,7 +99,7 @@ resource ResEng = ParamEng ** open Prelude in { } ; VerbForms : Type = - Tense => Anteriority => Polarity => Ord => Agr => {fin, inf : Str} ; + Tense => Anteriority => Polarity => Order => Agr => {fin, inf : Str} ; VP : Type = { s : VerbForms ; @@ -229,7 +229,7 @@ resource ResEng = ParamEng ** open Prelude in { -- For $Sentence$. Clause : Type = { - s : Tense => Anteriority => Polarity => Ord => Str + s : Tense => Anteriority => Polarity => Order => Str } ; mkClause : Str -> Agr -> VP -> Clause =