Renaming parser2 to parser.

5 files changed, 94 insertions, 6 deletions

diff --git a/Makefile b/Makefile
index 10e788b..867a726 100644
--- a/Makefile
+++ b/Makefile
@@ -11,11 +11,11 @@ UNINSTALL_VERSION=
 # ========= You shouldn't need to mess with any of these variables below ================
 
 MOON_FILES= code_obj.moon error_handling.moon files.moon nomsu.moon nomsu_compiler.moon \
-			syntax_tree.moon containers.moon bitops.moon \
-			parser2.moon pretty_errors.moon string2.moon
+			syntax_tree.moon containers.moon bitops.moon parser.moon pretty_errors.moon \
+			string2.moon
 LUA_FILES= code_obj.lua consolecolors.lua error_handling.lua files.lua nomsu.lua nomsu_compiler.lua \
-		   syntax_tree.lua containers.lua bitops.lua utils.lua \
-		   parser2.lua pretty_errors.lua string2.lua
+		   syntax_tree.lua containers.lua bitops.lua utils.lua parser.lua pretty_errors.lua \
+		   string2.lua
 CORE_NOM_FILES= $(wildcard core/*.nom)
 CORE_LUA_FILES= $(patsubst %.nom,%.lua,$(CORE_NOM_FILES))
 LIB_NOM_FILES= $(wildcard lib/*.nom)
diff --git a/nomsu_compiler.lua b/nomsu_compiler.lua
index 639e891..866a232 100644
--- a/nomsu_compiler.lua
+++ b/nomsu_compiler.lua
@@ -36,7 +36,7 @@ do
   NomsuCode, LuaCode, Source = _obj_0.NomsuCode, _obj_0.LuaCode, _obj_0.Source
 end
 local AST = require("syntax_tree")
-local make_parser = require("parser2")
+local make_parser = require("parser")
 SOURCE_MAP = { }
 table.map = function(t, fn)
   return setmetatable((function()
diff --git a/nomsu_compiler.moon b/nomsu_compiler.moon
index 5e1510b..f4592f3 100644
--- a/nomsu_compiler.moon
+++ b/nomsu_compiler.moon
@@ -24,7 +24,7 @@ unpack or= table.unpack
 {:match, :sub, :gsub, :format, :byte, :find} = string
 {:NomsuCode, :LuaCode, :Source} = require "code_obj"
 AST = require "syntax_tree"
-make_parser = require("parser2")
+make_parser = require("parser")
 -- Mapping from source string (e.g. "@core/metaprogramming.nom[1:100]") to a mapping
 -- from lua line number to nomsu line number
 export SOURCE_MAP
diff --git a/parser.lua b/parser.lua
new file mode 100644
index 0000000..0694e3e
--- /dev/null
+++ b/parser.lua
@@ -0,0 +1,88 @@
+local lpeg = require('lpeg')
+local re = require('re')
+lpeg.setmaxstack(20000)
+local P, R, S, C, Cmt, Carg, Cc
+P, R, S, C, Cmt, Carg, Cc = lpeg.P, lpeg.R, lpeg.S, lpeg.C, lpeg.Cmt, lpeg.Carg, lpeg.Cc
+local repr
+repr = require('utils').repr
+local DEFS
+do
+  local _with_0 = { }
+  _with_0.nl = P("\r") ^ -1 * P("\n")
+  _with_0.tab = P("\t")
+  _with_0.tonumber = tonumber
+  _with_0.tochar = string.char
+  _with_0.unpack = unpack or table.unpack
+  _with_0["nil"] = Cc(nil)
+  _with_0.userdata = Carg(1)
+  _with_0.utf8_char = (R("\194\223") * R("\128\191") + R("\224\239") * R("\128\191") * R("\128\191") + R("\240\244") * R("\128\191") * R("\128\191") * R("\128\191"))
+  _with_0.Tree = function(t, userdata)
+    return userdata.make_tree(t, userdata)
+  end
+  DEFS = _with_0
+end
+setmetatable(DEFS, {
+  __index = function(self, key)
+    do
+      local i = key:match("^ascii_(%d+)$")
+      if i then
+        local c = string.char(tonumber(i))
+        self[key] = c
+        return c
+      else
+        do
+          i = key:match("^number_(%d+)$")
+          if i then
+            local p = Cc(tonumber(i))
+            self[key] = p
+            return p
+          end
+        end
+      end
+    end
+  end
+})
+local peg_tidier = re.compile([[file <- %nl* {~ (def/comment) (%nl+ (def/comment))* %nl* ~}
+def <- anon_def / captured_def
+anon_def <-
+    ({ident} (" "*) ":" {[^%nl]* (%nl+ " "+ [^%nl]*)*}) 
+    -> "%1 <- %2"
+captured_def <-
+    ({ident} (" "*) "(" {ident} ")" (" "*) ":" {[^%nl]* (%nl+ " "+ [^%nl]*)*})
+    -> "%1 <- ({| {:start:{}:} %3 {:stop:{}:} {:type: (''->'%2') :} |} %%userdata) -> Tree"
+ident <- [a-zA-Z_][a-zA-Z0-9_]*
+comment <- "--" [^%nl]*
+]])
+local make_parser
+make_parser = function(peg, make_tree)
+  if make_tree == nil then
+    make_tree = nil
+  end
+  peg = assert(peg_tidier:match(peg))
+  peg = assert(re.compile(peg, DEFS))
+  return function(input, filename)
+    if filename == nil then
+      filename = '???'
+    end
+    input = tostring(input)
+    local tree_mt = {
+      __index = {
+        source = input,
+        filename = filename
+      }
+    }
+    local userdata = {
+      make_tree = make_tree or (function(t)
+        return setmetatable(t, tree_mt)
+      end),
+      filename = filename,
+      source = input
+    }
+    local tree = peg:match(input, nil, userdata)
+    if not tree then
+      error("File " .. tostring(filename) .. " failed to parse:\n" .. tostring(input))
+    end
+    return tree
+  end
+end
+return make_parser
diff --git a/parser2.moon b/parser.moon
index 9a2e2ff..9a2e2ff 100644
--- a/parser2.moon
+++ b/parser.moon