X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fidentifier.c;h=a95a157d78cd0f0c2dcfe1844c152ec88782f4e5;hb=f5c108becd49d78f4898cab11352291f5689d24e;hp=004ca5834651ac72df0be128e773721b999b1177;hpb=7eee0554f378481faf447e2d2e940f389d6b05ec;p=pspp-builds.git diff --git a/src/data/identifier.c b/src/data/identifier.c index 004ca583..a95a157d 100644 --- a/src/data/identifier.c +++ b/src/data/identifier.c @@ -16,8 +16,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* - This file is concerned with the definition of the PSPP syntax, NOT the +/* + This file is concerned with the definition of the PSPP syntax, NOT the action of scanning/parsing code . */ @@ -34,7 +34,7 @@ /* Returns true if C may be the first character in an identifier in the current locale. */ bool -lex_is_id1 (char c_) +lex_is_id1 (char c_) { unsigned char c = c_; return isalpha (c) || c == '@' || c == '#' || c == '$'; @@ -54,7 +54,7 @@ lex_is_idn (char c_) a valid identifier. Returns zero if STRING does not begin with a valid identifier. */ size_t -lex_id_get_length (struct substring string) +lex_id_get_length (struct substring string) { size_t length = 0; if (!ss_is_empty (string) && lex_is_id1 (ss_first (string))) @@ -79,7 +79,7 @@ lex_id_match (struct substring keyword, struct substring token) { size_t token_len = ss_length (token); size_t keyword_len = ss_length (keyword); - + if (token_len >= 3 && token_len < keyword_len) return ss_equals_case (ss_head (keyword, token_len), token); else @@ -87,13 +87,13 @@ lex_id_match (struct substring keyword, struct substring token) } /* Table of keywords. */ -struct keyword +struct keyword { int token; const struct substring identifier; }; -static const struct keyword keywords[] = +static const struct keyword keywords[] = { { T_AND, SS_LITERAL_INITIALIZER ("AND") }, { T_OR, SS_LITERAL_INITIALIZER ("OR") }, @@ -113,11 +113,11 @@ static const size_t keyword_cnt = sizeof keywords / sizeof *keywords; /* Returns true if TOKEN is representable as a keyword. */ bool -lex_is_keyword (int token) +lex_is_keyword (int token) { const struct keyword *kw; for (kw = keywords; kw < &keywords[keyword_cnt]; kw++) - if (kw->token == token) + if (kw->token == token) return true; return false; } @@ -127,30 +127,30 @@ lex_is_keyword (int token) int lex_id_to_token (struct substring id) { - if (ss_length (id) >= 2 && ss_length (id) <= 4) + if (ss_length (id) >= 2 && ss_length (id) <= 4) { const struct keyword *kw; for (kw = keywords; kw < &keywords[keyword_cnt]; kw++) if (ss_equals_case (kw->identifier, id)) return kw->token; } - + return T_ID; } /* Returns the name for the given keyword token type. */ const char * -lex_id_name (int token) +lex_id_name (int token) { const struct keyword *kw; for (kw = keywords; kw < &keywords[keyword_cnt]; kw++) - if (kw->token == token) + if (kw->token == token) { /* A "struct substring" is not guaranteed to be null-terminated, as our caller expects, but in this case it always will be. */ - return ss_data (kw->identifier); + return ss_data (kw->identifier); } NOT_REACHED (); }