From 40687c55ba0864cd567ecf8cc911d8f871855a49 Mon Sep 17 00:00:00 2001 From: jistone Date: Wed, 21 Dec 2005 22:20:53 +0000 Subject: 2005-12-21 Josh Stone * translate.cxx (itervar::next): emit different code for pmaps --- ChangeLog | 4 ++++ translate.cxx | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8d3af735..dafbf9f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-12-21 Josh Stone + + * translate.cxx (itervar::next): emit different code for pmaps + 2005-12-21 Frank Ch. Eigler * loc2c.h: Add __attribute__ defeating code for g++ 3.3 compatibility. diff --git a/translate.cxx b/translate.cxx index 98c6813b..bda28e8b 100644 --- a/translate.cxx +++ b/translate.cxx @@ -721,7 +721,10 @@ public: if (mv.type() != referent_ty) throw semantic_error("inconsistent iterator type in itervar::next()"); - return "_stp_map_iter (" + mv.qname() + ", " + qname() + ")"; + if (mv.is_parallel()) + return "_stp_map_iter (" + mv.fetch_existing_aggregate() + ", " + qname() + ")"; + else + return "_stp_map_iter (" + mv.qname() + ", " + qname() + ")"; } string qname () const -- cgit