diff options
| -rw-r--r-- | lib/collections.nom | 8 | ||||
| -rw-r--r-- | lib/control_flow.nom | 6 | ||||
| -rw-r--r-- | lib/core.nom | 14 | ||||
| -rw-r--r-- | lib/moonscript.nom | 2 | ||||
| -rw-r--r-- | lib/operators.nom | 2 | ||||
| -rw-r--r-- | lib/permissions.nom | 10 | ||||
| -rw-r--r-- | lib/plurals.nom | 2 | ||||
| -rw-r--r-- | lib/scopes.nom | 8 | ||||
| -rw-r--r-- | lib/testing.nom | 2 | ||||
| -rw-r--r-- | lib/utils.nom | 2 | ||||
| -rw-r--r-- | lib/utils2.nom | 10 | ||||
| -rw-r--r-- | nomsu.lua | 2 | ||||
| -rwxr-xr-x | 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: @@ -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 { @@ -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});" |