Adding some unusual annotations

4 files changed, 19 insertions, 13 deletions

diff --git a/examples/typedlua/test.lua b/examples/typedlua/test.lua
index aa78856..4e173b9 100755
--- a/examples/typedlua/test.lua
+++ b/examples/typedlua/test.lua
@@ -1813,7 +1813,7 @@ concat2 = 2^3..1
 test.lua:1:15: syntax error, unexpected '.1', expecting 'return', '(', 'Name', 'typealias', 'interface', 'goto', 'break', '::', 'local', 'function', 'const', 'repeat', 'for', 'do', 'while', 'if', ';', ',', 'or', 'and', '>', '<', '>=', '<=', '==', '~=', '|', '~', '&', '>>', '<<', '..', '-', '+', '%', '/', '//', '*', '^'
 ]=]
 e = [=[
-test.lua:1:15: unexpected '.1', expecting 'return', '(', 'Name', 'typealias', 'interface', 'goto', 'break', '::', 'local', 'function', 'const', 'repeat', 'for', 'do', 'while', 'if', ';', ',', 'or', 'and', '>', '<', '>=', '<=', '==', '~=', '|', '~', '&', '>>', '<<', '..', '-', '+', '%', '/', '//', '*', '^'
+test.lua:1:13: malformed <number>
 ]=]
 
 r, m = parse(s)
@@ -1926,7 +1926,7 @@ goto label
 test.lua:2:1: syntax error, unexpected 'goto', expecting ';', '(', 'Name', '{', 'function', '...', 'true', 'false', 'nil', 'String', 'Number', '#', '~', '-', 'not'
 ]=]
 e = [=[
-test.lua:2:1: unexpected 'goto', expecting ';', '(', 'Name', '{', 'function', '...', 'true', 'false', 'nil', 'String', 'Number', '#', '~', '-', 'not'
+test.lua:2:1: invalid statement after 'return'
 ]=]
 
 r, m = parse(s)
@@ -2106,7 +2106,7 @@ return 1,1-2*3+4,"alo";
 test.lua:2:1: syntax error, unexpected 'return', expecting ';', '(', 'Name', '{', 'function', '...', 'true', 'false', 'nil', 'String', 'Number', '#', '~', '-', 'not'
 ]=]
 e = [=[
-test.lua:2:1: unexpected 'return', expecting ';', '(', 'Name', '{', 'function', '...', 'true', 'false', 'nil', 'String', 'Number', '#', '~', '-', 'not'
+test.lua:2:1: invalid statement
 ]=]
 
 r, m = parse(s)
@@ -2193,7 +2193,7 @@ x = ...:any
 test.lua:1:8: syntax error, unexpected ':', expecting 'return', '(', 'Name', 'typealias', 'interface', 'goto', 'break', '::', 'local', 'function', 'const', 'repeat', 'for', 'do', 'while', 'if', ';', ',', 'or', 'and', '>', '<', '>=', '<=', '==', '~=', '|', '~', '&', '>>', '<<', '..', '-', '+', '%', '/', '//', '*', '^'
 ]=]
 e = [=[
-test.lua:1:8: unexpected ':', expecting 'return', '(', 'Name', 'typealias', 'interface', 'goto', 'break', '::', 'local', 'function', 'const', 'repeat', 'for', 'do', 'while', 'if', ';', ',', 'or', 'and', '>', '<', '>=', '<=', '==', '~=', '|', '~', '&', '>>', '<<', '..', '-', '+', '%', '/', '//', '*', '^'
+test.lua:1:8: invalid statement
 ]=]
 
 r, m = parse(s)
@@ -2232,7 +2232,7 @@ local x:number*
 test.lua:1:15: syntax error, unexpected '*', expecting 'return', '(', 'Name', 'typealias', 'interface', 'goto', 'break', '::', 'local', 'function', 'const', 'repeat', 'for', 'do', 'while', 'if', ';', '=', ',', '?', '|'
 ]=]
 e = [=[
-test.lua:1:15: unexpected '*', expecting 'return', '(', 'Name', 'typealias', 'interface', 'goto', 'break', '::', 'local', 'function', 'const', 'repeat', 'for', 'do', 'while', 'if', ';', '=', ',', '?', '|'
+test.lua:1:15: invalid local declaration
 ]=]
 
 r, m = parse(s)
@@ -2258,7 +2258,7 @@ local x:number?|string?
 test.lua:1:16: syntax error, unexpected '|', expecting 'return', '(', 'Name', 'typealias', 'interface', 'goto', 'break', '::', 'local', 'function', 'const', 'repeat', 'for', 'do', 'while', 'if', ';', '=', ','
 ]=]
 e = [=[
-test.lua:1:16: unexpected '|', expecting 'return', '(', 'Name', 'typealias', 'interface', 'goto', 'break', '::', 'local', 'function', 'const', 'repeat', 'for', 'do', 'while', 'if', ';', '=', ','
+test.lua:1:16: invalid local declaration
 ]=]
 
 r, m = parse(s)
