Make for Translate10

2014-04-04 14:32:05 +00:00
parent 316e473a1e
commit 81f76ba658
5 changed files with 91 additions and 39 deletions
--- a/lib/src/Makefile
+++ b/lib/src/Makefile
@@ -146,6 +146,14 @@ GFMKT=mkdir -p ../translator && gf $S -make -literal=Symb -probs=$(TPROBSFILE) -
 TRANSLATE8=TranslateEng.pgf TranslateBul.pgf TranslateChi.pgf TranslateGer.pgf TranslateSwe.pgf TranslateHin.pgf TranslateFin.pgf TranslateFre.pgf
 TRANSLATE10=TranslateEng.pgf TranslateBul.pgf TranslateChi.pgf TranslateGer.pgf TranslateSwe.pgf TranslateHin.pgf TranslateFin.pgf TranslateFre.pgf TranslateIta.pgf TranslateSpa.pgf

+# Without dependencies:
+Translate10:
+	$(GFMKT) -name=Translate10 $(TRANSLATE8) +RTS -K32M
+
+# With dependencies:
+Translate8.pgf: $(TRANSLATE10)
+	$(GFMKT) -name=Translate8 $(TRANSLATE10) +RTS -K32M
+
 # Without dependencies:
 Translate8:
 	$(GFMKT) -name=Translate8 $(TRANSLATE8) +RTS -K32M
--- a/lib/src/translator/TranslateChi.gf
+++ b/lib/src/translator/TranslateChi.gf
@@ -1,12 +1,15 @@
--# -path=.:../chinese:../abstract
+--# -path=.:src/chunk:alltenses

 concrete TranslateChi of Translate = 
  TenseChi,
  NounChi - [PPartNP],
  AdjectiveChi,
  NumeralChi,
-  SymbolChi [PN, Symb, String, CN, Card, NP, MkSymb, SymbPN, CNNumNP],
+  SymbolChi [
+    PN, Symb, String, CN, Card, NP, MkSymb, SymbPN, CNNumNP
+    ],
  ConjunctionChi,
+
  VerbChi - [
    UseCopula,  -- just removed
    SlashV2V, PassV2, ComplVV, -- generalized
@@ -19,12 +22,19 @@ concrete TranslateChi of Translate =
    QuestCl  -- Chi exception
    ],
  RelativeChi,
-  IdiomChi [NP, VP, Tense, Cl, ProgrVP, ExistNP, SelfAdvVP, SelfAdVVP, SelfNP],
+  IdiomChi [
+    NP, VP, Tense, Cl, ProgrVP, ExistNP, SelfAdvVP, SelfAdVVP, SelfNP, 
+    neutr, sjalv
+    ],
  ConstructionChi,
