DictEngFre 19k lemmas from Wiktionary; old one moved to V1_DictEngFre; created ParseFre for robust translation (syntax not yet complete)

lib/src/french/ParadigmsFre.gf

@@ -276,13 +276,24 @@ oper
 
   mkV0  : V -> V0 ;  --%
   mkVS  : V -> VS ;
-  mkV2S : V -> Prep -> V2S ;
   mkVV  : V -> VV ;  -- plain infinitive: "je veux parler"
   deVV  : V -> VV ;  -- "j'essaie de parler"
   aVV   : V -> VV ;  -- "j'arrive à parler"
-  mkV2V : V -> Prep -> Prep -> V2V ;
+  mkV2S  : overload {
+    mkV2S : V -> V2S ;
+    mkV2S : V -> Prep -> V2S ;
+    } ;
+  mkV2V  : overload {
+    mkV2V : V -> V2V ;
+    mkV2V : V -> Prep -> Prep -> V2V ;
+    } ;
   mkVA  : V -> VA ;
-  mkV2A : V -> Prep -> Prep -> V2A ;
+
+  mkV2A : overload {
+    mkV2A : V -> V2A ;
+    mkV2A : V -> Prep -> Prep -> V2A ;
+    } ;
+
   mkVQ  : V -> VQ ;
   mkV2Q : V -> Prep -> V2Q ;
 
@@ -403,13 +414,28 @@ oper
 
   mkV0  v = v ** {lock_V0 = <>} ;
   mkVS  v = v ** {m = \\_ => Indic ; lock_VS = <>} ;  ---- more moods
-  mkV2S v p = mmkV2 v p ** {mn,mp = Indic ; lock_V2S = <>} ;
+
+  mkV2S = overload {
+    mkV2S : V -> V2S = \v -> mmkV2 v dative ** {mn,mp = Indic ; lock_V2S = <>} ;
+    mkV2S : V -> Prep -> V2S = \v,p -> mmkV2 v p ** {mn,mp = Indic ; lock_V2S = <>} ;
+    } ;
+
   mkVV  v = v ** {c2 = complAcc ; lock_VV = <>} ;
   deVV  v = v ** {c2 = complGen ; lock_VV = <>} ;
   aVV  v = v ** {c2 = complDat ; lock_VV = <>} ;
-  mkV2V v p q = mmkV3 v p q ** {lock_V2V = <>} ;
+
+  mkV2V = overload {
+    mkV2V : V -> V2V                 = \v -> mmkV3 v accusative dative ** {lock_V2V = <>} ;
+    mkV2V : V -> Prep -> Prep -> V2V = \v,p,q -> mmkV3 v p q ** {lock_V2V = <>} ;
+    } ;
+
+  mkV2A = overload {
+    mkV2A : V -> V2A                 = \v -> mmkV3 v accusative dative ** {lock_V2A = <>} ;
+    mkV2A : V -> Prep -> Prep -> V2A = \v,p,q -> mmkV3 v p q ** {lock_V2A = <>} ;
+    } ;
+
   mkVA  v = v ** {lock_VA = <>} ;
-  mkV2A v p q = mmkV3 v p q ** {lock_V2A = <>} ;
+
   mkVQ  v = v ** {lock_VQ = <>} ;
   mkV2Q v p = mmkV2 v p ** {lock_V2Q = <>} ;
 
@@ -455,6 +481,8 @@ oper
     = \tenir,tiens,tient,tenons,tenez,tiennent,tienne,tenions,tiensI,tint,tiendra,tenu -> 
       let v = vvf (mkVerb12 tenir tiens tient tenons tenez tiennent tienne tenions tiensI tint tiendra tenu) in
       {s = v ; vtyp = VTyp VHabere (getVerbT v) ; lock_V = <>} ;
+   mkV : V -> V
+    = \v -> v ;
   } ;
 
   regV : Str -> V ;

lib/src/french/ParseFre.gf

