# HG changeset patch
# User Max Brister <max@2bass.com>
# Date 1340126144 18000
# Node ID 4b98b3f66e465bed96d69687ce8b0a6167d8f000
# Parent  9d60ee38c6e28a4ced90d9174cd988dd3ba38668
Rename jit_break to jit_branch and jit_cond_break to jit_cond_branch

* src/pt-jit.h (jit_break): Rename to jit_branch.
  (jit_cond_break): Rename to jit_cond_branch.
  (jit_break::print): Print branch instead of break.
  (jit_cond_break::print): Print cond_branch instead of cond_break.
  (JIT_VISIT_IR_NOTEMPLATE): Rename break to branch.

* src/pt-jit.cc (jit_convert::jit_convert, jit_convert::visit_simple_for_command,
  jit_convert::visit_if_command_list,  jit_convert::finish_breaks,
  jit_convert::llvm::convert::visit): Rename break to branch.

diff --git a/src/pt-jit.cc b/src/pt-jit.cc
--- a/src/pt-jit.cc
+++ b/src/pt-jit.cc
@@ -1506,7 +1506,7 @@
   assert (breaks.empty ());
   assert (continues.empty ());
 
-  block->append (create<jit_break> (final_block));
+  block->append (create<jit_branch> (final_block));
   add_block (final_block);
   
   for (vmap_t::iterator iter = vmap.begin (); iter != vmap.end (); ++iter)
@@ -1711,7 +1711,7 @@
   
   jit_value *check = block->append (create<jit_call> (jit_typeinfo::for_check,
                                                       control, iterator));
-  block->append (create<jit_cond_break> (check, body, tail));
+  block->append (create<jit_cond_branch> (check, body, tail));
   block = body;
 
   // compute the syntactical iterator
@@ -1738,7 +1738,7 @@
   add_block (check_block);
 
   if (! breaking)
-    block->append (create<jit_break> (check_block));
+    block->append (create<jit_branch> (check_block));
   finish_breaks (check_block, continues);
 
   block = check_block;
@@ -1749,7 +1749,7 @@
   block->append (create<jit_assign> (iterator, iter_inc));
   check = block->append (create<jit_call> (jit_typeinfo::for_check, control,
                                            iterator));
-  block->append (create<jit_cond_break> (check, body, tail));
+  block->append (create<jit_cond_branch> (check, body, tail));
 
   // breaks will go to our tail
   add_block (tail);
@@ -1870,7 +1870,7 @@
           jit_block *body = create<jit_block> (i == 0 ? "if_body" : "ifelse_body");
           add_block (body);
 
-          jit_instruction *br = create<jit_cond_break> (check, body,
+          jit_instruction *br = create<jit_cond_branch> (check, body,
                                                         entry_blocks[i + 1]);
           block->append (br);
           block = body;
@@ -1885,7 +1885,7 @@
       else
         {
           ++num_incomming;
-          block->append (create<jit_break> (tail));
+          block->append (create<jit_branch> (tail));
         }
     }
 
@@ -2343,7 +2343,7 @@
             {
               jit_block *succ = term->successor (1);
               term->remove ();
-              jit_break *abreak = b->append (create<jit_break> (succ));
+              jit_branch *abreak = b->append (create<jit_branch> (succ));
               abreak->infer ();
             }
 
@@ -2373,7 +2373,7 @@
        ++iter)
     {
       jit_block *b = *iter;
-      b->append (create<jit_break> (dest));
+      b->append (create<jit_branch> (dest));
     }
 }
 
@@ -2605,13 +2605,13 @@
 }
 
 void
-jit_convert::convert_llvm::visit (jit_break& b)
+jit_convert::convert_llvm::visit (jit_branch& b)
 {
   b.stash_llvm (builder.CreateBr (b.successor_llvm ()));
 }
 
 void
-jit_convert::convert_llvm::visit (jit_cond_break& cb)
+jit_convert::convert_llvm::visit (jit_cond_branch& cb)
 {
   llvm::Value *cond = cb.cond_llvm ();
   llvm::Value *br;
diff --git a/src/pt-jit.h b/src/pt-jit.h
--- a/src/pt-jit.h
+++ b/src/pt-jit.h
@@ -700,8 +700,8 @@
 
 #define JIT_VISIT_IR_NOTEMPLATE                 \
   JIT_METH(block);                              \
-  JIT_METH(break);                              \
-  JIT_METH(cond_break);                         \
+  JIT_METH(branch);                             \
+  JIT_METH(cond_branch);                        \
   JIT_METH(call);                               \
   JIT_METH(extract_argument);                   \
   JIT_METH(store_argument);                     \
@@ -1660,16 +1660,16 @@
 };
 
 class
-jit_break : public jit_terminator
+jit_branch : public jit_terminator
 {
 public:
-  jit_break (jit_block *succ) : jit_terminator (1, succ) {}
+  jit_branch (jit_block *succ) : jit_terminator (1, succ) {}
 
   virtual size_t successor_count (void) const { return 1; }
 
   virtual std::ostream& print (std::ostream& os, size_t indent = 0) const
   {
-    print_indent (os, indent) << "break: ";
+    print_indent (os, indent) << "branch: ";
     return print_successor (os);
   }
 
@@ -1677,10 +1677,10 @@
 };
 
 class
-jit_cond_break : public jit_terminator
+jit_cond_branch : public jit_terminator
 {
 public:
-  jit_cond_break (jit_value *c, jit_block *ctrue, jit_block *cfalse)
+  jit_cond_branch (jit_value *c, jit_block *ctrue, jit_block *cfalse)
     : jit_terminator (2, ctrue, cfalse, c) {}
 
   jit_value *cond (void) const { return argument (2); }
@@ -1699,7 +1699,7 @@
 
   virtual std::ostream& print (std::ostream& os, size_t indent = 0) const
   {
-    print_indent (os, indent) << "cond_break: ";
+    print_indent (os, indent) << "cond_branch: ";
     print_cond (os) << ", ";
     print_successor (os, 0) << ", ";
     return print_successor (os, 1);