Merge master in develop

.editorconfig

@@ -0,0 +1,4 @@
+[*.lua]
+indent_style = tab
+indent_size = 4
+end_of_line = lf

.gitattributes

@@ -0,0 +1,2 @@
+*.lua text=auto
+*.lua eol=lf

doc/SUMMARY.md

@@ -19,6 +19,8 @@
 * [ProxifyLocals](steps/proxifylocals.md)
 * [EncryptStrings](steps/encryptstrings.md)
 * [ConstantArray](steps/constantarray.md)
+* [AntiTamper](steps/anti-tamper.md)
+
 
 ## advanced
 

doc/advanced/using-prometheus-in-your-lua-application.md

@@ -1,6 +1,6 @@
 # Using Prometheus in your Lua Application
 
-Prometheus can also be used as a library for your custom Lua Applications instead of using it's cli tool. 
+Prometheus can also be used as a library for your custom Lua Applications instead of using its cli tool. 
 
 In order to do that you'll first need to clone the github repo:
 

doc/steps/anti-tamper.md

@@ -0,0 +1,11 @@
+---
+description: This step provides an obfuscation step, that breaks the script, when someone tries to tamper with it.
+---
+
+# Anti Tamper
+
+### Settings
+
+| Name        | type | description                                 | values                                  |
+| ----------- | ---- | ------------------------------------------- | --------------------------------------- |
+| UseDebug | boolean | Uses the debug library in lua. Disable this if you don't have access to debug library | "true","false" |

readme.md

@@ -34,7 +34,7 @@ To perform the Prometheus Tests, just run
 lua ./tests.lua
 ```
 ## Building
-Prometheus can currently only be build for and on Windows.
+Prometheus can currently only build on Windows.
 It requires [srlua.exe](https://github.com/LuaDist/srlua) and [glue.exe](https://github.com/LuaDist/srlua) inside of the root directory. If lua51 was linked dynamically, lua51.dll must also be present. Then Prometheus for Windows can be built using
 ```batch
 build.bat

src/prometheus/enums.lua

