From ca238f9c89d3156842b0a3d5fe24a5d69b2eedb0 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Fri, 6 Apr 2018 08:32:41 -0400
Subject: - Adapted new-luxc's code to latest stdlib changes.

---
 new-luxc/source/luxc/lang/translation/lua.lux | 39 ++++++++++++++-------------
 1 file changed, 21 insertions(+), 18 deletions(-)

(limited to 'new-luxc/source/luxc/lang/translation/lua.lux')

diff --git a/new-luxc/source/luxc/lang/translation/lua.lux b/new-luxc/source/luxc/lang/translation/lua.lux
index 115471cbe..fdd66af81 100644
--- a/new-luxc/source/luxc/lang/translation/lua.lux
+++ b/new-luxc/source/luxc/lang/translation/lua.lux
@@ -18,6 +18,16 @@
               (host [lua #+ Lua Expression Statement]))
         [".C" io]))
 
+(do-template [<name>]
+  [(exception: #export (<name> {message Text})
+     message)]
+
+  [No-Active-Module-Buffer]
+  [Cannot-Execute]
+
+  [No-Anchor]
+  )
+
 (host.import java/lang/Object)
 
 (host.import java/lang/String
@@ -83,7 +93,7 @@
                           variable (Variable::new [table])
                           loader (CompilerChunkLoader::of ["_lux_definition"])
                           executor (DirectCallExecutor::newExecutor [])]
-                      (function [code]
+                      (function (_ code)
                         (let [lua-function (ChunkLoader::loadTextChunk [variable "lux compilation" code]
                                                                        loader)]
                           ("lux try" (io (DirectCallExecutor::call [state-context (:! Object lua-function) (array.new +0)]
@@ -95,7 +105,7 @@
 
 (def: #export init-module-buffer
   (Meta Unit)
-  (function [compiler]
+  (function (_ compiler)
     (#e.Success [(update@ #.host
                           (|>> (:! Host)
                                (set@ #module-buffer (#.Some (StringBuilder::new [])))
@@ -103,12 +113,9 @@
                           compiler)
                  []])))
 
-(exception: #export No-Active-Module-Buffer)
-(exception: #export Cannot-Execute)
-
 (def: #export (with-sub-context expr)
   (All [a] (-> (Meta a) (Meta [Text a])))
-  (function [compiler]
+  (function (_ compiler)
     (let [old (:! Host (get@ #.host compiler))
           [old-name old-sub] (get@ #context old)
           new-name (format old-name "___" (%i (nat-to-int old-sub)))]
@@ -128,7 +135,7 @@
 
 (def: #export context
   (Meta Text)
-  (function [compiler]
+  (function (_ compiler)
     (#e.Success [compiler
                  (|> (get@ #.host compiler)
                      (:! Host)
@@ -138,7 +145,7 @@
 
 (def: #export (with-anchor anchor expr)
   (All [a] (-> Anchor (Meta a) (Meta a)))
-  (function [compiler]
+  (function (_ compiler)
     (let [old (:! Host (get@ #.host compiler))]
       (case (expr (set@ #.host
                         (:! Void (set@ #anchor (#.Some anchor) old))
@@ -154,11 +161,9 @@
         (#e.Error error)
         (#e.Error error)))))
 
-(exception: #export No-Anchor)
-
 (def: #export anchor
   (Meta Anchor)
-  (function [compiler]
+  (function (_ compiler)
     (case (|> compiler (get@ #.host) (:! Host) (get@ #anchor))
       (#.Some anchor)
       (#e.Success [compiler anchor])
@@ -168,32 +173,30 @@
 
 (def: #export module-buffer
   (Meta StringBuilder)
-  (function [compiler]
+  (function (_ compiler)
     (case (|> compiler (get@ #.host) (:! Host) (get@ #module-buffer))
       #.None
-      ((lang.fail (No-Active-Module-Buffer "")) compiler)
+      ((lang.throw No-Active-Module-Buffer "") compiler)
       
       (#.Some module-buffer)
       (#e.Success [compiler module-buffer]))))
 
 (def: #export program-buffer
   (Meta StringBuilder)
-  (function [compiler]
+  (function (_ compiler)
     (#e.Success [compiler (|> compiler (get@ #.host) (:! Host) (get@ #program-buffer))])))
 
 (def: (execute code)
   (-> Expression (Meta Unit))
-  (function [compiler]
+  (function (_ compiler)
     (let [interpreter (|> compiler (get@ #.host) (:! Host) (get@ #interpreter))]
       (case (interpreter code)
         (#e.Error error)
-        ((lang.fail (Cannot-Execute error)) compiler)
+        ((lang.throw Cannot-Execute error) compiler)
         
         (#e.Success _)
         (#e.Success [compiler []])))))
 
-(exception: #export Unknown-Member)
-
 (def: #export variant-tag-field "_lux_tag")
 (def: #export variant-flag-field "_lux_flag")
 (def: #export variant-value-field "_lux_value")
-- 
cgit v1.2.3