Mitigate some issues with reserved words (#3236)

* Add entity:getClass * Remove some common reserved words * lint
wiremod · Jan 6, 2025 · 4262b11 · 4262b11
1 parent c4d0ca9
commit 4262b11
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/lua/entities/gmod_wire_expression2/core/e2lib.lua b/lua/entities/gmod_wire_expression2/core/e2lib.lua
@@ -474,7 +474,7 @@ else
 	function E2Lib.isOwner(self, entity)
 		local owner = E2Lib.getOwner(self, entity)
 		if not IsValid(owner) then return false end
-	
+
 		return E2Lib.isFriend(owner, self.player)
 	end
 end
@@ -676,9 +676,7 @@ E2Lib.ReservedWord = {
 	["in"] = true,
 	instanceof = true,
 	interface = true,
-	match = true,
 	macro = true,
-	mod = true,
 	module = true,
 	mut = true,
 	namespace = true,
@@ -701,7 +699,6 @@ E2Lib.ReservedWord = {
 	typeof = true,
 	undefined = true,
 	union = true,
-	use = true,
 	yield = true,
 	var = true,
 }

diff --git a/lua/entities/gmod_wire_expression2/core/entity.lua b/lua/entities/gmod_wire_expression2/core/entity.lua
@@ -104,11 +104,15 @@ e2function string entity:name()
 	return this:GetName() or ""
 end
 
-e2function string entity:type()
+[nodiscard]
+e2function string entity:getClass()
 	if not IsValid(this) then return self:throw("Invalid entity!", "") end
 	return this:GetClass()
 end
 
+[deprecated = "Use getClass"]
+e2function string entity:type() = e2function string entity:getClass()
+
 e2function string entity:model()
 	if not IsValid(this) then return self:throw("Invalid entity!", "") end
 	return this:GetModel() or ""