From 9acd26377cc0f78b666d4fbaa5d05a033015fec3 Mon Sep 17 00:00:00 2001
From: Minero Aoki <mineroaoki@gmail.com>
Date: Fri, 18 Jan 2008 22:22:32 +0000
Subject: [PATCH] * net/loveruby/cflat/parser/Parser.jj: refactoring: rename
 lvar.

git-svn-id: file:///Users/aamine/c/gitwork/public/cbc/trunk@3846 1b9489fe-b721-0410-924e-b54b9192deb8
---
 ChangeLog                           |  4 ++++
 net/loveruby/cflat/parser/Parser.jj | 28 ++++++++++++++--------------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index aa2ec33..8c488f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Jan 19 07:22:29 2008  Minero Aoki  <aamine@loveruby.net>
+
+	* net/loveruby/cflat/parser/Parser.jj: refactoring: rename lvar.
+
 Tue Jan 15 02:34:00 2008  Minero Aoki  <aamine@loveruby.net>
 
 	* net/loveruby/cflat/parser/Parser.jj: should generate special
diff --git a/net/loveruby/cflat/parser/Parser.jj b/net/loveruby/cflat/parser/Parser.jj
index 1c35088..be2e1ab 100644
--- a/net/loveruby/cflat/parser/Parser.jj
+++ b/net/loveruby/cflat/parser/Parser.jj
@@ -1022,19 +1022,19 @@ ReturnNode return_stmt():
 // #@@range/expr{
 ExprNode expr():
 {
-    ExprNode l, r, expr;
+    ExprNode lhs, rhs, expr;
     String op;
 }
 {
       LOOKAHEAD(term() "=")
-      l=term() "=" r=expr()
+      lhs=term() "=" rhs=expr()
         {
-            return new AssignNode(l, r);
+            return new AssignNode(lhs, rhs);
         }
     | LOOKAHEAD(term() opassign_op())
-      l=term() op=opassign_op() r=expr()
+      lhs=term() op=opassign_op() rhs=expr()
         {
-            return new OpAssignNode(l, op, r);
+            return new OpAssignNode(lhs, op, rhs);
         }
     | expr=expr10()
         {
@@ -1217,21 +1217,21 @@ ExprNode unary():
 // #@@range/postfix{
 ExprNode postfix():
 {
-    ExprNode base, idx;
+    ExprNode expr, idx;
     String memb;
     List args;
 }
 {
-    base=primary()
-    ( "++"                  { base = new SuffixOpNode("++", base); }
-    | "--"                  { base = new SuffixOpNode("--", base); }
-    | "[" idx=expr() "]"    { base = new ArefNode(base, idx); }
-    | "." memb=name()       { base = new MemberNode(base, memb); }
-    | "->" memb=name()      { base = new PtrMemberNode(base, memb); }
-    | "(" args=args() ")"   { base = new FuncallNode(base, args); }
+    expr=primary()
+    ( "++"                  { expr = new SuffixOpNode("++", expr); }
+    | "--"                  { expr = new SuffixOpNode("--", expr); }
+    | "[" idx=expr() "]"    { expr = new ArefNode(expr, idx); }
+    | "." memb=name()       { expr = new MemberNode(expr, memb); }
+    | "->" memb=name()      { expr = new PtrMemberNode(expr, memb); }
+    | "(" args=args() ")"   { expr = new FuncallNode(expr, args); }
     )*
         {
-            return base;
+            return expr;
         }
 }
 // #@@}