Merge pull request #285 from davidgiven/nonwg

Fix some issues involving loading non-wg files.
davidgiven · Jan 22, 2025 · f411efa · f411efa
2 parents f10b8ed + 6d810f9
commit f411efa
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/lua/addons/templates.lua b/src/lua/addons/templates.lua
@@ -75,7 +75,7 @@ function Cmd.LoadDefaultTemplate()
 	local templatename = GlobalSettings.directories.templates.."/default.wg"
 	local r, e = wg.readfile(templatename)
 	if r then
-		local d, e = LoadFromString(r)
+		local d, e = LoadFromString(templatename, r)
 		if d then
 			local fileformat = d.fileformat or 1
 			if fileformat ~= FILEFORMAT then

diff --git a/src/lua/fileio.lua b/src/lua/fileio.lua
@@ -594,7 +594,7 @@ function LoadFromHeaderlessString(s)
 	return loadfromstreamt(CreateIStream(s))
 end
 
-function LoadFromString(data: string): (DocumentSet?, string?)
+function LoadFromString(filename: string, data: string): (DocumentSet?, string?)
 	local fp = CreateIStream(data)
 
 	local loader = nil
@@ -620,7 +620,7 @@ function LoadFromFile(filename): (DocumentSet?, string?)
 		return nil, ("'"..filename.."' could not be opened: "..e)
 	end
 	assert(data)
-	return LoadFromString(data)
+	return LoadFromString(filename, data)
 end
 
 local function loaddocument(filename): (DocumentSet?, string?)

diff --git a/src/lua/utils.lua b/src/lua/utils.lua
@@ -471,7 +471,9 @@ function CreateIStream(data: string): any
 				return function()
 					return self:read("*l")
 				end
-			end
+			end,
+
+			close = function(self) end,
 		}
 	})
-Original file line number
+Diff line change
@@ Expand Up / @@ -471,7 +471,9 @@ function CreateIStream(data: string): any @@
     				return function()
     					return self:read("*l")
     				end
-    			end
+    			end,
+    			close = function(self) end,
     		}
     	})
@@ Expand Down @@