From 6dc898dbd3893b1a3b790fa9e6b63106b65fd1a4 Mon Sep 17 00:00:00 2001
From: Minero Aoki <mineroaoki@gmail.com>
Date: Tue, 25 Dec 2007 21:12:31 +0000
Subject: [PATCH] * net/loveruby/cflat/parser/Parser.jj (expr10): then expr is
 expr().

git-svn-id: file:///Users/aamine/c/gitwork/public/cbc/trunk@3759 1b9489fe-b721-0410-924e-b54b9192deb8
---
 ChangeLog                           | 5 +++++
 net/loveruby/cflat/parser/Parser.jj | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index d712c7d..e5d51f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Dec 26 06:12:26 2007  Minero Aoki  <aamine@loveruby.net>
+
+	* net/loveruby/cflat/parser/Parser.jj (expr10): then expr is
+	  expr().
+
 Wed Dec 26 02:46:32 2007  Minero Aoki  <aamine@loveruby.net>
 
 	* net/loveruby/cflat/parser/Parser.jj: 5-1-1 should be 3, not 5.
diff --git a/net/loveruby/cflat/parser/Parser.jj b/net/loveruby/cflat/parser/Parser.jj
index eebf7bd..1319fe8 100644
--- a/net/loveruby/cflat/parser/Parser.jj
+++ b/net/loveruby/cflat/parser/Parser.jj
@@ -915,7 +915,7 @@ Class opassign_op(): {}
 Node expr10():
 { Node c, t, e; }
 {
-    c=expr9() ["?" t=expr10() ":" e=expr10()
+    c=expr9() ["?" t=expr() ":" e=expr10()
                     { return new CondExprNode(labelPool, c, t, e); }]
         {
             return c;