Add Ast.ATOM_pexp and -pexp mode wherein pexps live beyond parsing, into later stages. Fixes to pexp pretty printer.

2 files changed, 6 insertions, 0 deletions

diff --git a/src/boot/driver/main.ml b/src/boot/driver/main.ml
index 1e4c28e834e..8f686522252 100644
--- a/src/boot/driver/main.ml
+++ b/src/boot/driver/main.ml
@@ -24,6 +24,7 @@ let (sess:Session.sess) =
     Session.sess_out = None;
     Session.sess_library_mode = false;
     Session.sess_alt_backend = false;
+    Session.sess_use_pexps = false;
     (* FIXME (issue #69): need something fancier here for unix
      * sub-flavours.
      *)
@@ -214,6 +215,10 @@ let argspecs =
      "report dependencies of input, then exit");
     ("-version", Arg.Unit (fun _ -> print_version()),
      "print version information, then exit");
+
+    (flag (fun _ -> sess.Session.sess_use_pexps <- true)
+       "-pexp"         "use pexp portion of AST");
+
   ] @ (Glue.alt_argspecs sess)
 ;;
 
diff --git a/src/boot/driver/session.ml b/src/boot/driver/session.ml
index ce5a18fb9f0..f8e79fe2034 100644
--- a/src/boot/driver/session.ml
+++ b/src/boot/driver/session.ml
@@ -13,6 +13,7 @@ type sess =
   mutable sess_out: filename option;
   mutable sess_library_mode: bool;
   mutable sess_alt_backend: bool;
+  mutable sess_use_pexps: bool;
   mutable sess_targ: target;
   mutable sess_log_lex: bool;
   mutable sess_log_parse: bool;