compile surface from a map rather than an arbitrary function

ekoontz · Jun 2, 2024 · b3739ef · b3739ef
1 parent f57eef0
commit b3739ef
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/resources/español/lexicon/rules.edn b/resources/español/lexicon/rules.edn
@@ -9,8 +9,8 @@
        :boot-stem? true}
   :then [{:exceptions [{:infl :present
                         :agr {:person :1st :number :sing}
-                        :surface #(str (u/get-in % [:stems :boot]) "o")
-                        }
+                        :surface {:prefix [:stems :boot]
+                                  :suffix "o"}}
                        ;; TODO: other numbers and persons.
                        ]}]}
 

diff --git a/src/menard/lexiconfn.cljc b/src/menard/lexiconfn.cljc
@@ -44,12 +44,15 @@
           (merge consequent
                  {:exceptions (map (fn [exception]
                                      (let [surface (:surface exception)]
-                                       (cond (fn? surface)
-                                             ;; TODO: lock down what can be evaluated 
-                                             (merge exception
-                                                    {:surface (surface lexeme)})
-                                             :else
-                                             exception)))
+                                       (cond
+                                         (map? surface)
+                                         (merge exception
+                                                {:surface (str (u/get-in lexeme (:prefix surface))
+                                                               (:suffix surface))})
+                                         (string? surface)
+                                         exception
+                                         :else
+                                         (exception "Cannot find surface form given intermediate surface value: " surface))))
                                    (:exceptions consequent))})]
       retval)
     consequent))