projects
/
SXSI
/
xpathcomp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use the code alignment macro also in lexindex_stub.cpp
[SXSI/xpathcomp.git]
/
src
/
cache.ml
diff --git
a/src/cache.ml
b/src/cache.ml
index
60301fe
..
abe113a
100644
(file)
--- a/
src/cache.ml
+++ b/
src/cache.ml
@@
-1,5
+1,3
@@
-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
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
@@
-30,11
+28,9
@@
struct
Format.fprintf fmt "%s" "E")) a.line
let add a i v =
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
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
if i >= offset && i < offset + len then
a.line.(i - offset) <- v
else
@@
-58,8
+54,6
@@
struct
narray.(i - offset) <- v;
a.line <- narray
end
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
let find a i =
let offset = a.offset in
@@
-86,7
+80,7
@@
module Lvl2 =
struct
type 'a t = 'a Lvl1.t Lvl1.t
let create n a =
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;
{ Lvl1.line = Array.create n dummy1;
Lvl1.offset = ~-1;
Lvl1.dummy = dummy1;
@@
-94,16
+88,15
@@
struct
let add a i j v =
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
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
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 find a i j =
let v = Lvl1.find a i in
if v == a.Lvl1.dummy then a.Lvl1.dummy.Lvl1.dummy
@@
-136,9
+129,9
@@
struct
let add a i j k v =
let line = Lvl1.find a i in
if line == a.Lvl1.dummy then
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
- Lvl
2.add nline j k v
;
- Lvl
1.add a i nline
+ let nline =
Lvl1.create 0 line.Lvl1.dummy
in
+ Lvl
1.add a i nline
;
+ Lvl
2.add nline j k v
else
Lvl2.add line j k v
else
Lvl2.add line j k v