7232859119

Committed 16 Dec 2023 03:49PM UTC coverage: 66.878% (-7.7%) from 74.62%

Build # 7232859119

Build Type

push

github

Committed by

web-flow

Commit Message

Merge 05d75c2a3 into 8686730e4

Run Details

0 of 4 new or added lines in 1 file covered. (0.0%)

1201 existing lines in 56 files now uncovered.

10550 of 15775 relevant lines covered (66.88%)

3347.52 hits per line

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

87.64

/core/length.lua

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

return pl.class({
    type = "length",
    length = nil,
    stretch = nil,
    shrink = nil,

    _init = function (self, spec, stretch, shrink)
      if stretch or shrink then
        self.length = SILE.measurement(spec or 0)
        self.stretch = SILE.measurement(stretch or 0)
        self.shrink = SILE.measurement(shrink or 0)
      elseif type(spec) == "number" then
        self.length = SILE.measurement(spec)
      elseif SU.type(spec) == "measurement" then
        self.length = spec
      elseif SU.type(spec) == "glue" then
        self.length = SILE.measurement(spec.width.length or 0)
        self.stretch = SILE.measurement(spec.width.stretch or 0)
        self.shrink = SILE.measurement(spec.width.shrink or 0)
      elseif type(spec) == "table" then
        self.length = SILE.measurement(spec.length or 0)
        self.stretch = SILE.measurement(spec.stretch or 0)
        self.shrink = SILE.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.measurement() end
      if not self.stretch then self.stretch = SILE.measurement() end
      if not self.shrink then self.shrink = SILE.measurement() end
    end,

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

    negate = function (self)
      return self:__unm()
    end,

    tostring = function (self)
      return self:__tostring()
    end,

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

    new = function (_)
      SU.deprecated("SILE.length.new", "SILE.length", "0.10.0")
    end,

    make = function (_)
      SU.deprecated("SILE.length.make", "SILE.length", "0.10.0")
    end,

    parse = function (_)
      SU.deprecated("SILE.length.parse", "SILE.length", "0.10.0")
    end,

    fromLengthOrNumber = function (_, _)
      SU.deprecated("SILE.length.fromLengthOrNumber", "SILE.length", "0.10.0")
    end,

    __index = function (_, key)
      SU.deprecated("SILE.length." .. key, "SILE.length", "0.10.0")
    end,

    __tostring = function (self)
      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,

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

    -- See usage comments on SILE.measurement:___add()
    ___add = function (self, 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,

    __sub = function (self, other)
      local result = SILE.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.measurement:___add()
    ___sub = function (self, other)
      self.length:___sub(other.length)
      self.stretch:___sub(other.stretch)
      self.shrink:___sub(other.shrink)
      return nil
    end,

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

    __div = function (self, other)
      local result = SILE.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,

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

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

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

    __eq = function (self, 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

  })

1	local function _error_if_not_number (a)
2	if type(a) ~= "number" then	1,483✔
3	SU.error("We tried to do impossible arithmetic on a " .. SU.type(a) .. ". (That's a bug)", true)	×
4	end
5	end
6
7	return pl.class({	71✔
8	type = "length",
9	length = nil,
10	stretch = nil,
11	shrink = nil,
12
13	_init = function (self, spec, stretch, shrink)
14	if stretch or shrink then	205,196✔
15	self.length = SILE.measurement(spec or 0)	85,662✔
16	self.stretch = SILE.measurement(stretch or 0)	85,662✔
17	self.shrink = SILE.measurement(shrink or 0)	85,662✔
18	elseif type(spec) == "number" then	162,365✔
19	self.length = SILE.measurement(spec)	125,316✔
20	elseif SU.type(spec) == "measurement" then	199,414✔
21	self.length = spec	2,421✔
22	elseif SU.type(spec) == "glue" then	194,572✔
23	self.length = SILE.measurement(spec.width.length or 0)	48✔
24	self.stretch = SILE.measurement(spec.width.stretch or 0)	48✔
25	self.shrink = SILE.measurement(spec.width.shrink or 0)	48✔
26	elseif type(spec) == "table" then	97,262✔
27	self.length = SILE.measurement(spec.length or 0)	61,600✔
28	self.stretch = SILE.measurement(spec.stretch or 0)	61,600✔
29	self.shrink = SILE.measurement(spec.shrink or 0)	61,600✔
30	elseif type(spec) == "string" then	66,462✔
31	local amount = tonumber(spec)	1,369✔
32	if type(amount) == "number" then	1,369✔
33	self:_init(amount)	4✔
34	else
35	local parsed = SILE.parserBits.length:match(spec)	1,367✔
36	if not parsed then SU.error("Could not parse length '"..spec.."'") end	1,367✔
37	self:_init(parsed)	1,367✔
38	end
39	end
40	if not self.length then self.length = SILE.measurement() end	270,289✔
41	if not self.stretch then self.stretch = SILE.measurement() end	335,368✔
42	if not self.shrink then self.shrink = SILE.measurement() end	335,368✔
43	end,
44
45	absolute = function (self)
46	return SILE.length(self.length:tonumber(), self.stretch:tonumber(), self.shrink:tonumber())	81,436✔
47	end,
48
49	negate = function (self)
50	return self:__unm()	×
51	end,
52
53	tostring = function (self)
54	return self:__tostring()	×
55	end,
56
57	tonumber = function (self)
58	return self.length:tonumber()	165,498✔
59	end,
60
61	new = function (_)
62	SU.deprecated("SILE.length.new", "SILE.length", "0.10.0")	×
63	end,
64
65	make = function (_)
66	SU.deprecated("SILE.length.make", "SILE.length", "0.10.0")	×
67	end,
68
69	parse = function (_)
70	SU.deprecated("SILE.length.parse", "SILE.length", "0.10.0")	×
71	end,
72
73	fromLengthOrNumber = function (_, _)
74	SU.deprecated("SILE.length.fromLengthOrNumber", "SILE.length", "0.10.0")	×
75	end,
76
77	__index = function (_, key)
78	SU.deprecated("SILE.length." .. key, "SILE.length", "0.10.0")	×
79	end,
80
81	__tostring = function (self)
82	local str = tostring(self.length)	7✔
83	if self.stretch.amount ~= 0 then str = str .. " plus " .. tostring(self.stretch) end	8✔
84	if self.shrink.amount ~= 0 then str = str .. " minus " .. tostring(self.shrink) end	7✔
85	return str	7✔
86	end,
87
88	__add = function (self, other)
89	if type(self) == "number" then self, other = other, self end	18,375✔
90	other = SU.cast("length", other)	36,750✔
91	return SILE.length(self.length + other.length,	18,375✔
92	self.stretch + other.stretch,	18,375✔
93	self.shrink + other.shrink)	36,750✔
94	end,
95
96	-- See usage comments on SILE.measurement:___add()
97	___add = function (self, other)
98	if SU.type(other) ~= "length" then	126,560✔
99	self.length:___add(other)	7,368✔
100	else
101	self.length:___add(other.length)	59,596✔
102	self.stretch:___add(other.stretch)	59,596✔
103	self.shrink:___add(other.shrink)	59,596✔
104	end
105	return nil	63,280✔
106	end,
107
108	__sub = function (self, other)
109	local result = SILE.length(self)	17,575✔
110	other = SU.cast("length", other)	35,150✔
111	result.length = result.length - other.length	35,150✔
112	result.stretch = result.stretch - other.stretch	35,150✔
113	result.shrink = result.shrink - other.shrink	35,150✔
114	return result	17,575✔
115	end,
116
117	-- See usage comments on SILE.measurement:___add()
118	___sub = function (self, other)
119	self.length:___sub(other.length)	4,686✔
120	self.stretch:___sub(other.stretch)	4,686✔
121	self.shrink:___sub(other.shrink)	4,686✔
122	return nil	4,686✔
123	end,
124
125	__mul = function (self, other)
126	if type(self) == "number" then self, other = other, self end	1,296✔
127	_error_if_not_number(other)	1,296✔
128	local result = SILE.length(self)	1,296✔
129	result.length = result.length * other	2,592✔
130	result.stretch = result.stretch * other	2,592✔
131	result.shrink = result.shrink * other	2,592✔
132	return result	1,296✔
133	end,
134
135	__div = function (self, other)
136	local result = SILE.length(self)	187✔
137	_error_if_not_number(other)	187✔
138	result.length = result.length / other	374✔
139	result.stretch = result.stretch / other	374✔
140	result.shrink = result.shrink / other	374✔
141	return result	187✔
142	end,
143
144	__unm = function (self)
145	local result = SILE.length(self)	30✔
146	result.length = result.length:__unm()	60✔
147	return result	30✔
148	end,
149
150	__lt = function (self, other)
151	local a = SU.cast("number", self)	46,487✔
152	local b = SU.cast("number", other)	46,487✔
153	return a - b < 0	46,487✔
154	end,
155
156	__le = function (self, other)
157	local a = SU.cast("number", self)	26✔
158	local b = SU.cast("number", other)	26✔
159	return a - b <= 0	26✔
160	end,
161
162	__eq = function (self, other)
UNCOV 163	local a = SU.cast("length", self)	×
UNCOV 164	local b = SU.cast("length", other)	×
UNCOV 165	return a.length == b.length and a.stretch == b.stretch and a.shrink == b.shrink	×
166	end
167
168	})	71✔

sile-typesetter / sile / 7232859119

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