2005-11-01 Frank Ch. Eigler <fche@elastic.org>

	PR 1425.
	* configure.ac: Look for rpm-devel headers and libs.
	* configure: Regenerated.
	* session.h: New file to contain systemtap_session decl.
	* staptree.h: Likewise evict statistics_decl.
	* elaborate.h: Corresponding changes.
	* main.cxx (usage): Elaborate.  Re-enable "-r RELEASE" option.
	* parse.cxx (parser): Add systemtap_session& field.  Update users.
	(scan_pp, eval_pp_conditional): New routines for preprocessing.
	(peek, next): Call it.
	(lexer::scan): Lex the preprocessor operators.
	(parser::parse): Include an extra level of exception catching
	for parse errors that occur during recovery.
	* parse.h: Corresponding changes.
	(parse_error): Allow explicit token parameter.
	* stap.1.in: Document preprocessing.
	* testsuite/parseok/fourteen.stp: New test.

1 files changed, 2 insertions, 13 deletions

diff --git a/staptree.h b/staptree.h
index 072cc2e2..11628b18 100644
--- a/staptree.h
+++ b/staptree.h
@@ -9,6 +9,7 @@
 #ifndef STAPTREE_H
 #define STAPTREE_H
 
+#include "session.h"
 #include <map>
 #include <stack>
 #include <string>
@@ -38,19 +39,7 @@ struct semantic_error: public std::runtime_error
 
 // ------------------------------------------------------------------------
 
-struct statistic_decl
-{
-  statistic_decl()
-    : type(none), 
-      logarithmic_buckets(0),
-      linear_low(0), linear_high(0), linear_step(0)
-  {}    
-  enum { none, linear, logarithmic } type;
-  int64_t logarithmic_buckets;
-  int64_t linear_low;
-  int64_t linear_high;
-  int64_t linear_step;
-};
+/* struct statistic_decl moved to session.h */
 
 // ------------------------------------------------------------------------