summaryrefslogtreecommitdiff
path: root/tests/java.exp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/java.exp')
-rw-r--r--tests/java.exp145
1 files changed, 69 insertions, 76 deletions
diff --git a/tests/java.exp b/tests/java.exp
index a711b70..e2ca0c6 100644
--- a/tests/java.exp
+++ b/tests/java.exp
@@ -31,9 +31,9 @@ struct java_keyword { const char *name; int token; };
#define TOTAL_KEYWORDS 50
#define MIN_WORD_LENGTH 2
#define MAX_WORD_LENGTH 12
-#define MIN_HASH_VALUE 6
-#define MAX_HASH_VALUE 86
-/* maximum key range = 81, duplicates = 0 */
+#define MIN_HASH_VALUE 7
+#define MAX_HASH_VALUE 76
+/* maximum key range = 70, duplicates = 0 */
#ifdef __GNUC__
__inline
@@ -49,32 +49,32 @@ hash (str, len)
{
static unsigned char asso_values[] =
{
- 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
- 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
- 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
- 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
- 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
- 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
- 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
- 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
- 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
- 87, 87, 87, 87, 87, 87, 87, 18, 37, 38,
- 27, 1, 30, 3, 12, 8, 87, 2, 11, 87,
- 8, 1, 5, 87, 24, 1, 1, 30, 2, 36,
- 87, 1, 87, 87, 87, 87, 87, 87, 87, 87,
- 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
- 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
- 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
- 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
- 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
- 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
- 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
- 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
- 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
- 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
- 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
- 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
- 87, 87, 87, 87, 87, 87
+ 77, 77, 77, 77, 77, 77, 77, 77, 77, 77,
+ 77, 77, 77, 77, 77, 77, 77, 77, 77, 77,
+ 77, 77, 77, 77, 77, 77, 77, 77, 77, 77,
+ 77, 77, 77, 77, 77, 77, 77, 77, 77, 77,
+ 77, 77, 77, 77, 77, 77, 77, 77, 77, 77,
+ 77, 77, 77, 77, 77, 77, 77, 77, 77, 77,
+ 77, 77, 77, 77, 77, 77, 77, 77, 77, 77,
+ 77, 77, 77, 77, 77, 77, 77, 77, 77, 77,
+ 77, 77, 77, 77, 77, 77, 77, 77, 77, 77,
+ 77, 77, 77, 77, 77, 77, 77, 7, 30, 7,
+ 12, 1, 14, 28, 41, 3, 77, 16, 11, 77,
+ 16, 23, 1, 77, 15, 1, 1, 34, 30, 18,
+ 77, 11, 77, 77, 77, 77, 77, 77, 77, 77,
+ 77, 77, 77, 77, 77, 77, 77, 77, 77, 77,
+ 77, 77, 77, 77, 77, 77, 77, 77, 77, 77,
+ 77, 77, 77, 77, 77, 77, 77, 77, 77, 77,
+ 77, 77, 77, 77, 77, 77, 77, 77, 77, 77,
+ 77, 77, 77, 77, 77, 77, 77, 77, 77, 77,
+ 77, 77, 77, 77, 77, 77, 77, 77, 77, 77,
+ 77, 77, 77, 77, 77, 77, 77, 77, 77, 77,
+ 77, 77, 77, 77, 77, 77, 77, 77, 77, 77,
+ 77, 77, 77, 77, 77, 77, 77, 77, 77, 77,
+ 77, 77, 77, 77, 77, 77, 77, 77, 77, 77,
+ 77, 77, 77, 77, 77, 77, 77, 77, 77, 77,
+ 77, 77, 77, 77, 77, 77, 77, 77, 77, 77,
+ 77, 77, 77, 77, 77, 77
};
register int hval = len;
@@ -102,70 +102,63 @@ java_keyword (str, len)
static struct java_keyword wordlist[] =
{
{"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"try", TRY_TK},
+ {"", 0},
{"else", ELSE_TK},
- {"short", SHORT_TK},
- {"goto", GOTO_TK},
- {"extends", EXTENDS_TK},
- {"", 0}, {"", 0},
{"int", INT_TK},
{"this", THIS_TK},
- {"", 0},
- {"native", NATIVE_TK},
- {"", 0}, {"", 0},
- {"interface", INTERFACE_TK},
+ {"extends", EXTENDS_TK},
{"import", IMPORT_TK},
{"private", PRIVATE_TK},
- {"volatile", VOLATILE_TK},
- {"", 0},
+ {"case", CASE_TK},
+ {"interface", INTERFACE_TK},
{"implements", IMPLEMENTS_TK},
- {"", 0},
- {"long", LONG_TK},
- {"switch", SWITCH_TK},
+ {"package", PACKAGE_TK},
{"abstract", ABSTRACT_TK},
{"transient", TRANSIENT_TK},
- {"do", DO_TK},
- {"", 0},
- {"throws", THROWS_TK},
- {"", 0},
- {"null", NULL_TK},
+ {"if", IF_TK},
+ {"class", CLASS_TK},
+ {"static", STATIC_TK},
{"super", SUPER_TK},
- {"true", TRUE_TK},
- {"float", FLOAT_TK},
+ {"throws", THROWS_TK},
+ {"native", NATIVE_TK},
{"", 0},
- {"return", RETURN_TK},
- {"if", IF_TK},
- {"void", VOID_TK},
- {"protected", PROTECTED_TK},
- {"byte", BYTE_TK},
- {"case", CASE_TK},
- {"break", BREAK_TK},
- {"finally", FINALLY_TK},
- {"false", FALSE_TK},
- {"synchronized", SYNCHRONIZED_TK},
- {"instanceof", INSTANCEOF_TK},
+ {"try", TRY_TK},
{"while", WHILE_TK},
- {"package", PACKAGE_TK},
+ {"instanceof", INSTANCEOF_TK},
{"const", CONST_TK},
- {"boolean", BOOLEAN_TK},
- {"final", FINAL_TK},
+ {"short", SHORT_TK},
+ {"false", FALSE_TK},
{"continue", CONTINUE_TK},
- {"catch", CATCH_TK},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"class", CLASS_TK},
- {"static", STATIC_TK},
- {"double", DOUBLE_TK},
+ {"char", CHAR_TK},
{"default", DEFAULT_TK},
+ {"", 0},
+ {"byte", BYTE_TK},
+ {"do", DO_TK},
+ {"return", RETURN_TK},
{"throw", THROW_TK},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0},
+ {"true", TRUE_TK},
+ {"synchronized", SYNCHRONIZED_TK},
+ {"null", NULL_TK},
+ {"float", FLOAT_TK},
+ {"public", PUBLIC_TK},
+ {"protected", PROTECTED_TK},
+ {"final", FINAL_TK},
{"for", FOR_TK},
- {"", 0},
+ {"finally", FINALLY_TK},
+ {"void", VOID_TK},
+ {"volatile", VOLATILE_TK},
+ {"switch", SWITCH_TK},
+ {"break", BREAK_TK},
+ {"double", DOUBLE_TK},
+ {"catch", CATCH_TK},
{"new", NEW_TK},
- {"char", CHAR_TK},
- {"", 0},
- {"public", PUBLIC_TK}
+ {"goto", GOTO_TK},
+ {"", 0}, {"", 0},
+ {"long", LONG_TK},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"boolean", BOOLEAN_TK}
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)