summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-07 02:52:37 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-07 02:52:37 +0000
commitb196d3bafd41ba20126cc019d97cd2699dbacc05 (patch)
treed7f14859ae6204f6f2822edc1b26bd505d8a4182
parent9a34aff98c9b84a305c462266be7d7098eb6cd43 (diff)
downloadruby-b196d3bafd41ba20126cc019d97cd2699dbacc05.tar.gz
ruby-b196d3bafd41ba20126cc019d97cd2699dbacc05.tar.xz
ruby-b196d3bafd41ba20126cc019d97cd2699dbacc05.zip
* parse.y (arg): typo fixed ("!" -> "|") in the ripper code.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14125 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--parse.y2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 27b63e351..a16e50faf 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 4698c35bf..78cae5a36 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