projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Damn! Forgot to change casenum_t in *.q
[pspp]
/
src
/
language
/
expressions
/
operations.def
diff --git
a/src/language/expressions/operations.def
b/src/language/expressions/operations.def
index 95ac1e0b53ab2c14fdf86c8d4412e840f7335283..e1ae2a531e49cd34f6275637d25872fd5a15d372 100644
(file)
--- a/
src/language/expressions/operations.def
+++ b/
src/language/expressions/operations.def
@@
-133,7
+133,7
@@
function MAX.1 (a[n])
string function MAX (string a[n])
{
string function MAX (string a[n])
{
- struct
fixed_
string *max;
+ struct
sub
string *max;
size_t i;
max = &a[0];
size_t i;
max = &a[0];
@@
-164,7
+164,7
@@
function MIN.1 (a[n])
string function MIN (string a[n])
{
string function MIN (string a[n])
{
- struct
fixed_
string *min;
+ struct
sub
string *min;
size_t i;
min = &a[0];
size_t i;
min = &a[0];
@@
-220,8
+220,8
@@
boolean function RANGE (string x, string a[n*2])
for (i = 0; i < n; i++)
{
for (i = 0; i < n; i++)
{
- struct
fixed_
string *w = &a[2 * i];
- struct
fixed_
string *y = &a[2 * i + 1];
+ struct
sub
string *w = &a[2 * i];
+ struct
sub
string *y = &a[2 * i + 1];
if (compare_string (w, &x) <= 0 && compare_string (&x, y) <= 0)
return 1.;
}
if (compare_string (w, &x) <= 0 && compare_string (&x, y) <= 0)
return 1.;
}
@@
-303,19
+303,19
@@
function XDATE.YEAR (date >= DAY_S) = calendar_offset_to_year (date / DAY_S);
string function CONCAT (string a[n])
expression e;
{
string function CONCAT (string a[n])
expression e;
{
- struct
fixed_
string dst;
+ struct
sub
string dst;
size_t i;
size_t i;
- dst = alloc_string (e,
255
);
+ dst = alloc_string (e,
MAX_STRING
);
dst.length = 0;
for (i = 0; i < n; i++)
{
dst.length = 0;
for (i = 0; i < n; i++)
{
- struct
fixed_
string *src = &a[i];
+ struct
sub
string *src = &a[i];
size_t copy_len;
copy_len = src->length;
size_t copy_len;
copy_len = src->length;
- if (dst.length + copy_len >
255
)
- copy_len =
255
- dst.length;
+ if (dst.length + copy_len >
MAX_STRING
)
+ copy_len =
MAX_STRING
- dst.length;
memcpy (&dst.string[dst.length], src->string, copy_len);
dst.length += copy_len;
}
memcpy (&dst.string[dst.length], src->string, copy_len);
dst.length += copy_len;
}
@@
-440,13
+440,13
@@
string function UPCASE (string s)
absorb_miss string function LPAD (string s, n)
expression e;
{
absorb_miss string function LPAD (string s, n)
expression e;
{
- if (n < 0 || n >
255
|| (int) n != n)
+ if (n < 0 || n >
MAX_STRING
|| (int) n != n)
return empty_string;
else if (s.length >= n)
return s;
else
{
return empty_string;
else if (s.length >= n)
return s;
else
{
- struct
fixed_
string t = alloc_string (e, n);
+ struct
sub
string t = alloc_string (e, n);
memset (t.string, ' ', n - s.length);
memcpy (&t.string[(int) n - s.length], s.string, s.length);
return t;
memset (t.string, ' ', n - s.length);
memcpy (&t.string[(int) n - s.length], s.string, s.length);
return t;
@@
-456,13
+456,13
@@
absorb_miss string function LPAD (string s, n)
absorb_miss string function LPAD (string s, n, string c)
expression e;
{
absorb_miss string function LPAD (string s, n, string c)
expression e;
{
- if (n < 0 || n >
255
|| (int) n != n || c.length != 1)
+ if (n < 0 || n >
MAX_STRING
|| (int) n != n || c.length != 1)
return empty_string;
else if (s.length >= n)
return s;
else
{
return empty_string;
else if (s.length >= n)
return s;
else
{
- struct
fixed_
string t = alloc_string (e, n);
+ struct
sub
string t = alloc_string (e, n);
memset (t.string, c.string[0], n - s.length);
memcpy (&t.string[(int) n - s.length], s.string, s.length);
return t;
memset (t.string, c.string[0], n - s.length);
memcpy (&t.string[(int) n - s.length], s.string, s.length);
return t;
@@
-472,13
+472,13
@@
absorb_miss string function LPAD (string s, n, string c)
absorb_miss string function RPAD (string s, n)
expression e;
{
absorb_miss string function RPAD (string s, n)
expression e;
{
- if (n < 0 || n >
255
|| (int) n != n)
+ if (n < 0 || n >
MAX_STRING
|| (int) n != n)
return empty_string;
else if (s.length >= n)
return s;
else
{
return empty_string;
else if (s.length >= n)
return s;
else
{
- struct
fixed_
string t = alloc_string (e, n);
+ struct
sub
string t = alloc_string (e, n);
memcpy (t.string, s.string, s.length);
memset (&t.string[s.length], ' ', n - s.length);
return t;
memcpy (t.string, s.string, s.length);
memset (&t.string[s.length], ' ', n - s.length);
return t;
@@
-488,13
+488,13
@@
absorb_miss string function RPAD (string s, n)
absorb_miss string function RPAD (string s, n, string c)
expression e;
{
absorb_miss string function RPAD (string s, n, string c)
expression e;
{
- if (n < 0 || n >
255
|| (int) n != n || c.length != 1)
+ if (n < 0 || n >
MAX_STRING
|| (int) n != n || c.length != 1)
return empty_string;
else if (s.length >= n)
return s;
else
{
return empty_string;
else if (s.length >= n)
return s;
else
{
- struct
fixed_
string t = alloc_string (e, n);
+ struct
sub
string t = alloc_string (e, n);
memcpy (t.string, s.string, s.length);
memset (&t.string[s.length], c.string[0], n - s.length);
return t;
memcpy (t.string, s.string, s.length);
memset (&t.string[s.length], c.string[0], n - s.length);
return t;
@@
-563,7
+563,7
@@
absorb_miss string function STRING (x, no_format f)
expression e;
{
union value v;
expression e;
{
union value v;
- struct
fixed_
string dst;
+ struct
sub
string dst;
v.f = x;
dst = alloc_string (e, f->w);
v.f = x;
dst = alloc_string (e, f->w);
@@
-951,14
+951,15
@@
no_opt string operator STR_VAR ()
expression e;
str_var v;
{
expression e;
str_var v;
{
- struct
fixed_
string s = alloc_string (e, v->width);
+ struct
sub
string s = alloc_string (e, v->width);
memcpy (s.string, case_str (c, v->fv), v->width);
return s;
}
no_opt perm_only function LAG (num_var v, pos_int n_before)
memcpy (s.string, case_str (c, v->fv), v->width);
return s;
}
no_opt perm_only function LAG (num_var v, pos_int n_before)
+ dataset ds;
{
{
- struct ccase *c = lagged_case (n_before);
+ struct ccase *c = lagged_case (
ds,
n_before);
if (c != NULL)
{
double x = case_num (c, v->fv);
if (c != NULL)
{
double x = case_num (c, v->fv);
@@
-969,8
+970,9
@@
no_opt perm_only function LAG (num_var v, pos_int n_before)
}
no_opt perm_only function LAG (num_var v)
}
no_opt perm_only function LAG (num_var v)
+ dataset ds;
{
{
- struct ccase *c = lagged_case (1);
+ struct ccase *c = lagged_case (
ds,
1);
if (c != NULL)
{
double x = case_num (c, v->fv);
if (c != NULL)
{
double x = case_num (c, v->fv);
@@
-982,8
+984,9
@@
no_opt perm_only function LAG (num_var v)
no_opt perm_only string function LAG (str_var v, pos_int n_before)
expression e;
no_opt perm_only string function LAG (str_var v, pos_int n_before)
expression e;
+ dataset ds;
{
{
- struct ccase *c = lagged_case (n_before);
+ struct ccase *c = lagged_case (
ds,
n_before);
if (c != NULL)
return copy_string (e, case_str (c, v->fv), v->width);
else
if (c != NULL)
return copy_string (e, case_str (c, v->fv), v->width);
else
@@
-992,8
+995,9
@@
no_opt perm_only string function LAG (str_var v, pos_int n_before)
no_opt perm_only string function LAG (str_var v)
expression e;
no_opt perm_only string function LAG (str_var v)
expression e;
+ dataset ds;
{
{
- struct ccase *c = lagged_case (1);
+ struct ccase *c = lagged_case (
ds,
1);
if (c != NULL)
return copy_string (e, case_str (c, v->fv), v->width);
else
if (c != NULL)
return copy_string (e, case_str (c, v->fv), v->width);
else