From 7d2b7199d87930096b7fd799709fe0105d51eccb Mon Sep 17 00:00:00 2001
From: Bruce Hill <bruce@bruce-hill.com>
Date: Fri, 9 Nov 2018 14:36:15 -0800
Subject: Lots of cleanups, including expanded use of (... compiles to "text
 literal") shorthand, deprecating Lua value, and more use of Lua "..." with
 text interpolations.

---
 lib/consolecolor.nom |  6 +++---
 lib/os.nom           | 30 ++++++++++++++----------------
 lib/version.nom      |  2 +-
 3 files changed, 18 insertions(+), 20 deletions(-)

(limited to 'lib')

diff --git a/lib/consolecolor.nom b/lib/consolecolor.nom
index 4b231a9..d8b078f 100644
--- a/lib/consolecolor.nom
+++ b/lib/consolecolor.nom
@@ -15,9 +15,9 @@ test:
 for %name = %colornum in %colors:
     %colornum = "\%colornum"
     #(=lua "COMPILE_ACTIONS").%name = (..)
-        [%nomsu, %tree] -> (Lua value "'\\027[\(%colornum)m'")
+        [%nomsu, %tree] -> (Lua "'\\027[\(%colornum)m'")
     %compile.action.%name = (..)
         [%nomsu, %tree, %text] ->:
             if %text:
-                return (Lua value "('\\027[\(%colornum)m'..\(%text as lua expr)..'\\027[0m')")
-            ..else: return (Lua value "'\\027[\(%colornum)m'")
+                return (Lua "('\\027[\(%colornum)m'..\(%text as lua expr)..'\\027[0m')")
+            ..else: return (Lua "'\\027[\(%colornum)m'")
diff --git a/lib/os.nom b/lib/os.nom
index 2da395c..64b46c2 100644
--- a/lib/os.nom
+++ b/lib/os.nom
@@ -21,23 +21,21 @@ externally (read file %filename) means (=lua "Files.read(\%filename)")
 
 test:
     for file %f in "core": do nothing
-(for file %f in %path %body) compiles to (..)
-    Lua "\
-        ..for i,\(%f as lua expr) in Files.walk(\(%path as lua expr)) do
-            \(%body as lua statements)
-            \(what (===next %f ===) compiles to)
-        end
-        \(what (===stop %f ===) compiles to)"
+(for file %f in %path %body) compiles to "\
+    ..for i,\(%f as lua expr) in Files.walk(\(%path as lua expr)) do
+        \(%body as lua statements)
+        \(what (===next %f ===) compiles to)
+    end
+    \(what (===stop %f ===) compiles to)"
 
-(%expr for file %f in %path) compiles to (..)
-    Lua value "\
-        ..(function()
-            local ret = List{}
-            for i,\(%f as lua expr) in Files.walk(\(%path as lua expr)) do
-                ret[#ret+1] = \(%expr as lua statements)
-            end
-            return ret
-        end)()"
+(%expr for file %f in %path) compiles to "\
+    ..(function()
+        local ret = List{}
+        for i,\(%f as lua expr) in Files.walk(\(%path as lua expr)) do
+            ret[#ret+1] = \(%expr as lua statements)
+        end
+        return ret
+    end)()"
 
 externally [..]
     write to file %filename %text, to file %filename write %text
diff --git a/lib/version.nom b/lib/version.nom
index 2f4003f..ee9ac92 100644
--- a/lib/version.nom
+++ b/lib/version.nom
@@ -1,3 +1,3 @@
 #!/usr/bin/env nomsu -V4.8.10
 # This file sets the current library version.
-lua> "NOMSU_LIB_VERSION = 6"
+lua> "NOMSU_LIB_VERSION = 7"
-- 
cgit v1.2.3