fix a luaminify issue and asset files reading.

IppClub · Nov 27, 2023 · 262aaae · 262aaae
1 parent 6eee5ff
commit 262aaae
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/Assets/Script/Lib/WebServer.yue b/Assets/Script/Lib/WebServer.yue
@@ -78,8 +78,11 @@ luaCheck = (file, content)->
 				if not item[5]\match("unused") and item[5]\match check
 					useCheck = false
 			continue unless useCheck
-			if item[1] == "type"
-				item[1] = "warning"
+			switch item[1]
+				when "type"
+					item[1] = "warning"
+				when "parsing", "syntax"
+					continue
 			item
 		if #info == 0
 			info = nil
@@ -560,7 +563,7 @@ HttpServer\post "/assets", ->
 		children = nil
 		dirs = Content\getDirs path
 		for dir in *dirs
-			if root then switch dir when ".upload", ".download", ".www"
+			if root then switch dir when ".upload", ".download", ".www", ".build"
 				continue
 			elseif dir == ".git"
 				continue

diff --git a/Assets/Script/Lib/luaminify.lua b/Assets/Script/Lib/luaminify.lua
@@ -1309,6 +1309,9 @@ local function ParseLua(src)
 				if not tok:ConsumeKeyword('then', tokenList) then
 					return false, GenerateError("`then` expected.")
 				end
+				if tok:IsSymbol(';') then
+					tok:Get()
+				end
 				local st, nodeBody = ParseStatementList(scope)
 				if not st then return false, nodeBody end
 				nodeIfStat.Clauses[#nodeIfStat.Clauses+1] = {

diff --git a/Source/Common/Own.h b/Source/Common/Own.h
@@ -64,7 +64,7 @@ class OwnVector : public std::vector<Own<T>> {
 	bool fast_remove(const Own<T>& item) {
 		size_t index = std::distance(OwnV::begin(), OwnVector::index(item));
 		if (index < OwnV::size()) {
-			OwnV::at(index) = OwnV::back();
+			OwnV::at(index) = std::move(OwnV::back());
 			OwnV::pop_back();
 			return true;
 		}