Commit 2e30c8a7 authored by Pietro Abate's avatar Pietro Abate
Browse files

[r2005-09-15 15:28:53 by afrisch] bug in merge

Original author: afrisch
Date: 2005-09-15 15:28:53+00:00
parent f6c96c51
...@@ -110,12 +110,10 @@ let merge (t1 : 'a t) (t2 : 'a t) = ...@@ -110,12 +110,10 @@ let merge (t1 : 'a t) (t2 : 'a t) =
let i = i + 2 in let i = i + 2 in
if (i1 = n1) then ( if (i1 = n1) then (
let l = n2 - i2 in let l = n2 - i2 in
let i2 = i2 - 2 in
Array.blit t2 i2 t i l; Array.blit t2 i2 t i l;
i + l i + l
) else if (i2 = n2) then ( ) else if (i2 = n2) then (
let l = n1 - i1 in let l = n1 - i1 in
let i1 = i1 - 2 in
Array.blit t1 i1 t i l; Array.blit t1 i1 t i l;
i + l i + l
) else ) else
...@@ -127,7 +125,6 @@ let merge (t1 : 'a t) (t2 : 'a t) = ...@@ -127,7 +125,6 @@ let merge (t1 : 'a t) (t2 : 'a t) =
set t (succ i) (get t1 (pred i1)); set t (succ i) (get t1 (pred i1));
let i = i + 2 in let i = i + 2 in
if (i1 = n1) then ( if (i1 = n1) then (
let i2 = i2 - 2 in
let l = n2 - i2 in let l = n2 - i2 in
Array.blit t2 i2 t i l; Array.blit t2 i2 t i l;
i + l i + l
...@@ -141,7 +138,6 @@ let merge (t1 : 'a t) (t2 : 'a t) = ...@@ -141,7 +138,6 @@ let merge (t1 : 'a t) (t2 : 'a t) =
let i = i + 2 in let i = i + 2 in
if (i2 = n2) then ( if (i2 = n2) then (
let l = n1 - i1 in let l = n1 - i1 in
let i1 = i1 - 2 in
Array.blit t1 i1 t i l; Array.blit t1 i1 t i l;
i + l i + l
) else ) else
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment