aboutsummaryrefslogtreecommitdiff
path: root/nomsu_environment.lua
diff options
context:
space:
mode:
authorBruce Hill <bruce@bruce-hill.com>2019-01-22 16:15:25 -0800
committerBruce Hill <bruce@bruce-hill.com>2019-01-22 16:16:53 -0800
commitf746ba34d799e6560df1aad1cad15a70b34914d1 (patch)
tree3829ce9bd8469e59d1a51470823d510dc808e1c7 /nomsu_environment.lua
parenta596195f6cfb6731f1e778e4bc304028ecd9bf08 (diff)
Moved all the text method stuff into text.moon instead of splitting
across string2/containers. Modified the type stuff to output better type names and use (a Dict) and (a List) instead of (Dict) and (List). (Text) now also has a proper constructor. (assume) now also handles a bunch of different assumptions with smart error messages.
Diffstat (limited to 'nomsu_environment.lua')
-rw-r--r--nomsu_environment.lua10
1 files changed, 6 insertions, 4 deletions
diff --git a/nomsu_environment.lua b/nomsu_environment.lua
index d9014c3..08fd662 100644
--- a/nomsu_environment.lua
+++ b/nomsu_environment.lua
@@ -3,11 +3,12 @@ do
local _obj_0 = require("code_obj")
NomsuCode, LuaCode, Source = _obj_0.NomsuCode, _obj_0.LuaCode, _obj_0.Source
end
-local List, Dict, Text
+local List, Dict
do
local _obj_0 = require('containers')
- List, Dict, Text = _obj_0.List, _obj_0.Dict, _obj_0.Text
+ List, Dict = _obj_0.List, _obj_0.Dict
end
+local Text = require('text')
local SyntaxTree = require("syntax_tree")
local Files = require("files")
local Errhand = require("error_handling")
@@ -121,8 +122,9 @@ nomsu_environment = Importer({
jit = jit,
_VERSION = _VERSION,
bit = (jit or _VERSION == "Lua 5.2") and require('bitops') or nil,
- List = List,
- Dict = Dict,
+ a_List = List,
+ a_Dict = Dict,
+ Text = Text,
lpeg = lpeg,
re = re,
Files = Files,