@@ -0,0 +1,157 @@
+--# -path=alltenses
+concrete ParseFre of ParseEngAbs = 
+  TenseFre,
+--  CatFre,
+  NounFre - [PPartNP],
+  AdjectiveFre,
+  NumeralFre,
+  SymbolFre [PN, Symb, String, CN, Card, NP, MkSymb, SymbPN, CNNumNP],
+  ConjunctionFre,
+  VerbFre - [SlashV2V, PassV2, UseCopula, ComplVV  , SlashV2VNP],
+  AdverbFre,
+  PhraseFre,
+  SentenceFre - [  SlashVP],
+  QuestionFre,
+  RelativeFre,
+  IdiomFre [NP, VP, Tense, Cl, ProgrVP, ExistNP],
+  ExtraFre [NP, Quant, VPSlash, VP, Tense, GenNP, PassVPSlash,
+            Temp, Pol, Conj, VPS, ListVPS, S, Num, CN, RP, MkVPS, BaseVPS, ConsVPS, ConjVPS, PredVPS, GenRP,
+            VPI, VPIForm, VPIInf, VPIPresPart, ListVPI, VV, MkVPI, BaseVPI, ConsVPI, ConjVPI, ComplVPIVV,
+            ClSlash, RCl, EmptyRelSlash],
+
+  DictEngFre ** 
+open PhonoFre, MorphoFre, ResFre, ParadigmsFre, SyntaxFre, Prelude in {
+
+flags
+  literal=Symb ;
+  beam_size=0.95 ;
+  coding = utf8 ;
+
+
+lin
+-- missing from ExtraFre; should not really be there either
+
+  GenNP np = 
+    let denp = (np.s ! ResFre.genitive).ton in {
+      s = \\_,_,_,_ => [] ; 
+      sp = \\_,_,_ => denp ;
+      s2 = denp ; 
+      isNeg = False ;
+    } ;
+
+  EmptyRelSlash slash = mkRCl which_RP (lin ClSlash slash) ;
+
+  that_RP = which_RP ;
+
+  UncNeg = negativePol ;
+
+-- lexical entries
+
+----  another_Quant = mkQuantifier "autre" "autre" "autres" "autres" ;
+----  some_Quant = mkQuantifier "quelqu'un" "quelqu'une" "quelques-uns" "quelques-unes" ;
+----  anySg_Det = mkDeterminer "n'importe quel" "n'importe quelle" Sg False ; ---- also meaning "whichever" ? 
+--  each_Det = SyntaxFre.every_Det ;
+
+  but_Subj = {s = "mais" ; m = Indic} ; ---- strange to have this as Subj
+
+{-
+  myself_NP = regNP "myself" singular ;
+  yourselfSg_NP = regNP "yourself" singular ;
+  himself_NP = regNP "himself" singular ;
+  herself_NP = regNP "herself" singular ;
+  itself_NP = regNP "itself" singular ;
+  ourself_NP = regNP "ourself" plural ;
+  yourselfPl_NP = regNP "yourself" plural ;
+  themself_NP = regNP "themself" plural ;
+  themselves_NP = regNP "themselves" plural ;
+-}
+
+  CompoundCN num noun cn = {
+    s = \\n => cn.s ! n ++ elisDe ++ noun.s ! num.n ;
+    g = cn.g
+  } ;
+
+{-  
+  DashCN noun1 noun2 = {
+    s = \\n,c => noun1.s ! Sg ! Nom ++ "-" ++ noun2.s ! n ! c ;
+    g = noun2.g
+  } ;
+
+  GerundN v = {
+    s = \\n,c => v.s ! VPresPart ;
+    g = Neutr
+  } ;
+  
+  GerundAP v = {
+    s = \\agr => v.s ! VPresPart ;
+    isPre = True
+  } ;
+-}
+
+  PastPartAP v = {
+    s = table {
+      AF g n => v.s ! VPart g n ;
+      _ => v.s ! VPart Masc Sg  ---- the adverb form
+      } ;
+    isPre = True
+  } ;
+
+{-
+  OrdCompar a = {s = \\c => a.s ! AAdj Compar c } ;
+-}
+
+  PositAdVAdj a = {s = a.s ! Posit ! AA} ;
+
+{-
+  UseQuantPN q pn = {s = \\c => q.s ! False ! Sg ++ pn.s ! npcase2case c ; a = agrgP3 Sg pn.g} ;
+
+  SlashV2V v ant p vp = insertObjc (\\a => v.c3 ++ ant.s ++ p.s ++
+                                           infVP v.typ vp ant.a p.p a)
+                                   (predVc v) ;
+
+  SlashVPIV2V v p vpi = insertObjc (\\a => p.s ++ 
+                                           v.c3 ++ 
+                                           vpi.s ! VVAux ! a)
+                                   (predVc v) ;
+-}
+  ComplVV v a p vp = 
+      insertComplement (\\a => prepCase v.c2.c ++ infVP vp a) (predV v) ; ---- a,p
+
+---- TODO: find proper expressions for OSV and OVS in Fre
+  PredVPosv np vp = mkCl (lin NP np) (lin VP vp) ;
+  PredVPovs np vp = mkCl (lin NP np) (lin VP vp) ;
+
+
+  CompS s = {s = \\_ => "de" ++ "que" ++ s.s ! Indic} ; ---- de ?
+
+{-
+  CompQS qs = {s = \\_ => qs.s ! QIndir} ;
+  CompVP ant p vp = {s = \\a => ant.s ++ p.s ++ 
+                                infVP VVInf vp ant.a p.p a} ;
+
+  VPSlashVS vs vp = 
+    insertObj (\\a => infVP VVInf vp Simul CPos a) (predV vs) **
+    {c2 = ""; gapInMiddle = False} ;
+
+  PastPartRS ant pol vps = {
+    s = \\agr => vps.ad ++ vps.ptp ++ vps.s2 ! agr ;
+    c = npNom
+    } ;
+
+  PresPartRS ant pol vp = {
+    s = \\agr => vp.ad ++ vp.prp ++ vp.s2 ! agr ;
+    c = npNom
+  } ;
+
+  ApposNP np1 np2 = {
+    s = \\c => np1.s ! c ++ "," ++ np2.s ! npNom ;
+    a = np1.a
+  } ;
+  
+  AdAdV = cc2 ;
+  
+  UttAdV adv = adv;
+
+-}    
+
+}