Fixed lookups and calls that shouldn't parse.

Author: ReFreezed

Changelog.txt

@@ -1,6 +1,9 @@
 Changelog
 Dumb Lua Parser
 
+v1.2.1 (2021-06-01)
+- Fixed lookups and calls that shouldn't parse, like "":sub().
+
 v1.2.0 (2021-05-13)
 - Added parser.updateReferences().
 - Changed arguments for parser.traverseTree() and the callback.

dumbParser.lua

@@ -3,7 +3,7 @@
 --=  Dumb Lua Parser - Lua parsing library
 --=  by Marcus 'ReFreezed' Thunström
 --=
---=  v1.2 (2021-05-13)
+--=  v1.2.1 (2021-06-01)
 --=
 --=  License: MIT (see the bottom of this file)
 --=  Website: https://github.com/ReFreezed/DumbLuaParser
@@ -154,7 +154,7 @@
 
 --============================================================]]
 
-local PARSER_VERSION = "1.2.0"
+local PARSER_VERSION = "1.2.1"
 
 local F       = string.format
 local find    = string.find
@@ -1006,14 +1006,16 @@ end
 
 function parseExpression(tokens, tok, lastPrecedence) --> expression, token
 	local expr
+	local canParseLookupOrCall = false
 
 	-- identifier
 	if isTokenType(tokens, tok, "identifier") then
 		local ident, tokNext = parseIdentifier(tokens, tok)
 		if not ident then  return false, tok  end
 		tok = tokNext
 
-		expr = ident
+		expr                 = ident
+		canParseLookupOrCall = true
 
 	-- ...
 	elseif isToken(tokens, tok, "punctuation", "...") then
@@ -1096,7 +1098,8 @@ function parseExpression(tokens, tok, lastPrecedence) --> expression, token
 		end
 		tok = tok + 1 -- ')'
 
-		expr = _expr
+		expr                 = _expr
+		canParseLookupOrCall = true
 
 	else
 		reportErrorAtToken(tokens, tok, "Parser", "Failed parsing expression.")
@@ -1105,7 +1108,7 @@ function parseExpression(tokens, tok, lastPrecedence) --> expression, token
 
 	assert(expr)
 
-	-- Binary expressions etc.
+	-- Binary expressions, including lookups and calls.
 	while true do
 		-- a + b
 		if
@@ -1131,6 +1134,9 @@ function parseExpression(tokens, tok, lastPrecedence) --> expression, token
 
 			expr = binary
 
+		elseif not canParseLookupOrCall then
+			break
+
 		-- t.k
 		elseif isToken(tokens, tok, "punctuation", ".") then
 			local lookup = AstLookup(tok)
@@ -2969,7 +2975,7 @@ do
 			lastOutput = writeAlphanum(buffer, pretty, "end", lastOutput)
 
 		else
-			printfError("Error: Unknown node type '%s'.", nodeType)
+			printfError("Error: Unknown node type '%s'.", tostring(nodeType))
 			return false, lastOutput
 		end
 		return true, lastOutput
@@ -2978,6 +2984,8 @@ do
 	-- lua = toLua( astNode [, prettyOuput=false ] )
 	-- Returns nil on error.
 	function toLua(node, pretty)
+		if type(node) ~= "table" then  error(F("bad argument #1 to 'toLua' (AST node expected, got %s)", type(node)), 2)  end
+
 		local buffer = {}
 
 		local ok

runTest.lua

@@ -45,7 +45,7 @@ do
 		print(luaEdit)
 	end
 
-	assert(loadLuaString(lua, "@lua"))
+	assert(loadLuaString(lua, "@<luastring>"))
 
 	-- Round-trip.
 	local tripTokens = assert(parser.tokenizeString(lua))
@@ -77,7 +77,7 @@ do
 	local lua = assert(parser.toLua(ast, pretty))
 	print(lua)
 
-	assert(loadLuaString(lua, "@lua"))
+	assert(loadLuaString(lua, "@<luastring>"))
 end
 
 -- AST manipulations.
