projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pspp-sheet-view.c: Separate destroy method into finalize and dispose.
[pspp]
/
src
/
language
/
expressions
/
parse.c
diff --git
a/src/language/expressions/parse.c
b/src/language/expressions/parse.c
index 32c2e6152917f721f2a50fc1d569720e8ad9386b..3124c100a19e4c8922916fcda501ec2c0db058b1 100644
(file)
--- a/
src/language/expressions/parse.c
+++ b/
src/language/expressions/parse.c
@@
-897,8
+897,8
@@
parse_primary (struct lexer *lexer, struct expression *e)
dict_encoding = (e->ds != NULL
? dict_get_encoding (dataset_dict (e->ds))
: "UTF-8");
dict_encoding = (e->ds != NULL
? dict_get_encoding (dataset_dict (e->ds))
: "UTF-8");
- s = recode_string (dict_encoding, "UTF-8", lex_tokcstr (lexer),
- ss_length (lex_tokss (lexer)));
+ s = recode_string
_pool
(dict_encoding, "UTF-8", lex_tokcstr (lexer),
+ ss_length (lex_tokss (lexer))
, e->expr_pool
);
node = expr_allocate_string (e, ss_cstr (s));
lex_get (lexer);
node = expr_allocate_string (e, ss_cstr (s));
lex_get (lexer);
@@
-1268,7
+1268,7
@@
parse_function (struct lexer *lexer, struct expression *e)
break;
else if (!lex_match (lexer, T_COMMA))
{
break;
else if (!lex_match (lexer, T_COMMA))
{
- lex_error_expecting (lexer, "
,", ")
", NULL_SENTINEL);
+ lex_error_expecting (lexer, "
`,'", "`)'
", NULL_SENTINEL);
goto fail;
}
}
goto fail;
}
}