2005-11-23 Graydon Hoare <graydon@redhat.com>

	* elaborate.h (get_symbol_within_expression): Make visible.
	* elaborate.cxx (get_symbol_within_expression): Make non-static.
	(stat_decl_collector): New struct.
	(semantic_pass_stats): New semantic pass.
	(semantic_pass): Call it.
	(semantic_pass_symbols): Remove collection of statistic_decls from files.
	(visit_stat_op): Only fail if inferred type is not pe_long.

	* parse.cxx (parser::parse): Don't pass per-file statistic_decl
	into parse_global.
	(parser::parse_global): Don't parse global statistic_decls,
	they're obsolete.
	* parse.hh (parser::parse_global): Adjust signature to match.

	* session.h (statistic_decl::operator==): New method.

	* staptree.h (print_format::is_empty): New method.
	(stapfile::stat_decls): Remove field.
	* staptree.cxx (string_to_components): Fix bugs in format-string
	parser.

	* translate.cxx (var): Make private fields protected.
	(var::init): Support HIST_NONE stats.
	(aggvar): New struct.
	(mapvar::is_parallel): New method.
	(mapvar::call_prefix): Use it.
	(mapvar::calculate_aggregate): New method.
	(mapvar::fetch_existing_aggregate): New method.
	(mapvar::get): Support pe_stats.
	(mapvar::init): Use is_parallel(), and support HIST_NONE.
	(itervar::itervar): Only fault on pe_unknown.
	(itervar::start): Use mapvar::is_parallel and
	mapvar::fetch_existing_aggregate.
	(emit_map_type_instantiations): Include alloc.c before pmap-gen.c.
	Include pmap-gen.c for pe_stats maps.
	(c_unparser::gensym_aggregate): New method.
	(c_unparser::visit_foreach_loop): Handle mapvar::is_parallel case.
	(arrayindex_downcaster): New struct.
	(expression_is_arrayindex): New function.
	(c_tmpcounter::visit_stat_op): New method.
	(c_unparser::visit_stat_op): Implement.
	(c_unparser::visit_hist_op): Add commentary, still not implemented.

	* testsuite/buildok/stat_{insert,extract}.stp: New tests.
	* testsuite/semok/ten.stp: Correct for changes to global declarations.
	* testsuite/semko/*.stp: Likewise.

8 files changed, 11 insertions, 8 deletions

diff --git a/testsuite/semko/thirty.stp b/testsuite/semko/thirty.stp
index b8f0ab4b..b145f826 100755
--- a/testsuite/semko/thirty.stp
+++ b/testsuite/semko/thirty.stp
@@ -2,10 +2,11 @@
 
 # need one of these for each prohibited statistic operation
 
-global log_hist(x, 10)
+global x
 
 probe end
 {
+	x <<< 1
 	x = 10
 }
 
diff --git a/testsuite/semko/thirtyone.stp b/testsuite/semko/thirtyone.stp
index 4b6e98d5..0462d4d5 100755
--- a/testsuite/semko/thirtyone.stp
+++ b/testsuite/semko/thirtyone.stp
@@ -2,10 +2,11 @@
 
 # need one of these for each prohibited statistic operation
 
-global log_hist(x, 10)
+global x
 
 probe end
 {
+	x[10] <<< 1
 	x[10] = 10
 }
 
diff --git a/testsuite/semko/twentyeight.stp b/testsuite/semko/twentyeight.stp
index 68590f86..ea214596 100755
--- a/testsuite/semko/twentyeight.stp
+++ b/testsuite/semko/twentyeight.stp
@@ -2,7 +2,7 @@
 
 # need one of these for each prohibited statistic operation
 
-global log_hist(x, 10)
+global x
 
 probe end
 {
diff --git a/testsuite/semko/twentyfive.stp b/testsuite/semko/twentyfive.stp
index 7ac7e099..8758bb67 100755
--- a/testsuite/semko/twentyfive.stp
+++ b/testsuite/semko/twentyfive.stp
@@ -2,7 +2,7 @@
 
 # need one of these for each prohibited statistic operation
 
-global log_hist(x, 10), log_hist(y, 10)
+global x, y
 
 
 probe end
diff --git a/testsuite/semko/twentyfour.stp b/testsuite/semko/twentyfour.stp
index 81a69902..ae75bf31 100755
--- a/testsuite/semko/twentyfour.stp
+++ b/testsuite/semko/twentyfour.stp
@@ -2,7 +2,7 @@
 
 # need one of these for each prohibited statistic operation
 
-global log_hist(x, 10), log_hist(y, 10)
+global x, y
 
 
 probe end
diff --git a/testsuite/semko/twentynine.stp b/testsuite/semko/twentynine.stp
index 8cc2e2d5..b26e9872 100755
--- a/testsuite/semko/twentynine.stp
+++ b/testsuite/semko/twentynine.stp
@@ -2,7 +2,7 @@
 
 # need one of these for each prohibited statistic operation
 
-global log_hist(x, 10)
+global x
 
 probe end
 {
diff --git a/testsuite/semko/twentyseven.stp b/testsuite/semko/twentyseven.stp
index a678bcd2..6c5bd4f9 100755
--- a/testsuite/semko/twentyseven.stp
+++ b/testsuite/semko/twentyseven.stp
@@ -2,7 +2,7 @@
 
 # need one of these for each prohibited statistic operation
 
-global log_hist(x, 10)
+global x
 
 function foo(bar)
 {
diff --git a/testsuite/semko/twentysix.stp b/testsuite/semko/twentysix.stp
index 34d6d1d3..9ebffa4a 100755
--- a/testsuite/semko/twentysix.stp
+++ b/testsuite/semko/twentysix.stp
@@ -2,11 +2,12 @@
 
 # need one of these for each prohibited statistic operation
 
-global log_hist(x, 10)
+global x
 
 
 probe end
 {
+	x[10] <<< 1
 	x[10] = 10
 }