Commit e6c1e588 authored by Marko Mäkelä's avatar Marko Mäkelä

gen_lex_hash: Omit deprecated register keywords

This is follow-up to d36c107a
parent a5e268a2
...@@ -403,8 +403,8 @@ int main(int argc,char **argv) ...@@ -403,8 +403,8 @@ int main(int argc,char **argv)
static SYMBOL *get_hash_symbol(const char *s,\n\ static SYMBOL *get_hash_symbol(const char *s,\n\
unsigned int len,bool function)\n\ unsigned int len,bool function)\n\
{\n\ {\n\
register uchar *hash_map;\n\ uchar *hash_map;\n\
register const char *cur_str= s;\n\ const char *cur_str= s;\n\
\n\ \n\
if (len == 0) {\n\ if (len == 0) {\n\
DBUG_PRINT(\"warning\", (\"get_hash_symbol() received a request for a zero-length symbol, which is probably a mistake.\"));\ DBUG_PRINT(\"warning\", (\"get_hash_symbol() received a request for a zero-length symbol, which is probably a mistake.\"));\
...@@ -416,25 +416,25 @@ static SYMBOL *get_hash_symbol(const char *s,\n\ ...@@ -416,25 +416,25 @@ static SYMBOL *get_hash_symbol(const char *s,\n\
if (function){\n\ if (function){\n\
if (len>sql_functions_max_len) return 0;\n\ if (len>sql_functions_max_len) return 0;\n\
hash_map= sql_functions_map;\n\ hash_map= sql_functions_map;\n\
register uint32 cur_struct= uint4korr(hash_map+((len-1)*4));\n\ uint32 cur_struct= uint4korr(hash_map+((len-1)*4));\n\
\n\ \n\
for (;;){\n\ for (;;){\n\
register uchar first_char= (uchar)cur_struct;\n\ uchar first_char= (uchar)cur_struct;\n\
\n\ \n\
if (first_char == 0)\n\ if (first_char == 0)\n\
{\n\ {\n\
register int16 ires= (int16)(cur_struct>>16);\n\ int16 ires= (int16)(cur_struct>>16);\n\
if (ires==array_elements(symbols)) return 0;\n\ if (ires==array_elements(symbols)) return 0;\n\
register SYMBOL *res;\n\ SYMBOL *res;\n\
if (ires>=0) \n\ if (ires>=0) \n\
res= symbols+ires;\n\ res= symbols+ires;\n\
else\n\ else\n\
res= sql_functions-ires-1;\n\ res= sql_functions-ires-1;\n\
register uint count= (uint) (cur_str - s);\n\ uint count= (uint) (cur_str - s);\n\
return lex_casecmp(cur_str,res->name+count,len-count) ? 0 : res;\n\ return lex_casecmp(cur_str,res->name+count,len-count) ? 0 : res;\n\
}\n\ }\n\
\n\ \n\
register uchar cur_char= (uchar)to_upper_lex[(uchar)*cur_str];\n\ uchar cur_char= (uchar)to_upper_lex[(uchar)*cur_str];\n\
if (cur_char<first_char) return 0;\n\ if (cur_char<first_char) return 0;\n\
cur_struct>>=8;\n\ cur_struct>>=8;\n\
if (cur_char>(uchar)cur_struct) return 0;\n\ if (cur_char>(uchar)cur_struct) return 0;\n\
...@@ -450,20 +450,20 @@ static SYMBOL *get_hash_symbol(const char *s,\n\ ...@@ -450,20 +450,20 @@ static SYMBOL *get_hash_symbol(const char *s,\n\
}else{\n\ }else{\n\
if (len>symbols_max_len) return 0;\n\ if (len>symbols_max_len) return 0;\n\
hash_map= symbols_map;\n\ hash_map= symbols_map;\n\
register uint32 cur_struct= uint4korr(hash_map+((len-1)*4));\n\ uint32 cur_struct= uint4korr(hash_map+((len-1)*4));\n\
\n\ \n\
for (;;){\n\ for (;;){\n\
register uchar first_char= (uchar)cur_struct;\n\ uchar first_char= (uchar)cur_struct;\n\
\n\ \n\
if (first_char==0){\n\ if (first_char==0){\n\
register int16 ires= (int16)(cur_struct>>16);\n\ int16 ires= (int16)(cur_struct>>16);\n\
if (ires==array_elements(symbols)) return 0;\n\ if (ires==array_elements(symbols)) return 0;\n\
register SYMBOL *res= symbols+ires;\n\ SYMBOL *res= symbols+ires;\n\
register uint count= (uint) (cur_str - s);\n\ uint count= (uint) (cur_str - s);\n\
return lex_casecmp(cur_str,res->name+count,len-count)!=0 ? 0 : res;\n\ return lex_casecmp(cur_str,res->name+count,len-count)!=0 ? 0 : res;\n\
}\n\ }\n\
\n\ \n\
register uchar cur_char= (uchar)to_upper_lex[(uchar)*cur_str];\n\ uchar cur_char= (uchar)to_upper_lex[(uchar)*cur_str];\n\
if (cur_char<first_char) return 0;\n\ if (cur_char<first_char) return 0;\n\
cur_struct>>=8;\n\ cur_struct>>=8;\n\
if (cur_char>(uchar)cur_struct) return 0;\n\ if (cur_char>(uchar)cur_struct) return 0;\n\
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment