11645827362

Committed 02 Nov 2024 09:08PM UTC coverage: 54.19% (-15.2%) from 69.34%

Build # 11645827362

Build Type

push

github

Committed by

web-flow

Commit Message

Merge pull request #2151 from Omikhleia/math-more-fixes-and-features

Math more fixes and features

Run Details

103 of 208 new or added lines in 4 files covered. (49.52%)

2652 existing lines in 91 files now uncovered.

9816 of 18114 relevant lines covered (54.19%)

671.83 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

83.2

/inputters/sil.lua

local base = require("inputters.base")

local _variant = "epnf"
local parser
local function load_parser ()
   parser = require("inputters.sil-" .. _variant)
end

local inputter = pl.class(base)
inputter._name = "sil"

inputter.order = 50

inputter.appropriate = function (round, filename, doc)
   if not parser then
      load_parser()
   end
   if round == 1 then
      return filename:match(".sil$")
   elseif round == 2 then
      local sniff = doc:sub(1, 100)
      local promising = sniff:match("\\begin") or sniff:match("\\document") or sniff:match("\\sile")
      return promising and inputter.appropriate(3, filename, doc) or false
   elseif round == 3 then
      local status, _ = pcall(parser, doc)
      return status
   end
end

function inputter:_init (options)
   options = options or {}
   if options.variant then
      _variant = options.variant
      load_parser()
   else
      if not parser then
         load_parser()
      end
   end
   -- Save time when parsing strings by only setting up the grammar once per
   -- instantiation then re-using it on every use.
   self._parser = parser
   base._init(self)
end

local linecache = {}
local lno, col, lastpos
local function resetCache ()
   lno = 1
   col = 1
   lastpos = 0
   linecache = { { lno = 1, pos = 1 } }
end

