9428435077

Committed 08 Jun 2024 11:35AM UTC coverage: 64.56% (-9.9%) from 74.46%

Build # 9428435077

Build Type

push

github

Committed by

web-flow

Commit Message

Merge pull request #2047 from alerque/end-pars

Run Details

23 of 46 new or added lines in 5 files covered. (50.0%)

1684 existing lines in 60 files now uncovered.

11145 of 17263 relevant lines covered (64.56%)

4562.45 hits per line

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

90.0

/types/length.lua

--- SILE length type.
-- Lengths are composed of 3 `measurement`s: a length, a stretch, and a shrink. Each part internally is just
-- a measurement, but combined describe a flexible length that is allowed to grow up to the amout defined by stretch or
-- compress up to the amount defined by shrink.
-- @types length

local function _error_if_not_number (a)
   if type(a) ~= "number" then
      SU.error("We tried to do impossible arithmetic on a " .. SU.type(a) .. ". (That's a bug)", true)
   end
end

--- @type length
local length = pl.class()
length.type = "length"

length.length = nil
length.stretch = nil
length.shrink = nil

--- Constructor.
-- @tparam measurement spec A measurement or value that can be cast to a measurement.
-- @tparam[opt=0] measurement stretch A measurement describing how much the length is allowed to grow.
-- @tparam[opt=0] measurement shrink A measurement describing how much the length is allowed to grow.
-- @treturn length
-- @usage
-- SILE.types.length("6em", "4pt", "2pt")
-- SILE.types.length("6em plus 4pt minus 2pt")
-- SILE.types.length(30, 4, 2)
function length:_init (spec, stretch, shrink)
   if stretch or shrink then
      self.length = SILE.types.measurement(spec or 0)
      self.stretch = SILE.types.measurement(stretch or 0)
      self.shrink = SILE.types.measurement(shrink or 0)
   elseif type(spec) == "number" then
      self.length = SILE.types.measurement(spec)
   elseif SU.type(spec) == "measurement" then
      self.length = spec
   elseif SU.type(spec) == "glue" then
      self.length = SILE.types.measurement(spec.width.length or 0)
      self.stretch = SILE.types.measurement(spec.width.stretch or 0)
      self.shrink = SILE.types.measurement(spec.width.shrink or 0)
   elseif type(spec) == "table" then
      self.length = SILE.types.measurement(spec.length or 0)
      self.stretch = SILE.types.measurement(spec.stretch or 0)
      self.shrink = SILE.types.measurement(spec.shrink or 0)
   elseif type(spec) == "string" then
      local amount = tonumber(spec)
      if type(amount) == "number" then
         self:_init(amount)
      else
         local parsed = SILE.parserBits.length:match(spec)
         if not parsed then
            SU.error("Could not parse length '" .. spec .. "'")
         end
         self:_init(parsed)
      end
   end
   if not self.length then
      self.length = SILE.types.measurement()
   end
   if not self.stretch then
      self.stretch = SILE.types.measurement()
   end
   if not self.shrink then
      self.shrink = SILE.types.measurement()
   end
end

function length:absolute ()
   return SILE.types.length(self.length:tonumber(), self.stretch:tonumber(), self.shrink:tonumber())
end

function length:negate ()
   return self:__unm()
end

function length:tostring ()
   return self:__tostring()
end

function length:tonumber ()
   return self.length:tonumber()
end

function length:__tostring ()
   local str = tostring(self.length)
   if self.stretch.amount ~= 0 then
      str = str .. " plus " .. tostring(self.stretch)
   end
   if self.shrink.amount ~= 0 then
      str = str .. " minus " .. tostring(self.shrink)
   end
   return str
end

function length:__add (other)
   if type(self) == "number" then
      self, other = other, self
   end
   other = SU.cast("length", other)
   return SILE.types.length(self.length + other.length, self.stretch + other.stretch, self.shrink + other.shrink)
end

-- See usage comments on SILE.types.measurement:___add()
function length:___add (other)
   if SU.type(other) ~= "length" then
      self.length:___add(other)
   else
      self.length:___add(other.length)
      self.stretch:___add(other.stretch)
      self.shrink:___add(other.shrink)
   end
   return nil
end

function length:__sub (other)
   local result = SILE.types.length(self)
   other = SU.cast("length", other)
   result.length = result.length - other.length
   result.stretch = result.stretch - other.stretch
   result.shrink = result.shrink - other.shrink
   return result
