X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flexer.c;h=66324a2508701b65e63261c209e096285bf8b031;hb=5ff91bd55867848d448c2f09bc7057cc1fb77b18;hp=568a87e316654c45b3b979460d8805bf0c9f8261;hpb=05e356b2a3087e819ef3b5388e29c822f41502e1;p=pspp diff --git a/src/lexer.c b/src/lexer.c index 568a87e316..66324a2508 100644 --- a/src/lexer.c +++ b/src/lexer.c @@ -14,8 +14,8 @@ 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 #include "lexer.h" @@ -29,11 +29,15 @@ #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 */ @@ -41,6 +45,9 @@ /* Global variables. */ +extern const char *keywords[T_N_KEYWORDS + 1]; + + /* Current token. */ int token; @@ -51,20 +58,11 @@ double tokval; char tokid[LONG_NAME_LEN + 1]; /* T_ID, T_STRING: token string value. - For T_ID, this is not truncated to SHORT_NAME_LEN characters as is tokid. */ + For T_ID, this is not truncated as is tokid. */ struct string tokstr; /* 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; @@ -116,8 +114,7 @@ restore_token (void) assert (put_token != 0); token = put_token; ds_replace (&tokstr, ds_c_str (&put_tokstr)); - strncpy (tokid, ds_c_str (&put_tokstr), SHORT_NAME_LEN); - tokid[SHORT_NAME_LEN] = 0; + str_copy_trunc (tokid, sizeof tokid, ds_c_str (&tokstr)); tokval = put_tokval; put_token = 0; } @@ -137,8 +134,6 @@ save_token (void) void lex_get (void) { - int i; - /* If a token was pushed ahead, return it. */ if (put_token) { @@ -360,14 +355,10 @@ lex_get (void) while (CHAR_IS_IDN (*prog)) ds_putc (&tokstr, *prog++); - /* Copy tokstr to tokid, truncating it to LONG_NAME_LEN characters.*/ - strncpy (tokid, ds_c_str (&tokstr), LONG_NAME_LEN); - tokid[LONG_NAME_LEN] = 0; - - /* Convert to upper case */ - for ( i = 0 ; i < ds_length(&tokstr) ; ++i ) - tokstr.string[i] = toupper(tokstr.string[i]); + /* Copy tokstr to tokid, possibly truncating it.*/ + str_copy_trunc (tokid, sizeof tokid, ds_c_str (&tokstr)); + /* Determine token type. */ token = lex_id_to_token (ds_c_str (&tokstr), ds_length (&tokstr)); break; @@ -387,17 +378,40 @@ lex_get (void) #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; @@ -406,12 +420,10 @@ lex_error (const char *message, ...) 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. @@ -485,7 +497,8 @@ lex_match (int t) } /* 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) @@ -545,7 +558,7 @@ lex_force_match (int t) } else { - lex_error (_("expecting %s"), lex_token_name (t)); + lex_error (_("expecting `%s'"), lex_token_name (t)); return 0; } } @@ -605,60 +618,6 @@ lex_force_id (void) return 0; } } - -/* 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)); -} - -/* Returns the proper token type, either T_ID or a reserved keyword - enum, for ID[], which must contain LEN characters. */ -int -lex_id_to_token (const char *id, size_t len) -{ - const char **kwp; - - if (len < 2 || len > 4) - return T_ID; - - for (kwp = keywords; *kwp; kwp++) - if (!strcasecmp (*kwp, id)) - return T_FIRST_KEYWORD + (kwp - keywords); - - return T_ID; -} - /* Weird token functions. */ /* Returns the first character of the next token, except that if the @@ -717,11 +676,11 @@ lex_put_back (int t) 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), SHORT_NAME_LEN); - tokid[SHORT_NAME_LEN] = 0; + str_copy_trunc (tokid, sizeof tokid, ds_c_str (&tokstr)); } /* Weird line processing functions. */ @@ -792,7 +751,7 @@ lex_preprocess_line (void) 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; ) { @@ -842,7 +801,7 @@ lex_preprocess_line (void) 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--;