projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cleanup
[pspp]
/
src
/
ui
/
gui
/
executor.c
diff --git
a/src/ui/gui/executor.c
b/src/ui/gui/executor.c
index e9ef3f07b784536896e10e011051fea4c4d1cc78..6d5af138e8dad4b16e57b858475e9844cd0b273c 100644
(file)
--- a/
src/ui/gui/executor.c
+++ b/
src/ui/gui/executor.c
@@
-95,7
+95,7
@@
execute_syntax (PsppireDataWindow *window, struct lex_reader *lex_reader)
{
const struct caseproto *proto;
struct casereader *reader;
{
const struct caseproto *proto;
struct casereader *reader;
- casenumber
case_cnt
;
+ casenumber
n_cases
;
/* When the user executes a number of snippets of syntax in a
row, none of which read from the active dataset, the GUI becomes
/* When the user executes a number of snippets of syntax in a
row, none of which read from the active dataset, the GUI becomes
@@
-111,8
+111,8
@@
execute_syntax (PsppireDataWindow *window, struct lex_reader *lex_reader)
it is reused the next time syntax is run, without wrapping
it in another layer. */
proto = psppire_data_store_get_proto (pdw->data_store);
it is reused the next time syntax is run, without wrapping
it in another layer. */
proto = psppire_data_store_get_proto (pdw->data_store);
-
case_cnt
= psppire_data_store_get_case_count (pdw->data_store);
- reader = lazy_casereader_create (proto,
case_cnt
,
+
n_cases
= psppire_data_store_get_case_count (pdw->data_store);
+ reader = lazy_casereader_create (proto,
n_cases
,
create_casereader_from_data_store,
pdw->data_store, &pdw->lazy_serial);
dataset_set_source (pdw->dataset, reader);
create_casereader_from_data_store,
pdw->data_store, &pdw->lazy_serial);
dataset_set_source (pdw->dataset, reader);
@@
-134,14
+134,14
@@
execute_syntax (PsppireDataWindow *window, struct lex_reader *lex_reader)
struct dataset *ds = session_active_dataset (the_session);
enum cmd_result result = cmd_parse (lexer, ds);
struct dataset *ds = session_active_dataset (the_session);
enum cmd_result result = cmd_parse (lexer, ds);
- if (
cmd_result_is_failure (result))
+ if (cmd_result_is_failure (result))
{
retval = FALSE;
{
retval = FALSE;
- if (
lex_get_error_mode (lexer) == LEX_ERROR_STOP
)
+ if (
lex_get_error_mode (lexer) == LEX_ERROR_STOP
)
break;
}
break;
}
- if (
result == CMD_EOF || result == CMD_FINISH)
+ if (result == CMD_EOF || result == CMD_FINISH)
break;
}
break;
}
@@
-200,5
+200,5
@@
execute_syntax_string (PsppireDataWindow *window, gchar *syntax)
void
execute_const_syntax_string (PsppireDataWindow *window, const gchar *syntax)
{
void
execute_const_syntax_string (PsppireDataWindow *window, const gchar *syntax)
{
- execute_syntax (window, lex_reader_for_string (syntax));
+ execute_syntax (window, lex_reader_for_string (syntax
, "UTF-8"
));
}
}