Adwaith-Rajesh/gperf
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/gperf.git synced 2025-12-02 13:09:22 +00:00
Code Activity

Provoke a compilation error if the execution character set doesn't match the

Browse Source 
expectations.
This commit is contained in:
Bruno Haible
2003-04-28 10:08:35 +00:00
parent d267e31dea
commit 16e10a330c
19 changed files with 438 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/input.cc
View File

@@ -698,6 +698,7 @@ Input::read_input ()
Keyword_List **list_tail = &_head;
const char *delimiters = option.get_delimiters ();
unsigned int lineno = keywords_lineno;
bool charset_dependent = false;
for (const char *line = keywords; line < keywords_end; )
{
const char *line_end;
@@ -797,34 +798,42 @@ Input::read_input ()
case '\\': case '\'': case '"':
*kp = c;
lp++;
charset_dependent = true;
break;
case 'n':
*kp = '\n';
lp++;
charset_dependent = true;
break;
case 't':
*kp = '\t';
lp++;
charset_dependent = true;
break;
case 'r':
*kp = '\r';
lp++;
charset_dependent = true;
break;
case 'f':
*kp = '\f';
lp++;
charset_dependent = true;
break;
case 'b':
*kp = '\b';
lp++;
charset_dependent = true;
break;
case 'a':
*kp = '\a';
lp++;
charset_dependent = true;
break;
case 'v':
*kp = '\v';
lp++;
charset_dependent = true;
break;
default:
fprintf (stderr, "%s:%u: invalid escape sequence"
@@ -839,6 +848,7 @@ Input::read_input ()
{
*kp = c;
lp++;
charset_dependent = true;
}
kp++;
}
@@ -901,6 +911,8 @@ Input::read_input ()
}
lp++;
}
if (keyword_length > 0)
charset_dependent = true;
}
/* Allocate Keyword and add it to the list. */
@@ -922,6 +934,8 @@ Input::read_input ()
pretty_input_file_name ());
exit (1);
}
_charset_dependent = charset_dependent;
}
/* To be freed in the destructor. */

5
src/input.h
View File

@@ -2,7 +2,7 @@
/* Input routines.
Copyright (C) 1989-1998, 2002 Free Software Foundation, Inc.
Copyright (C) 1989-1998, 2002-2003 Free Software Foundation, Inc.
Written by Douglas C. Schmidt <schmidt@ics.uci.edu>
and Bruno Haible <bruno@clisp.org>.
@@ -61,6 +61,9 @@ public:
const char * _struct_tag;
/* List of all keywords. */
Keyword_List * _head;
/* Whether the keyword chars would have different values in a different
character set. */
bool _charset_dependent;
};
#endif

3
src/main.cc
View File

@@ -1,5 +1,5 @@
/* Driver program for the hash function generator
Copyright (C) 1989-1998, 2000, 2002 Free Software Foundation, Inc.
Copyright (C) 1989-1998, 2000, 2002-2003 Free Software Foundation, Inc.
Written by Douglas C. Schmidt <schmidt@ics.uci.edu>
and Bruno Haible <bruno@clisp.org>.
@@ -102,6 +102,7 @@ main (int argc, char *argv[])
inputter._verbatim_code,
inputter._verbatim_code_end,
inputter._verbatim_code_lineno,
inputter._charset_dependent,
searcher._total_keys,
searcher._max_key_len,
searcher._min_key_len,

37
src/output.cc
View File

@@ -82,7 +82,7 @@ Output::Output (KeywordExt_List *head, const char *struct_decl,
const char *verbatim_declarations_end,
unsigned int verbatim_declarations_lineno,
const char *verbatim_code, const char *verbatim_code_end,
unsigned int verbatim_code_lineno,
unsigned int verbatim_code_lineno, bool charset_dependent,
int total_keys, int max_key_len, int min_key_len,
const Positions& positions, const unsigned int *alpha_inc,
int total_duplicates, unsigned int alpha_size,
@@ -96,6 +96,7 @@ Output::Output (KeywordExt_List *head, const char *struct_decl,
_verbatim_code (verbatim_code),
_verbatim_code_end (verbatim_code_end),
_verbatim_code_lineno (verbatim_code_lineno),
_charset_dependent (charset_dependent),
_total_keys (total_keys),
_max_key_len (max_key_len), _min_key_len (min_key_len),
_key_positions (positions), _alpha_inc (alpha_inc),
@@ -1949,6 +1950,40 @@ Output::output ()
_key_positions.print();
printf ("' */\n");
}
printf ("\n");
if (_charset_dependent
&& (_key_positions.get_size() > 0 || option[UPPERLOWER]))
{
/* The generated tables assume that the execution character set is
based on ISO-646, not EBCDIC. */
printf ("#if !((' ' == 32) && ('!' == 33) && ('\"' == 34) && ('#' == 35) \\\n"
" && ('%%' == 37) && ('&' == 38) && ('\\'' == 39) && ('(' == 40) \\\n"
" && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \\\n"
" && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \\\n"
" && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \\\n"
" && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \\\n"
" && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \\\n"
" && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \\\n"
" && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \\\n"
" && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \\\n"
" && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \\\n"
" && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \\\n"
" && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \\\n"
" && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \\\n"
" && ('Z' == 90) && ('[' == 91) && ('\\\\' == 92) && (']' == 93) \\\n"
" && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \\\n"
" && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \\\n"
" && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \\\n"
" && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \\\n"
" && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \\\n"
" && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \\\n"
" && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \\\n"
" && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))\n"
"/* The character set is not based on ISO-646. */\n");
printf ("%s \"gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>.\"\n", option[KRC] || option[C] ? "error" : "#error");
printf ("#endif\n\n");
}
if (_verbatim_declarations < _verbatim_declarations_end)
{

4
src/output.h
View File

@@ -48,6 +48,7 @@ public:
const char *verbatim_code,
const char *verbatim_code_end,
unsigned int verbatim_code_lineno,
bool charset_dependent,
int total_keys,
int max_key_len, int min_key_len,
const Positions& positions,
@@ -125,6 +126,9 @@ private:
const char * const _verbatim_code;
const char * const _verbatim_code_end;
unsigned int const _verbatim_code_lineno;
/* Whether the keyword chars would have different values in a different
character set. */
bool _charset_dependent;
/* Total number of keys, counting duplicates. */
int const _total_keys;
/* Maximum length of the longest keyword. */