 +  method dInit (out:out_channel) (i:int) (init1:init) : unit = fprint out i (self#pInit () init1)
 +
 +  (*** auxiliary methods ***)
-+  (* Mart: hmmmm *)
 +  method private pp_storage (s:storage) : doc =
 +    let tok = match s with
 +	      | NoStorage -> "NoStorage"
 +	      | Static    -> "Static"
 +	      | Register  -> "Register"
 +	      | Extern	  -> "Extern"
-+    in pQuoted ("Storage" ^ tok)
++    in text ("Storage_" ^ tok)
 +
 +  method private pp_typeinfo (tinfo:typeinfo) : doc = if !E.verboseFlag then trace "pp_typeinfo" ;
 +    text "Typeinfo" ++ (pParens @ pCommaSep) [   

+	      | BOr -> "BOr"
+	      | LAnd -> "LAnd"
+	      | LOr -> "LOr"
+    in pQuoted ("BinOp" ^ tok )
+
+  method private pp_constant (c:constant) : doc = if !E.verboseFlag then trace "pp_constant" ;
+    match c with

 	./config.status $@
diff -urN cil.orig/src/ext/atermprinter.ml cil/src/ext/atermprinter.ml
--- cil.orig/src/ext/atermprinter.ml	1970-01-01 01:00:00.000000000 +0100
+++ cil/src/ext/atermprinter.ml	2006-02-20 10:50:49.000000000 +0100
@@ -0,0 +1,488 @@
+open Cil
+open Pretty
+open List
