From 3d04363266c3f825e8f3bfbc82d3cb63e0e3a545 Mon Sep 17 00:00:00 2001
From: josh <josh@bd8a9e45-a331-0410-811e-c64571078777>
Date: Tue, 4 Nov 2008 20:01:54 +0000
Subject: [PATCH] added logic and bitwise operators

git-svn-id: svn://anubis/misc/llvm@69 bd8a9e45-a331-0410-811e-c64571078777
---
 jlc/jlc.lex | 8 ++++++++
 jlc/jlc.y   | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/jlc/jlc.lex b/jlc/jlc.lex
index 257910c..f54dab8 100644
--- a/jlc/jlc.lex
+++ b/jlc/jlc.lex
@@ -12,6 +12,14 @@
 \<\<                return LSHIFT;
 \>\>                return RSHIFT;
 
+&&                  return AND;
+\|\|                return OR;
+!                   return NOT;
+&                   return BIT_AND;
+\|                  return BIT_OR;
+\^                  return BIT_XOR;
+~                   return BIT_NEG;
+
 \+\+                return INCREMENT;
 --                  return DECREMENT;
 
diff --git a/jlc/jlc.y b/jlc/jlc.y
index 52940b5..3dc0e27 100644
--- a/jlc/jlc.y
+++ b/jlc/jlc.y
@@ -33,6 +33,14 @@ int main(int argc, char * argv[])
 %token LSHIFT;
 %token RSHIFT;
 
+%token AND;
+%token OR;
+%token NOT;
+%token BIT_AND;
+%token BIT_OR;
+%token BIT_XOR;
+%token BIT_NEG;
+
 %token INCREMENT;
 %token DECREMENT;