Commit a02bdf46 authored by Gérard Huet's avatar Gérard Huet

Privative transducer A accommodates a+ch->acch; version bumped to 3.05

parent 6f966c63
......@@ -4,7 +4,7 @@
(* *)
(* Gérard Huet & Pawan Goyal *)
(* *)
(* ©2017 Institut National de Recherche en Informatique et en Automatique *)
(* ©2018 Institut National de Recherche en Informatique et en Automatique *)
(**************************************************************************)
(* The auto structure *)
......
......@@ -4,7 +4,7 @@
(* *)
(* Gérard Huet & Pawan Goyal *)
(* *)
(* ©2017 Institut National de Recherche en Informatique et en Automatique *)
(* ©2018 Institut National de Recherche en Informatique et en Automatique *)
(**************************************************************************)
(*i module Automaton = struct i*)
......
......@@ -4,7 +4,7 @@
(* *)
(* Gérard Huet *)
(* *)
(* ©2017 Institut National de Recherche en Informatique et en Automatique *)
(* ©2018 Institut National de Recherche en Informatique et en Automatique *)
(**************************************************************************)
(*i module Inflected = struct i*)
......@@ -383,7 +383,7 @@ type flexion =
| Absotvaa of conjugation and word (* abs-tvaa *)
]
;
value is_taddhita = fun (* unused at present - see [Subst.taddhitas] *)
value is_taddhita = fun (* OBSOLETE - see [Subst.taddhitas] *)
[ "taa" | "tva" | "vat" | "mat" | "tas"
| "kataa" | "katva" (* -ka-taa -ka-tva *)
| "vattva" | "tvavat"-> True
......@@ -408,7 +408,8 @@ value enter1 entry =
; match entry with (* generative ifcs of infinitive bahus *)
[ "kaama" (* volition : who wants to do *)
| "manas" (* consideration : who thinks about doing *)
(* | "zakya" (* consideration : who is able to do *) kridanta *)
(* | "zakya" (* possibility : who is able to do *)
(* not amenable since kridanta, other phase *) *)
-> add_morphkama w delta f
| _ -> ()
]
......
......@@ -124,8 +124,9 @@ value load_transducer cat =
else do { Prel.prelude (); abort cat } ]
;
(* privative prefixes automata *)
value a_trans = State(False,[(1,State(True,[],[]))],[])
and an_trans = let n_trans = State(False,[(36,State(True,[],[]))],[]) in
value a_trans = State(False,[(1,State(True,[],[cch]))],[])
where cch = (([ 22; 23 ],[],[ 23 ]) : rule) (* a-ch \R acch *)
and an_trans = let n_trans = State(False,[(36,State(True,[],[]))],[]) in
State(False,[(1,n_trans)],[])
;
(* Splitting an automaton into vowel-initial and consonant-initial solutions *)
......
......@@ -77,8 +77,8 @@ value voices_of = fun
(*| "kan" Atma needed for kaayamaana *)
(*| "gam" Atma needed for sa.mgacchate *)
(*| "van" Atma needed for vanute *)
(*| "mah" also Atma for pft. maamahe *)
(*| "cit#1" also Atma for pft. cikite *)
(*| "mah" Atma needed for pft. maamahe *)
(*| "cit#1" Atma needed for pft. cikite *)
(*| "kaafk.s" | "han#1" occur also in Atma in BhG: kaafk.se hani.sye *)
(*| "a~nj" also Atma afkte | "naath" "praz" "sp.rz#1" idem *)
-> Para (* active only *)
......@@ -98,8 +98,8 @@ value voices_of = fun
| "sva~nj" | "haa#2" | "hu.n.d" | "h.r#2" | "hnu" | "hraad" | "hlaad"
(*| "m.r" Ubha needed for non present tenses - see \Pan{1,3,61} for exact rule *)
(* DRP restriction: "dyut#1" *)
-> Atma (* middle only *)
| _ -> Ubha (* default *)
-> Atma (* "deponent" verbs: middle only *)
| _ -> Ubha (* default *)
(* Attested Ubha (over all ga.nas) :
[ "a~nc" | "arh" | "i" | "i.s#1" | "uurj#1" | "uuh" | ".r" | ".rj"
| "ka.n.d" | "kal" | "ka.s" | "ku.t.t" | "ku.n.d" | "k.r#1" | "k.r#2"
......
......@@ -5609,6 +5609,7 @@ value compute_extra_participles () = do
{ record_part_ppp (revstem "gupta") "gup" (* gup gana 10 *)
; record_part_ppp (revstem "zaata") "zaa"
; record_part_ppp (revstem "kaanta") "kam"
; record_part_ppp (revstem "k.sita") "k.sii"
; record_part_ppp (revstem "spa.s.ta") "spaz#1"
; record_part (Ppra_ 1 Intensive (revstem "jaajam") (revstem "jaajamat") "jam")
; record_pfp "d.r#1" (revcode "d.r")
......@@ -5775,6 +5776,7 @@ value fake_compute_conjugs (gana : int) (entry : string) = do
{ compute_conjugs_stems entry (vmorph,False)
; match entry with (* extra forms - to be completed from [compute_extra] *)
[ ".rc#1" -> compute_extra_rc ()
| "k.sii" -> record_part_ppp (revcode "k.sita") entry
| "khan" -> compute_extra_khan ()
| "gup" -> record_part_ppp (revcode "gupta") entry
| "car" -> compute_extra_car ()
......
......@@ -8,4 +8,4 @@
(**************************************************************************)
(* Generated by make version - see main Makefile *)
value version="3.04" and version_date="2018-02-14";
value version="3.05" and version_date="2018-02-15";
......@@ -5,7 +5,7 @@
# Gérard Huet #
# #
############################################################################
# README Copyright Gérard Huet 2017 #
# README Copyright Gérard Huet 2018 #
############################################################################
This platform aims at computer treatment of Sanskrit, in view of diverse
......
VERSION='3.04'
DATE='2018-02-14'
VERSION='3.05'
DATE='2018-02-15'
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment