projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
psppire-dialog: Fix incompatible pointer type.
[pspp]
/
src
/
language
/
expressions
/
operations.def
diff --git
a/src/language/expressions/operations.def
b/src/language/expressions/operations.def
index 0286acf91e393d917a1259181165d4c8c88c8934..37af54a9118abf8755fd0205cdaebdbe20021f46 100644
(file)
--- a/
src/language/expressions/operations.def
+++ b/
src/language/expressions/operations.def
@@
-1,7
+1,7
@@
// -*- c -*-
//
// PSPP - a program for statistical analysis.
// -*- c -*-
//
// PSPP - a program for statistical analysis.
-// Copyright (C) 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006, 2009, 2010
, 2011, 2012
Free Software Foundation, Inc.
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@
-585,12
+585,12
@@
function NUMBER (string s, ni_format f)
if (s.length > f->w)
s.length = f->w;
if (s.length > f->w)
s.length = f->w;
- error = data_in (s,
LEGACY_NATIVE
, f->type, &out, 0, NULL);
+ error = data_in (s,
C_ENCODING
, f->type, &out, 0, NULL);
if (error == NULL)
if (error == NULL)
-
data_in_imply_decimals (s, LEGACY_NATIVE
, f->type, f->d, &out);
+
data_in_imply_decimals (s, C_ENCODING
, f->type, f->d, &out);
else
{
else
{
- msg (SE, "Cannot parse
\"%.*s\"
as format %s: %s",
+ msg (SE, "Cannot parse
`%.*s'
as format %s: %s",
(int) s.length, s.string, fmt_name (f->type), error);
free (error);
}
(int) s.length, s.string, fmt_name (f->type), error);
free (error);
}
@@
-607,7
+607,7
@@
absorb_miss string function STRING (x, no_format f)
v.f = x;
assert (!fmt_is_string (f->type));
v.f = x;
assert (!fmt_is_string (f->type));
- s = data_out (&v,
LEGACY_NATIVE
, f);
+ s = data_out (&v,
C_ENCODING
, f);
dst = alloc_string (e, strlen (s));
strcpy (dst.string, s);
free (s);
dst = alloc_string (e, strlen (s));
strcpy (dst.string, s);
free (s);
@@
-654,14
+654,17
@@
boolean operator NUM_TO_BOOLEAN (x, string op_name)
{
if (x == 0. || x == 1. || x == SYSMIS)
return x;
{
if (x == 0. || x == 1. || x == SYSMIS)
return x;
+
+ if (!ss_is_empty (op_name))
+ msg (SE, _("An operand of the %.*s operator was found to have a value "
+ "other than 0 (false), 1 (true), or the system-missing "
+ "value. The result was forced to 0."),
+ (int) op_name.length, op_name.string);
else
else
- {
- msg (SE, _("An operand of the %.*s operator was found to have a value "
- "other than 0 (false), 1 (true), or the system-missing "
- "value. The result was forced to 0."),
- (int) op_name.length, op_name.string);
- return 0.;
- }
+ msg (SE, _("A logical expression was found to have a value other than 0 "
+ "(false), 1 (true), or the system-missing value. The result "
+ "was forced to 0."));
+ return 0.;
}
operator BOOLEAN_TO_NUM (boolean x) = x;
}
operator BOOLEAN_TO_NUM (boolean x) = x;