Update and fix selene

gamax92 · gamax92 · commit 6a350c62ecd3 · 2017-06-03T11:37:47.000-06:00
loading selene's parser afterwards allows use to use unmodified selene
diff --git a/src/main/java/pcl/lc/irc/hooks/JNLuaSandbox.java b/src/main/java/pcl/lc/irc/hooks/JNLuaSandbox.java
@@ -100,9 +100,9 @@ public int invoke(LuaState luaState) {
 		luaState.load(luasb, "=luasb");
 		luaState.call(0, 0);
 
-		System.out.println(runScriptInSandbox("_selene_parser_ =(function()\n" + sparser + "\nend)()"));
-		System.out.println(runScriptInSandbox("if _selene_parser_ then selene = (function()\n" + selene + "\nend)() end"));
-		System.out.println(runScriptInSandbox("if selene then selene.load() end"));
+		System.out.println(runScriptInSandbox("selene = (function()\n" + selene + "\nend)()"));
+		System.out.println(runScriptInSandbox("selene.parser =(function()\n" + sparser + "\nend)()"));
+		System.out.println(runScriptInSandbox("selene.load()"));
 	}
 
 	static String runScriptInSandbox(String script) {
diff --git a/src/main/resources/jnlua/selene/init.lua b/src/main/resources/jnlua/selene/init.lua
@@ -244,7 +244,7 @@ local fmt = {
     return fnc._fnc(...)
   end,
   __len = function(fnc)
-    return #fnc._fnc
+    return parCount(fnc)
   end,
   __pairs = function(fnc)
     return pairs(fnc._fnc)
@@ -1215,7 +1215,8 @@ end
 local selene = {}
 
 do
-  selene.parser = _selene_parser_
+  local s, p = pcall(require, "selene.parser") -- This might not be possible in every environment
+  selene.parser = s and p or nil
 end
 
 local function parse(chunk, stripcomments)
diff --git a/src/main/resources/jnlua/selene/parser.lua b/src/main/resources/jnlua/selene/parser.lua
@@ -350,7 +350,9 @@ local function findForeach(tokens, i, part, line)
   local step = i - 1
   local params = {}
   while not start do
-    if tokens[step][1] == "for" then
+    if not tokens[step] then
+      return false
+    elseif tokens[step][1] == "for" then
       start = step + 1
     else
       table.insert(params, 1, tokens[step][1])
@@ -362,7 +364,9 @@ local function findForeach(tokens, i, part, line)
   local stop
   local vars = {}
   while not stop do
-    if tokens[step][1] == "do" then
+    if not tokens[step] then
+      return false
+    elseif tokens[step][1] == "do" then
       stop = step - 1
     else
       vars[#vars + 1] = tokens[step][1]
@@ -525,8 +529,8 @@ local function parse(chunk, stripcomments)
   while i <= #tokens do
     local part = tokens[i][1]
     if keywords[part] then
-      if not tokens[i + 1] then tokens[i + 1] = {""} end
-      if not tokens[i - 1] then tokens[i - 1] = {""} end
+      if not tokens[i + 1] then tokens[i + 1] = {"", tokens[i][2], false} end
+      if not tokens[i - 1] then tokens[i - 1] = {"", tokens[i][2], false} end
       local start, stop = keywords[part](tokens, i, part, tokens[i][2], stripcomments)
       if start then
         chunk = nil
@@ -569,4 +573,4 @@ function selenep.setTimeoutHandler(func, time, timefunc)
   timeout.time = timefunc
 end
 
-return selenep
+return selenep
