-INCLUDE "trace.ml"
-
let realloc l old_size new_size dummy =
let l' = Array.create new_size dummy in
for i = 0 to (min old_size new_size) - 1 do
Format.fprintf fmt "%s" "E")) a.line
let add a i v =
- TRACE("twopass", 2, __ "Before add (%i): %a\n%!" i print a);
if a.offset == ~-1 then a.offset <- i;
let offset = a.offset in
let len = Array.length a.line in
- let () =
if i >= offset && i < offset + len then
a.line.(i - offset) <- v
else
narray.(i - offset) <- v;
a.line <- narray
end
- in
- TRACE("twopass", 2, __ "After add (%i): %a\n%!" i print a)
let find a i =
let offset = a.offset in
struct
type 'a t = 'a Lvl1.t Lvl1.t
let create n a =
- let dummy1 = Lvl1.create 0 a in
+ let dummy1 = Lvl1.create 512 a in
{ Lvl1.line = Array.create n dummy1;
Lvl1.offset = ~-1;
Lvl1.dummy = dummy1;
let add a i j v =
- TRACE("twopass", 2, __ "Adding %i %i\n%!" i j);
let line = Lvl1.find a i in
if line == a.Lvl1.dummy then
let nline = Lvl1.create 0 line.Lvl1.dummy in
- TRACE("twopass", 2, __ "Reallocating\n%!");
Lvl1.add a i nline;
Lvl1.add nline j v
else
Lvl1.add line j v
+
let find a i j =
let v = Lvl1.find a i in
if v == a.Lvl1.dummy then a.Lvl1.dummy.Lvl1.dummy
let add a i j k v =
let line = Lvl1.find a i in
if line == a.Lvl1.dummy then
- let nline = { line with Lvl1.offset = ~-1 } in
- Lvl2.add nline j k v;
- Lvl1.add a i nline
+ let nline = Lvl1.create 0 line.Lvl1.dummy in
+ Lvl1.add a i nline;
+ Lvl2.add nline j k v
else
Lvl2.add line j k v