X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Flexer%2Flexer.c;h=a409a83ee957647a7b5d9b5f8195732ac8e0a61c;hb=c0d0b8039a3cd836398a76a0a884d6166ed761e0;hp=4a899bdff91b7b9b13d8a57d8f1b6c1f521a96ff;hpb=55e6e7ba37a30570f5a31e2d78c22dfa7b61a36f;p=pspp-builds.git diff --git a/src/language/lexer/lexer.c b/src/language/lexer/lexer.c index 4a899bdf..a409a83e 100644 --- a/src/language/lexer/lexer.c +++ b/src/language/lexer/lexer.c @@ -781,17 +781,6 @@ lex_put_back (struct lexer *lexer, enum token_type t) save_token (lexer); lexer->token = t; } - -/* Makes the current token become the next token to be read; the - current token is set to the identifier ID. */ -void -lex_put_back_id (struct lexer *lexer, const char *id) -{ - assert (lex_id_to_token (ss_cstr (id)) == T_ID); - save_token (lexer); - lexer->token = T_ID; - ds_assign_cstr (&lexer->tokstr, id); -} /* Weird line processing functions. */ @@ -917,8 +906,7 @@ lex_preprocess_line (struct string *line, { strip_comments (line); ds_rtrim (line, ss_cstr (CC_SPACES)); - *line_ends_command = (ds_chomp (line, settings_get_endcmd ()) - || (ds_is_empty (line) && settings_get_nulline ())); + *line_ends_command = ds_chomp (line, '.') || ds_is_empty (line); *line_starts_command = false; if (syntax == GETL_BATCH) { @@ -978,6 +966,7 @@ lex_token_name (enum token_type token) case T_POS_NUM: case T_NEG_NUM: case T_STRING: + case TOKEN_N_TYPES: NOT_REACHED (); case T_STOP: