restructured Russian; copies of Constructors in present and alltenses

This commit is contained in:
aarne
2007-06-08 15:30:21 +00:00
parent 741d3e1706
commit 5c0f1a3fc0
5 changed files with 21 additions and 19 deletions

View File

@@ -1,4 +1,4 @@
--# -path=.:mathematical:present:api:prelude --# -path=.:mathematical:present:prelude
concrete ArithmEng of Arithm = LogicEng ** concrete ArithmEng of Arithm = LogicEng **
open open

View File

@@ -12,6 +12,7 @@ GFC=$(GFCC) -src
# comment the first and uncomment the second in Windows # comment the first and uncomment the second in Windows
GFCP=$(GFC) -preproc=./mkPresent GFCP=$(GFC) -preproc=./mkPresent
GFCCP=$(GFCC) -preproc=./mkPresent
#GFCP=$(GFC) -preproc=mkPresent #GFCP=$(GFC) -preproc=mkPresent
@@ -42,6 +43,11 @@ alltenses:
$(GFC) swedish/Swedish.gf $(GFC) swedish/Swedish.gf
$(GFC) common/ConstructX.gf $(GFC) common/ConstructX.gf
cp -p */*.gfc */*.gfr ../alltenses cp -p */*.gfc */*.gfr ../alltenses
touch api/Constructors.gf
$(GFCC) api/Constructors???.gf
cp -p api/Constructors*.gfc api/Constructors*.gfr ../alltenses
langs: langs:
echo "s ;; pm | wf langs.gfcm" | $(GFCA) -path=alltenses:prelude ../alltenses/Lang???.gfc $(RTSS) echo "s ;; pm | wf langs.gfcm" | $(GFCA) -path=alltenses:prelude ../alltenses/Lang???.gfc $(RTSS)
@@ -66,6 +72,9 @@ present:
$(GFCP) swedish/Swedish.gf $(GFCP) swedish/Swedish.gf
$(GFCP) common/ConstructX.gf $(GFCP) common/ConstructX.gf
mv */*.gfc */*.gfr ../present mv */*.gfc */*.gfr ../present
touch api/Constructors.gf
$(GFCCP) api/Constructors???.gf
mv api/Constructors*.gfc api/Constructors*.gfr ../alltenses
mathematical: mathematical:
$(GFCC) mathematical/MathematicalEng.gf $(GFCC) mathematical/MathematicalEng.gf

View File

@@ -12,7 +12,7 @@ incomplete resource Constructors = open Grammar in {
-- --
-- is written -- is written
-- --
-- $mkS (mkCl (mkPN "John") (mkV2 "love") (mkPN "Mary"))$ -- $mkS (mkCl (mkNP (mkPN "John")) (mkV2 "love") (mkNP (mkPN "Mary")))$
-- --
-- This module defines the syntactic constructors, which take trees as arguments. -- This module defines the syntactic constructors, which take trees as arguments.
-- Lexical constructors, which take strings as arguments, are defined in the -- Lexical constructors, which take strings as arguments, are defined in the

View File

@@ -212,11 +212,11 @@ oper
-- In practice, it is enough to give three forms, -- In practice, it is enough to give three forms,
-- e.g. "drink - drank - drunk". -- e.g. "drink - drank - drunk".
mkV : (drink, drank, drunk : Str) -> V ; mkV : (drink, drank, drunk : Str) -> V ;
-- Irregular verbs with duplicated consonant in the present participle. -- Irregular verbs with duplicated consonant in the present participle.
mkV : (run, ran, run, running : Str) -> V ; mkV : (run, ran, run, running : Str) -> V ;
-- Except for "be", the worst case needs five forms: the infinitive and -- Except for "be", the worst case needs five forms: the infinitive and
-- the third person singular present, the past indicative, and the -- the third person singular present, the past indicative, and the

View File

@@ -1,17 +1,10 @@
--# -path=.:../abstract:../common:../../prelude --# -path=.:../abstract:../common:prelude
concrete LangRus of Lang = concrete LangRus of Lang =
NounRus, GrammarRus,
VerbRus, LexiconRus
AdjectiveRus, ** {
AdverbRus,
NumeralRus, flags startcat = Phr ; unlexer = text ; lexer = text ;
SentenceRus,
QuestionRus, } ;
RelativeRus,
ConjunctionRus,
PhraseRus,
TextX,
StructuralRus,
IdiomRus,
LexiconRus ** { flags startcat = Phr ; unlexer = text ; lexer = text ;} ;