@@ -36,7 +36,7 @@ Enums.Conventions = {
 		BinaryNumberChars   = {"0", "1"},
 		DecimalExponent     = {"e", "E"},
 		HexadecimalNums     = {"x", "X"},
-		BinaryNums          = false,
+		BinaryNums          = {"b", "B"},
 		DecimalSeperators   = false,
 
 		EscapeSequences     = {
@@ -52,9 +52,9 @@ Enums.Conventions = {
 			["\'"] = "\'";
 		},
 		NumericalEscapes = true,
-		EscapeZIgnoreNextWhitespace = false,
-		HexEscapes = false,
-		UnicodeEscapes = false,
+		EscapeZIgnoreNextWhitespace = true,
+		HexEscapes = true,
+		UnicodeEscapes = true,
 	},
 	[Enums.LuaVersion.LuaU] = {
 		Keywords = {
@@ -103,4 +103,4 @@ Enums.Conventions = {
 	},
 }
 
-return Enums;
+return Enums;

src/prometheus/steps/AntiTamper.lua

@@ -38,22 +38,28 @@ function AntiTamper:apply(ast, pipeline)
         local string = RandomStrings.randomString();
         code = code .. [[
             -- Anti Beautify
-            local sethook = debug and debug.sethook or function() end;
-            local allowedLine = nil;
-            local called = 0;
-            sethook(function(s, line)
-                called = called + 1;
-                if allowedLine then
-                    if allowedLine ~= line then
-                        sethook(error, "l");
-                    end
-                else
-                    allowedLine = line;
-                end
-            end, "l");
-            (function() end)();
-            (function() end)();
-            sethook();
+			local sethook = debug and debug.sethook or function() end;
+			local allowedLine = nil;
+			local called = 0;
+			sethook(function(s, line)
+				if not line then
+					return
+				end
+				called = called + 1;
+				if allowedLine then
+					if allowedLine ~= line then
+						sethook(error, "l", 5);
+					end
+				else
+					allowedLine = line;
+				end
+			end, "l", 5);
+			(function() end)();
+			(function() end)();
+			sethook();
+			if called < 2 then
+				valid = false;
+			end
             if called < 2 then
                 valid = false;
             end
@@ -173,4 +179,4 @@ end
     return ast;
 end
 
-return AntiTamper;
+return AntiTamper;

src/prometheus/tokenizer.lua

@@ -44,12 +44,8 @@ Tokenizer.EOF_TOKEN = {
 	source = "<EOF>",
 }
 
-local function getPosition(source, i)
-	return source:sub(1, i):gsub("[^\n]", ""):len() + 1, i - source:sub(1, i):gsub("[^\r]", ""):len() + 1;
-end
-
 local function token(self, startPos, kind, value)
-	local line, linePos = getPosition(self.source, self.index);
+	local line, linePos = self:getPosition(self.index);
 	local annotations = self.annotations
 	self.annotations = {};
 	return {
@@ -65,14 +61,45 @@ local function token(self, startPos, kind, value)
 end
 
 local function generateError(self, message)
-	local line, linePos = getPosition(self.source, self.index);
+	local line, linePos = self:getPosition(self.index);
 	return "Lexing Error at Position " .. tostring(line) .. ":" .. tostring(linePos) .. ", " .. message;
 end
 
 local function generateWarning(token, message)
 	return "Warning at Position " .. tostring(token.line) .. ":" .. tostring(token.linePos) .. ", " .. message;
 end
 
+function Tokenizer:getPosition(i)
+	local column = self.columnMap[i]
+
+	if not column then --// `i` is bigger than self.length, this shouldnt happen, but it did. (Theres probably some error in the tokenizer, cant find it.)
+		column = self.columnMap[#self.columnMap] 
+	end
+
+	return column.id, column.charMap[i]
+end
+
+--// Prepare columnMap for getPosition
+function Tokenizer:prepareGetPosition()
+	local columnMap, column = {}, { charMap = {}, id = 1, length = 0 }
+
+	for index = 1, self.length do
+		local character = string.sub(self.source, index, index) -- NOTE_1: this could use table.clone to reduce amount of NEWTABLE (if that causes any performance issues)
+
+		local columnLength = column.length + 1
+		column.length = columnLength
+		column.charMap[index] = columnLength
+
+		if character == "\n" then
+			column = { charMap = {}, id = column.id + 1, length = 0 } -- NOTE_1
+		end
+
+		columnMap[index] = column
+	end
+
+	self.columnMap = columnMap
+end
+
 -- Constructor for Tokenizer
 function Tokenizer:new(settings) 
 	local luaVersion = (settings and (settings.luaVersion or settings.LuaVersion)) or LuaVersion.LuaU;
@@ -132,12 +159,14 @@ function Tokenizer:reset()
 	self.length = 0;
 	self.source = "";
 	self.annotations = {};
+	self.columnMap = {};
 end
 
 -- Append String to this Tokenizer
 function Tokenizer:append(code)
 	self.source = self.source .. code
 	self.length = self.length + code:len();
+	self:prepareGetPosition();
 end
 
 -- Function to peek the n'th char in the source of the tokenizer

src/prometheus/unparser.lua

@@ -383,25 +383,22 @@ function Unparser:unparseStatement(statement, tabbing)
 			end
 		end
 	elseif self.luaVersion == LuaVersion.LuaU then
-		if statement.kind == AstKind.CompoundAddStatement then
-			code = code .. self:unparseExpression(statement.lhs, tabbing) .. self:optionalWhitespace() .. "+=" .. self:optionalWhitespace() .. self:unparseExpression(statement.rhs, tabbing);
-		elseif statement.kind == AstKind.CompoundSubStatement then
-			code = code .. self:unparseExpression(statement.lhs, tabbing) .. self:optionalWhitespace() .. "-=" .. self:optionalWhitespace() .. self:unparseExpression(statement.rhs, tabbing);
-		elseif statement.kind == AstKind.CompoundMulStatement then
-			code = code .. self:unparseExpression(statement.lhs, tabbing) .. self:optionalWhitespace() .. "*=" .. self:optionalWhitespace() .. self:unparseExpression(statement.rhs, tabbing);
-		elseif statement.kind == AstKind.CompoundDivStatement then
-			code = code .. self:unparseExpression(statement.lhs, tabbing) .. self:optionalWhitespace() .. "/=" .. self:optionalWhitespace() .. self:unparseExpression(statement.rhs, tabbing);
-		elseif statement.kind == AstKind.CompoundModStatement then
-			code = code .. self:unparseExpression(statement.lhs, tabbing) .. self:optionalWhitespace() .. "%=" .. self:optionalWhitespace() .. self:unparseExpression(statement.rhs, tabbing);
-		elseif statement.kind == AstKind.CompoundPowStatement then
-			code = code .. self:unparseExpression(statement.lhs, tabbing) .. self:optionalWhitespace() .. "^=" .. self:optionalWhitespace() .. self:unparseExpression(statement.rhs, tabbing);
-		elseif statement.kind == AstKind.CompoundConcatStatement then
-			code = code .. self:unparseExpression(statement.lhs, tabbing) .. self:optionalWhitespace() .. "..=" .. self:optionalWhitespace() .. self:unparseExpression(statement.rhs, tabbing);
+		local compoundOperators = {
+		    [AstKind.CompoundAddStatement] = "+=",
+		    [AstKind.CompoundSubStatement] = "-=",
+		    [AstKind.CompoundMulStatement] = "*=",
+		    [AstKind.CompoundDivStatement] = "/=",
+		    [AstKind.CompoundModStatement] = "%=",
+		    [AstKind.CompoundPowStatement] = "^=",
+		    [AstKind.CompoundConcatStatement] = "..=",
+		}
+
+		local operator = compoundOperators[statement.kind]
+		if operator then
+		    code = code .. self:unparseExpression(statement.lhs, tabbing) .. self:optionalWhitespace() .. operator .. self:optionalWhitespace() .. self:unparseExpression(statement.rhs, tabbing)
 		else
-			logger:error(string.format("\"%s\" is not a valid unparseable statement in %s!", statement.kind, self.luaVersion));
+		    logger:error(string.format("\"%s\" is not a valid unparseable statement in %s!", statement.kind, self.luaVersion))
 		end
-	else
-		logger:error(string.format("\"%s\" is not a valid unparseable statement in %s!", statement.kind, self.luaVersion));
 	end
 
 	return self:tabs(tabbing, false) .. code;
@@ -450,6 +447,12 @@ function Unparser:unparseExpression(expression, tabbing)
 
 	if(expression.kind == AstKind.NumberExpression) then
 		local str = tostring(expression.value);
+		if(str == "inf") then
+			return "2e1024"
+		end
+		if(str == "-inf") then
+			return "-2e1024"
+		end
 		if(str:sub(1, 2) == "0.") then
 			str = str:sub(2);
 		end

src/prometheus/util.lua

@@ -6,6 +6,8 @@
 local logger = require("logger");
 local bit32  = require("prometheus.bit").bit32;
 
+local MAX_UNPACK_COUNT = 195;
+
 local function lookupify(tb)
 	local tb2 = {};
 	for _, v in ipairs(tb) do
@@ -24,7 +26,7 @@ end
 
 local function escape(str)
 	return str:gsub(".", function(char)
-		if char:match('[^ -~\n\t\a\b\v\r\"\']') then -- Check if non Printable ASCII Character
+		if char:match("[^ %-~\n\t\a\b\v\r\"\']") then -- Check if non Printable ASCII Character
 			return string.format("\\%03d", string.byte(char))
 		end
 		if(char == "\\") then
@@ -222,11 +224,20 @@ local function readU32(arr)
 end
 
 local function bytesToString(arr)
+	local lenght = arr.n or #arr;
+
+	if lenght < MAX_UNPACK_COUNT then
+		return string.char(table.unpack(arr))
+	end
+
 	local str = "";
-	for i = 1, #arr do
-		str = str .. string.char(arr[i]);
+	local overflow = lenght % MAX_UNPACK_COUNT;
+
+	for i = 1, (#arr - overflow) / MAX_UNPACK_COUNT do
+		str = str .. string.char(table.unpack(arr, (i - 1) * MAX_UNPACK_COUNT + 1, i * MAX_UNPACK_COUNT));
 	end
-	return str;
+
+	return str..(overflow > 0 and string.char(table.unpack(arr, lenght - overflow + 1, lenght)) or "");
 end
 
 local function isNaN(n)