local function getline (str, pos)
   local start = 1
   lno = 1
   if pos > lastpos then
      lno = linecache[#linecache].lno
      start = linecache[#linecache].pos + 1
      col = 1
   else
      for j = 1, #linecache - 1 do
         if linecache[j + 1].pos >= pos then
            lno = linecache[j].lno
            col = pos - linecache[j].pos
            return lno, col
         end
      end
   end
   for i = start, pos do
      if string.sub(str, i, i) == "\n" then
         lno = lno + 1
         col = 1
         linecache[#linecache + 1] = { pos = i, lno = lno }
         lastpos = i
      end
      col = col + 1
   end
   return lno, col
end

local function ast_from_parse_tree (tree, doc, depth)
   if type(tree) == "string" then
      return tree
   end

   if tree.pos then
      tree.lno, tree.col = getline(doc, tree.pos)
      tree.pos = nil
   end

   local sep -- luacheck: ignore 211
   if SU.debugging("inputter") then
      depth = depth + 1
      sep = ("   "):rep(depth)
   end
   SU.debug("inputter", sep and (sep .. "Processing ID:"), tree.id)

   local res
   if tree.id == "comment" then
      -- Drop comments
      SU.debug("inputter", sep and (sep .. "Discarding comment"))
      res = {}
   elseif
      false
      or tree.id == "document"
      or tree.id == "braced_content"
      or tree.id == "passthrough_content"
      or tree.id == "braced_passthrough_content"
      or tree.id == "env_passthrough_content"
      or tree.id == "text"
      or tree.id == "passthrough_text"
      or tree.id == "braced_passthrough_text"
      or tree.id == "env_passthrough_text"
   then
      -- These nodes have only one child, which needs recursion.
      SU.debug("inputter", sep and (sep .. "Massaging a node"))
      res = ast_from_parse_tree(tree[1], doc, depth)
      --res = #res > 1 and not res.id and res or res[1]
   elseif false or tree.id == "environment" or tree.id == "command" then
      -- These nodes have multiple children, which need recursion.
      SU.debug("inputter", sep and (sep .. "Processing command"), tree.command, #tree, "subtrees")
      local newtree = { -- I don't think we can avoid a shallow copy here
         command = tree.command,
         options = tree.options,
         id = tree.id,
         lno = tree.lno,
         col = tree.col,
      }
      for _, node in ipairs(tree) do
         if type(node) == "table" then
            SU.debug("inputter", sep and (sep .. " -"), node.id or "table")
            local ast_node = ast_from_parse_tree(node, doc, depth)
            if type(ast_node) == "table" and not ast_node.id then
               SU.debug("inputter", sep and (sep .. " -"), "Collapsing subtree")
               -- Comments can an empty table, skip them
               if #ast_node > 0 then
                  -- Simplify the tree if it's just a plain list
                  for _, child in ipairs(ast_node) do
                     if type(child) ~= "table" or child.id or #child > 0 then
                        table.insert(newtree, child)
                     end
                  end
               end
            else
               table.insert(newtree, ast_node)
            end
         end
         -- Non table nodes are skipped (e.g. extraneous text from 'raw' commands)
      end
      res = newtree
   elseif tree.id == "content" then
      -- This node has multiple children, which need recursion
      -- And the node itself needs to be replaced with its children
      SU.debug("inputter", sep and (sep .. "Massage content node"), #tree, "subtrees")
      local newtree = {} -- I don't think we can avoid a shallow copy here
      for i, node in ipairs(tree) do
         SU.debug("inputter", sep and (sep .. " -"), node.id)
         newtree[i] = ast_from_parse_tree(node, doc, depth)
      end
      -- Simplify the tree if it has only one child
      res = #newtree == 1 and not newtree.id and newtree[1] or newtree
   elseif tree.id then
      -- Shouldn't happen, or we missed something
      SU.error("Unknown node type: " .. tree.id)
   else
      SU.debug("inputter", sep and (sep .. "Table node"), #tree, "subtrees")
      res = #tree == 1 and tree[1] or tree
   end
   SU.debug("inputter", sep and (sep .. "Returning a"), type(res) == "table" and res.id or "string")
   return res
end

function inputter:parse (doc)
   local status, result = pcall(self._parser, doc)
   if not status then
      return SU.error(([[
         Unable to parse input document to an AST tree

         Parser error:

           %s

         thrown from document beginning.]]):format(pl.stringx.indent(result, 6)))
   end
   resetCache()
   local top = ast_from_parse_tree(result[1], doc, 0)
   local tree
   -- Content not part of a tagged command could either be part of a document
   -- fragment or junk (e.g. comments, whitespace) outside of a document tag. We
   -- need to either capture the document tag only or decide this is a fragment
   -- and wrap it in a document tag.
   if top.command == "document" or top.command == "sile" then
      tree = top
   elseif type(top) == "table" then
      for _, leaf in ipairs(top) do
         if leaf.command and (leaf.command == "document" or leaf.command == "sile") then
            tree = leaf
            break
         end
      end
   end
   -- In the event we didn't isolate a top level document tag above, assume this
   -- is a fragment and wrap it in one.
   if not tree then
      tree = { top, command = "document" }
   end
   return { tree }
end

return inputter

1	local base = require("inputters.base")	18✔
2
3	local _variant = "epnf"	18✔
4	local parser
5	local function load_parser ()
6	parser = require("inputters.sil-" .. _variant)	16✔
7	end
8
9	local inputter = pl.class(base)	18✔
10	inputter._name = "sil"	18✔
11
12	inputter.order = 50	18✔
13
14	inputter.appropriate = function (round, filename, doc)
15	if not parser then	16✔
16	load_parser()	16✔
17	end
18	if round == 1 then	16✔
19	return filename:match(".sil$")	16✔
UNCOV 20	elseif round == 2 then	×
UNCOV 21	local sniff = doc:sub(1, 100)	×
UNCOV 22	local promising = sniff:match("\\begin") or sniff:match("\\document") or sniff:match("\\sile")	×
UNCOV 23	return promising and inputter.appropriate(3, filename, doc) or false	×
UNCOV 24	elseif round == 3 then	×
UNCOV 25	local status, _ = pcall(parser, doc)	×
UNCOV 26	return status	×
27	end
28	end
29
30	function inputter:_init (options)	18✔
31	options = options or {}	16✔
32	if options.variant then	16✔
33	_variant = options.variant	×
34	load_parser()	×
35	else
36	if not parser then	16✔
37	load_parser()	×
38	end
39	end
40	-- Save time when parsing strings by only setting up the grammar once per
41	-- instantiation then re-using it on every use.
42	self._parser = parser	16✔
43	base._init(self)	16✔
44	end
45
46	local linecache = {}	18✔
47	local lno, col, lastpos
48	local function resetCache ()
49	lno = 1	16✔
50	col = 1	16✔
51	lastpos = 0	16✔
52	linecache = { { lno = 1, pos = 1 } }	16✔
53	end
54
55	local function getline (str, pos)
56	local start = 1	418✔
57	lno = 1	418✔
58	if pos > lastpos then	418✔
59	lno = linecache[#linecache].lno	395✔
60	start = linecache[#linecache].pos + 1	395✔
61	col = 1	395✔
62	else
63	for j = 1, #linecache - 1 do	59✔
64	if linecache[j + 1].pos >= pos then	59✔
65	lno = linecache[j].lno	23✔
66	col = pos - linecache[j].pos	23✔
67	return lno, col	23✔
68	end
69	end
70	end
71	for i = start, pos do	12,694✔
72	if string.sub(str, i, i) == "\n" then	24,598✔
73	lno = lno + 1	283✔
74	col = 1	283✔
75	linecache[#linecache + 1] = { pos = i, lno = lno }	283✔
76	lastpos = i	283✔
77	end
78	col = col + 1	12,299✔
79	end
80	return lno, col	395✔
81	end
82
83	local function ast_from_parse_tree (tree, doc, depth)
84	if type(tree) == "string" then	590✔
85	return tree	172✔
86	end
87
88	if tree.pos then	418✔
89	tree.lno, tree.col = getline(doc, tree.pos)	836✔
90	tree.pos = nil	418✔
91	end
92
93	local sep -- luacheck: ignore 211
94	if SU.debugging("inputter") then	836✔
95	depth = depth + 1	×
96	sep = (" "):rep(depth)	×
97	end
98	SU.debug("inputter", sep and (sep .. "Processing ID:"), tree.id)	418✔
99
100	local res
101	if tree.id == "comment" then	418✔
102	-- Drop comments
103	SU.debug("inputter", sep and (sep .. "Discarding comment"))	17✔
104	res = {}	17✔
105	elseif	×
106	false
107	or tree.id == "document"	401✔
108	or tree.id == "braced_content"	401✔
109	or tree.id == "passthrough_content"	378✔
110	or tree.id == "braced_passthrough_content"	374✔
111	or tree.id == "env_passthrough_content"	374✔
112	or tree.id == "text"	371✔
113	or tree.id == "passthrough_text"	206✔
114	or tree.id == "braced_passthrough_text"	206✔
115	or tree.id == "env_passthrough_text"	202✔
116	then
117	-- These nodes have only one child, which needs recursion.
118	SU.debug("inputter", sep and (sep .. "Massaging a node"))	202✔
119	res = ast_from_parse_tree(tree[1], doc, depth)	404✔
120	--res = #res > 1 and not res.id and res or res[1]
121	elseif false or tree.id == "environment" or tree.id == "command" then	199✔
122	-- These nodes have multiple children, which need recursion.
123	SU.debug("inputter", sep and (sep .. "Processing command"), tree.command, #tree, "subtrees")	140✔
124	local newtree = { -- I don't think we can avoid a shallow copy here	140✔
125	command = tree.command,	140✔
126	options = tree.options,	140✔
127	id = tree.id,	140✔
128	lno = tree.lno,	140✔
129	col = tree.col,	140✔
130	}
131	for _, node in ipairs(tree) do	195✔
132	if type(node) == "table" then	55✔
133	SU.debug("inputter", sep and (sep .. " -"), node.id or "table")	49✔
134	local ast_node = ast_from_parse_tree(node, doc, depth)	49✔
135	if type(ast_node) == "table" and not ast_node.id then	49✔
136	SU.debug("inputter", sep and (sep .. " -"), "Collapsing subtree")	21✔
137	-- Comments can an empty table, skip them
138	if #ast_node > 0 then	21✔
139	-- Simplify the tree if it's just a plain list
140	for _, child in ipairs(ast_node) do	289✔
141	if type(child) ~= "table" or child.id or #child > 0 then	269✔
142	table.insert(newtree, child)	252✔
143	end
144	end
145	end
146	else
147	table.insert(newtree, ast_node)	28✔
148	end
149	end
150	-- Non table nodes are skipped (e.g. extraneous text from 'raw' commands)
151	end
152	res = newtree	140✔
153	elseif tree.id == "content" then	59✔
154	-- This node has multiple children, which need recursion
155	-- And the node itself needs to be replaced with its children
156	SU.debug("inputter", sep and (sep .. "Massage content node"), #tree, "subtrees")	59✔
157	local newtree = {} -- I don't think we can avoid a shallow copy here	59✔
158	for i, node in ipairs(tree) do	382✔
159	SU.debug("inputter", sep and (sep .. " -"), node.id)	323✔
160	newtree[i] = ast_from_parse_tree(node, doc, depth)	646✔
161	end
162	-- Simplify the tree if it has only one child
163	res = #newtree == 1 and not newtree.id and newtree[1] or newtree	59✔
164	elseif tree.id then	×
165	-- Shouldn't happen, or we missed something
166	SU.error("Unknown node type: " .. tree.id)	×
167	else
168	SU.debug("inputter", sep and (sep .. "Table node"), #tree, "subtrees")	×
169	res = #tree == 1 and tree[1] or tree	×
170	end
171	SU.debug("inputter", sep and (sep .. "Returning a"), type(res) == "table" and res.id or "string")	418✔
172	return res	418✔
173	end
174
175	function inputter:parse (doc)	18✔
176	local status, result = pcall(self._parser, doc)	16✔
177	if not status then	16✔
178	return SU.error(([[	×
179	Unable to parse input document to an AST tree
180
181	Parser error:
182
183	%s
184
185	thrown from document beginning.]]):format(pl.stringx.indent(result, 6)))	×
186	end
187	resetCache()	16✔
188	local top = ast_from_parse_tree(result[1], doc, 0)	16✔
189	local tree
190	-- Content not part of a tagged command could either be part of a document
191	-- fragment or junk (e.g. comments, whitespace) outside of a document tag. We
192	-- need to either capture the document tag only or decide this is a fragment
193	-- and wrap it in a document tag.
194	if top.command == "document" or top.command == "sile" then	16✔
UNCOV 195	tree = top	×
196	elseif type(top) == "table" then	16✔
197	for _, leaf in ipairs(top) do	16✔
198	if leaf.command and (leaf.command == "document" or leaf.command == "sile") then	16✔
199	tree = leaf	16✔
200	break	16✔
201	end
202	end
203	end
204	-- In the event we didn't isolate a top level document tag above, assume this
205	-- is a fragment and wrap it in one.
206	if not tree then	16✔
UNCOV 207	tree = { top, command = "document" }	×
208	end
209	return { tree }	16✔
210	end
211
212	return inputter	18✔

sile-typesetter / sile / 11645827362

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous