/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2007 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2007, 2009, 2010, 2011 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
#include <config.h>
-#include "repeat.h"
+#include "language/control/repeat.h"
#include <ctype.h>
#include <math.h>
#include <stdlib.h>
-#include <data/dictionary.h>
-#include <data/procedure.h>
-#include <data/settings.h>
-#include <libpspp/getl.h>
-#include <language/command.h>
-#include <language/lexer/lexer.h>
-#include <language/lexer/variable-parser.h>
-#include <libpspp/alloc.h>
-#include <libpspp/ll.h>
-#include <libpspp/message.h>
-#include <libpspp/misc.h>
-#include <libpspp/pool.h>
-#include <libpspp/str.h>
-#include <data/variable.h>
-
-#include "intprops.h"
+#include "data/dictionary.h"
+#include "data/procedure.h"
+#include "data/settings.h"
+#include "libpspp/getl.h"
+#include "language/command.h"
+#include "language/lexer/lexer.h"
+#include "language/lexer/variable-parser.h"
+#include "libpspp/cast.h"
+#include "libpspp/ll.h"
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
+#include "libpspp/pool.h"
+#include "libpspp/str.h"
+#include "data/variable.h"
+
+#include "gl/intprops.h"
+#include "gl/xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
const char *file_name; /* File name. */
int line_number; /* Line number. */
struct substring text; /* Contents. */
- enum getl_syntax syntax; /* Syntax mode. */
};
/* The type of substitution made for a DO REPEAT macro. */
struct pool *);
static void do_repeat_filter (struct getl_interface *,
- struct string *, enum getl_syntax);
+ struct string *);
static bool do_repeat_read (struct getl_interface *,
- struct string *, enum getl_syntax *);
+ struct string *);
static void do_repeat_close (struct getl_interface *);
static bool always_false (const struct getl_interface *);
static const char *do_repeat_name (const struct getl_interface *);
block->parent.location = do_repeat_location;
if (!ll_is_empty (&block->lines))
- getl_include_source (lex_get_source_stream (lexer), &block->parent);
+ getl_include_source (lex_get_source_stream (lexer),
+ &block->parent,
+ lex_current_syntax_mode (lexer),
+ lex_current_error_mode (lexer)
+ );
else
pool_destroy (block->pool);
/* Get a stand-in variable name and make sure it's unique. */
if (!lex_force_id (lexer))
return false;
- if (dict_lookup_var (dict, lex_tokid (lexer)))
- msg (SW, _("Dummy variable name \"%s\" hides dictionary "
- "variable \"%s\"."),
- lex_tokid (lexer), lex_tokid (lexer));
- if (find_macro (block, ss_cstr (lex_tokid (lexer))))
+ if (dict_lookup_var (dict, lex_tokcstr (lexer)))
+ msg (SW, _("Dummy variable name `%s' hides dictionary variable `%s'."),
+ lex_tokcstr (lexer), lex_tokcstr (lexer));
+ if (find_macro (block, lex_tokss (lexer)))
{
- msg (SE, _("Dummy variable name \"%s\" is given twice."),
- lex_tokid (lexer));
+ msg (SE, _("Dummy variable name `%s' is given twice."),
+ lex_tokcstr (lexer));
return false;
}
/* Make a new macro. */
macro = pool_alloc (block->pool, sizeof *macro);
- ss_alloc_substring_pool (¯o->name, ss_cstr (lex_tokid (lexer)),
- block->pool);
+ ss_alloc_substring_pool (¯o->name, lex_tokss (lexer), block->pool);
ll_push_tail (&block->macros, ¯o->ll);
/* Skip equals sign. */
lex_get (lexer);
- if (!lex_force_match (lexer, '='))
+ if (!lex_force_match (lexer, T_EQUALS))
return false;
/* Get the details of the variable's possible values. */
count = parse_ids (lexer, dict, macro, block->pool);
else if (lex_is_number (lexer))
count = parse_numbers (lexer, macro, block->pool);
- else if (lex_token (lexer) == T_STRING)
+ else if (lex_is_string (lexer))
count = parse_strings (lexer, macro, block->pool);
else
{
}
if (count == 0)
return false;
- if (lex_token (lexer) != '/' && lex_token (lexer) != '.')
+ if (lex_token (lexer) != T_SLASH && lex_token (lexer) != T_ENDCMD)
{
lex_error (lexer, NULL);
return false;
}
else if (block->loop_cnt != count)
{
- msg (SE, _("Dummy variable \"%.*s\" had %d "
- "substitutions, so \"%.*s\" must also, but %d "
+ msg (SE, _("Dummy variable `%.*s' had %d "
+ "substitutions, so `%.*s' must also, but %d "
"were specified."),
(int) ss_length (first_name), ss_data (first_name),
block->loop_cnt,
return false;
}
- lex_match (lexer, '/');
+ lex_match (lexer, T_SLASH);
}
- while (lex_token (lexer) != '.');
+ while (lex_token (lexer) != T_ENDCMD);
return true;
}
{
struct substring id;
ss_ltrim (line, ss_cstr (CC_SPACES));
- ss_get_chars (line, lex_id_get_length (*line), &id);
+ ss_get_bytes (line, lex_id_get_length (*line), &id);
return lex_id_match (ss_cstr (keyword), id);
}
const char *cur_file_name;
struct repeat_line *line;
struct string text;
- enum getl_syntax syntax;
bool command_ends_before_line, command_ends_after_line;
/* Retrieve an input line and make a copy of it. */
- if (!lex_get_line_raw (lexer, &syntax))
- return false;
+ if (!lex_get_line_raw (lexer))
+ {
+ msg (SE, _("DO REPEAT without END REPEAT."));
+ return false;
+ }
ds_init_string (&text, lex_entire_line_ds (lexer));
/* Record file name. */
line->file_name = previous_file_name;
line->line_number = getl_source_location (lex_get_source_stream (lexer));
ss_alloc_substring_pool (&line->text, ds_ss (&text), block->pool);
- line->syntax = syntax;
+
/* Check whether the line contains a DO REPEAT or END
REPEAT command. */
- lex_preprocess_line (&text, syntax,
+ lex_preprocess_line (&text,
+ lex_current_syntax_mode (lexer),
&command_ends_before_line,
&command_ends_after_line);
if (recognize_do_repeat (ds_ss (&text)))
{
- if (get_syntax () == COMPATIBLE)
+ if (settings_get_syntax () == COMPATIBLE)
msg (SE, _("DO REPEAT may not nest in compatibility mode."));
else
nesting_level++;
add_replacement (ss_cstr (pool_asprintf (pool, "%g", i)),
macro, pool, &used, &allocated);
- lex_match (lexer, ',');
+ lex_match (lexer, T_COMMA);
}
- while (lex_token (lexer) != '/' && lex_token (lexer) != '.');
+ while (lex_token (lexer) != T_SLASH && lex_token (lexer) != T_ENDCMD);
return used;
}
{
char *string;
- if (lex_token (lexer) != T_STRING)
+ if (!lex_force_string (lexer))
{
msg (SE, _("String expected."));
return 0;
add_replacement (ss_cstr (string), macro, pool, &used, &allocated);
lex_get (lexer);
- lex_match (lexer, ',');
+ lex_match (lexer, T_COMMA);
}
- while (lex_token (lexer) != '/' && lex_token (lexer) != '.');
+ while (lex_token (lexer) != T_SLASH && lex_token (lexer) != T_ENDCMD);
return used;
}
/* Makes appropriate DO REPEAT macro substitutions within the
repeated lines. */
static void
-do_repeat_filter (struct getl_interface *block_,
- struct string *line, enum getl_syntax syntax UNUSED)
+do_repeat_filter (struct getl_interface *interface, struct string *line)
{
- struct repeat_block *block = (struct repeat_block *) block_;
+ struct repeat_block *block
+ = UP_CAST (interface, struct repeat_block, parent);
bool in_apos, in_quote, dot;
struct substring input;
struct string output;
/* Strip trailing whitespace, check for & remove terminal dot. */
ds_rtrim (line, ss_cstr (CC_SPACES));
- dot = ds_chomp (line, get_endcmd ());
-
+ dot = ds_chomp_byte (line, '.');
input = ds_ss (line);
in_apos = in_quote = false;
while ((c = ss_first (input)) != EOF)
if (in_quote || in_apos || !lex_is_id1 (c))
{
- ds_put_char (&output, c);
+ ds_put_byte (&output, c);
ss_advance (&input, 1);
}
else
{
struct substring id;
- ss_get_chars (&input, lex_id_get_length (input), &id);
+ ss_get_bytes (&input, lex_id_get_length (input), &id);
ds_put_substring (&output, find_substitution (block, id));
}
}
if (dot)
- ds_put_char (&output, get_endcmd ());
+ ds_put_byte (&output, '.');
ds_swap (line, &output);
ds_destroy (&output);
static struct repeat_line *
current_line (const struct getl_interface *interface)
{
- struct repeat_block *block = (struct repeat_block *) interface;
+ struct repeat_block *block
+ = UP_CAST (interface, struct repeat_block, parent);
return (block->cur_line != ll_null (&block->lines)
? ll_data (block->cur_line, struct repeat_line, ll)
: NULL);
was obtained, false if the source is exhausted. */
static bool
do_repeat_read (struct getl_interface *interface,
- struct string *output, enum getl_syntax *syntax)
+ struct string *output)
{
- struct repeat_block *block = (struct repeat_block *) interface;
+ struct repeat_block *block
+ = UP_CAST (interface, struct repeat_block, parent);
struct repeat_line *line;
block->cur_line = ll_next (block->cur_line);
line = current_line (interface);
ds_assign_substring (output, line->text);
- *syntax = line->syntax;
return true;
}
/* Frees a DO REPEAT block.
Called by getl to close out the DO REPEAT block. */
static void
-do_repeat_close (struct getl_interface *block_)
+do_repeat_close (struct getl_interface *interface)
{
- struct repeat_block *block = (struct repeat_block *) block_;
+ struct repeat_block *block
+ = UP_CAST (interface, struct repeat_block, parent);
pool_destroy (block->pool);
}
}
/* Returns the line number in the source file from which the
- previous line was originally obtained, or -1 if none. */
+ previous line was originally obtained, or 0 if none. */
static int
do_repeat_location (const struct getl_interface *interface)
{
struct repeat_line *line = current_line (interface);
- return line ? line->line_number : -1;
+ return line ? line->line_number : 0;
}
projects / pspp-builds.git / blobdiff