diff --git a/examples/typedlua/tlerror.lua b/examples/typedlua/tlerror.lua
index c51a53b..94be024 100644
--- a/examples/typedlua/tlerror.lua
+++ b/examples/typedlua/tlerror.lua
@@ -35,10 +35,11 @@ new_error("ParList", "expecting '...'")
 new_error("MethodCall", "expecting '(' for method call")
 new_error("Label1", "expecting <name> after '::'")
 new_error("Label2", "expecting '::' to close label declaration")
-new_error("LocalAssign", "expecting expression list after '='")
+new_error("LocalAssign1", "expecting expression list after '='")
+new_error("LocalAssign2", "invalid local declaration")
 new_error("ForGen", "expecting 'in'")
 new_error("LocalFunc", "expecting <name> in local function declaration")
-new_error("Exp", "malformed expression")
+new_error("RetStat", "invalid statement after 'return'")
 new_error("ElseIf", "expecting <exp> after 'elseif'")
 new_error("SubExpr_1", "malformed 'or' expression")
 new_error("SubExpr_2", "malformed 'and' expression")
@@ -52,6 +53,7 @@ new_error("SubExpr_9", "malformed addition expression")
 new_error("SubExpr_10", "malformed multiplication expression")
 new_error("SubExpr_11", "malformed unary expression")
 new_error("SubExpr_12", "malformed '^' expression")
+new_error("Stat", "invalid statement")
 
 local labels = {}
 for k, v in ipairs(errors) do
diff --git a/examples/typedlua/tllexer.lua b/examples/typedlua/tllexer.lua
index 2e11377..6517ba5 100644
--- a/examples/typedlua/tllexer.lua
+++ b/examples/typedlua/tllexer.lua
@@ -9,6 +9,10 @@ function tllexer.try (pat, label)
   return pat + lpeg.T(tlerror.labels[label])
 end
 
+function tllexer.catch (pat, label)
+  return lpeg.Lc(pat, lpeg.P(false), tlerror.labels[label])
+end
+
 local function setffp (s, i, t, n)
   if not t.ffp or i > t.ffp then
     t.ffp = i
@@ -75,7 +79,7 @@ end
 
 local Hex = (lpeg.P("0x") + lpeg.P("0X")) * tllexer.try(lpeg.xdigit^1, "Number")
 local Expo = lpeg.S("eE") * lpeg.S("+-")^-1 * tllexer.try(lpeg.digit^1, "Number")
-local Float = (((lpeg.digit^1 * lpeg.P(".") * lpeg.digit^0) +
+local Float = (((lpeg.digit^1 * lpeg.P(".") * lpeg.digit^0 * tllexer.try(-lpeg.P("."), "Number")) +
               (lpeg.P(".") * lpeg.digit^1)) * Expo^-1) +
               (lpeg.digit^1 * Expo)
 local Int = lpeg.digit^1
diff --git a/examples/typedlua/tlparser.lua b/examples/typedlua/tlparser.lua
index 67a06a4..dba94f7 100644
--- a/examples/typedlua/tlparser.lua
+++ b/examples/typedlua/tlparser.lua
@@ -11,7 +11,7 @@ local function chainl1 (pat, sep, label)
 end
 
 local G = lpeg.P { "TypedLua";
-  TypedLua = tllexer.Shebang^-1 * tllexer.Skip * lpeg.V("Chunk") * -1;
+  TypedLua = tllexer.Shebang^-1 * tllexer.Skip * lpeg.V("Chunk") * tllexer.try(-1, "Stat");
   -- type language
   Type = lpeg.V("NilableType");
   NilableType = lpeg.V("UnionType") * tllexer.symb("?")^-1;
@@ -179,14 +179,14 @@ local G = lpeg.P { "TypedLua";
              tllexer.kw("function") * lpeg.V("FuncName") * lpeg.V("FuncBody");
   LocalFunc = tllexer.kw("function") *
               tllexer.try(lpeg.V("Id"), "LocalFunc") * lpeg.V("FuncBody");
-  LocalAssign = lpeg.V("NameList") *
-                ((tllexer.symb("=") * tllexer.try(lpeg.V("ExpList"), "LocalAssign")))^-1;
+  LocalAssign = lpeg.V("NameList") * tllexer.symb("=") * tllexer.try(lpeg.V("ExpList"), "LocalAssign1") +
+                lpeg.V("NameList") * (#(-tllexer.symb("=") * (lpeg.V("Stat") + -1)) * lpeg.P(true)) + lpeg.T(tlerror.labels["LocalAssign2"]);
   LocalStat = tllexer.kw("local") *
               (lpeg.V("LocalTypeDec") + lpeg.V("LocalFunc") + lpeg.V("LocalAssign"));
   LabelStat = tllexer.symb("::") * tllexer.try(tllexer.token(tllexer.Name, "Name"), "Label1") * tllexer.try(tllexer.symb("::"), "Label2");
   BreakStat = tllexer.kw("break");
   GoToStat = tllexer.kw("goto") * tllexer.token(tllexer.Name, "Name");
-  RetStat = tllexer.kw("return") *
+  RetStat = tllexer.kw("return") * tllexer.try(-lpeg.V("Stat"), "RetStat") *
             (lpeg.V("Expr") * (tllexer.symb(",") * lpeg.V("Expr"))^0)^-1 *
             tllexer.symb(";")^-1;
   TypeDecStat = lpeg.V("Interface");