end

-- See usage comments on SILE.types.measurement:___add()
function length:___sub (other)
   self.length:___sub(other.length)
   self.stretch:___sub(other.stretch)
   self.shrink:___sub(other.shrink)
   return nil
end

function length:__mul (other)
   if type(self) == "number" then
      self, other = other, self
   end
   _error_if_not_number(other)
   local result = SILE.types.length(self)
   result.length = result.length * other
   result.stretch = result.stretch * other
   result.shrink = result.shrink * other
   return result
end

function length:__div (other)
   local result = SILE.types.length(self)
   _error_if_not_number(other)
   result.length = result.length / other
   result.stretch = result.stretch / other
   result.shrink = result.shrink / other
   return result
end

function length:__unm ()
   local result = SILE.types.length(self)
   result.length = result.length:__unm()
   return result
end

function length:__lt (other)
   local a = SU.cast("number", self)
   local b = SU.cast("number", other)
   return a - b < 0
end

function length:__le (other)
   local a = SU.cast("number", self)
   local b = SU.cast("number", other)
   return a - b <= 0
end

function length:__eq (other)
   local a = SU.cast("length", self)
   local b = SU.cast("length", other)
   return a.length == b.length and a.stretch == b.stretch and a.shrink == b.shrink
end

return length

1	--- SILE length type.
2	-- Lengths are composed of 3 `measurement`s: a length, a stretch, and a shrink. Each part internally is just
3	-- a measurement, but combined describe a flexible length that is allowed to grow up to the amout defined by stretch or
4	-- compress up to the amount defined by shrink.
5	-- @types length
6
7	local function _error_if_not_number (a)
8	if type(a) ~= "number" then	1,461✔
9	SU.error("We tried to do impossible arithmetic on a " .. SU.type(a) .. ". (That's a bug)", true)	×
10	end
11	end
12
13	--- @type length
14	local length = pl.class()	118✔
15	length.type = "length"	118✔
16
17	length.length = nil	118✔
18	length.stretch = nil	118✔
19	length.shrink = nil	118✔
20
21	--- Constructor.
22	-- @tparam measurement spec A measurement or value that can be cast to a measurement.
23	-- @tparam[opt=0] measurement stretch A measurement describing how much the length is allowed to grow.
24	-- @tparam[opt=0] measurement shrink A measurement describing how much the length is allowed to grow.
25	-- @treturn length
26	-- @usage
27	-- SILE.types.length("6em", "4pt", "2pt")
28	-- SILE.types.length("6em plus 4pt minus 2pt")
29	-- SILE.types.length(30, 4, 2)
30	function length:_init (spec, stretch, shrink)	118✔
31	if stretch or shrink then	198,036✔
32	self.length = SILE.types.measurement(spec or 0)	77,406✔
33	self.stretch = SILE.types.measurement(stretch or 0)	77,406✔
34	self.shrink = SILE.types.measurement(shrink or 0)	77,406✔
35	elseif type(spec) == "number" then	159,333✔
36	self.length = SILE.types.measurement(spec)	127,144✔
37	elseif SU.type(spec) == "measurement" then	191,522✔
38	self.length = spec	2,285✔
39	elseif SU.type(spec) == "glue" then	186,952✔
UNCOV 40	self.length = SILE.types.measurement(spec.width.length or 0)	×
UNCOV 41	self.stretch = SILE.types.measurement(spec.width.stretch or 0)	×
UNCOV 42	self.shrink = SILE.types.measurement(spec.width.shrink or 0)	×
43	elseif type(spec) == "table" then	93,476✔
44	self.length = SILE.types.measurement(spec.length or 0)	56,994✔
45	self.stretch = SILE.types.measurement(spec.stretch or 0)	56,994✔
46	self.shrink = SILE.types.measurement(spec.shrink or 0)	56,994✔
47	elseif type(spec) == "string" then	64,979✔
48	local amount = tonumber(spec)	1,477✔
49	if type(amount) == "number" then	1,477✔
50	self:_init(amount)	6✔
51	else
52	local parsed = SILE.parserBits.length:match(spec)	1,474✔
53	if not parsed then	1,474✔
54	SU.error("Could not parse length '" .. spec .. "'")	×
55	end
56	self:_init(parsed)	1,474✔
57	end
58	end
59	if not self.length then	198,036✔
60	self.length = SILE.types.measurement()	127,004✔
61	end
62	if not self.stretch then	198,036✔
63	self.stretch = SILE.types.measurement()	258,718✔
64	end
65	if not self.shrink then	198,036✔
66	self.shrink = SILE.types.measurement()	258,718✔
67	end
68	end
69
70	function length:absolute ()	118✔
71	return SILE.types.length(self.length:tonumber(), self.stretch:tonumber(), self.shrink:tonumber())	68,296✔
72	end
73
74	function length:negate ()	118✔
75	return self:__unm()	×
76	end
77
78	function length:tostring ()	118✔
79	return self:__tostring()	×
80	end
81
82	function length:tonumber ()	118✔
83	return self.length:tonumber()	140,416✔
84	end
85
86	function length:__tostring ()	118✔
87	local str = tostring(self.length)	7✔
88	if self.stretch.amount ~= 0 then	7✔
89	str = str .. " plus " .. tostring(self.stretch)	2✔
90	end
91	if self.shrink.amount ~= 0 then	7✔
UNCOV 92	str = str .. " minus " .. tostring(self.shrink)	×
93	end
94	return str	7✔
95	end
96
97	function length:__add (other)	118✔
98	if type(self) == "number" then	18,043✔
99	self, other = other, self	7,893✔
100	end
101	other = SU.cast("length", other)	36,086✔
102	return SILE.types.length(self.length + other.length, self.stretch + other.stretch, self.shrink + other.shrink)	72,172✔
103	end
104
105	-- See usage comments on SILE.types.measurement:___add()
106	function length:___add (other)	118✔
107	if SU.type(other) ~= "length" then	113,366✔
108	self.length:___add(other)	6,452✔
109	else
110	self.length:___add(other.length)	53,457✔
111	self.stretch:___add(other.stretch)	53,457✔
112	self.shrink:___add(other.shrink)	53,457✔
113	end
114	return nil	56,683✔
115	end
116
117	function length:__sub (other)	118✔
118	local result = SILE.types.length(self)	16,449✔
119	other = SU.cast("length", other)	32,898✔
120	result.length = result.length - other.length	32,898✔
121	result.stretch = result.stretch - other.stretch	32,898✔
122	result.shrink = result.shrink - other.shrink	32,898✔
123	return result	16,449✔
124	end
125
126	-- See usage comments on SILE.types.measurement:___add()
127	function length:___sub (other)	118✔
128	self.length:___sub(other.length)	3,408✔
129	self.stretch:___sub(other.stretch)	3,408✔
130	self.shrink:___sub(other.shrink)	3,408✔
131	return nil	3,408✔
132	end
133
134	function length:__mul (other)	118✔
135	if type(self) == "number" then	1,292✔
136	self, other = other, self	6✔
137	end
138	_error_if_not_number(other)	1,292✔
139	local result = SILE.types.length(self)	1,292✔
140	result.length = result.length * other	2,584✔
141	result.stretch = result.stretch * other	2,584✔
142	result.shrink = result.shrink * other	2,584✔
143	return result	1,292✔
144	end
145
146	function length:__div (other)	118✔
147	local result = SILE.types.length(self)	169✔
148	_error_if_not_number(other)	169✔
149	result.length = result.length / other	338✔
150	result.stretch = result.stretch / other	338✔
151	result.shrink = result.shrink / other	338✔
152	return result	169✔
153	end
154
155	function length:__unm ()	118✔
156	local result = SILE.types.length(self)	30✔
157	result.length = result.length:__unm()	60✔
158	return result	30✔
159	end
160
161	function length:__lt (other)	118✔
162	local a = SU.cast("number", self)	42,556✔
163	local b = SU.cast("number", other)	42,556✔
164	return a - b < 0	42,556✔
165	end
166
167	function length:__le (other)	118✔
168	local a = SU.cast("number", self)	24✔
169	local b = SU.cast("number", other)	24✔
170	return a - b <= 0	24✔
171	end
172
173	function length:__eq (other)	118✔
UNCOV 174	local a = SU.cast("length", self)	×
UNCOV 175	local b = SU.cast("length", other)	×
UNCOV 176	return a.length == b.length and a.stretch == b.stretch and a.shrink == b.shrink	×
177	end
178
179	return length	118✔

sile-typesetter / sile / 9428435077

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