You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA. */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA. */
#include <config.h>
#include "lexer.h"
#include "alloc.h"
#include "command.h"
#include "error.h"
-#include "getline.h"
+#include "getl.h"
#include "magic.h"
#include "settings.h"
#include "str.h"
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+#define N_(msgid) msgid
+
/*
#define DUMP_TOKENS 1
*/
\f
/* Global variables. */
+extern const char *keywords[T_N_KEYWORDS + 1];
+
+
/* Current token. */
int token;
double tokval;
/* T_ID: the identifier. */
-char tokid[9];
+char tokid[LONG_NAME_LEN + 1];
/* T_ID, T_STRING: token string value.
- For T_ID, this is not truncated to 8 characters as is tokid. */
+ For T_ID, this is not truncated as is tokid. */
struct string tokstr;
\f
/* Static variables. */
-/* Table of keywords. */
-static const char *keywords[T_N_KEYWORDS + 1] =
- {
- "AND", "OR", "NOT",
- "EQ", "GE", "GT", "LE", "LT", "NE",
- "ALL", "BY", "TO", "WITH",
- NULL,
- };
-
/* Pointer to next token in getl_buf. */
static char *prog;
static double put_tokval;
static void unexpected_eof (void);
-static inline int check_id (const char *id, size_t len);
static void convert_numeric_string_to_char_string (int type);
static int parse_string (int type);
void
lex_init (void)
{
+ ds_init (&tokstr, 64);
ds_init (&put_tokstr, 64);
if (!lex_get_line ())
unexpected_eof ();
void
lex_done (void)
{
- ds_destroy(&put_tokstr);
+ ds_destroy (&put_tokstr);
+ ds_destroy (&tokstr);
}
\f
assert (put_token != 0);
token = put_token;
ds_replace (&tokstr, ds_c_str (&put_tokstr));
- strncpy (tokid, ds_c_str (&put_tokstr), 8);
- tokid[8] = 0;
+ str_copy_trunc (tokid, sizeof tokid, ds_c_str (&tokstr));
tokval = put_tokval;
put_token = 0;
}
}
/* Copy id to tokstr. */
- ds_putc (&tokstr, toupper ((unsigned char) *prog++));
+ ds_putc (&tokstr, *prog++);
while (CHAR_IS_IDN (*prog))
- ds_putc (&tokstr, toupper ((unsigned char) *prog++));
+ ds_putc (&tokstr, *prog++);
- /* Copy tokstr to tokid, truncating it to 8 characters. */
- strncpy (tokid, ds_c_str (&tokstr), 8);
- tokid[8] = 0;
+ /* Copy tokstr to tokid, possibly truncating it.*/
+ str_copy_trunc (tokid, sizeof tokid, ds_c_str (&tokstr));
- token = check_id (ds_c_str (&tokstr), ds_length (&tokstr));
+ /* Determine token type. */
+ token = lex_id_to_token (ds_c_str (&tokstr), ds_length (&tokstr));
break;
default:
#endif
}
+/* Reports an error to the effect that subcommand SBC may only be
+ specified once. */
+void
+lex_sbc_only_once (const char *sbc)
+{
+ msg (SE, _("Subcommand %s may only be specified once."), sbc);
+}
+
+/* Reports an error to the effect that subcommand SBC is
+ missing. */
+void
+lex_sbc_missing (const char *sbc)
+{
+ lex_error (_("missing required subcommand %s"), sbc);
+}
+
/* Prints a syntax error message containing the current token and
given message MESSAGE (if non-null). */
void
lex_error (const char *message, ...)
{
char *token_rep;
+ char where[128];
token_rep = lex_token_representation ();
- if (token_rep[0] == 0)
- msg (SE, _("Syntax error at end of file."));
- else if (message)
+ if (token == T_STOP)
+ strcpy (where, "end of file");
+ else if (token == '.')
+ strcpy (where, "end of command");
+ else
+ snprintf (where, sizeof where, "`%s'", token_rep);
+ free (token_rep);
+
+ if (message)
{
char buf[1024];
va_list args;
vsnprintf (buf, 1024, message, args);
va_end (args);
- msg (SE, _("Syntax error %s at `%s'."), buf, token_rep);
+ msg (SE, _("Syntax error %s at %s."), buf, where);
}
else
- msg (SE, _("Syntax error at `%s'."), token_rep);
-
- free (token_rep);
+ msg (SE, _("Syntax error at %s."), where);
}
/* Checks that we're at end of command.
}
/* If the current token is the identifier S, skips it and returns
- nonzero.
+ nonzero. The identifier may be abbreviated to its first three
+ letters.
Otherwise, returns zero. */
int
lex_match_id (const char *s)
}
else
{
- lex_error (_("expecting %s"), lex_token_name (t));
+ lex_error (_("expecting `%s'"), lex_token_name (t));
return 0;
}
}
return 0;
}
}
-\f
-/* Comparing identifiers. */
-
-/* Keywords match if one of the following is true: KW and TOK are
- identical (barring differences in case), or TOK is at least 3
- characters long and those characters are identical to KW. KW_LEN
- is the length of KW, TOK_LEN is the length of TOK. */
-int
-lex_id_match_len (const char *kw, size_t kw_len,
- const char *tok, size_t tok_len)
-{
- size_t i = 0;
-
- assert (kw && tok);
- for (;;)
- {
- if (i == kw_len && i == tok_len)
- return 1;
- else if (i == tok_len)
- return i >= 3;
- else if (i == kw_len)
- return 0;
- else if (toupper ((unsigned char) kw[i])
- != toupper ((unsigned char) tok[i]))
- return 0;
-
- i++;
- }
-}
-
-/* Same as lex_id_match_len() minus the need to pass in the lengths. */
-int
-lex_id_match (const char *kw, const char *tok)
-{
- return lex_id_match_len (kw, strlen (kw), tok, strlen (tok));
-}
-\f
/* Weird token functions. */
/* Returns the first character of the next token, except that if the
void
lex_put_back_id (const char *id)
{
+ assert (lex_id_to_token (id, strlen (id)) == T_ID);
save_token ();
token = T_ID;
ds_replace (&tokstr, id);
- strncpy (tokid, ds_c_str (&tokstr), 8);
- tokid[8] = 0;
+ str_copy_trunc (tokid, sizeof tokid, ds_c_str (&tokstr));
}
\f
/* Weird line processing functions. */
int quote;
/* Remove C-style comments begun by slash-star and terminated by
- star-slash or newline. */
+ star-slash or newline. */
quote = comment = 0;
for (cp = ds_c_str (&getl_buf); *cp; )
{
len--;
/* Check for and remove terminal dot. */
- if (len > 0 && s[len - 1] == get_endcmd() )
+ if (len > 0 && s[len - 1] == get_endcmd ())
{
dot = 1;
len--;
}
- else if (len == 0 && get_nullline() )
+ else if (len == 0 && get_nulline ())
dot = 1;
else
dot = 0;
msg (FE, _("Unexpected end of file."));
}
-/* Returns the proper token type, either T_ID or a reserved keyword
- enum, for ID[], which must contain LEN characters. */
-static inline int
-check_id (const char *id, size_t len)
-{
- const char **kwp;
-
- if (len < 2 || len > 4)
- return T_ID;
-
- for (kwp = keywords; *kwp; kwp++)
- if (!strcmp (*kwp, id))
- return T_FIRST_KEYWORD + (kwp - keywords);
-
- return T_ID;
-}
-
/* When invoked, tokstr contains a string of binary, octal, or hex
digits, for values of TYPE of 0, 1, or 2, respectively. The string
is converted to characters having the specified values. */
projects / pspp-builds.git / blobdiff