X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fexpressions%2Foperations.def;h=e8f1f781dc29d3bbc0042e55cce0fec3f81f5c1c;hb=0369a800f7007c89a7e12d190fdc81e4f80d4314;hp=18ab4447c824032a7f896161c9fc760fa31a2d62;hpb=adccf1932c84ccb435f14f60fdb4aaaf9fdc1e30;p=pspp

diff --git a/src/language/expressions/operations.def b/src/language/expressions/operations.def
index 18ab4447c8..e8f1f781dc 100644
--- a/src/language/expressions/operations.def
+++ b/src/language/expressions/operations.def
@@ -90,7 +90,9 @@ function RND (x, mult != 0, fuzzbits >= 0) = round_nearest (x, mult, fuzzbits);
 function SIN (x) = sin (x);
 function SQRT (x >= 0) = sqrt (x);
 function TAN (x) = check_errno (tan (x));
-function TRUNC (x) = x >= 0. ? floor (x) : -floor (-x);
+function TRUNC (x) = round_zero (x, 1, 0);
+function TRUNC (x, mult != 0) = round_zero (x, mult, 0);
+function TRUNC (x, mult != 0, fuzzbits >= 0) = round_zero (x, mult, fuzzbits);
 
 absorb_miss function MOD (n, d)
 {
@@ -629,6 +631,18 @@ absorb_miss string function STRING (x, no_format f)
   return dst;
 }
 
+absorb_miss string function STRUNC (string s, n)
+{
+  if (n < 1 || n == SYSMIS)
+    return empty_string;
+
+  if (n < s.length)
+    s.length = n;
+  while (s.length > 0 && s.string[s.length - 1] == ' ')
+    s.length--;
+  return s;
+}
+
 absorb_miss string function SUBSTR (string s, ofs)
      expression e;
 {