From 756c1f718ee427d89e5fdbfae00f760b89f793eb Mon Sep 17 00:00:00 2001
From: Bruce Hill <bitbucket@bruce-hill.com>
Date: Thu, 11 Jan 2018 03:35:35 -0800
Subject: Renamed "require %" to "use %"

---
 lib/collections.nom  |  8 ++++----
 lib/control_flow.nom |  6 +++---
 lib/core.nom         | 14 +++++++-------
 lib/moonscript.nom   |  2 +-
 lib/operators.nom    |  2 +-
 lib/permissions.nom  | 10 +++++-----
 lib/plurals.nom      |  2 +-
 lib/scopes.nom       |  8 ++++----
 lib/testing.nom      |  2 +-
 lib/utils.nom        |  2 +-
 lib/utils2.nom       | 10 +++++-----
 nomsu.lua            |  2 +-
 nomsu.moon           |  2 +-
 13 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/lib/collections.nom b/lib/collections.nom
index fb66468..cb003bd 100644
--- a/lib/collections.nom
+++ b/lib/collections.nom
@@ -1,7 +1,7 @@
-require "lib/metaprogramming.nom"
-require "lib/utils.nom"
-require "lib/control_flow.nom"
-require "lib/operators.nom"
+use "lib/metaprogramming.nom"
+use "lib/utils.nom"
+use "lib/control_flow.nom"
+use "lib/operators.nom"
 
 # List/dict functions:
 
diff --git a/lib/control_flow.nom b/lib/control_flow.nom
index d06de4f..ade9b42 100644
--- a/lib/control_flow.nom
+++ b/lib/control_flow.nom
@@ -1,6 +1,6 @@
-require "lib/metaprogramming.nom"
-require "lib/operators.nom"
-require "lib/utils.nom"
+use "lib/metaprogramming.nom"
+use "lib/operators.nom"
+use "lib/utils.nom"
 
 # Conditionals
 immediately:
diff --git a/lib/core.nom b/lib/core.nom
index c31c208..aecd154 100644
--- a/lib/core.nom
+++ b/lib/core.nom
@@ -1,8 +1,8 @@
-require "lib/metaprogramming.nom"
-require "lib/utils.nom"
-require "lib/operators.nom"
-require "lib/control_flow.nom"
-require "lib/collections.nom"
-require "lib/utils2.nom"
-require "lib/scopes.nom"
+use "lib/metaprogramming.nom"
+use "lib/utils.nom"
+use "lib/operators.nom"
+use "lib/control_flow.nom"
+use "lib/collections.nom"
+use "lib/utils2.nom"
+use "lib/scopes.nom"
 lua> "nomsu.core_defs = nomsu.__class.def_number;"
diff --git a/lib/moonscript.nom b/lib/moonscript.nom
index 89468c6..30c45dd 100644
--- a/lib/moonscript.nom
+++ b/lib/moonscript.nom
@@ -1,4 +1,4 @@
-require "lib/metaprogramming.nom"
+use "lib/metaprogramming.nom"
 
 # Moonscript!
 parse [moonscript do> %moonscript_code] as:
diff --git a/lib/operators.nom b/lib/operators.nom
index f576e40..d57c061 100644
--- a/lib/operators.nom
+++ b/lib/operators.nom
@@ -1,4 +1,4 @@
-require "lib/metaprogramming.nom"
+use "lib/metaprogramming.nom"
 
 # Literals
 compile [true, yes] to: "true"
diff --git a/lib/permissions.nom b/lib/permissions.nom
index 1811ee8..bb49242 100644
--- a/lib/permissions.nom
+++ b/lib/permissions.nom
@@ -1,9 +1,9 @@
-require "lib/metaprogramming.nom"
-require "lib/control_flow.nom"
-require "lib/operators.nom"
-require "lib/collections.nom"
+use "lib/metaprogramming.nom"
+use "lib/control_flow.nom"
+use "lib/operators.nom"
+use "lib/collections.nom"
 