-  ExtensionsChi,
-  DictionaryChi
-   ** 
-open ResChi, ParadigmsChi, SyntaxChi, Prelude, (G = GrammarChi), (E = ExtraChi) in {
+  DocumentationChi,
+
+  ChunkChi,
+  ExtensionsChi [CompoundCN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, that_RP, who_RP],
+
+  DictionaryChi ** 
+ 
+  open ResChi, ParadigmsChi, SyntaxChi, Prelude, (G = GrammarChi), (E = ExtraChi) in {

 flags
  literal = Symb ;
@@ -34,10 +44,11 @@ flags
 -- Chinese-specific overrides

 lin
-  CompAP = G.CompAP | E.CompBareAP ;                     -- he is good | he good
+  CompAP = E.CompBareAP | G.CompAP ;                      -- he good | he is good

-  AdvVP vp adv = E.TopicAdvVP vp adv | G.AdvVP vp adv ;  -- he *today* here sleeps | *today* he here sleeps
+  AdvVP vp adv = G.AdvVP vp adv | E.TopicAdvVP vp adv  ;  -- he *today* here sleeps | *today* he here sleeps

-  QuestCl cl = G.QuestCl cl | E.QuestRepV cl ;           -- he comes 'ma' | he come not come
+  QuestCl cl = G.QuestCl cl | E.QuestRepV cl ;            -- he comes 'ma' | he come not come

 }
+
--- a/lib/src/translator/TranslateFin.gf
+++ b/lib/src/translator/TranslateFin.gf
@@ -1,31 +1,39 @@
--# -path=.:../finnish/stemmed:../finnish:../abstract:../common:../finnish/kotus:../api
+--# -path=.:src/chunk:src/finnish/stemmed:src/finnish:src/api

 concrete TranslateFin of Translate = 
-  TenseX,  ---- TODO add potential forms 
+  TenseX,
  CatFin,
  NounFin - [
-    PPartNP,
-    UsePron, PossPron  -- Fin specific: replaced by variants with prodrop
+    PPartNP
+    ,UsePron, PossPron  -- Fin specific: replaced by variants with prodrop
    ],
  AdjectiveFin,
  NumeralFin,
-  SymbolFin [PN, Symb, String, CN, Card, NP, MkSymb, SymbPN, CNNumNP],
+  SymbolFin [
+    PN, Symb, String, CN, Card, NP, MkSymb, SymbPN, CNNumNP
+    ],
  ConjunctionFin,
-  VerbFin - [
-    SlashV2V, PassV2, UseCopula, ComplVV,
-             VPSlashPrep -- with empty prepositions, a cyclic rule that leads to overgeneration
-    ],  
+  VerbFin -  [
+    UseCopula,  
+    SlashV2V, PassV2, ComplVV  -- generalized in Extensions
+    ],
  AdverbFin,
  PhraseFin,
  SentenceFin,
  QuestionFin,
  RelativeFin,
-  IdiomFin [NP, VP, Tense, Cl, ProgrVP, ExistNP, SelfAdvVP, SelfAdVVP, SelfNP],
+  IdiomFin [
+    NP, VP, Tense, Cl, ProgrVP, ExistNP, SelfAdvVP, SelfAdVVP, SelfNP, 
+    neutr, sjalv
+    ],
  ConstructionFin,
  DocumentationFin,
-- ExtensionsFin,  
-  DictionaryFin 
-** 
+
+  ChunkFin,
+  ExtensionsFin [CompoundCN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, that_RP, who_RP],
+
+  DictionaryFin ** 
+
 open MorphoFin, ResFin, ParadigmsFin, SyntaxFin, StemFin, (E = ExtraFin), (G = GrammarFin), Prelude in {

 flags literal=Symb ; coding = utf8 ;
--- a/lib/src/translator/TranslateFre.gf
+++ b/lib/src/translator/TranslateFre.gf
@@ -1,21 +1,35 @@
--# -path=.:../French:../abstract:../romance:alltenses
+--# -path=.:src/chunk:alltenses
+
 concrete TranslateFre of Translate = 
  TenseFre,
  NounFre - [PPartNP],
  AdjectiveFre,
  NumeralFre,
-  SymbolFre [PN, Symb, String, CN, Card, NP, MkSymb, SymbPN, CNNumNP],
+  SymbolFre [
+    PN, Symb, String, CN, Card, NP, MkSymb, SymbPN, CNNumNP
+    ],
  ConjunctionFre,
-  VerbFre - [SlashV2V, PassV2, UseCopula, ComplVV],
+  VerbFre -  [
+    UseCopula,  
+    SlashV2V, PassV2, ComplVV  -- generalized in Extensions
+    ],
  AdverbFre,
  PhraseFre,
  SentenceFre,
-  QuestionFre - [QuestCl, QuestIAdv], -- more variants here
+  QuestionFre - [
+    QuestCl,QuestIAdv -- french-specific overrides
+    ],
  RelativeFre,
-  IdiomFre [NP, VP, Tense, Cl, ProgrVP, ExistNP, SelfAdvVP, SelfAdVVP, SelfNP],
+  IdiomFre [
+    NP, VP, Tense, Cl, ProgrVP, ExistNP, SelfAdvVP, SelfAdVVP, SelfNP, 
+    neutr, sjalv
+    ],
  ConstructionFre,
  DocumentationFre,
-  ExtensionsFre,
+
+  ChunkFre,
+  ExtensionsFre [CompoundCN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, that_RP, who_RP],
+
  DictionaryFre ** 
 open PhonoFre, MorphoFre, ResFre, CommonRomance, ParadigmsFre, SyntaxFre, Prelude, (G = GrammarFre) in {

--- a/lib/src/translator/TranslateGer.gf
+++ b/lib/src/translator/TranslateGer.gf
@@ -1,26 +1,37 @@
--# -path=alltenses:.:../german:../abstract
+--# -path=.:src/chunk:alltenses
+
 concrete TranslateGer of Translate = 
  TenseGer,
  NounGer - [PPartNP],
  AdjectiveGer,
  NumeralGer,
-  SymbolGer [PN, Symb, String, CN, Card, NP, MkSymb, SymbPN, CNNumNP],
+  SymbolGer [
+    PN, Symb, String, CN, Card, NP, MkSymb, SymbPN, CNNumNP
+    ],
  ConjunctionGer,
-  VerbGer - [SlashV2V, PassV2, UseCopula, ComplVV],
+  VerbGer -  [
+    UseCopula,  
+    SlashV2V, PassV2, ComplVV  -- generalized in Extensions
+    ],
  AdverbGer,
  PhraseGer,
  SentenceGer,
  QuestionGer,
  RelativeGer,
-  IdiomGer [NP, VP, Tense, Cl, ProgrVP, ExistNP, SelfAdvVP, SelfAdVVP, SelfNP, geben],
+  IdiomGer [
+    NP, VP, Tense, Cl, ProgrVP, ExistNP, SelfAdvVP, SelfAdVVP, SelfNP, 
+    neutr, sjalv
+    ],
  ConstructionGer,
  DocumentationGer,
-  ExtensionsGer,
-  DictionaryGer ** 
-open MorphoGer, ResGer, ParadigmsGer, SyntaxGer, Prelude in {

-flags 
-  literal=Symb ; 
-  coding = utf8 ;
+  ChunkGer,
+  ExtensionsGer [CompoundCN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, that_RP, who_RP],
+
+  DictionaryGer ** 
+open MorphoGer, ResGer, ParadigmsGer, SyntaxGer, CommonScand, (E = ExtraGer), Prelude in {
+
+flags
+  literal=Symb ;

 }