From 2095d4da4d60956a09b6c67940392e12c572e6d6 Mon Sep 17 00:00:00 2001 From: obrien Date: Wed, 12 Mar 2008 14:51:47 +0000 Subject: If the special target .MAKEFILEDEPS exists, then enable the "remaking makefiles" feature. Otherwise, follow traditional Pmake behavior. --- usr.bin/make/hash_tables.c | 52 +++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/usr.bin/make/hash_tables.c b/usr.bin/make/hash_tables.c index 27fdf2d..27909d0 100644 --- a/usr.bin/make/hash_tables.c +++ b/usr.bin/make/hash_tables.c @@ -1,7 +1,7 @@ /* * DO NOT EDIT * $FreeBSD$ - * auto-generated from FreeBSD: src/usr.bin/make/parse.c,v 1.108 2005/05/24 15:30:03 harti Exp + * auto-generated from FreeBSD: src/usr.bin/make/parse.c,v 1.114 2008/03/12 14:50:58 obrien Exp * DO NOT EDIT */ #include @@ -66,12 +66,12 @@ directive_hash(const u_char *key, size_t len) } /* * d=2 - * n=72 - * m=34 + * n=74 + * m=35 * c=2.09 * maxlen=1 * minklen=4 - * maxklen=12 + * maxklen=13 * minchar=46 * maxchar=95 * loop=0 @@ -80,30 +80,30 @@ directive_hash(const u_char *key, size_t len) */ static const signed char keyword_g[] = { - 8, 15, -1, 25, 22, 20, -1, 33, 16, -1, - 21, 31, 0, 0, 0, 29, 30, 8, -1, 0, - -1, 21, -1, 0, -1, -1, -1, -1, -1, 4, - -1, -1, 25, 28, -1, 27, 11, 23, 0, 0, - 24, -1, -1, 0, 3, 0, -1, 24, 0, 0, - -1, 28, 12, -1, 20, 13, -1, 5, -1, 1, - 0, 0, -1, 0, 10, 19, 13, 9, -1, 2, - -1, -1, + 12, 18, 7, 25, 30, 5, -1, -1, -1, 7, + -1, 0, 33, 0, 4, -1, -1, 13, 29, 0, + -1, 28, -1, 28, -1, 0, -1, 27, 4, 34, + -1, -1, -1, 30, 13, 10, -1, -1, 0, 10, + 24, -1, -1, -1, 0, 6, 0, 0, -1, 23, + -1, -1, -1, 0, -1, 23, -1, -1, 19, 4, + -1, 31, 12, 16, -1, 20, 22, 9, 0, -1, + -1, 9, 4, 0, }; static const u_char keyword_T0[] = { - 32, 10, 54, 61, 2, 35, 62, 50, 52, 53, - 70, 7, 62, 18, 24, 30, 31, 66, 10, 61, - 52, 71, 56, 56, 28, 6, 33, 67, 12, 41, - 39, 45, 51, 21, 34, 53, 56, 40, 47, 52, - 21, 61, 60, 12, 7, 28, 42, 38, 38, 52, + 34, 28, 50, 61, 14, 57, 48, 60, 20, 67, + 60, 63, 0, 24, 28, 2, 49, 64, 18, 23, + 36, 33, 40, 14, 38, 42, 71, 49, 2, 53, + 53, 37, 7, 29, 24, 21, 12, 50, 59, 10, + 43, 23, 0, 44, 47, 6, 46, 22, 48, 64, }; static const u_char keyword_T1[] = { - 0, 39, 65, 48, 13, 62, 46, 42, 5, 50, - 69, 69, 69, 43, 2, 46, 12, 6, 11, 9, - 24, 10, 25, 64, 68, 13, 57, 55, 17, 33, - 1, 18, 0, 67, 10, 14, 57, 56, 0, 6, - 50, 13, 3, 47, 56, 22, 37, 13, 28, 48, + 18, 67, 39, 60, 7, 70, 2, 26, 31, 18, + 73, 47, 61, 17, 38, 50, 22, 52, 13, 55, + 56, 32, 63, 4, 64, 55, 49, 21, 47, 67, + 33, 66, 60, 73, 30, 68, 69, 32, 72, 4, + 28, 49, 51, 15, 66, 68, 43, 67, 46, 56, }; @@ -113,7 +113,7 @@ keyword_hash(const u_char *key, size_t len) unsigned f0, f1; const u_char *kp = key; - if (len < 4 || len > 12) + if (len < 4 || len > 13) return -1; for (f0=f1=0; *kp; ++kp) { @@ -123,8 +123,8 @@ keyword_hash(const u_char *key, size_t len) f1 += keyword_T1[-46 + *kp]; } - f0 %= 72; - f1 %= 72; + f0 %= 74; + f1 %= 74; - return (keyword_g[f0] + keyword_g[f1]) % 34; + return (keyword_g[f0] + keyword_g[f1]) % 35; } -- cgit v1.1