From: ntakahas <ntakahas>
Date: Thu, 25 Mar 2010 10:26:33 +0000 (+0000)
Subject: (stage 2): Use iteration rather than recursive for reordering.
X-Git-Tag: REL-1-6-0~19
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=db07e967f43d906d68e48ed58fb83e6adafd02bb;p=m17n%2Fm17n-db.git

(stage 2): Use iteration rather than recursive for reordering.
---

diff --git a/FLT/DEVA-OTF.flt b/FLT/DEVA-OTF.flt
index f14a465..5328c9b 100644
--- a/FLT/DEVA-OTF.flt
+++ b/FLT/DEVA-OTF.flt
@@ -145,11 +145,11 @@
 
    ;; Syllables with an overt halant
    (" (RHJ?)?([^ ]+)(HN) "
-    | (1 = *) (2 reorder) (3 = =) |)
+    | (1 = *) (2 reorder *) (3 = =) |)
 
    ;; Ordinary syllables
    (" (RHJ?)?([^mubpasStA ]+)(m?u?b?p?n?a?[sS]?t?A?) "
-    | (1 = *) (2 reorder) (3 = *) |)
+    | (1 = *) (2 reorder *) (3 = *) |)
 
    ("." =))
   *)
@@ -160,8 +160,8 @@
  (reorder
   (cond
    ("J?(H)(R)$" (2 =) (1 =))
-   ("J?(HR)(.+)$" (1 = =) (2 reorder))
-   ("(.)(.*)$" (1 =) (2 reorder))))
+   ("J?(HR)" (1 = =))
+   ("." =)))
  )
 
 ;; Stage 3