*** ../cil/src/mergecil.ml	2006-05-21 06:14:15.000000000 +0200
--- ../cil_patch/src/mergecil.ml	2006-06-20 17:20:05.000000000 +0200
***************
*** 1,3 ****
--- 1,5 ----
+ (* MODIF: Loop constructor replaced by 3 constructors: While, DoWhile, For. *)
+ 
  (*
   *
   * Copyright (c) 2001-2002, 
***************
*** 1151,1157 ****
--- 1153,1164 ----
                            + 41*(stmtListSum b2.bstmts)
      | Switch(_,b,_,_) -> 43 + 47*(stmtListSum b.bstmts)
                              (* don't look at stmt list b/c is not part of tree *)
+ (*
      | Loop(b,_,_,_) -> 49 + 53*(stmtListSum b.bstmts)
+ *)
+     | While(_,b,_) -> 49 + 53*(stmtListSum b.bstmts)
+     | DoWhile(_,b,_) -> 49 + 53*(stmtListSum b.bstmts)
+     | For(_,_,_,b,_) -> 49 + 53*(stmtListSum b.bstmts)
      | Block(b) -> 59 + 61*(stmtListSum b.bstmts)
      | TryExcept (b, (il, e), h, _) -> 
          67 + 83*(stmtListSum b.bstmts) + 97*(stmtListSum h.bstmts)