v1.12

-Fixed all cases when 'this.' was not added before members/methods -Fixed when ! was replaces witn minus instead of ~ in some cases -Now all method names is correct -Added deallocation -Now variable created with .allocate inside of create method is not translated and all this variable mentions are replaced with 'this' -Fixed a lot of bugs
goshante · Dec 7, 2019 · 85c7d68 · 85c7d68
1 parent f81e241
commit 85c7d68
Show file tree

Hide file tree

Showing 7 changed files with 87 additions and 23 deletions.
diff --git a/README.md b/README.md
@@ -42,7 +42,7 @@ Warcraft III Reforged brought us Lua scripting, but still a lot of map makers fo
 - Read logs if something goes wrong, this application leaves cjass2lua.log file with all it's actions and possible problems. Everything should be fine if you have no warnings.
 
 ### Latest release
-- [v1.11](https://github.com/fullmetal-a/cjass2lua/releases/tag/v1.11)
+- [v1.12](https://github.com/fullmetal-a/cjass2lua/releases/tag/v1.12)
 
 ### Manual
  (No TL;DR sections, complicated bullshit or other retarded shit, just exe file with simple interface)

diff --git a/cJass2Lua/Utils.cpp b/cJass2Lua/Utils.cpp
@@ -256,21 +256,21 @@ namespace Utils
 
 	std::string op2lua(const std::string& op, cJass::OperationObject::ConstType prevType)
 	{
-		if (op == "&&")
+		if (op == "!")
+			return " not ";
+		else if (op == "&&")
 			return " and ";
 		else if (op == "." || op == ":")
 			return op;
 		else if (op == "+" && prevType == cJass::OperationObject::ConstType::String)
 			return " .. ";
 		else if (op == "||")
 			return " or ";
-		else if (op == "!")
-			return " not ";
 		else if (op == "!=")
 			return " ~= ";
 		else if (op == "++" || op == "--" || op == "+=" || op == "-=" || op == "*=" || op == "/=")
 			return "";
-		if (op == "dig_minus")
+		else if (op == "dig_minus")
 			return "-";
 
 		return " " + op + " ";

diff --git a/cJass2Lua/cJassNodes.cpp b/cJass2Lua/cJassNodes.cpp
@@ -780,10 +780,14 @@ namespace cJass
 		if (mainTopNodeType == Node::Type::Function)
 			return name;
 
+		auto classNode = mainNode->Top();
+
 		if (mainNode->Ptr<Method>()->IsStatic())
+		{
+			if (mainNode->Ptr<Method>()->GetReplaceThisName() != "" && mainNode->Ptr<Method>()->GetReplaceThisName() == name)
+				return "this";
 			return name;
-
-		auto classNode = mainNode->Top();
+		}	
 
 		if (classNode->Ptr<Class>()->HasNonstaticMember(name))
 		{
@@ -870,27 +874,27 @@ namespace cJass
 				if (_extra == "++")
 				{
 					if (_AssignUnary)
-						_out << _opText << " = " << _opText << " + 1";
+						_out << GetFullIdName() << " = " << GetFullIdName() << " + 1";
 					else
 					{
-						_out << "(" << _opText << " + 1" << ")";
+						_out << "(" << GetFullIdName() << " + 1" << ")";
 					}
 				}
 				else if (_extra == "--")
 				{
 					if (_AssignUnary)
-						_out << _opText << " = " << _opText << " - 1";
+						_out << GetFullIdName() << " = " << GetFullIdName() << " - 1";
 					else
-						_out << "(" << _opText << " - 1" << ")";
+						_out << "(" << GetFullIdName() << " - 1" << ")";
 				}
 
 			}
 			else
 			{
 				if (!_isString)
-					_out << _opText << " = " << _opText << std::string({ ' ', _extra[0], ' ' });
+					_out << GetFullIdName() << " = " << GetFullIdName() << std::string({ ' ', _extra[0], ' ' });
 				else
-					_out << _opText << " = " << _opText << " .. ";
+					_out << GetFullIdName() << " = " << GetFullIdName() << " .. ";
 				for (auto& node : _subnodes)
 					node->ToLua();
 			}
@@ -914,7 +918,7 @@ namespace cJass
 			break;
 
 		case OpType::Call:
-			_out << _opText << "(";
+			_out << GetFullIdName() << "(";
 			nodeCount = CountSubnodes();
 			if (nodeCount > 0)
 			{
@@ -1228,6 +1232,7 @@ namespace cJass
 		case 'v':
 			_otype = OpType::VarInitExpression;
 			_isWrapper = true;
+			_opText = strings[1];
 			break;
 
 		case 'a':
@@ -1508,11 +1513,19 @@ namespace cJass
 		, _type("")
 		, _vars({})
 		, _arrSizes({})
+		, _doNotPrint(false)
 	{
 	}
 
 	void LocalDeclaration::ToLua()
 	{
+		if (_doNotPrint)
+		{
+			if (_root)
+				_root->TryToCreatePrintNotify();
+			return;
+		}
+
 		_out << OutputInterface::nl;
 		PrintTabs();
 		_out << "local ";
@@ -1611,6 +1624,11 @@ namespace cJass
 		return (_type != "");
 	}
 
+	void LocalDeclaration::DoNotPrint()
+	{
+		_doNotPrint = true;
+	}
+
 	Node* LocalDeclaration::AddVariable(const std::string& name, const std::string& arrSize)
 	{
 		appLog(Debug) << "Adding local variable" << name;
@@ -1621,7 +1639,7 @@ namespace cJass
 			_vars.push_back(name);
 		_arrSizes.push_back(arrSize);
 		auto node = Node::Produce(Node::Type::OperationObject, this, _out);
-		node->InitData({ "v" });
+		node->InitData({ "v", name });
 		AddSubnode(node);
 		return node->Ptr();
 	}
@@ -1791,9 +1809,7 @@ namespace cJass
 		_out << OutputInterface::nl;
 
 		PrintTabs();
-		_out << "function this:allocate() return this end" << OutputInterface::nl;
-		PrintTabs();
-		_out << "function this:deallocate() end" << OutputInterface::nl;
+		_out << "function this.deallocate() this = nil end" << OutputInterface::nl;
 
 		if (CountSubnodes() > 1)
 		{
@@ -2007,10 +2023,11 @@ namespace cJass
 		{
 			_out << OutputInterface::nl;
 			PrintTabs(1);
-			_out << "function " << className << ":" << _name << "(";
+			_out << "function " << "this." << _name << "(";
 		}
 		else
-			_out << OutputInterface::nl << "function " << "this:" << _name << "(";
+			_out << "function " << className << ":" << _name << "(";
+
 
 		if (_args.size() == 0)
 			_out << ")";
@@ -2056,6 +2073,16 @@ namespace cJass
 		return _name;
 	}
 
+	void Method::SetThisname(const std::string& name)
+	{
+		_thisName = name;
+	}
+
+	std::string Method::GetReplaceThisName() const
+	{
+		return _thisName;
+	}
+
 	void Method::InitData(const std::vector<std::string>& strings)
 	{
 		size_t size = strings.size();

diff --git a/cJass2Lua/cJassNodes.h b/cJass2Lua/cJassNodes.h
@@ -216,6 +216,7 @@ namespace cJass
 	{
 	private:
 		std::string					_name;
+		std::string					_thisName;
 		std::string					_returnType;
 		std::vector<std::string>	_args;
 		std::vector<std::string>	_strIds;
@@ -235,6 +236,8 @@ namespace cJass
 		bool HasStringId(const std::string& strId) const override;
 		bool IsStatic() const;
 		std::string GetMethodName() const;
+		void SetThisname(const std::string& name);
+		std::string GetReplaceThisName() const;
 	};
 
 
@@ -351,6 +354,7 @@ namespace cJass
 		std::string					 _type;
 		std::vector<std::string>	 _vars;
 		std::vector<std::string>	_arrSizes;
+		bool						_doNotPrint;
 
 	protected:
 		virtual void CountAllNodes() override;
@@ -362,5 +366,6 @@ namespace cJass
 		size_t GetVarCount() const;
 		Node* AddVariable(const std::string& name, const std::string& arrSize = 0);
 		bool hasType() const;
+		void DoNotPrint();
 	};
 }
diff --git a/cJass2Lua/cJassParser2.cpp b/cJass2Lua/cJassParser2.cpp
@@ -196,6 +196,9 @@ namespace cJass
 		if (word == "native")
 			return word_t::native;
 
+		if (word == "allocate")
+			return word_t::allocate;
+
 		if (word == "do")
 			return word_t::Do;
 
@@ -544,6 +547,7 @@ namespace cJass
 			bool							doNotPutNewLine = false;
 			bool							goBackToComment = false;
 			bool							goBackToExpClose = false;
+			Node* nd, *nd2;
 
 			if (clearStatic)
 			{
@@ -1379,6 +1383,9 @@ namespace cJass
 					getReadyToEndStatement = false;
 				}
 
+				if (_word == "destroy")
+					_word = _word;
+
 				bool endOfLogic = false;
 				switch (wtype)
 				{
@@ -1405,6 +1412,30 @@ namespace cJass
 						break;
 					}
 
+				case word_t::allocate:
+					nd = _activeNode;
+					while (nd != nullptr && nd->GetType() != Node::Type::LocalDeclaration)
+						nd = nd->Top();
+
+					if (nd->GetType() == Node::Type::LocalDeclaration)
+					{
+						nd->Ptr<LocalDeclaration>()->DoNotPrint();
+						nd = nd->Top();
+						while (nd != nullptr && nd->GetType() != Node::Type::Method)
+							nd = nd->Top();
+
+						if (nd->GetType() == Node::Type::Method)
+						{
+							nd2 = _activeNode;
+							while (nd2 != nullptr && nd2->GetType() != Node::Type::OperationObject && nd2->Ptr<OperationObject>()->GetOpType() != OperationObject::OpType::VarInitExpression)
+								nd2 = nd2->Top();
+
+							if (nd2->GetType() == Node::Type::OperationObject && nd2->Ptr<OperationObject>()->GetOpType() == OperationObject::OpType::VarInitExpression)
+								nd->Ptr<Method>()->SetThisname(nd2->GetText());
+						}
+					}
+
+					break;
 				case word_t::This:
 				case word_t::id:
 					if (isLocalTop && !varAddedStack.top())
@@ -1526,7 +1557,7 @@ namespace cJass
 						}
 
 						std::string oper = _word;
-						if (wtype_prev == word_t::op || _activeNode->CountSubnodes() == 0 && oper == "-")
+						if (oper == "-" && (wtype_prev == word_t::op || _activeNode->CountSubnodes() == 0))
 							oper = "dig_minus";
 						_addNode(Node::Type::OperationObject, { "o", oper });
 					}

diff --git a/cJass2Lua/defs.h b/cJass2Lua/defs.h
@@ -11,7 +11,7 @@
 #pragma warning(disable : 4834)
 
 
-#define APP_VER		"1.11"
+#define APP_VER		"1.12"
 #ifdef _WIN64
 #define APP_BUILD	"x64"
 #else
@@ -108,7 +108,8 @@ namespace cJass
 		priv,
 		pub,
 		Static,
-		evaluate
+		evaluate,
+		allocate
 	};
 
 	enum class ParseSpecialSubject

diff --git a/cJass2Lua/resource.rc b/cJass2Lua/resource.rc