diff --git a/ChangeLog b/ChangeLog
index 51aa7cedde..556419bf54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+Thu Apr 26 17:18:51 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y: fixes for ripper.
+
+	* parse.y (primary): reduced duplcated code.
+
+	* parse.y (f_arg_item): should not override by meaningless value.
+
+	* parse.y (f_arg, assocs): should not use $$ before assigned.
+
+	* parse.y (assoc_list): dispatch assoclist_from_args for assocs as
+	  well as args.
+
+	* parse.y (assoc): return assoc if dispatched result is $1.
+
 Thu Apr 26 13:54:51 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* misc/ruby-style.el: new file.  C/C++ style for ruby source code.
diff --git a/parse.y b/parse.y
index 14ae0a232a..4811371ae1 100644
--- a/parse.y
+++ b/parse.y
@@ -2778,15 +2778,12 @@ primary		: literal
 		    }
 		| keyword_def fname
 		    {
-		    /*%%%*/
 			$<id>$ = cur_mid;
 			cur_mid = $2;
 			in_def++;
+		    /*%%%*/
 			local_push(0);
 		    /*%
-			$<id>$ = cur_mid;
-			cur_mid = $2;
-			in_def++;
 		    %*/
 		    }
 		  f_arglist
@@ -2809,13 +2806,11 @@ primary		: literal
 		    }
 		| keyword_def singleton dot_or_colon {lex_state = EXPR_FNAME;} fname
 		    {
-		    /*%%%*/
 			in_single++;
-			local_push(0);
 		        lex_state = EXPR_END; /* force for args */
+		    /*%%%*/
+			local_push(0);
 		    /*%
-			in_single++;
-		        lex_state = EXPR_END;
 		    %*/
 		    }
 		  f_arglist
@@ -4102,7 +4097,6 @@ f_arg_item	: f_norm_arg
 			arg_var($1);
 			$$ = NEW_ARGS_AUX($1, 1);
                     /*%
-                        $$ = rb_ary_new();
                     %*/
 		    }
 		| tLPAREN f_margs rparen
@@ -4133,7 +4127,7 @@ f_arg		: f_arg_item
 			$$->nd_next = block_append($$->nd_next, $3->nd_next);
 		        rb_gc_force_recycle((VALUE)$3);
 		    /*%
-			rb_ary_push($$, $3);
+			$$ = rb_ary_push($1, $3);
 		    %*/
 		    }
  		;
@@ -4278,7 +4272,11 @@ singleton	: var_ref
 assoc_list	: none
 		| assocs trailer
 		    {
+		    /*%%%*/
 			$$ = $1;
+		    /*%
+		    	$$ = dispatch1(assoclist_from_args, $1);
+		    %*/
 		    }
 		| args trailer
 		    {
@@ -4305,7 +4303,7 @@ assocs		: assoc
 		    /*%%%*/
 			$$ = list_concat($1, $3);
 		    /*%
-			rb_ary_push($$, $3);
+			$$ = rb_ary_push($1, $3);
 		    %*/
 		    }
 		;
@@ -4316,6 +4314,7 @@ assoc		: arg_value tASSOC arg_value
 			$$ = list_append(NEW_LIST($1), $3);
 		    /*%
 			$$ = dispatch2(assoc_new, $1, $3);
+			if ($$ == $1) $$ = rb_assoc_new($1, $3);
 		    %*/
 		    }
 		| tLABEL arg_value
@@ -4323,7 +4322,8 @@ assoc		: arg_value tASSOC arg_value
 		    /*%%%*/
 			$$ = list_append(NEW_LIST(NEW_LIT(ID2SYM($1))), $2);
 		    /*%
-		    	$$ = dispatch2(assoc_new, $1, $2);
+			$$ = dispatch2(assoc_new, $1, $2);
+			if ($$ == $1) $$ = rb_assoc_new($1, $2);
 		    %*/
 		    }
 		;