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

Minor improvements

parent 26ee877e
......@@ -10,7 +10,8 @@
(*i module Canon = struct i*)
(* Inverse of [Transduction.code_raw] - word to VH transliteration *)
value canon = fun
(* Except that .ll has no canonical code *)
value canon = fun
[ 0 -> "-" (* notation for suffixes and segmentation hint in compounds *)
| 1 -> "a"
| 2 -> "aa"
......
......@@ -386,18 +386,8 @@ type flexion =
| Absotvaa of conjugation and word (* abs-tvaa *)
]
;
(*i OBSOLETE for NN - see [Subst.taddhitas]
[value is_taddhita = fun
[ "taa" | "tva" | "vat" | "mat" | "tas"
| "kataa" | "katva" (* -ka-taa -ka-tva *)
| "vattva" | "tvavat"-> True
| _ -> False
]
;
value sort_taddhita s = if is_taddhita s then "-" ^ s else s
;] OBS i*)
(* Now functions that populate the inflected treebanks from the lexemes *)
(* Now functions that populate the inflected forms treebanks from the lexemes *)
(* enter1: string -> flexion -> unit *)
value enter1 entry =
let delta = Encode.diff_str entry (* partial application for patching *)
......@@ -508,7 +498,7 @@ value enter_form stem =
else ()
}
| Bare (Krid (_,Action_noun) root) w ->
add_morphauxiick w stem Bare_stem (* cvi *)
add_morphauxiick w stem Bare_stem (* cvi patch *)
| Bare (Krid _ root) w -> let f = Bare_stem in do (* losing verbal and root *)
{ add_morphpi w stem f aapv
; if auxiliary root then add_morphauxiick w stem f else ()
......
......@@ -1559,7 +1559,7 @@ value build_mas_vas stem entry =
; decline Loc "vatsu"
])
]
(* ; Bare Noun (fix stem "vas") *) (* ou vat ? *)
; Bare Noun (fix stem "vat") (* eg vidvat- *)
; Avyayaf (fix stem "vas")
]
;
......@@ -2419,10 +2419,10 @@ value build_aksan stem entry =
; decline Loc "nos"
])
; (Plural,
[ decline Voc "iinii"
; decline Nom "iinii"
; decline Acc "iinii"
; decline Acc "aanii" (* MW véd. sakthaanii RV{10,86,16} AV{6,9,1} *)
[ decline Voc "iini"
; decline Nom "iini"
; decline Acc "iini"
; decline Acc "aani" (* MW véd. sakthaani RV{10,86,16} AV{6,9,1} *)
; decline Ins "ibhis"
; decline Dat "ibhyas"
; decline Abl "ibhyas"
......
......@@ -470,7 +470,10 @@ value build_mas_ppfa verbal stem inter stem_vas root =
; decline Gen "u.saam"
; declinev Loc "vatsu"
])
] ]
]
; Bare krid (fix stem "vat") (* eg vidvat- *)
(* ; Avyayaf (fix stem "vas") - Not dealt with by [Inflected.enter_form] *)
]
;
(* Similar to [Nouns.build_neu_vas] *)
value build_neu_ppfa verbal stem inter stem_vas root =
......@@ -511,10 +514,13 @@ value build_neu_ppfa verbal stem inter stem_vas root =
; decline Gen "u.saam"
; declinev Loc "vatsu"
])
] ]
]
; Bare krid (fix stem "vat") (* eg vidvat- *)
(* ; Avyayaf (fix stem "vas") - Not dealt with by [Inflected.enter_form] *)
]
;
(* Supplementary forms with intercalation of i *)
value build_more_ppfa verbal stem stem_vas root =
(* Supplementary forms with intercalation of i in later language Whitney§805b *)
value build_late_ppfa verbal stem stem_vas root =
let gen_entry = gen_stem (verbal,root) stem_vas in
let krid = Krid verbal root in
let declinev case suff = (case,fix stem ("i" ^ suff)) in do
......@@ -562,7 +568,9 @@ value build_more_ppfa verbal stem stem_vas root =
; declinev Abl "vadbhyas"
; declinev Loc "vatsu"
])
] ]
]
; Bare krid (fix stem "vat")
]
}
;
value build_part_a part_kind stem root =
......@@ -595,7 +603,7 @@ and build_part_vas c stem inter stemf root =
{ build_mas_ppfa verbal stem inter prati root (* (i)vas *)
; build_neu_ppfa verbal stem inter prati root (* (i)vas *)
; if (root="d.rz#1" || root="vid#2" || root="viz#1") && c=Primary
then build_more_ppfa verbal stem prati root (* Whitney §805b *)
then build_late_ppfa verbal stem prati root (* i supplement Whitney§805b *)
else ()
; build_part_ii verbal stemf prati root (* u.sii *)
}
......
......@@ -4865,9 +4865,6 @@ value compute_present_system entry rstem gana pada third =
match voices_of_gana gana entry with
[ Para -> (* active only *) if pada then
compute_thematic_active gana Primary stem entry third
(* else if entry = ".r"
|| entry = "tap" then (* for sam- *)
compute_thematic_middle gana Primary stem entry third *)
else emit_warning ("Unexpected middle form: " ^ entry)
| Atma -> (* middle only *)
if padam then emit_warning ("Unexpected active form: " ^ entry)
......
......@@ -8,4 +8,4 @@
(**************************************************************************)
(* Generated by make version - see main Makefile *)
value version="3.08" and version_date="2018-07-22";
value version="3.08" and version_date="2018-07-26";
VERSION='3.08'
DATE='2018-07-22'
DATE='2018-07-26'
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