Apply review comments

Author: tbdasap

vidyut-prakriya/src/core/term.rs

@@ -226,7 +226,7 @@ impl Term {
     }
 
     pub fn u_adi(&self) -> Option<char> {
-        self.u.clone().unwrap().bytes().next().map(|x| x as char)
+        self.u.as_ref()?.bytes().next().map(|x| x as char)
     }
 
     /// Returns the last sound in the term if it exists.

vidyut-prakriya/src/it_agama.rs

@@ -512,7 +512,6 @@ fn run_valadau_ardhadhatuke_before_attva_for_term(ip: &mut ItPrakriya) -> Option
                 can_block = !ip.optional_try_add("7.2.17");
             }
             if can_block {
-                // Block iw-agama
                 ip.try_block("7.2.16");
             }
         } else if anga.has_u_in(&["wuvama~", "Svasa~"]) {

vidyut-prakriya/src/samjna.rs

@@ -456,8 +456,6 @@ pub fn try_decide_pratipadika(p: &mut Prakriya) -> Option<()> {
             && !t.is_agama()
             && !t.is_abhyasa()
             && !t.is_pada()
-            && !t.is_upasarga()
-
         {
             // 1.2.45 specifies "arthavat", so exclude meaningless terms (agamas and abhyasas).
             // TODO: is there anything else that's not arthavat?

vidyut-prakriya/src/tripadi/pada_8_4.rs

@@ -63,20 +63,6 @@ fn try_natva_for_span(
         }
     }
 
-    /* This is only for debugging
-    if let Some(i_dhatu2) = ip.p.find_first_with_tag(T::Pada) {
-        let term = ip.p.get(i_dhatu2)?;
-
-        if term.has_u_in( &["BU", "BA\\", "pUY"]) {
-            ip.p.debug("Found term BA");
-        } else {
-            ip.p.debug("did not find term BA");
-            ip.p.debug(format!("i_x={}, i_y={:?}", i_x, i_y));
-        }
-        ip.p.dump();
-    }
-    // End Debugging */
-
     let x = ip.p.get(i_x)?;
     let y = ip.p.get(i_y)?;
 
@@ -225,14 +211,12 @@ fn try_natva_for_span(
 
             if dhatu.has_u_in( &["BU", "BA\\", "pUY",
                     Aupadeshika::opyAyI.as_str(), "ga\\mx~", "kamu~\\", "wuvepf~\\"]) {
-                // Really do not apply anything but note the usage of the rule to deny Ratva
                 ip.p.step("8.4.34");
             } else if dhatu.has_antya(HAL) && dhatu.has_tag(T::idit) {
                 if dhatu.has_u_adi(IC) {
                     ip.p.run_at("8.4.32", i_y, |t| t.find_and_replace_text("n", "R"));
                 } else {
-                    // Do nothing but note the step for clarification
-                    //   this is the case for परिमङ्गनम् and प्राङ्गनम्
+                    // This is the case for परिमङ्गनम् and प्राङ्गनम्
                     ip.p.step("8.4.32");
                 }
             } else if prev_is_ac {

vidyut-prakriya/tests/integration/kashika_3_2.rs

@@ -525,12 +525,9 @@ fn sutra_3_2_45() {
 
 #[test]
 fn sutra_3_2_46() {
-    let mut myd = d("Df\\Y", Bhvadi);
-    assert_has_upapada_krdanta("vasu", &[], &nic(&myd), Krt::Kac, &["vasunDara"]);
-    myd = d("quBf\\Y", Juhotyadi);
-    assert_has_upapada_krdanta("viSva", &[], &myd, Krt::Kac, &["viSvamBara"]);
-    myd = d("tF", Bhvadi);
-    assert_has_upapada_krdanta("raTa", &[], &myd, Krt::Kac, &["raTantara"]);
+    assert_has_upapada_krdanta("vasu", &[], &nic(&d("Df\\Y", Bhvadi)), Krt::Kac, &["vasunDara"]);
+    assert_has_upapada_krdanta("viSva", &[], &d("quBf\\Y", Juhotyadi), Krt::Kac, &["viSvamBara"]);
+    assert_has_upapada_krdanta("raTa", &[], &d("tF", Bhvadi), Krt::Kac, &["raTantara"]);
 }
 
 #[test]

vidyut-prakriya/tests/integration/kashika_6_1.rs

@@ -524,8 +524,12 @@ fn sutra_6_1_48() {
 
 #[test]
 fn sutra_6_1_49() {
-    let zid = d("zi\\Du~", Divadi);
-    assert_has_tip(&[],  &nic(&zid), Lat, &["sADayati", "seDayati"]);
+    assert_has_tip(
+        &[],
+        &nic(&d("zi\\Du~", Divadi)),
+        Lat,
+        &["sADayati", "seDayati"],
+    );
 }
 
 #[test]

vidyut-prakriya/tests/integration/kashika_8_4.rs

@@ -75,18 +75,17 @@ fn sutra_8_4_2() {
 
 #[test]
 fn sutra_8_4_8() {
-    let mut rule_choices: Vec<RuleChoice> = vec![];
     let vah = d("va\\ha~^", Bhvadi);
 
     // 8.4.8 has two rules
     //  Nipatana ufor vAhana always
     // 8.4.8.1 : Ahita for vAhanam
-    rule_choices.push(RuleChoice {
-        rule: Rule::Ashtadhyayi("8.4.8.1"),
-        decision: Decision::Accept
-    });
-
-    let mut t = Tester::with_rule_choices(rule_choices);
+    let mut t = Tester::with_rule_choices(vec![
+        RuleChoice {
+            rule: Rule::Ashtadhyayi("8.4.8.1"),
+            decision: Decision::Accept
+        },
+    ]);
 
     t.assert_has_upapada_krdanta("ikzu", &[], &vah, Krt::lyuw, &["ikzuvAhaRa"]);
     t.assert_has_upapada_krdanta("darBa", &[], &vah, Krt::lyuw, &["darBavAhaRa"]);
@@ -96,13 +95,12 @@ fn sutra_8_4_8() {
     t.assert_has_bahuvrihi("darBa", "vAhana", &["darBavAhaRa"]);
 
     // Swamitva artha
-    rule_choices = vec![];
-    rule_choices.push(RuleChoice {
-        rule: Rule::Ashtadhyayi("8.4.8.1"),
-        decision: Decision::Decline
-    });
-
-    t = Tester::with_rule_choices(rule_choices);
+    t = Tester::with_rule_choices(vec![
+        RuleChoice {
+            rule: Rule::Ashtadhyayi("8.4.8.1"),
+            decision: Decision::Decline
+        },
+    ]);
     t.assert_has_upapada_krdanta("dAkzi", &[], &vah, Krt::lyuw, &["dAkzivAhana"]);
 
     // As in dAkzi's vAhana .. (sasthi tatpurusha intent so Decline the rule)
@@ -309,15 +307,13 @@ fn sutra_8_4_24() {
     assert_has_jhi(&["antar"], &han, Lat, &["antarGnanti"]);
     assert_has_krdanta(&["antar"], &han, Krt::lyuw, &["antarhaRana", "antarhanana"]);
 
-    // Forcing a specific choice to assume "desh" context
-    let mut rule_choices = vec![];
-    rule_choices.push(RuleChoice {
-        rule: Rule::Ashtadhyayi("8.4.24"),
-        decision: Decision::Decline
-    });
-
     // The "desh" case
-    let t = Tester::with_rule_choices(rule_choices);
+    let t = Tester::with_rule_choices(vec![
+        RuleChoice {
+            rule: Rule::Ashtadhyayi("8.4.24"),
+            decision: Decision::Decline
+        }
+    ]);
     t.assert_has_ta_k(&["antar"], &han, Lat, &["antarhanyate"]);
     t.assert_has_ta_k(&["antar"], &han, Lun, &["antaraGAni", "antaravaDi"]); // No change
     t.assert_has_jhi(&["antar"], &han, Lat, &["antarGnanti"]);
@@ -326,26 +322,22 @@ fn sutra_8_4_24() {
 
 #[test]
 fn sutra_8_4_25() {
-    let mut rule_choices: Vec<RuleChoice> = vec![];
-
-    // 8.4.25 : Accept
-    rule_choices.push(RuleChoice {
-        rule: Rule::Ashtadhyayi("8.4.25"),
-        decision: Decision::Accept
-    });
-
-    let mut t = Tester::with_rule_choices(rule_choices);
+    let mut t = Tester::with_rule_choices(vec![
+        RuleChoice {
+            rule: Rule::Ashtadhyayi("8.4.25"),
+            decision: Decision::Accept
+        }
+    ]);
     // antaH (antarasmin?) ayanam
     t.assert_has_saptami_tatpurusha("antar", "ayana", &["antarayaRa"]);
 
     // 8.4.25: Decline ("Desh" case)
-    rule_choices = vec![];
-    rule_choices.push(RuleChoice {
-        rule: Rule::Ashtadhyayi("8.4.25"),
-        decision: Decision::Decline
-    });
-
-    t = Tester::with_rule_choices(rule_choices);
+    t = Tester::with_rule_choices(vec![
+        RuleChoice {
+            rule: Rule::Ashtadhyayi("8.4.25"),
+            decision: Decision::Decline
+        }
+    ]);
     // antaH Iyate asmin deSe
     t.assert_has_bahuvrihi("antar", "ayana", &["antarayana"]);
 }

vidyut-prakriya/tests/integration/regressions.rs

@@ -354,15 +354,16 @@ fn ratva_8_4_14() {
 }
 
 #[test]
+#[allow(non_snake_case)]
 fn zta_with_upsarga() {
-    let myd = d("zWA\\", Bhvadi);
+    let zWA = d("zWA\\", Bhvadi);
     // No upsarga actually has both atmane and parasmai padi forms
-    assert_has_krdanta(&[], &san(&myd), Krt::Satf, &["tizWAsat"]);
-    assert_has_krdanta(&[], &san(&myd), Krt::SAnac, &["tizWAsamAna"]);
+    assert_has_krdanta(&[], &san(&zWA), Krt::Satf, &["tizWAsat"]);
+    assert_has_krdanta(&[], &san(&zWA), Krt::SAnac, &["tizWAsamAna"]);
     // "pari" upasarga is always parasmaipadi
-    assert_has_krdanta(&["pari"], &san(&myd), Krt::Satf, &["paritizWAsat"]);
-    assert_has_krdanta(&["pari"], &san(&myd), Krt::SAnac, &[]); // fails
+    assert_has_krdanta(&["pari"], &san(&zWA), Krt::Satf, &["paritizWAsat"]);
+    assert_has_krdanta(&["pari"], &san(&zWA), Krt::SAnac, &[]);
     // "pra" upasarga is always atmanepadi
-    assert_has_krdanta(&["pra"], &san(&myd), Krt::SAnac, &["pratizWAsamAna"]);
-    assert_has_krdanta(&["pra"], &san(&myd), Krt::Satf, &[]); // fails
+    assert_has_krdanta(&["pra"], &san(&zWA), Krt::SAnac, &["pratizWAsamAna"]);
+    assert_has_krdanta(&["pra"], &san(&zWA), Krt::Satf, &[]);
 }