CHJ:LIB: fix warnings and reformat

Author: sipma

CodeHawk/CHJ/jchlib/jCHBasicTypesAPI.mli

@@ -95,16 +95,16 @@ type java_basic_type_t =
 
 class type class_name_int =
 object ('a)
-  method compare : 'a -> int
-  method equal   : 'a -> bool
-  method index   : int
-  method name    : string
-  method package : string list
+  method compare: 'a -> int
+  method equal: 'a -> bool
+  method index: int
+  method name: string
+  method package: string list
   method abbreviated_package_name: string
   method package_name: string
-  method simple_name : string
+  method simple_name: string
   method abbreviated_name: string
-  method toPretty    : pretty_t
+  method toPretty: pretty_t
 end
 
 type object_type_t = TClass of class_name_int | TArray of value_type_t
@@ -647,31 +647,33 @@ type opcode_t =
 
 class type opcodes_int =
   object
-    method replace      : int -> opcode_t -> unit
-    method at           : int -> opcode_t
-    method length       : int
-    method instr_count  : int
-    method opcodes      : opcode_t array
+    method replace: int -> opcode_t -> unit
+    method at: int -> opcode_t
+    method length: int
+    method instr_count: int
+    method opcodes: opcode_t array
 
     method offset_to_instrn_array: int array
     method offset_to_from_instrn_arrays: int array * int array
 
-    method iteri        : (int -> opcode_t -> unit) -> unit
-    method next         : int -> int option
-    method previous     : int -> int option
+    method iteri: (int -> opcode_t -> unit) -> unit
+    method next: int -> int option
+    method previous: int -> int option
 
-    method toPretty     : pretty_t
+    method toPretty: pretty_t
   end
 
+
 class type exception_handler_int =
   object
-    method catch_type   : class_name_int option
-    method h_end        : int
-    method h_start      : int
-    method handler      : int
-    method toPretty     : pretty_t
+    method catch_type: class_name_int option
+    method h_end: int
+    method h_start: int
+    method handler: int
+    method toPretty: pretty_t
   end
 
+
 class type bytecode_int =
   object
     method get_attributes          : (string * string) list

CodeHawk/CHJ/jchlib/jCHParseUTF8Signature.ml

@@ -220,18 +220,14 @@ let read_utf8 getchar =
      end
   | _ -> assert false
 
-let in_range c lower_bound upper_bound = c >= lower_bound && c <= upper_bound
-
-let is_ascii c = in_range 0x01 0x7F
-
 
 module XString = struct
   type t = string
-  let empty = ""
-  let length = String.length
-  let append = ( ^ )
-  let lowercase = String.lowercase_ascii
-  let iter f s =
+  let _empty = ""
+  let _length = String.length
+  let _append = ( ^ )
+  let _lowercase = String.lowercase_ascii
+  let _iter f s =
     let len = String.length s in
     let pos = ref ~-1 in
     let get () =
@@ -242,19 +238,21 @@ module XString = struct
       while true do f (read_utf8 get) done
     with
     | Exit -> ()
-  let of_string s = s
-  let to_utf8 f v x = f v x
+  let _of_string s = s
+  let _to_utf8 f v x = f v x
   let compare = String.compare
 end
 
-let string_equal s1 s2 = (XString.compare s1 s2) = 0
+
+let _string_equal s1 s2 = (XString.compare s1 s2) = 0
+
 
 module XBuffer = struct
-  type string = XString.t
-  type t = Buffer.t
+  type _string = XString.t
+  type _t = Buffer.t
   exception Full
   let create = Buffer.create
-  let add_char = Buffer.add_char
+  let _add_char = Buffer.add_char
   let add_uchar buffer uchar =
     try
       let store c = Buffer.add_char buffer (Char.chr c) in
@@ -282,11 +280,13 @@ module XBuffer = struct
 
   let clear = Buffer.clear
   let contents = Buffer.contents
-  let length = Buffer.length
+  let _length = Buffer.length
 end
 
+
 let c_end_of_input = max_int
 
+
 let raise_utf8_parse_error msg char_la s =
   if char_la = c_end_of_input then
     raise

CodeHawk/CHJ/jchlib/jCHParseUTF8Signature.mli

@@ -35,6 +35,7 @@ open JCHBasicTypesAPI
 
 exception UTF8ParseError of pretty_t
 
+
 val parse_base_type: string -> java_basic_type_t
 
 val parse_class_name: string -> class_name_int