Objects: Add position to unpack

Issue: #99
nvs · Jul 4, 2022 · e2e027c · e2e027c
1 parent 99fc72f
commit e2e027c
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 19 deletions.
diff --git a/file/objects.lua b/file/objects.lua
@@ -26,9 +26,12 @@ local to_type = {
 	[3] = 'string'
 }
 
-function Objects.unpack (input, extra)
-	local version,
-	position = unpack ('< i4', input)
+function Objects.unpack (input, position, extra)
+	extra = not not extra
+	local version
+
+	version,
+	position = unpack ('< i4', input, position)
 
 	assert (is_supported [version])
 
@@ -93,8 +96,7 @@ function Objects.unpack (input, extra)
 	unpack_table ()
 	unpack_table ()
 
-	assert (#input == position - 1)
-	return output
+	return output, position
 end
 
 local from_type = {

diff --git a/file/war3map/w3a.lua b/file/war3map/w3a.lua
@@ -2,8 +2,8 @@ local Objects = require ('map.file.objects')
 
 local W3A = {}
 
-function W3A.unpack (input)
-	return Objects.unpack (input, true)
+function W3A.unpack (input, position)
+	return Objects.unpack (input, position, true)
 end
 
 function W3A.pack (input)

diff --git a/file/war3map/w3b.lua b/file/war3map/w3b.lua
@@ -2,8 +2,8 @@ local Objects = require ('map.file.objects')
 
 local W3B = {}
 
-function W3B.unpack (input)
-	return Objects.unpack (input)
+function W3B.unpack (input, position)
+	return Objects.unpack (input, position)
 end
 
 function W3B.pack (input)

diff --git a/file/war3map/w3d.lua b/file/war3map/w3d.lua
@@ -2,8 +2,8 @@ local Objects = require ('map.file.objects')
 
 local W3D = {}
 
-function W3D.unpack (input)
-	return Objects.unpack (input, true)
+function W3D.unpack (input, position)
+	return Objects.unpack (input, position, true)
 end
 
 function W3D.pack (input)

diff --git a/file/war3map/w3h.lua b/file/war3map/w3h.lua
@@ -2,8 +2,8 @@ local Objects = require ('map.file.objects')
 
 local W3H = {}
 
-function W3H.unpack (input)
-	return Objects.unpack (input)
+function W3H.unpack (input, position)
+	return Objects.unpack (input, position)
 end
 
 function W3H.pack (input)

diff --git a/file/war3map/w3q.lua b/file/war3map/w3q.lua
@@ -2,8 +2,8 @@ local Objects = require ('map.file.objects')
 
 local W3Q = {}
 
-function W3Q.unpack (input)
-	return Objects.unpack (input, true)
+function W3Q.unpack (input, position)
+	return Objects.unpack (input, position,true)
 end
 
 function W3Q.pack (input)

diff --git a/file/war3map/w3t.lua b/file/war3map/w3t.lua
@@ -2,8 +2,8 @@ local Objects = require ('map.file.objects')
 
 local W3T = {}
 
-function W3T.unpack (input)
-	return Objects.unpack (input)
+function W3T.unpack (input, position)
+	return Objects.unpack (input, position)
 end
 
 function W3T.pack (input)

diff --git a/file/war3map/w3u.lua b/file/war3map/w3u.lua
@@ -2,8 +2,8 @@ local Objects = require ('map.file.objects')
 
 local W3U = {}
 
-function W3U.unpack (input)
-	return Objects.unpack (input)
+function W3U.unpack (input, position)
+	return Objects.unpack (input, position)
 end
 
 function W3U.pack (input)