ruby-changes:2415
From: ko1@a...
Date: 13 Nov 2007 15:30:10 +0900
Subject: [ruby-changes:2415] akr - Ruby:r13906 (trunk): * lex.c.blt: moved from lex.c.
akr 2007-11-13 15:29:49 +0900 (Tue, 13 Nov 2007)
New Revision: 13906
Added files:
trunk/lex.c.blt
trunk/lex.c.src
Removed files:
trunk/lex.c
Modified files:
trunk/ChangeLog
trunk/Makefile.in
trunk/bcc32/Makefile.sub
trunk/win32/Makefile.sub
trunk/wince/Makefile.sub
Log:
* lex.c.blt: moved from lex.c.
* lex.c.src: copied from keywords. This is the source of lex.c.blt.
* Makefile.in (lex.c): use lex.c.blt if keywords is same as lex.c.src.
* win32/Makefile.sub (lex.c): re-introduce copy rule.
* bcc32/Makefile.sub (lex.c): ditto.
* wince/Makefile.sub (lex.c): ditto.
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/wince/Makefile.sub?r1=13906&r2=13905
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/Makefile.in?r1=13906&r2=13905
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=13906&r2=13905
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/win32/Makefile.sub?r1=13906&r2=13905
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/bcc32/Makefile.sub?r1=13906&r2=13905
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lex.c
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lex.c.blt
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lex.c.src
Index: lex.c
===================================================================
--- lex.c (revision 13905)
+++ lex.c (revision 13906)
@@ -1,214 +0,0 @@
-/* C code produced by gperf version 3.0.2 */
-/* Command-line: gperf --output-file=lex.c.tmp -C -p -j1 -i 1 -g -o -t -N rb_reserved_word -k'1,3,$' keywords */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
- && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
- && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
- && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
- && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
- && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
- && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
- && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
- && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
- && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
- && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
- && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
- && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
- && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
- && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
- && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
- && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
- && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
- && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
- && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
- && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
- && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
- && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646. */
-error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@g...>."
-#endif
-
-#line 1 "keywords"
-
-struct kwtable {char *name; int id[2]; enum lex_state_e state;};
-const struct kwtable *rb_reserved_word _((const char *, unsigned int));
-#ifndef RIPPER
-#line 7 "keywords"
-struct kwtable;
-
-#define TOTAL_KEYWORDS 40
-#define MIN_WORD_LENGTH 2
-#define MAX_WORD_LENGTH 8
-#define MIN_HASH_VALUE 6
-#define MAX_HASH_VALUE 50
-/* maximum key range = 45, duplicates = 0 */
-
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-static unsigned int
-hash (str, len)
- register const char *str;
- register unsigned int len;
-{
- static const unsigned char asso_values[] =
- {
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 23, 51, 51, 13, 51, 1, 1,
- 11, 12, 51, 51, 51, 51, 10, 51, 12, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 11, 51, 13, 1, 26,
- 4, 1, 8, 28, 51, 23, 51, 1, 1, 27,
- 5, 19, 21, 51, 8, 3, 3, 11, 51, 21,
- 24, 16, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51
- };
- register int hval = len;
-
- switch (hval)
- {
- default:
- hval += asso_values[(unsigned char)str[2]];
- /*FALLTHROUGH*/
- case 2:
- case 1:
- hval += asso_values[(unsigned char)str[0]];
- break;
- }
- return hval + asso_values[(unsigned char)str[len - 1]];
-}
-
-#ifdef __GNUC__
-__inline
-#endif
-const struct kwtable *
-rb_reserved_word (str, len)
- register const char *str;
- register unsigned int len;
-{
- static const struct kwtable wordlist[] =
- {
- {""}, {""}, {""}, {""}, {""}, {""},
-#line 12 "keywords"
- {"END", {keyword_END, keyword_END}, EXPR_END},
- {""},
-#line 16 "keywords"
- {"break", {keyword_break, keyword_break}, EXPR_MID},
-#line 22 "keywords"
- {"else", {keyword_else, keyword_else}, EXPR_BEG},
-#line 32 "keywords"
- {"nil", {keyword_nil, keyword_nil}, EXPR_END},
-#line 25 "keywords"
- {"ensure", {keyword_ensure, keyword_ensure}, EXPR_BEG},
-#line 24 "keywords"
- {"end", {keyword_end, keyword_end}, EXPR_END},
-#line 41 "keywords"
- {"then", {keyword_then, keyword_then}, EXPR_BEG},
-#line 33 "keywords"
- {"not", {keyword_not, keyword_not}, EXPR_VALUE},
-#line 26 "keywords"
- {"false", {keyword_false, keyword_false}, EXPR_END},
-#line 39 "keywords"
- {"self", {keyword_self, keyword_self}, EXPR_END},
-#line 23 "keywords"
- {"elsif", {keyword_elsif, keyword_elsif}, EXPR_VALUE},
-#line 36 "keywords"
- {"rescue", {keyword_rescue, modifier_rescue}, EXPR_MID},
-#line 42 "keywords"
- {"true", {keyword_true, keyword_true}, EXPR_END},
-#line 45 "keywords"
- {"until", {keyword_until, modifier_until}, EXPR_VALUE},
-#line 44 "keywords"
- {"unless", {keyword_unless, modifier_unless}, EXPR_VALUE},
-#line 38 "keywords"
- {"return", {keyword_return, keyword_return}, EXPR_MID},
-#line 19 "keywords"
- {"def", {keyword_def, keyword_def}, EXPR_FNAME},
-#line 14 "keywords"
- {"and", {keyword_and, keyword_and}, EXPR_VALUE},
-#line 21 "keywords"
- {"do", {keyword_do, keyword_do}, EXPR_BEG},
-#line 48 "keywords"
- {"yield", {keyword_yield, keyword_yield}, EXPR_ARG},
-#line 27 "keywords"
- {"for", {keyword_for, keyword_for}, EXPR_VALUE},
-#line 43 "keywords"
- {"undef", {keyword_undef, keyword_undef}, EXPR_FNAME},
-#line 34 "keywords"
- {"or", {keyword_or, keyword_or}, EXPR_VALUE},
-#line 29 "keywords"
- {"in", {keyword_in, keyword_in}, EXPR_VALUE},
-#line 46 "keywords"
- {"when", {keyword_when, keyword_when}, EXPR_VALUE},
-#line 37 "keywords"
- {"retry", {keyword_retry, keyword_retry}, EXPR_END},
-#line 28 "keywords"
- {"if", {keyword_if, modifier_if}, EXPR_VALUE},
-#line 17 "keywords"
- {"case", {keyword_case, keyword_case}, EXPR_VALUE},
-#line 35 "keywords"
- {"redo", {keyword_redo, keyword_redo}, EXPR_END},
-#line 31 "keywords"
- {"next", {keyword_next, keyword_next}, EXPR_MID},
-#line 40 "keywords"
- {"super", {keyword_super, keyword_super}, EXPR_ARG},
-#line 30 "keywords"
- {"module", {keyword_module, keyword_module}, EXPR_VALUE},
-#line 15 "keywords"
- {"begin", {keyword_begin, keyword_begin}, EXPR_BEG},
-#line 9 "keywords"
- {"__LINE__", {keyword__LINE__, keyword__LINE__}, EXPR_END},
-#line 10 "keywords"
- {"__FILE__", {keyword__FILE__, keyword__FILE__}, EXPR_END},
-#line 11 "keywords"
- {"BEGIN", {keyword_BEGIN, keyword_BEGIN}, EXPR_END},
-#line 20 "keywords"
- {"defined?", {keyword_defined, keyword_defined}, EXPR_ARG},
-#line 13 "keywords"
- {"alias", {keyword_alias, keyword_alias}, EXPR_FNAME},
- {""}, {""},
-#line 18 "keywords"
- {"class", {keyword_class, keyword_class}, EXPR_CLASS},
- {""}, {""},
-#line 47 "keywords"
- {"while", {keyword_while, modifier_while}, EXPR_VALUE}
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = hash (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- {
- register const char *s = wordlist[key].name;
-
- if (*str == *s && !strcmp (str + 1, s + 1))
- return &wordlist[key];
- }
- }
- return 0;
-}
-#line 49 "keywords"
-
-#endif
Index: ChangeLog
===================================================================
--- ChangeLog (revision 13905)
+++ ChangeLog (revision 13906)
@@ -1,3 +1,17 @@
+Tue Nov 13 15:26:33 2007 Tanaka Akira <akr@f...>
+
+ * lex.c.blt: moved from lex.c.
+
+ * lex.c.src: copied from keywords. This is the source of lex.c.blt.
+
+ * Makefile.in (lex.c): use lex.c.blt if keywords is same as lex.c.src.
+
+ * win32/Makefile.sub (lex.c): re-introduce copy rule.
+
+ * bcc32/Makefile.sub (lex.c): ditto.
+
+ * wince/Makefile.sub (lex.c): ditto.
+
Tue Nov 13 15:21:52 2007 Koichi Sasada <ko1@a...>
* compile.c (iseq_specialized_instruction): check argc.
Index: lex.c.blt
===================================================================
--- lex.c.blt (revision 0)
+++ lex.c.blt (revision 13906)
@@ -0,0 +1,214 @@
+/* C code produced by gperf version 3.0.2 */
+/* Command-line: gperf --output-file=lex.c.tmp -C -p -j1 -i 1 -g -o -t -N rb_reserved_word -k'1,3,$' keywords */
+
+#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
+ && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
+ && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
+ && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
+ && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
+ && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
+ && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
+ && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
+ && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
+ && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
+ && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
+ && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
+ && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
+ && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
+ && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
+ && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
+ && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
+ && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
+ && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
+ && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
+ && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
+ && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
+ && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
+/* The character set is not based on ISO-646. */
+error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@g...>."
+#endif
+
+#line 1 "keywords"
+
+struct kwtable {char *name; int id[2]; enum lex_state_e state;};
+const struct kwtable *rb_reserved_word _((const char *, unsigned int));
+#ifndef RIPPER
+#line 7 "keywords"
+struct kwtable;
+
+#define TOTAL_KEYWORDS 40
+#define MIN_WORD_LENGTH 2
+#define MAX_WORD_LENGTH 8
+#define MIN_HASH_VALUE 6
+#define MAX_HASH_VALUE 50
+/* maximum key range = 45, duplicates = 0 */
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+static unsigned int
+hash (str, len)
+ register const char *str;
+ register unsigned int len;
+{
+ static const unsigned char asso_values[] =
+ {
+ 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+ 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+ 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+ 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+ 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+ 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+ 51, 51, 51, 23, 51, 51, 13, 51, 1, 1,
+ 11, 12, 51, 51, 51, 51, 10, 51, 12, 51,
+ 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+ 51, 51, 51, 51, 51, 11, 51, 13, 1, 26,
+ 4, 1, 8, 28, 51, 23, 51, 1, 1, 27,
+ 5, 19, 21, 51, 8, 3, 3, 11, 51, 21,
+ 24, 16, 51, 51, 51, 51, 51, 51, 51, 51,
+ 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+ 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+ 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+ 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+ 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+ 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+ 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+ 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+ 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+ 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+ 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+ 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+ 51, 51, 51, 51, 51, 51
+ };
+ register int hval = len;
+
+ switch (hval)
+ {
+ default:
+ hval += asso_values[(unsigned char)str[2]];
+ /*FALLTHROUGH*/
+ case 2:
+ case 1:
+ hval += asso_values[(unsigned char)str[0]];
+ break;
+ }
+ return hval + asso_values[(unsigned char)str[len - 1]];
+}
+
+#ifdef __GNUC__
+__inline
+#endif
+const struct kwtable *
+rb_reserved_word (str, len)
+ register const char *str;
+ register unsigned int len;
+{
+ static const struct kwtable wordlist[] =
+ {
+ {""}, {""}, {""}, {""}, {""}, {""},
+#line 12 "keywords"
+ {"END", {keyword_END, keyword_END}, EXPR_END},
+ {""},
+#line 16 "keywords"
+ {"break", {keyword_break, keyword_break}, EXPR_MID},
+#line 22 "keywords"
+ {"else", {keyword_else, keyword_else}, EXPR_BEG},
+#line 32 "keywords"
+ {"nil", {keyword_nil, keyword_nil}, EXPR_END},
+#line 25 "keywords"
+ {"ensure", {keyword_ensure, keyword_ensure}, EXPR_BEG},
+#line 24 "keywords"
+ {"end", {keyword_end, keyword_end}, EXPR_END},
+#line 41 "keywords"
+ {"then", {keyword_then, keyword_then}, EXPR_BEG},
+#line 33 "keywords"
+ {"not", {keyword_not, keyword_not}, EXPR_VALUE},
+#line 26 "keywords"
+ {"false", {keyword_false, keyword_false}, EXPR_END},
+#line 39 "keywords"
+ {"self", {keyword_self, keyword_self}, EXPR_END},
+#line 23 "keywords"
+ {"elsif", {keyword_elsif, keyword_elsif}, EXPR_VALUE},
+#line 36 "keywords"
+ {"rescue", {keyword_rescue, modifier_rescue}, EXPR_MID},
+#line 42 "keywords"
+ {"true", {keyword_true, keyword_true}, EXPR_END},
+#line 45 "keywords"
+ {"until", {keyword_until, modifier_until}, EXPR_VALUE},
+#line 44 "keywords"
+ {"unless", {keyword_unless, modifier_unless}, EXPR_VALUE},
+#line 38 "keywords"
+ {"return", {keyword_return, keyword_return}, EXPR_MID},
+#line 19 "keywords"
+ {"def", {keyword_def, keyword_def}, EXPR_FNAME},
+#line 14 "keywords"
+ {"and", {keyword_and, keyword_and}, EXPR_VALUE},
+#line 21 "keywords"
+ {"do", {keyword_do, keyword_do}, EXPR_BEG},
+#line 48 "keywords"
+ {"yield", {keyword_yield, keyword_yield}, EXPR_ARG},
+#line 27 "keywords"
+ {"for", {keyword_for, keyword_for}, EXPR_VALUE},
+#line 43 "keywords"
+ {"undef", {keyword_undef, keyword_undef}, EXPR_FNAME},
+#line 34 "keywords"
+ {"or", {keyword_or, keyword_or}, EXPR_VALUE},
+#line 29 "keywords"
+ {"in", {keyword_in, keyword_in}, EXPR_VALUE},
+#line 46 "keywords"
+ {"when", {keyword_when, keyword_when}, EXPR_VALUE},
+#line 37 "keywords"
+ {"retry", {keyword_retry, keyword_retry}, EXPR_END},
+#line 28 "keywords"
+ {"if", {keyword_if, modifier_if}, EXPR_VALUE},
+#line 17 "keywords"
+ {"case", {keyword_case, keyword_case}, EXPR_VALUE},
+#line 35 "keywords"
+ {"redo", {keyword_redo, keyword_redo}, EXPR_END},
+#line 31 "keywords"
+ {"next", {keyword_next, keyword_next}, EXPR_MID},
+#line 40 "keywords"
+ {"super", {keyword_super, keyword_super}, EXPR_ARG},
+#line 30 "keywords"
+ {"module", {keyword_module, keyword_module}, EXPR_VALUE},
+#line 15 "keywords"
+ {"begin", {keyword_begin, keyword_begin}, EXPR_BEG},
+#line 9 "keywords"
+ {"__LINE__", {keyword__LINE__, keyword__LINE__}, EXPR_END},
+#line 10 "keywords"
+ {"__FILE__", {keyword__FILE__, keyword__FILE__}, EXPR_END},
+#line 11 "keywords"
+ {"BEGIN", {keyword_BEGIN, keyword_BEGIN}, EXPR_END},
+#line 20 "keywords"
+ {"defined?", {keyword_defined, keyword_defined}, EXPR_ARG},
+#line 13 "keywords"
+ {"alias", {keyword_alias, keyword_alias}, EXPR_FNAME},
+ {""}, {""},
+#line 18 "keywords"
+ {"class", {keyword_class, keyword_class}, EXPR_CLASS},
+ {""}, {""},
+#line 47 "keywords"
+ {"while", {keyword_while, modifier_while}, EXPR_VALUE}
+ };
+
+ if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
+ {
+ register int key = hash (str, len);
+
+ if (key <= MAX_HASH_VALUE && key >= 0)
+ {
+ register const char *s = wordlist[key].name;
+
+ if (*str == *s && !strcmp (str + 1, s + 1))
+ return &wordlist[key];
+ }
+ }
+ return 0;
+}
+#line 49 "keywords"
+
+#endif
Property changes on: lex.c.blt
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ LF
Index: lex.c.src
===================================================================
--- lex.c.src (revision 0)
+++ lex.c.src (revision 13906)
@@ -0,0 +1,50 @@
+%{
+struct kwtable {char *name; int id[2]; enum lex_state_e state;};
+const struct kwtable *rb_reserved_word _((const char *, unsigned int));
+#ifndef RIPPER
+%}
+
+struct kwtable;
+%%
+__LINE__, {keyword__LINE__, keyword__LINE__}, EXPR_END
+__FILE__, {keyword__FILE__, keyword__FILE__}, EXPR_END
+BEGIN, {keyword_BEGIN, keyword_BEGIN}, EXPR_END
+END, {keyword_END, keyword_END}, EXPR_END
+alias, {keyword_alias, keyword_alias}, EXPR_FNAME
+and, {keyword_and, keyword_and}, EXPR_VALUE
+begin, {keyword_begin, keyword_begin}, EXPR_BEG
+break, {keyword_break, keyword_break}, EXPR_MID
+case, {keyword_case, keyword_case}, EXPR_VALUE
+class, {keyword_class, keyword_class}, EXPR_CLASS
+def, {keyword_def, keyword_def}, EXPR_FNAME
+defined?, {keyword_defined, keyword_defined}, EXPR_ARG
+do, {keyword_do, keyword_do}, EXPR_BEG
+else, {keyword_else, keyword_else}, EXPR_BEG
+elsif, {keyword_elsif, keyword_elsif}, EXPR_VALUE
+end, {keyword_end, keyword_end}, EXPR_END
+ensure, {keyword_ensure, keyword_ensure}, EXPR_BEG
+false, {keyword_false, keyword_false}, EXPR_END
+for, {keyword_for, keyword_for}, EXPR_VALUE
+if, {keyword_if, modifier_if}, EXPR_VALUE
+in, {keyword_in, keyword_in}, EXPR_VALUE
+module, {keyword_module, keyword_module}, EXPR_VALUE
+next, {keyword_next, keyword_next}, EXPR_MID
+nil, {keyword_nil, keyword_nil}, EXPR_END
+not, {keyword_not, keyword_not}, EXPR_VALUE
+or, {keyword_or, keyword_or}, EXPR_VALUE
+redo, {keyword_redo, keyword_redo}, EXPR_END
+rescue, {keyword_rescue, modifier_rescue}, EXPR_MID
+retry, {keyword_retry, keyword_retry}, EXPR_END
+return, {keyword_return, keyword_return}, EXPR_MID
+self, {keyword_self, keyword_self}, EXPR_END
+super, {keyword_super, keyword_super}, EXPR_ARG
+then, {keyword_then, keyword_then}, EXPR_BEG
+true, {keyword_true, keyword_true}, EXPR_END
+undef, {keyword_undef, keyword_undef}, EXPR_FNAME
+unless, {keyword_unless, modifier_unless}, EXPR_VALUE
+until, {keyword_until, modifier_until}, EXPR_VALUE
+when, {keyword_when, keyword_when}, EXPR_VALUE
+while, {keyword_while, modifier_while}, EXPR_VALUE
+yield, {keyword_yield, keyword_yield}, EXPR_ARG
+%%
+#endif
Property changes on: lex.c.src
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ LF
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub (revision 13905)
+++ win32/Makefile.sub (revision 13906)
@@ -575,6 +575,9 @@
.rc.res:
$(RC) -I. -I$(<D) $(iconinc) -I$(srcdir)/win32 $(RFLAGS) -fo$@ $(<:\=/)
+lex.c: {$(srcdir)}lex.c.blt
+ copy $(?:/=\) $@
+
{$(srcdir)}.y.c:
$(YACC) $(YFLAGS) $(<:\=/)
sed -e "s!^ *extern char \*getenv();!/* & */!;s/^\(#.*\)y\.tab/\1parse/" y.tab.c > $@
Index: Makefile.in
===================================================================
--- Makefile.in (revision 13905)
+++ Makefile.in (revision 13906)
@@ -168,11 +168,13 @@
# * svn checkout generate a file with mtime as current time
# * XFS has a mtime with fractional part
lex.c: keywords
- ( gperf -C -p -j1 -i 1 -g -o -t -N rb_reserved_word -k1,3,$$ $? > $@.tmp && mv $@.tmp $@ ) || \
- if test -f $@; then \
- touch $@ && echo $@ touched.; \
+ if cmp -s $(srcdir)/lex.c.src $?; then \
+ cp $(srcdir)/lex.c.blt $@; \
else \
- cp $(srcdir)/lex.c $@ && echo $@ copied.; \
+ gperf -C -p -j1 -i 1 -g -o -t -N rb_reserved_word -k1,3,$$ $? > $@.tmp && \
+ mv $@.tmp $@ && \
+ cp $? $(srcdir)/lex.c.src && \
+ cp $@ $(srcdir)/lex.c.blt; \
fi
.y.c:
Index: bcc32/Makefile.sub
===================================================================
--- bcc32/Makefile.sub (revision 13905)
+++ bcc32/Makefile.sub (revision 13906)
@@ -482,6 +482,9 @@
-so_name=$(RUBY_SO_NAME) \
. $(icondirs) $(srcdir)/win32
+lex.c: {$(srcdir)}lex.c.blt
+ copy "$(?:/=\)" $@
+
post-install-bin::
@$(NULLCMD)
post-install-lib::
Index: wince/Makefile.sub
===================================================================
--- wince/Makefile.sub (revision 13905)
+++ wince/Makefile.sub (revision 13906)
@@ -527,6 +527,9 @@
.rc.res:
$(RC) -I. -I$(<D) $(iconinc) -I$(srcdir)/win32 $(RFLAGS) -fo$@ $(<:\=/)
+lex.c: {$(srcdir)}lex.c.blt
+ copy $(?:/=\) $@
+
{$(srcdir)}.y.c:
$(YACC) $(YFLAGS) $(<:\=/)
sed -e "s!^ *extern char \*getenv();!/* & */!;s/^\(#.*\)y\.tab/\1parse/" y.tab.c > $@
--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml