perf(core): Don't waste time instantiating unused intermediaries

sile-typesetter · Jan 4, 2020 · 6f3dba1 · 6f3dba1
1 parent 6dff532
commit 6f3dba1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/core/length.lua b/core/length.lua
@@ -87,12  87,11 @@ return pl.class({
     end,
 
     __add = function (self, other)
-      local result = SILE.length(self)
       if type(self) == "number" then self, other = other, self end
       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
       return SILE.length(self.length   other.length,
         self.stretch   other.stretch,
         self.shrink   other.shrink)
     end,
 
     __sub = function (self, other)

diff --git a/core/measurement.lua b/core/measurement.lua
@@ -58,17  58,17 @@ local measurement = pl.class({
     end,
 
     absolute = function (self)
-      local def = SILE.units[self.unit]
-      local amount = def.converter and def.converter(self.amount) or self.amount * def.value
-      return SILE.measurement(amount)
       return SILE.measurement(self:tonumber())
     end,
 
     tostring = function (self)
       return self:__tostring()
     end,
 
     tonumber = function (self)
-      return self:absolute().amount
       local def = SILE.units[self.unit]
       local amount = def.converter and def.converter(self.amount) or self.amount * def.value
       return amount
     end,
 
     __tostring = function (self)