Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
H
Heritage_Platform
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Packages
Packages
Container Registry
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Gérard Huet
Heritage_Platform
Commits
90f5aa33
Commit
90f5aa33
authored
Feb 22, 2019
by
Gérard Huet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor corrections and additions
parent
1e0c58b0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
75 additions
and
23 deletions
+75
-23
ML/nouns.ml
ML/nouns.ml
+16
-13
ML/verbs.ml
ML/verbs.ml
+59
-10
No files found.
ML/nouns.ml
View file @
90f5aa33
...
...
@@ -2179,7 +2179,7 @@ value build_neu_vas stem entry =
])
]
;
Bare
Noun
(
fix
stem
"vat"
)
(* eg vidvat- *)
;
Avyayaf
(
fix
stem
"vas"
)
;
Avyayaf
(
fix
stem
"vas"
)
(* vat Acc ? *)
]
;
(* i is dropped before u.s - Macdonnel §89a *)
...
...
@@ -2220,7 +2220,7 @@ value build_neu_ivas stem entry =
])
]
;
Bare
Noun
(
fix
stem
"ivat"
)
;
Avyayaf
(
fix
stem
"ivas"
)
;
Avyayaf
(
fix
stem
"ivas"
)
(* why not ivat Acc ? *)
]
;
value
build_neu_red
stem
entry
=
...
...
@@ -2302,7 +2302,7 @@ value build_neu_at stem entry =
;
decline
Loc
"tsu"
])
]
;
Avyayaf
(
fix
stem
"tam"
)
;
Avyayaf
(
fix
stem
"tam"
)
(* why not Acc ? *)
]
;
value
build_neu_mahat
stem
entry
=
...
...
@@ -2361,7 +2361,7 @@ value build_aatman entry =
])
]
;
Bare
Pron
(
code
"aatma"
)
;
Avyayaf
(
code
"aatmam"
)
;
Avyayaf
(
code
"aatmam"
)
(* aatmaanam Acc ? *)
]
;
value
build_neu_yuvan
entry
=
...
...
@@ -2401,7 +2401,7 @@ value build_neu_yuvan entry =
;
decline
Loc
"uvasu"
])
]
;
Avyayaf
(
fix
stem
"uvam"
)
;
Avyayaf
(
fix
stem
"uvam"
)
(* uva Acc ? *)
]
;
value
build_neu_brahman
entry
=
...
...
@@ -2441,7 +2441,7 @@ value build_neu_brahman entry =
])
]
;
Bare
Noun
(
code
"brahma"
)
;
Avyayaf
(
code
"brahma
m"
)
;
Avyayaf
(
code
"brahma
"
)
(* Acc *)
]
;
value
build_aksan
stem
entry
=
...
...
@@ -2488,6 +2488,7 @@ value build_aksan stem entry =
])
]
;
Bare
Noun
(
fix
stem
"i"
)
(* also indirectly generated by var subentry *)
;
Avyayaf
(
fix
stem
"i"
)
(* Acc *)
]
;
value
build_ahan
stem
entry
=
(* stem = "ah" *)
...
...
@@ -2531,8 +2532,8 @@ value build_ahan stem entry = (* stem = "ah" *)
]
;
Bare
Noun
(
fix
stem
"ar"
)
;
Bare
Noun
(
fix
stem
"as"
)
(* before r Pan{8;2;68} *)
;
Avyayaf
(
fix
stem
"am"
)
(* pratyaham
*)
;
Avyayaf
(
fix
stem
"ar"
)
(*
pratyaha.h *)
(* Avyayaf (fix stem "am") NO pratyaham Acc of pratyaha
*)
;
Avyayaf
(
fix
stem
"ar"
)
(*
Acc pratyaha.h *)
]
;
value
build_uudhan
stem
entry
=
(* stem = "uudh" *)
(* Whitney §430d *)
...
...
@@ -2619,7 +2620,7 @@ value build_neu_in stem entry =
;
decline
Loc
"i.su"
])
]
;
Bare
Noun
bare
;
Bare
Noun
bare
(* same as Acc *)
;
Avyayaf
bare
]
;
...
...
@@ -2733,7 +2734,7 @@ value build_neu_vac stem entry =
;
decline
Loc
"vak.su"
])
]
;
Avyayaf
(
code
"vacam"
)
;
Avyayaf
(
code
"vacam"
)
(* check *)
]
;
value
build_neu_ac
stem
entry
=
...
...
@@ -2826,7 +2827,7 @@ value build_fem_aa stem entry =
;
decline
Loc
"aasu"
])
]
;
Avyayaf
(
fix
stem
"am"
)
;
Avyayaf
(
fix
stem
"am"
)
(* acc of neuter stem with hrasva of vowel *)
]
@
(
if
aa_iiv
entry
then
[
Cvi
(
wrap
stem
4
)
]
else
[]
))
;
(* vedic g = Fem, rare (jaa) Whitney 351 *)
...
...
@@ -2867,7 +2868,7 @@ value build_mono_aa g stem entry =
;
decline
Loc
"aasu"
])
]
;
Avyayaf
(
fix
stem
"am"
)
;
Avyayaf
(
fix
stem
"am"
)
(* acc of neuter stem with hrasva of vowel *)
]
;
(* gandharva Haahaa [Tirupati] and pkt raa.naa *)
...
...
@@ -2989,13 +2990,15 @@ value build_fem_i stem trunc entry =
])
]
;
Bare
Noun
(
mirror
stem
)
;
Avyayaf
(
mirror
stem
)
;
Avyayaf
(
mirror
stem
)
(* actually acc of neuter stem *)
;
Indecl
Tas
(
fix
stem
"tas"
)
]
@
(
if
entry
=
"vi.mzati"
then
[
Bare
Noun
(
mirror
trunc
)
(* vi.mzat *)
]
else
[]
))
;
(* NB concerning Avyayaf of stems ending in long vowels. According to Pan{2,4,18}
avyayiibhaava compounds are of neuter gender, incurring hrasva of ifc stem *)
value
build_fem_ii
trunc
entry
=
let
stems
=
[
3
::
trunc
]
and
steml
=
[
4
::
trunc
]
in
...
...
ML/verbs.ml
View file @
90f5aa33
...
...
@@ -2497,8 +2497,8 @@ value intercalate_pp root rstem =
|
"piz"
|
"pii.d"
|
"pulak"
|
"puuj"
|
"prath"
|
"pru.s#1"
|
"phal"
|
"baadh"
|
"bha.n"
|
"bhas"
|
"bhaa.s"
|
"bhaas#1"
|
"bhuu.s"
|
"bhraaj"
|
"ma.mh"
|
"manth"
|
"mah"
|
"likh"
|
"mil"
|
"mi.s"
|
"miil"
|
"mud#1"
|
"mu.s#1"
|
"
yaac"
|
"rac"
|
"ra.n"
|
"ras"
|
"ra
h"
|
"raaj#1"
|
"ruc#1"
|
"rud#1"
|
"lag"
|
"lap"
|
"lal"
|
"miil"
|
"mud#1"
|
"mu.s#1"
|
"
m.rg"
|
"yaac"
|
"rac"
|
"ra.n"
|
"ra
s"
|
"rah"
|
"raaj#1"
|
"ruc#1"
|
"rud#1"
|
"lag"
|
"lap"
|
"lal"
|
"la.s"
|
"las"
|
"lu.th"
|
"lul"
|
"lok"
|
"loc"
|
"vad"
|
"val"
|
"vas#2"
|
"vaaz"
|
"vaas#3"
|
"vid#1"
|
"vip"
|
"ven"
|
"vyath"
|
"vraj"
|
"vra.n"
|
"vrii.d"
|
"zubh#1"
|
"zcut#1"
|
"zrath"
...
...
@@ -2638,6 +2638,7 @@ value compute_ppp_stems entry rstem =
|
".rj"
->
revcode
"arj"
(* strong *)
|
"k.svi.d"
->
revcode
"k.sve.d"
|
"vip"
->
revcode
"vep"
|
"m.rg"
->
revcode
"marg"
(* strong *)
|
"jak.s"
->
revcode
"jagh"
(* jagdha *)
|
"trai"
->
revcode
"traa"
(* glai given in -na section *)
|
"k.san"
->
revcode
"k.sa"
(* removal of final nasal *)
...
...
@@ -2691,8 +2692,8 @@ value compute_ppp_stems entry rstem =
|
_
->
passive_stem
entry
rstem
(* possibly duhified and mirjified *)
]
in
[
Ta
ppstem
::
match
entry
with
[
".rc#1"
|
".rj"
|
"k.svi.d"
|
"ba.mh"
|
"ma.mh"
|
"manth"
|
"
yaj#1"
|
"vyadh"
|
"grah"
|
"vrazc"
|
"praz"
|
"zrath
"
|
"svap"
->
|
"
m.rg"
|
"yaj#1"
|
"vyadh"
|
"grah"
|
"vrazc"
|
"praz
"
|
"
zrath"
|
"
svap"
->
[
Tia
ppstem
]
(* avoids *ma.mhita *)
|
"vaz"
|
"vac"
|
"vap"
|
"vap#1"
|
"vap#2"
|
"vad"
|
"vas#1"
|
"vas#4"
->
...
...
@@ -3981,8 +3982,9 @@ value redup_aor weak root =
else
if
v
=
6
then
5
(* uu \R u *)
else
match
root
with
[
"klid"
|
"tvar"
|
"tvi.s#1"
|
"zri"
|
"grah"
|
"vrazc"
->
3
|
"j~naa#1"
|
"sthaa#1"
(* hidden heavy since stem in i *)
->
3
|
"gaah"
(* heavy exception *)
->
4
|
"j~naa#1"
|
"sthaa#1"
|
"hlaad"
(* hidden heavy since stem in i *)
->
3
|
"gaah"
(* heavy exception *)
->
4
|
_
->
if
heavy
||
amui
root
then
if
v
=
1
||
v
=
2
||
v
=
7
then
1
(* Whitney§860 *)
else
3
(* short \R ii, long \R i *)
(* \Pan{7,4,93} *)
...
...
@@ -4148,7 +4150,7 @@ value compute_aorist entry =
]
;
match
entry
with
(* 5. i.s aorist se.t-sic *)
[
"ak.s"
|
"aj"
|
"aas#2"
|
"i.s#1"
|
"iik.s"
|
"uk.s"
|
"uc"
|
"u.s"
|
"uuh"
|
".rc#1"
|
"k.rt#1"
|
"krand"
|
"kram"
|
"khan"
|
"car"
|
"uuh"
|
".rc#1"
|
"k.rt#1"
|
"krand"
|
"kram"
|
"k
.san"
|
"k
han"
|
"car"
|
"ce.s.t"
|
"jalp"
|
"jaag.r"
|
"t.rr"
|
"diip"
|
"pa.th"
|
"puu#1"
|
"p.rc"
|
"baadh"
|
"budh#1"
|
"mad#1"
|
"mud#1"
|
"muurch"
|
"mlecch"
|
"yaac"
|
"ruc#1"
|
"lu~nc"
|
"luu#1"
|
"vad"
|
"vadh"
|
"vid#1"
|
"v.r#1"
|
"vraj"
...
...
@@ -4199,7 +4201,7 @@ value compute_aorist entry =
}
|
_
->
()
]
;
match
entry
with
(* 7. sa aorist ksa *)
;
match
entry
with
(* 7. sa aorist ksa *)
[
"guh"
|
"diz#1"
|
"dih"
|
"duh#1"
|
"lih#1"
|
"viz#1"
|
"v.rj"
->
do
(* \Pan{7,3,72-73} *)
{
compute_ath_sa_aorista
weak
entry
...
...
@@ -4265,8 +4267,53 @@ value compute_injunctive entry =
}
|
_
->
()
]
}
;
;
match
entry
with
(* 5. i.s injunct *)
[
"ak.s"
|
"aj"
|
"aas#2"
|
"i.s#1"
|
"iik.s"
|
"uk.s"
|
"uc"
|
"u.s"
|
"uuh"
|
".rc#1"
|
"k.rt#1"
|
"krand"
|
"kram"
|
"k.san"
|
"khan"
|
"car"
|
"ce.s.t"
|
"jalp"
|
"jaag.r"
|
"t.rr"
|
"diip"
|
"pa.th"
|
"puu#1"
|
"p.rc"
|
"baadh"
|
"budh#1"
|
"mad#1"
|
"mud#1"
|
"muurch"
|
"mlecch"
|
"yaac"
|
"ruc#1"
|
"lu~nc"
|
"luu#1"
|
"vad"
|
"vadh"
|
"vid#1"
|
"v.r#1"
|
"vraj"
|
"z.rr"
|
"sidh#2"
|
"skhal"
|
"stan"
|
"stu"
|
"hi.ms"
->
do
{
let
stem
=
match
weak
with
[
[
7
(* .r *)
::
_
]
->
if
entry
=
"jaag.r"
then
strong
(* jaagari.sam RF IC 2 p 88 *)
else
long
(* avaariit *)
|
[
8
(* .rr *)
::
_
]
->
if
entry
=
"z.rr"
then
strong
(* azariit *)
else
long
|
[
c
::
_
]
->
if
vowel
c
then
long
else
match
entry
with
[
"kan"
|
"khan"
|
"car"
|
"mad#1"
|
"vad"
|
"skhal"
->
long
|
_
->
strong
]
|
[]
->
error_empty
24
]
in
compute_ath_is_injuncta
stem
entry
;
compute_ath_is_injunctm
strong
entry
}
|
"gup"
|
"vrazc"
|
"zcut#1"
|
"sphu.t"
->
(* active only *)
compute_ath_is_injuncta
strong
entry
|
"zuu"
->
compute_ath_is_injuncta
(
revcode
"zve"
)
entry
|
"kan"
|
"k.r#2"
|
"p.rr"
->
(* active only *)
compute_ath_is_injuncta
long
entry
|
"kamp"
|
"jan"
|
"zii#1"
|
"spand"
->
(* middle only *)
compute_ath_is_injunctm
strong
entry
|
"grah"
->
do
{
let
stem
=
revcode
"grah"
in
do
(* same as group above *)
{
compute_ath_is_injuncta
stem
entry
;
compute_ath_is_injunctm
stem
entry
}
;
let
stem
=
revcode
"grabh"
in
do
(* supplement (ved) -- Whitney§900b *)
{
compute_ath_is_injuncta
stem
entry
;
compute_ath_is_injunctm
stem
entry
}
}
|
_
->
()
]
}
(* injunctives of kinds 6. and 7. missing *)
;
(* Aorist of causative *)
value
compute_redup_aorista_ca
stem
entry
=
let
conjug
person
suff
=
(
person
,
fix_augment
stem
suff
)
in
...
...
@@ -4287,6 +4334,7 @@ value compute_aor_ca cpstem entry =
|
"p.r#1"
(* apiiparat *)
|
"t.rr"
(* atiitarat *)
|
"vah#1"
(* aviivahat *)
|
"hlaad"
(* ajihladat *)
(* | "jan" (* wrong *ajijiinat for ajiijanat *)
| "sp.rz#1" (* wrong *apii.spazat for apisp.rzat *) TODO *)
->
match
cpstem
with
(* cpstem-ayati is the ca stem *)
...
...
@@ -5410,6 +5458,7 @@ value compute_denom stem ystem entry = do (* other than present system - rare *)
[
[
1
::
rest
]
->
match
entry
with
[
"asuuya"
->
()
(* wrong asya *)
|
"m.rga"
->
()
(* from m.rg *)
|
_
->
do
(* experimental - rare acc. to Whitney *)
{
compute_passive_11
entry
rest
;
record_pfp_10
entry
rest
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment