diff --git a/ChangeLog b/ChangeLog
index 660ed9f8e7..984b11f878 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Oct 18 00:55:33 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_yylex): use particular enums.  [ruby-core:09221]
+
 Tue Oct 17 22:03:08 2006  Minero Aoki  <aamine@loveruby.net>
 
 	* lib/erb.rb: String#each was removed, use #each_line instead.
diff --git a/parse.y b/parse.y
index 5326daf79f..5b963aaef1 100644
--- a/parse.y
+++ b/parse.y
@@ -6498,13 +6498,13 @@ parser_yylex(struct parser_params *parser)
 		return tSTRING_BEG;
 
 	      case 'W':
-		lex_strterm = NEW_STRTERM(str_dquote | STR_FUNC_QWORDS, term, paren);
+		lex_strterm = NEW_STRTERM(str_dword, term, paren);
 		do {c = nextc();} while (ISSPACE(c));
 		pushback(c);
 		return tWORDS_BEG;
 
 	      case 'w':
-		lex_strterm = NEW_STRTERM(str_squote | STR_FUNC_QWORDS, term, paren);
+		lex_strterm = NEW_STRTERM(str_sword, term, paren);
 		do {c = nextc();} while (ISSPACE(c));
 		pushback(c);
 		return tQWORDS_BEG;