2005-08-16 Frank Ch. Eigler <fche@elastic.org>

	* main.cxx: Don't print library parse trees if last_pass=1.

3 files changed, 12 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 74accbf0..bb0fd0f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-16  Frank Ch. Eigler  <fche@elastic.org>
+
+	* main.cxx: Don't print library parse trees if last_pass=1.
+
 2005-08-14  Roland McGrath  <roland@redhat.com>
 
 	* systemtap.spec.in: Update elfutils_version requirement to 0.113;
diff --git a/main.cxx b/main.cxx
index 99be67da..16d2df37 100644
--- a/main.cxx
+++ b/main.cxx
@@ -307,11 +307,12 @@ main (int argc, char * const argv [])
       cout << "# parse tree dump" << endl;
       s.user_file->print (cout);
       cout << endl;
-      for (unsigned i=0; i<s.library_files.size(); i++)
-        {
-          s.library_files[i]->print (cout);
-          cout << endl;
-        }
+      if (s.verbose)
+        for (unsigned i=0; i<s.library_files.size(); i++)
+          {
+            s.library_files[i]->print (cout);
+            cout << endl;
+          }
     }
 
   // syntax errors, if any, are already printed
diff --git a/staptree.cxx b/staptree.cxx
index eb811e49..843f96b7 100644
--- a/staptree.cxx
+++ b/staptree.cxx
@@ -220,8 +220,8 @@ void post_crement::print (ostream& o)
 
 void ternary_expression::print (ostream& o)
 {
-  o << "(" << *cond << ") ? ("
-    << *truevalue << ") : ("
+  o << "(" << *cond << ")?("
+    << *truevalue << "):("
     << *falsevalue << ")"; 
 }