projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Patch #6262. New developers guide and resulting fixes and cleanups.
[pspp-builds.git]
/
src
/
language
/
xforms
/
compute.c
diff --git
a/src/language/xforms/compute.c
b/src/language/xforms/compute.c
index bf279c90802d45c4932c3265794d8166aa2e951a..f17798f77722a35cb2597a82f5ecaea4ccfcced7 100644
(file)
--- a/
src/language/xforms/compute.c
+++ b/
src/language/xforms/compute.c
@@
-16,6
+16,7
@@
#include <config.h>
#include <config.h>
+#include <stdint.h>
#include <stdlib.h>
#include <data/case.h>
#include <stdlib.h>
#include <data/case.h>
@@
-27,12
+28,12
@@
#include <language/command.h>
#include <language/expressions/public.h>
#include <language/lexer/lexer.h>
#include <language/command.h>
#include <language/expressions/public.h>
#include <language/lexer/lexer.h>
-#include <libpspp/alloc.h>
-#include <libpspp/message.h>
#include <libpspp/message.h>
#include <libpspp/misc.h>
#include <libpspp/str.h>
#include <libpspp/message.h>
#include <libpspp/misc.h>
#include <libpspp/str.h>
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-257,7
+258,7
@@
cmd_if (struct lexer *lexer, struct dataset *ds)
static trns_proc_func *
get_proc_func (const struct lvalue *lvalue)
{
static trns_proc_func *
get_proc_func (const struct lvalue *lvalue)
{
- bool is_numeric = lvalue_get_type (lvalue) == VA
R
_NUMERIC;
+ bool is_numeric = lvalue_get_type (lvalue) == VA
L
_NUMERIC;
bool is_vector = lvalue_is_vector (lvalue);
return (is_numeric
bool is_vector = lvalue_is_vector (lvalue);
return (is_numeric
@@
-271,7
+272,7
@@
static struct expression *
parse_rvalue (struct lexer *lexer,
const struct lvalue *lvalue, struct dataset *ds)
{
parse_rvalue (struct lexer *lexer,
const struct lvalue *lvalue, struct dataset *ds)
{
- bool is_numeric = lvalue_get_type (lvalue) == VA
R
_NUMERIC;
+ bool is_numeric = lvalue_get_type (lvalue) == VA
L
_NUMERIC;
return expr_parse (lexer, ds, is_numeric ? EXPR_NUMBER : EXPR_STRING);
}
return expr_parse (lexer, ds, is_numeric ? EXPR_NUMBER : EXPR_STRING);
}