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.

1 files changed, 0 insertions, 106 deletions

diff --git a/string2.moon b/string2.moon
deleted file mode 100644
index de2980d..0000000
--- a/string2.moon
+++ /dev/null
@@ -1,106 +0,0 @@
--- Expand the capabilities of the built-in strings
-{:reverse, :upper, :lower, :find, :byte, :match, :gmatch, :gsub, :sub, :format, :rep, :char} = string
-
-isplit = (sep='%s+')=>
-    step = (i)=>
-        start = @pos
-        return unless start
-        i += 1
-        nl = find(@str, @sep, start)
-        @pos = nl and (nl+1) or nil
-        line = sub(@str, start, nl and (nl-1) or #@str)
-        return i, line, start, (nl and (nl-1) or #@str)
-    return step, {str:@, pos:1, :sep}, 0
-
-lua_keywords = {
-    ["and"]:true, ["break"]:true, ["do"]:true, ["else"]:true, ["elseif"]:true, ["end"]:true,
-    ["false"]:true, ["for"]:true, ["function"]:true, ["goto"]:true, ["if"]:true,
-    ["in"]:true, ["local"]:true, ["nil"]:true, ["not"]:true, ["or"]:true, ["repeat"]:true,
-    ["return"]:true, ["then"]:true, ["true"]:true, ["until"]:true, ["while"]:true
-}
-is_lua_id = (str)->
-    match(str, "^[_a-zA-Z][_a-zA-Z0-9]*$") and not lua_keywords[str]
-
-string2 = {
-    :isplit, uppercase:upper, lowercase:lower, reversed:reverse, :is_lua_id
-    capitalized: => gsub(@, '%l', upper, 1)
-    byte: byte, bytes: (i, j)=> {byte(@, i or 1, j or -1)}
-    split: (sep)=> [chunk for i,chunk in isplit(@, sep)]
-    starts_with: (s)=> sub(@, 1, #s) == s
-    ends_with: (s)=> #@ >= #s and sub(@, #@-#s, -1) == s
-    lines: => [line for i,line in isplit(@, '\n')]
-    line: (line_num)=>
-        for i, line, start in isplit(@, '\n')
-            return line if i == line_num
-
-    line_at: (pos)=>
-        assert(type(pos) == 'number', "Invalid string position")
-        for i, line, start, stop in isplit(@, '\n')
-            if stop+1 >= pos
-                return line, i, (pos-start+1)
-
-    wrap: (maxlen=80, buffer=8)=>
-        lines = {}
-        for line in *@lines!
-            while #line > maxlen
-                chunk = sub(line, 1, maxlen)
-                split = find(chunk, ' ', maxlen-buffer, true) or maxlen
-                chunk = sub(line, 1, split)
-                line = sub(line, split+1, -1)
-                lines[#lines+1] = chunk
-            lines[#lines+1] = line
-        return table.concat(lines, "\n")
-
-    indented: (indent="    ")=>
-        indent..(gsub(@, "\n", "\n"..indent))
-
-    as_lua: =>
-        escaped = gsub(@, "\\", "\\\\")
-        escaped = gsub(escaped, "\n", "\\n")
-        escaped = gsub(escaped, '"', '\\"')
-        escaped = gsub(escaped, "[^ %g]", (c)-> format("\\%03d", byte(c, 1)))
-        return '"'..escaped..'"'
-
-    as_nomsu: =>
-        escaped = gsub(@, "\\", "\\\\")
-        escaped = gsub(escaped, "\n", "\\n")
-        escaped = gsub(escaped, '"', '\\"')
-        escaped = gsub(escaped, "[^ %g]", (c)-> format("\\%03d", byte(c, 1)))
-        return '"'..escaped..'"'
-
-    -- Convert an arbitrary text into a valid Lua identifier. This function is injective,
-    -- but not idempotent. In logic terms: (x != y) => (as_lua_id(x) != as_lua_id(y)),
-    -- but not (as_lua_id(a) == b) => (as_lua_id(b) == b).
-    as_lua_id: (str)->
-        -- Escape 'x' (\x78) when it precedes something that looks like an uppercase hex sequence.
-        -- This way, all Lua IDs can be unambiguously reverse-engineered, but normal usage
-        -- of 'x' won't produce ugly Lua IDs.
-        -- i.e. "x" -> "x", "oxen" -> "oxen", but "Hex2Dec" -> "Hex782Dec" and "He-ec" -> "Hex2Dec"
-        str = gsub str, "x([0-9A-F][0-9A-F])", "x78%1"
-        -- Map spaces to underscores, and everything else non-alphanumeric to hex escape sequences
-        str = gsub str, "%W", (c)->
-            if c == ' ' then '_'
-            else format("x%02X", byte(c))
-
-        unless is_lua_id(match(str, "^_*(.*)$"))
-            str = "_"..str
-        return str
-
-    -- from_lua_id(as_lua_id(str)) == str, but behavior is unspecified for inputs that
-    -- did not come from as_lua_id()
-    from_lua_id: (str)->
-        unless is_lua_id(match(str, "^_*(.*)$"))
-            str = sub(str,2,-1)
-        str = gsub(str, "_", " ")
-        str = gsub(str, "x([0-9A-F][0-9A-F])", (hex)-> char(tonumber(hex, 16)))
-        return str
-}
-for k,v in pairs(string) do string2[k] or= v
-
-for test in *{"", "_", " ", "return", "asdf", "one two", "one_two", "Hex2Dec", "He-ec", "\3"}
-    lua_id = string2.as_lua_id(test)
-    assert is_lua_id(lua_id), "failed to convert '#{test}' to a valid Lua identifier (got '#{lua_id}')"
-    roundtrip = string2.from_lua_id(lua_id)
-    assert roundtrip == test, "Failed lua_id roundtrip: '#{test}' -> '#{lua_id}' -> '#{roundtrip}'"
-
-return string2