projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid link error when compiling without libxml2 installed
[pspp]
/
src
/
language
/
expressions
/
operations.def
diff --git
a/src/language/expressions/operations.def
b/src/language/expressions/operations.def
index 18ab4447c824032a7f896161c9fc760fa31a2d62..e8f1f781dc29d3bbc0042e55cce0fec3f81f5c1c 100644
(file)
--- 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 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)
{
absorb_miss function MOD (n, d)
{
@@
-629,6
+631,18
@@
absorb_miss string function STRING (x, no_format f)
return dst;
}
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;
{
absorb_miss string function SUBSTR (string s, ofs)
expression e;
{