From 20ee1580c79c7290ed9b365454a7535d903a8f2b Mon Sep 17 00:00:00 2001
From: Alexandre Bique <bique.alexandre@gmail.com>
Date: Thu, 29 Jan 2009 14:12:24 +0100
Subject: [PATCH] refractoring: LAndExp -> AndExp etc...

---
 src/ast/generator-data.cc               | 6 +++---
 src/ast/llvm-generator-visitor.cc       | 6 +++---
 src/ast/llvm-generator-visitor.hh       | 6 +++---
 src/ast/simplify-visitor.cc             | 6 +++---
 src/ast/simplify-visitor.hh             | 6 +++---
 src/lang/mugiwara/bison-parser/lexer.l  | 6 +++---
 src/lang/mugiwara/bison-parser/parser.y | 8 ++++----
 7 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/ast/generator-data.cc b/src/ast/generator-data.cc
index 7407bac..39c6a37 100644
--- a/src/ast/generator-data.cc
+++ b/src/ast/generator-data.cc
@@ -134,17 +134,17 @@ const ag::Node ag::nodes[] = {
     }
   },
 
-  {"LAndExp", "BinaryExp", "Expression `&'", {
+  {"AndExp", "BinaryExp", "Expression `&'", {
       {"", ""}
     }
   },
 
-  {"LOrExp", "BinaryExp", "Expression `|'", {
+  {"OrExp", "BinaryExp", "Expression `|'", {
       {"", ""}
     }
   },
 
-  {"LXorExp", "BinaryExp", "Expression `^'", {
+  {"XorExp", "BinaryExp", "Expression `^'", {
       {"", ""}
     }
   },
diff --git a/src/ast/llvm-generator-visitor.cc b/src/ast/llvm-generator-visitor.cc
index 72e4fef..1789a83 100644
--- a/src/ast/llvm-generator-visitor.cc
+++ b/src/ast/llvm-generator-visitor.cc
@@ -69,9 +69,9 @@ namespace ast
   GEN_BINARY_EXP(DivExp, "sdiv") /// @todo play with udiv and sdiv instructions
   GEN_BINARY_EXP(ModExp, "srem") /// @todo play with urem and srem instructions
 
-  GEN_BINARY_EXP(LAndExp, "and")
-  GEN_BINARY_EXP(LOrExp, "or")
-  GEN_BINARY_EXP(LXorExp, "xor")
+  GEN_BINARY_EXP(AndExp, "and")
+  GEN_BINARY_EXP(OrExp, "or")
+  GEN_BINARY_EXP(XorExp, "xor")
 
   void
   LLVMGeneratorVisitor::visit(const IdExp & node)
diff --git a/src/ast/llvm-generator-visitor.hh b/src/ast/llvm-generator-visitor.hh
index f14d593..b7bdcd0 100644
--- a/src/ast/llvm-generator-visitor.hh
+++ b/src/ast/llvm-generator-visitor.hh
@@ -38,9 +38,9 @@ namespace ast
     virtual void visit(const DivExp & node);
     virtual void visit(const ModExp & node);
 
-    virtual void visit(const LAndExp & node);
-    virtual void visit(const LOrExp & node);
-    virtual void visit(const LXorExp & node);
+    virtual void visit(const AndExp & node);
+    virtual void visit(const OrExp & node);
+    virtual void visit(const XorExp & node);
 
   protected:
     std::ostream & out_;
diff --git a/src/ast/simplify-visitor.cc b/src/ast/simplify-visitor.cc
index a980a97..81aba1d 100644
--- a/src/ast/simplify-visitor.cc
+++ b/src/ast/simplify-visitor.cc
@@ -106,9 +106,9 @@ namespace ast
   SIMPLIFY_BINARY_EXP(DivExp)
   SIMPLIFY_BINARY_EXP(ModExp)
 
-  SIMPLIFY_BINARY_EXP(LAndExp)
-  SIMPLIFY_BINARY_EXP(LOrExp)
-  SIMPLIFY_BINARY_EXP(LXorExp)
+  SIMPLIFY_BINARY_EXP(AndExp)
+  SIMPLIFY_BINARY_EXP(OrExp)
+  SIMPLIFY_BINARY_EXP(XorExp)
 
   void
   SimplifyVisitor::visit(AssignExp & node)
diff --git a/src/ast/simplify-visitor.hh b/src/ast/simplify-visitor.hh
index 72dcc3c..3f9d333 100644
--- a/src/ast/simplify-visitor.hh
+++ b/src/ast/simplify-visitor.hh
@@ -45,9 +45,9 @@ namespace ast
     virtual void visit(DivExp & node);
     virtual void visit(ModExp & node);
 
-    virtual void visit(LAndExp & node);
-    virtual void visit(LOrExp & node);
-    virtual void visit(LXorExp & node);
+    virtual void visit(AndExp & node);
+    virtual void visit(OrExp & node);
+    virtual void visit(XorExp & node);
 
 
     virtual void visit(NumberExp & node);
diff --git a/src/lang/mugiwara/bison-parser/lexer.l b/src/lang/mugiwara/bison-parser/lexer.l
index 69cf478..2494c06 100644
--- a/src/lang/mugiwara/bison-parser/lexer.l
+++ b/src/lang/mugiwara/bison-parser/lexer.l
@@ -35,9 +35,9 @@
 \/                      return DIV;
 %                       return MOD;
 
-\|                      return LOR;
-&                       return LAND;
-\^                      return LXOR;
+\|                      return OR;
+&                       return AND;
+\^                      return XOR;
 
 const                   return CONST;
 
diff --git a/src/lang/mugiwara/bison-parser/parser.y b/src/lang/mugiwara/bison-parser/parser.y
index 9b4a031..26f3df6 100644
--- a/src/lang/mugiwara/bison-parser/parser.y
+++ b/src/lang/mugiwara/bison-parser/parser.y
@@ -61,7 +61,7 @@ int yywrap(yyscan_t /*yyscanner*/)
 %token EQ SEMICOL DOT
 %token EQEQ LT LTEQ GT GTEQ NEQ
 %token ADD SUB DIV MUL MOD
-%token LOR LAND LXOR
+%token OR AND XOR
 %token LPAR RPAR LBR RBR
 
 %type <nodes> decls
@@ -169,9 +169,9 @@ mexp: mexp MUL bexp { MAKE_BINARY_EXP(MulExp, $$, $1, $3); }
 | mexp MOD bexp { MAKE_BINARY_EXP(ModExp, $$, $1, $3); }
 | bexp { assert($1); $$ = $1; };
 
-bexp: bexp LOR uexp { MAKE_BINARY_EXP(LOrExp, $$, $1, $3); }
-| bexp LAND uexp { MAKE_BINARY_EXP(LAndExp, $$, $1, $3); }
-| bexp LXOR uexp { MAKE_BINARY_EXP(LXorExp, $$, $1, $3); }
+bexp: bexp OR uexp { MAKE_BINARY_EXP(OrExp, $$, $1, $3); }
+| bexp AND uexp { MAKE_BINARY_EXP(AndExp, $$, $1, $3); }
+| bexp XOR uexp { MAKE_BINARY_EXP(XorExp, $$, $1, $3); }
 | uexp { assert($1); $$ = $1; };
 
 uexp: NUMBER {
-- 
2.11.4.GIT