-rule [called by %whitelist] =:
+action [called by %whitelist]:
     if ((%whitelist's "type") != "List"): %whitelist = [%whitelist]
     %defs = (..)
         dict ([(nomsu's "defs")->(nomsu "get_stub" [%]), yes] for all %whitelist)
diff --git a/lib/plurals.nom b/lib/plurals.nom
index 49fd6d1..0bb7e50 100644
--- a/lib/plurals.nom
+++ b/lib/plurals.nom
@@ -1,4 +1,4 @@
-require "lib/core.nom"
+use "lib/core.nom"
 
 # Plurals
 using:
diff --git a/lib/scopes.nom b/lib/scopes.nom
index 3f6eff1..de35b50 100644
--- a/lib/scopes.nom
+++ b/lib/scopes.nom
@@ -1,7 +1,7 @@
-require "lib/metaprogramming.nom"
-require "lib/operators.nom"
-require "lib/control_flow.nom"
-require "lib/collections.nom"
+use "lib/metaprogramming.nom"
+use "lib/operators.nom"
+use "lib/control_flow.nom"
+use "lib/collections.nom"
 
 compile [<%var> = %value] to code: ".."
     nomsu.defs['#vars'][\(repr (%var's "value"))] = \(%value as lua);
diff --git a/lib/testing.nom b/lib/testing.nom
index 447922b..96fa089 100644
--- a/lib/testing.nom
+++ b/lib/testing.nom
@@ -1,4 +1,4 @@
-require "lib/metaprogramming.nom"
+use "lib/metaprogramming.nom"
 
 # For unit testing
 rule [test tree %generated == %expected] =:
diff --git a/lib/utils.nom b/lib/utils.nom
index 218fed2..a7d4941 100644
--- a/lib/utils.nom
+++ b/lib/utils.nom
@@ -1,4 +1,4 @@
-require "lib/metaprogramming.nom"
+use "lib/metaprogramming.nom"
 
 # Error functions
 action [error!, panic!, fail!, abort!]:
diff --git a/lib/utils2.nom b/lib/utils2.nom
index c8fa3b4..a920be8 100644
--- a/lib/utils2.nom
+++ b/lib/utils2.nom
@@ -1,8 +1,8 @@
-require "lib/metaprogramming.nom"
-require "lib/utils.nom"
-require "lib/control_flow.nom"
-require "lib/operators.nom"
-require "lib/collections.nom"
+use "lib/metaprogramming.nom"
+use "lib/utils.nom"
+use "lib/control_flow.nom"
+use "lib/operators.nom"
+use "lib/collections.nom"
 
 
 compile [say %str] to:
diff --git a/nomsu.lua b/nomsu.lua
index 478ca8b..3226c0e 100644
--- a/nomsu.lua
+++ b/nomsu.lua
@@ -1220,7 +1220,7 @@ end]]):format(lua_code))
       self:define_action("run file %filename", "nomsu.moon", function(self, _filename)
         return self:run_file(_filename)
       end)
-      return self:define_compile_action("require %filename", "nomsu.moon", function(self, _filename)
+      return self:define_compile_action("use %filename", "nomsu.moon", function(self, _filename)
         local filename = self:tree_to_value(_filename)
         self:require_file(filename)
         return {
diff --git a/nomsu.moon b/nomsu.moon
index 78c72ce..8705dba 100755
--- a/nomsu.moon
+++ b/nomsu.moon
@@ -799,7 +799,7 @@ end]]\format(lua_code))
         @define_action "run file %filename", "nomsu.moon", (_filename)=>
             @run_file(_filename)
 
-        @define_compile_action "require %filename", "nomsu.moon", (_filename)=>
+        @define_compile_action "use %filename", "nomsu.moon", (_filename)=>
             filename = @tree_to_value(_filename)
             @require_file(filename)
             return statements:"nomsu:require_file(#{repr filename});"
-- 
cgit v1.2.3