From c8e2898611fa759cbe7c2ac84738b5b403575664 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Fri, 23 Feb 2018 00:42:23 -0400
Subject: - Added all the missing tests for translation of common procedures. -
 Implemented some missing process functionality in the JVM runtime. - Minor
 bug fixes.

---
 .../lang/translation/jvm/procedure/common.jvm.lux  | 41 ++++++++++------------
 1 file changed, 18 insertions(+), 23 deletions(-)

(limited to 'new-luxc/source/luxc/lang/translation/jvm/procedure')

diff --git a/new-luxc/source/luxc/lang/translation/jvm/procedure/common.jvm.lux b/new-luxc/source/luxc/lang/translation/jvm/procedure/common.jvm.lux
index 57455e1e1..5ce483730 100644
--- a/new-luxc/source/luxc/lang/translation/jvm/procedure/common.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/jvm/procedure/common.jvm.lux
@@ -434,29 +434,24 @@
   )
 
 (def: index-method $.Method ($t.method (list $String $t.int) (#.Some $t.int) (list)))
-(do-template [<name> <method>]
-  [(def: (<name> [textI partI startI])
-     Trinary
-     (<| $i.with-label (function [@not-found])
-         $i.with-label (function [@end])
-         (|>> textI ($i.CHECKCAST "java.lang.String")
-              partI ($i.CHECKCAST "java.lang.String")
-              startI jvm-intI
-              ($i.INVOKEVIRTUAL "java.lang.String" <method> index-method false)
-              $i.DUP
-              ($i.int -1)
-              ($i.IF_ICMPEQ @not-found)
-              lux-intI
-              runtimeT.someI
-              ($i.GOTO @end)
-              ($i.label @not-found)
-              $i.POP
-              runtimeT.noneI
-              ($i.label @end))))]
-
-  [text//index      "indexOf"]
-  [text//last-index "lastIndexOf"]
-  )
+(def: (text//index [textI partI startI])
+  Trinary
+  (<| $i.with-label (function [@not-found])
+      $i.with-label (function [@end])
+      (|>> textI ($i.CHECKCAST "java.lang.String")
+           partI ($i.CHECKCAST "java.lang.String")
+           startI jvm-intI
+           ($i.INVOKEVIRTUAL "java.lang.String" "indexOf" index-method false)
+           $i.DUP
+           ($i.int -1)
+           ($i.IF_ICMPEQ @not-found)
+           lux-intI
+           runtimeT.someI
+           ($i.GOTO @end)
+           ($i.label @not-found)
+           $i.POP
+           runtimeT.noneI
+           ($i.label @end))))
 
 ## [[Math]]
 (def: math-unary-method ($t.method (list $t.double) (#.Some $t.double) (list)))
-- 
cgit v1.2.3