aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--parse.y2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 27b63e351b..a16e50fafa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Dec 6 19:52:50 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * parse.y (arg): typo fixed ("!" -> "|") in the ripper code.
+
Thu Dec 6 19:48:41 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* parse.y (arg): tUPLUS no longer works as identity operation any
diff --git a/parse.y b/parse.y
index 4698c35bfb..78cae5a367 100644
--- a/parse.y
+++ b/parse.y
@@ -2053,7 +2053,7 @@ arg : lhs '=' arg
/*%%%*/
$$ = call_bin_op($1, '|', $3);
/*%
- $$ = dispatch3(binary, $1, ID2SYM('!'), $3);
+ $$ = dispatch3(binary, $1, ID2SYM('|'), $3);
%*/
}
| arg '^' arg