@@ -103,7 +103,7 @@ do
 
 	local block = assert(parser.parse([[
 		local x = 49
-	]], "<inline lua>"))
+	]], "<luastring>"))
 
 	assert(block.type == "block")
 	assert(block.statements[1])
@@ -121,7 +121,53 @@ do
 	local lua = assert(parser.toLua(block, pretty))
 	print(lua)
 
-	assert(loadLuaString(lua, "@lua"))
+	assert(loadLuaString(lua, "@<luastring>"))
 end
 
-print("Tests passed!")
+-- Tests that should fail.
+do
+	assert(    parser.parse([[ x =  tbl   () ]], "<luastring>"))
+	assert(    parser.parse([[ x =  tbl   "" ]], "<luastring>"))
+	assert(    parser.parse([[ x =  tbl .m() ]], "<luastring>"))
+	assert(    parser.parse([[ x =  tbl :m"" ]], "<luastring>"))
+	assert(    parser.parse([[ x = (tbl)  () ]], "<luastring>"))
+	assert(    parser.parse([[ x = (tbl)  "" ]], "<luastring>"))
+	assert(    parser.parse([[ x = (tbl).m() ]], "<luastring>"))
+	assert(    parser.parse([[ x = (tbl):m"" ]], "<luastring>"))
+	assert(not parser.parse([[ x =  " "   () ]], "<luastring>"))
+	assert(not parser.parse([[ x =  " "   "" ]], "<luastring>"))
+	assert(not parser.parse([[ x =  " " .m() ]], "<luastring>"))
+	assert(not parser.parse([[ x =  " " :m"" ]], "<luastring>"))
+	assert(    parser.parse([[ x = (" ")  () ]], "<luastring>"))
+	assert(    parser.parse([[ x = (" ")  "" ]], "<luastring>"))
+	assert(    parser.parse([[ x = (" ").m() ]], "<luastring>"))
+	assert(    parser.parse([[ x = (" "):m"" ]], "<luastring>"))
+	assert(not parser.parse([[ x =  { }   () ]], "<luastring>"))
+	assert(not parser.parse([[ x =  { }   "" ]], "<luastring>"))
+	assert(not parser.parse([[ x =  { } .m() ]], "<luastring>"))
+	assert(not parser.parse([[ x =  { } :m"" ]], "<luastring>"))
+	assert(    parser.parse([[ x = ({ })  () ]], "<luastring>"))
+	assert(    parser.parse([[ x = ({ })  "" ]], "<luastring>"))
+	assert(    parser.parse([[ x = ({ }).m() ]], "<luastring>"))
+	assert(    parser.parse([[ x = ({ }):m"" ]], "<luastring>"))
+	assert(not parser.parse([[ x =  123   () ]], "<luastring>"))
+	assert(not parser.parse([[ x =  123   "" ]], "<luastring>"))
+	assert(not parser.parse([[ x =  123 .m() ]], "<luastring>"))
+	assert(not parser.parse([[ x =  123 :m"" ]], "<luastring>"))
+	assert(    parser.parse([[ x = (123)  () ]], "<luastring>"))
+	assert(    parser.parse([[ x = (123)  "" ]], "<luastring>"))
+	assert(    parser.parse([[ x = (123).m() ]], "<luastring>"))
+	assert(    parser.parse([[ x = (123):m"" ]], "<luastring>"))
+	assert(not parser.parse([[ x =  nil   () ]], "<luastring>"))
+	assert(not parser.parse([[ x =  nil   "" ]], "<luastring>"))
+	assert(not parser.parse([[ x =  nil .m() ]], "<luastring>"))
+	assert(not parser.parse([[ x =  nil :m"" ]], "<luastring>"))
+	assert(    parser.parse([[ x = (nil)  () ]], "<luastring>"))
+	assert(    parser.parse([[ x = (nil)  "" ]], "<luastring>"))
+	assert(    parser.parse([[ x = (nil).m() ]], "<luastring>"))
+	assert(    parser.parse([[ x = (nil):m"" ]], "<luastring>"))
+end
+
+print()
+print("Tests passed successfully!")
+print()