Index: src/AST/Convert.cpp
===================================================================
--- src/AST/Convert.cpp	(revision e4d7c1c357a5b1b2a17a980a263be977539b988b)
+++ src/AST/Convert.cpp	(revision db6cdc0f7e39fa424be65d849107ecd0c1e8e90b)
@@ -1876,5 +1876,5 @@
 		auto&& type = GET_ACCEPT_1(type, Type);
 		auto&& attr = GET_ACCEPT_V(attributes, Attribute);
- 
+
 		auto decl = new ast::InlineMemberDecl(
 			old->location,
Index: src/AST/Decl.hpp
===================================================================
--- src/AST/Decl.hpp	(revision e4d7c1c357a5b1b2a17a980a263be977539b988b)
+++ src/AST/Decl.hpp	(revision db6cdc0f7e39fa424be65d849107ecd0c1e8e90b)
@@ -398,4 +398,5 @@
 };
 
+/// Static Assertion `_Static_assert( ... , ... );`
 class StaticAssertDecl : public Decl {
 public:
@@ -412,4 +413,5 @@
 };
 
+/// Inline Member Declaration `inline TypeName;`
 class InlineMemberDecl final : public DeclWithType {
 public:
@@ -429,4 +431,5 @@
 	MUTATE_FRIEND
 };
+
 }
 
Index: src/AST/Pass.hpp
===================================================================
--- src/AST/Pass.hpp	(revision e4d7c1c357a5b1b2a17a980a263be977539b988b)
+++ src/AST/Pass.hpp	(revision db6cdc0f7e39fa424be65d849107ecd0c1e8e90b)
@@ -141,5 +141,5 @@
 	const ast::DirectiveDecl *    visit( const ast::DirectiveDecl        * ) override final;
 	const ast::StaticAssertDecl * visit( const ast::StaticAssertDecl     * ) override final;
-	const ast::DeclWithType	*     visit( const ast::InlineMemberDecl      * ) override final;
+	const ast::DeclWithType	*     visit( const ast::InlineMemberDecl     * ) override final;
 	const ast::CompoundStmt *     visit( const ast::CompoundStmt         * ) override final;
 	const ast::Stmt *             visit( const ast::ExprStmt             * ) override final;
Index: src/AST/Pass.impl.hpp
===================================================================
--- src/AST/Pass.impl.hpp	(revision e4d7c1c357a5b1b2a17a980a263be977539b988b)
+++ src/AST/Pass.impl.hpp	(revision db6cdc0f7e39fa424be65d849107ecd0c1e8e90b)
@@ -810,5 +810,5 @@
 
 //--------------------------------------------------------------------------
-// DeclWithType
+// InlineMemberDecl
 template< typename core_t >
 const ast::DeclWithType * ast::Pass< core_t >::visit( const ast::InlineMemberDecl * node ) {
Index: src/AST/Visitor.hpp
===================================================================
--- src/AST/Visitor.hpp	(revision e4d7c1c357a5b1b2a17a980a263be977539b988b)
+++ src/AST/Visitor.hpp	(revision db6cdc0f7e39fa424be65d849107ecd0c1e8e90b)
@@ -33,5 +33,5 @@
     virtual const ast::DirectiveDecl *    visit( const ast::DirectiveDecl        * ) = 0;
     virtual const ast::StaticAssertDecl * visit( const ast::StaticAssertDecl     * ) = 0;
-    virtual const ast::DeclWithType *     visit( const ast::InlineMemberDecl      * ) = 0;
+    virtual const ast::DeclWithType *     visit( const ast::InlineMemberDecl     * ) = 0;
     virtual const ast::CompoundStmt *     visit( const ast::CompoundStmt         * ) = 0;
     virtual const ast::Stmt *             visit( const ast::ExprStmt             * ) = 0;
Index: src/Common/utility.h
===================================================================
--- src/Common/utility.h	(revision e4d7c1c357a5b1b2a17a980a263be977539b988b)
+++ src/Common/utility.h	(revision db6cdc0f7e39fa424be65d849107ecd0c1e8e90b)
@@ -461,16 +461,22 @@
 	Iterables iterables;
 
+	// Getting the iterator and value types this way preserves const.
 	template<size_t I> using Iter = decltype(std::get<I>(iterables).begin());
 	template<size_t I> using Data = decltype(*std::get<I>(iterables).begin());
 	template<typename> struct base_iterator;
 
-	template<std::size_t... Is>
-	struct base_iterator<std::integer_sequence<std::size_t, Is...>> {
-		using value_type = std::tuple< Data<Is>... >;
-		std::tuple<Iter<Is>...> iterators;
-
-		base_iterator( Iter<Is>... is ) : iterators( is... ) {}
+	// This inner template puts the sequence of `0, 1, ... sizeof...(Args)-1`
+	// into a pack. These are the indexes into the tuples, so unpacking can
+	// go over each element of the tuple.
+	// The std::integer_sequence is just used to build that sequence.
+	// A library reference will probably explain it better than I can.
+	template<std::size_t... Indices>
+	struct base_iterator<std::integer_sequence<std::size_t, Indices...>> {
+		using value_type = std::tuple< Data<Indices>... >;
+		std::tuple<Iter<Indices>...> iterators;
+
+		base_iterator( Iter<Indices>... is ) : iterators( is... ) {}
 		base_iterator operator++() {
-			return base_iterator( ++std::get<Is>( iterators )... );
+			return base_iterator( ++std::get<Indices>( iterators )... );
 		}
 		bool operator!=( const base_iterator& other ) const {
@@ -478,12 +484,12 @@
 		}
 		value_type operator*() const {
-			return std::tie( *std::get<Is>( iterators )... );
+			return std::tie( *std::get<Indices>( iterators )... );
 		}
 
 		static base_iterator make_begin( Iterables & data ) {
-			return base_iterator( std::get<Is>( data ).begin()... );
+			return base_iterator( std::get<Indices>( data ).begin()... );
 		}
 		static base_iterator make_end( Iterables & data ) {
-			return base_iterator( std::get<Is>( data ).end()... );
+			return base_iterator( std::get<Indices>( data ).end()... );
 		}
 	};
Index: src/GenPoly/ErasableScopedMap.h
===================================================================
--- src/GenPoly/ErasableScopedMap.h	(revision e4d7c1c357a5b1b2a17a980a263be977539b988b)
+++ src/GenPoly/ErasableScopedMap.h	(revision db6cdc0f7e39fa424be65d849107ecd0c1e8e90b)
@@ -23,256 +23,268 @@
 
 namespace GenPoly {
-	/// A map where the items are placed into nested scopes;
-	/// inserted items are placed into the innermost scope, lookup looks from the innermost scope outward;
-	/// erasing a key means that find() will no longer report any instance of the key in a scope further
-	/// out, but the erasure itself is scoped. Key erasure works by inserting a sentinal value into the
-	/// value field, and thus only works for Value types where a meaningful sentinal can be chosen.
-	template<typename Key, typename Value>
-	class ErasableScopedMap {
-		typedef std::map< Key, Value > Scope;
-		typedef std::vector< Scope > ScopeList;
-
-		ScopeList scopes; ///< scoped list of maps
-		Value erased;     ///< sentinal value for erased keys
-	public:
-		typedef typename Scope::key_type key_type;
-		typedef typename Scope::mapped_type mapped_type;
-		typedef typename Scope::value_type value_type;
-		typedef typename ScopeList::size_type size_type;
-		typedef typename ScopeList::difference_type difference_type;
-		typedef typename Scope::reference reference;
-		typedef typename Scope::const_reference const_reference;
-		typedef typename Scope::pointer pointer;
-		typedef typename Scope::const_pointer const_pointer;
-
-		class iterator : public std::iterator< std::bidirectional_iterator_tag,
-		                                       value_type > {
-		friend class ErasableScopedMap;
-		friend class const_iterator;
-			typedef typename std::map< Key, Value >::iterator wrapped_iterator;
-			typedef typename std::vector< std::map< Key, Value > > scope_list;
-			typedef typename scope_list::size_type size_type;
-
-			/// Checks if this iterator points to a valid item
-			bool is_valid() const {
-				return it != map->scopes[i].end() && it->second != map->erased;
+
+/// A map where the items are placed into nested scopes.
+/// Inserted items are placed into the innermost scope, lookup looks from the
+/// innermost scope outward. Erasing a key means that find() will no longer
+/// report any instance of the key in a scope further out, but the erasure
+/// itself is scoped. Key erasure works by inserting a sentinal value into
+/// the value field, and thus only works for Value types where a meaningful
+/// sentinal can be chosen.
+template<typename Key, typename Value>
+class ErasableScopedMap {
+	typedef std::map< Key, Value > Scope;
+	typedef std::vector< Scope > ScopeList;
+
+	/// Scoped list of maps.
+	ScopeList scopes;
+	/// Sentinal value for erased keys.
+	Value erased;
+public:
+	typedef typename Scope::key_type key_type;
+	typedef typename Scope::mapped_type mapped_type;
+	typedef typename Scope::value_type value_type;
+	typedef typename ScopeList::size_type size_type;
+	typedef typename ScopeList::difference_type difference_type;
+	typedef typename Scope::reference reference;
+	typedef typename Scope::const_reference const_reference;
+	typedef typename Scope::pointer pointer;
+	typedef typename Scope::const_pointer const_pointer;
+
+	// Both iterator types are complete bidirection iterators, defined below.
+	class iterator;
+	class const_iterator;
+
+	/// Starts a new scope
+	void beginScope() {
+		Scope scope;
+		scopes.push_back(scope);
+	}
+
+	/// Ends a scope; invalidates any iterators pointing to elements of that scope
+	void endScope() {
+		scopes.pop_back();
+		assert( ! scopes.empty() );
+	}
+
+	/// Default constructor initializes with one scope
+	ErasableScopedMap( const Value &erased_ ) : erased( erased_ ) { beginScope(); }
+
+	iterator begin() { return iterator(*this, scopes.back().begin(), scopes.size()-1).next_valid(); }
+	const_iterator begin() const { return const_iterator(*this, scopes.back().begin(), scopes.size()-1).next_valid(); }
+	const_iterator cbegin() const { return const_iterator(*this, scopes.back().begin(), scopes.size()-1).next_valid(); }
+	iterator end() { return iterator(*this, scopes[0].end(), 0); }
+	const_iterator end() const { return const_iterator(*this, scopes[0].end(), 0); }
+	const_iterator cend() const { return const_iterator(*this, scopes[0].end(), 0); }
+
+	/// Gets the index of the current scope (counted from 1)
+	size_type currentScope() const { return scopes.size(); }
+
+	/// Finds the given key in the outermost scope it occurs; returns end() for none such
+	iterator find( const Key &key ) {
+		for ( size_type i = scopes.size() - 1; ; --i ) {
+			typename Scope::iterator val = scopes[i].find( key );
+			if ( val != scopes[i].end() ) {
+				return val->second == erased ? end() : iterator( *this, val, i );
 			}
-
-			/// Increments on invalid
-			iterator& next_valid() {
-				if ( ! is_valid() ) { ++(*this); }
-				return *this;
+			if ( i == 0 ) break;
+		}
+		return end();
+	}
+	const_iterator find( const Key &key ) const {
+		return const_iterator( const_cast< ErasableScopedMap< Key, Value >* >(this)->find( key ) );
+	}
+
+	/// Finds the given key in the outermost scope inside the given scope where it occurs
+	iterator findNext( const_iterator &it, const Key &key ) {
+		if ( it.i == 0 ) return end();
+		for ( size_type i = it.i - 1; ; --i ) {
+			typename Scope::iterator val = scopes[i].find( key );
+			if ( val != scopes[i].end() ) {
+				return val->second == erased ? end() : iterator( *this, val, i );
 			}
-
-			/// Decrements on invalid
-			iterator& prev_valid() {
-				if ( ! is_valid() ) { --(*this); }
-				return *this;
-			}
-			
-			iterator(ErasableScopedMap< Key, Value > const &_map, const wrapped_iterator &_it, size_type _i)
-					: map(&_map), it(_it), i(_i) {}
-			
-		public:
-			iterator(const iterator &that) : map(that.map), it(that.it), i(that.i) {}
-			iterator& operator= (const iterator &that) {
-				map = that.map; i = that.i; it = that.it;
-				return *this;
-			}
-
-			reference operator* () { return *it; }
-			pointer operator-> () { return it.operator->(); }
-
-			iterator& operator++ () {
-				if ( it == map->scopes[i].end() ) {
-					if ( i == 0 ) return *this;
-					--i;
-					it = map->scopes[i].begin();
-				} else {
-					++it;
-				}
-				return next_valid();
-			}
-			iterator& operator++ (int) { iterator tmp = *this; ++(*this); return tmp; }
-
-			iterator& operator-- () {
-				// may fail if this is the begin iterator; allowed by STL spec
-				if ( it == map->scopes[i].begin() ) {
-					++i;
-					it = map->scopes[i].end();
-				}
-				--it;
-				return prev_valid();
-			}
-			iterator& operator-- (int) { iterator tmp = *this; --(*this); return tmp; }
-
-			bool operator== (const iterator &that) {
-				return map == that.map && i == that.i && it == that.it;
-			}
-			bool operator!= (const iterator &that) { return !( *this == that ); }
-
-		private:
-			ErasableScopedMap< Key, Value > const *map;
-			wrapped_iterator it;
-			size_type i;
-		};
-
-		class const_iterator : public std::iterator< std::bidirectional_iterator_tag,
-		                                             value_type > {
-		friend class ErasableScopedMap;
-			typedef typename std::map< Key, Value >::iterator wrapped_iterator;
-			typedef typename std::map< Key, Value >::const_iterator wrapped_const_iterator;
-			typedef typename std::vector< std::map< Key, Value > > scope_list;
-			typedef typename scope_list::size_type size_type;
-
-			/// Checks if this iterator points to a valid item
-			bool is_valid() const {
-				return it != map->scopes[i].end() && it->second != map->erased;
-			}
-
-			/// Increments on invalid
-			const_iterator& next_valid() {
-				if ( ! is_valid() ) { ++(*this); }
-				return *this;
-			}
-
-			/// Decrements on invalid
-			const_iterator& prev_valid() {
-				if ( ! is_valid() ) { --(*this); }
-				return *this;
-			}
-			
-			const_iterator(ErasableScopedMap< Key, Value > const &_map, const wrapped_const_iterator &_it, size_type _i)
-					: map(&_map), it(_it), i(_i) {}
-		public:
-			const_iterator(const iterator &that) : map(that.map), it(that.it), i(that.i) {}
-			const_iterator(const const_iterator &that) : map(that.map), it(that.it), i(that.i) {}
-			const_iterator& operator= (const iterator &that) {
-				map = that.map; i = that.i; it = that.it;
-				return *this;
-			}
-			const_iterator& operator= (const const_iterator &that) {
-				map = that.map; i = that.i; it = that.it;
-				return *this;
-			}
-
-			const_reference operator* () { return *it; }
-			const_pointer operator-> () { return it.operator->(); }
-
-			const_iterator& operator++ () {
-				if ( it == map->scopes[i].end() ) {
-					if ( i == 0 ) return *this;
-					--i;
-					it = map->scopes[i].begin();
-				} else {
-					++it;
-				}
-				return next_valid();
-			}
-			const_iterator& operator++ (int) { const_iterator tmp = *this; ++(*this); return tmp; }
-
-			const_iterator& operator-- () {
-				// may fail if this is the begin iterator; allowed by STL spec
-				if ( it == map->scopes[i].begin() ) {
-					++i;
-					it = map->scopes[i].end();
-				}
-				--it;
-				return prev_valid();
-			}
-			const_iterator& operator-- (int) { const_iterator tmp = *this; --(*this); return tmp; }
-
-			bool operator== (const const_iterator &that) {
-				return map == that.map && i == that.i && it == that.it;
-			}
-			bool operator!= (const const_iterator &that) { return !( *this == that ); }
-
-		private:
-			ErasableScopedMap< Key, Value > const *map;
-			wrapped_const_iterator it;
-			size_type i;
-		};
-
-		/// Starts a new scope
-		void beginScope() {
-			Scope scope;
-			scopes.push_back(scope);
-		}
-
-		/// Ends a scope; invalidates any iterators pointing to elements of that scope
-		void endScope() {
-			scopes.pop_back();
-			assert( ! scopes.empty() );
-		}
-
-		/// Default constructor initializes with one scope
-		ErasableScopedMap( const Value &erased_ ) : erased( erased_ ) { beginScope(); }
-
-		iterator begin() { return iterator(*this, scopes.back().begin(), scopes.size()-1).next_valid(); }
-		const_iterator begin() const { return const_iterator(*this, scopes.back().begin(), scopes.size()-1).next_valid(); }
-		const_iterator cbegin() const { return const_iterator(*this, scopes.back().begin(), scopes.size()-1).next_valid(); }
-		iterator end() { return iterator(*this, scopes[0].end(), 0); }
-		const_iterator end() const { return const_iterator(*this, scopes[0].end(), 0); }
-		const_iterator cend() const { return const_iterator(*this, scopes[0].end(), 0); }
-
-		/// Gets the index of the current scope (counted from 1)
-		size_type currentScope() const { return scopes.size(); }
-
-		/// Finds the given key in the outermost scope it occurs; returns end() for none such
-		iterator find( const Key &key ) {
-			for ( size_type i = scopes.size() - 1; ; --i ) {
-				typename Scope::iterator val = scopes[i].find( key );
-				if ( val != scopes[i].end() ) {
-					return val->second == erased ? end() : iterator( *this, val, i );
-				}
-				if ( i == 0 ) break;
-			}
-			return end();
-		}
-		const_iterator find( const Key &key ) const {
-				return const_iterator( const_cast< ErasableScopedMap< Key, Value >* >(this)->find( key ) );
-		}
-
-		/// Finds the given key in the outermost scope inside the given scope where it occurs
-		iterator findNext( const_iterator &it, const Key &key ) {
-			if ( it.i == 0 ) return end();
-			for ( size_type i = it.i - 1; ; --i ) {
-				typename Scope::iterator val = scopes[i].find( key );
-				if ( val != scopes[i].end() ) {
-					return val->second == erased ? end() : iterator( *this, val, i );
-				}
-				if ( i == 0 ) break;
-			}
-			return end();
-		}
-		const_iterator findNext( const_iterator &it, const Key &key ) const {
-				return const_iterator( const_cast< ErasableScopedMap< Key, Value >* >(this)->findNext( it, key ) );
-		}
-
-		/// Inserts the given key-value pair into the outermost scope
-		std::pair< iterator, bool > insert( const value_type &value ) {
-			std::pair< typename Scope::iterator, bool > res = scopes.back().insert( value );
-			return std::make_pair( iterator(*this, res.first, scopes.size()-1), res.second );
-		}
-		std::pair< iterator, bool > insert( const Key &key, const Value &value ) { return insert( std::make_pair( key, value ) ); }
-
-		/// Marks the given element as erased from this scope inward; returns 1 for erased an element, 0 otherwise
-		size_type erase( const Key &key ) {
-			typename Scope::iterator val = scopes.back().find( key );
-			if ( val != scopes.back().end() ) {
-				val->second = erased;
-				return 1;
-			} else {
-				scopes.back().insert( val, std::make_pair( key, erased ) );
-				return 0;
-			}
-		}
-
-		Value& operator[] ( const Key &key ) {
-			iterator slot = find( key );
-			if ( slot != end() ) return slot->second;
-			return insert( key, Value() ).first->second;
-		}
-	};
+			if ( i == 0 ) break;
+		}
+		return end();
+	}
+	const_iterator findNext( const_iterator &it, const Key &key ) const {
+		return const_iterator( const_cast< ErasableScopedMap< Key, Value >* >(this)->findNext( it, key ) );
+	}
+
+	/// Inserts the given key-value pair into the outermost scope
+	std::pair< iterator, bool > insert( const value_type &value ) {
+		std::pair< typename Scope::iterator, bool > res = scopes.back().insert( value );
+		return std::make_pair( iterator(*this, res.first, scopes.size()-1), res.second );
+	}
+	std::pair< iterator, bool > insert( const Key &key, const Value &value ) { return insert( std::make_pair( key, value ) ); }
+
+	/// Marks the given element as erased from this scope inward; returns 1 for erased an element, 0 otherwise
+	size_type erase( const Key &key ) {
+		typename Scope::iterator val = scopes.back().find( key );
+		if ( val != scopes.back().end() ) {
+			val->second = erased;
+			return 1;
+		} else {
+			scopes.back().insert( val, std::make_pair( key, erased ) );
+			return 0;
+		}
+	}
+
+	Value& operator[] ( const Key &key ) {
+		iterator slot = find( key );
+		if ( slot != end() ) return slot->second;
+		return insert( key, Value() ).first->second;
+	}
+};
+
+template<typename Key, typename Value>
+class ErasableScopedMap<Key, Value>::iterator :
+		public std::iterator< std::bidirectional_iterator_tag, value_type > {
+	friend class ErasableScopedMap;
+	typedef typename std::map< Key, Value >::iterator wrapped_iterator;
+	typedef typename std::vector< std::map< Key, Value > > scope_list;
+	typedef typename scope_list::size_type size_type;
+
+	/// Checks if this iterator points to a valid item
+	bool is_valid() const {
+		return it != map->scopes[i].end() && it->second != map->erased;
+	}
+
+	/// Increments on invalid
+	iterator& next_valid() {
+		if ( ! is_valid() ) { ++(*this); }
+		return *this;
+	}
+
+	/// Decrements on invalid
+	iterator& prev_valid() {
+		if ( ! is_valid() ) { --(*this); }
+		return *this;
+	}
+
+	iterator(ErasableScopedMap< Key, Value > const &_map, const wrapped_iterator &_it, size_type _i)
+			: map(&_map), it(_it), i(_i) {}
+
+public:
+	iterator(const iterator &that) : map(that.map), it(that.it), i(that.i) {}
+	iterator& operator= (const iterator &that) {
+		map = that.map; i = that.i; it = that.it;
+		return *this;
+	}
+
+	reference operator* () { return *it; }
+	pointer operator-> () { return it.operator->(); }
+
+	iterator& operator++ () {
+		if ( it == map->scopes[i].end() ) {
+			if ( i == 0 ) return *this;
+			--i;
+			it = map->scopes[i].begin();
+		} else {
+			++it;
+		}
+		return next_valid();
+	}
+
+	iterator& operator++ (int) { iterator tmp = *this; ++(*this); return tmp; }
+
+	iterator& operator-- () {
+		// may fail if this is the begin iterator; allowed by STL spec
+		if ( it == map->scopes[i].begin() ) {
+			++i;
+			it = map->scopes[i].end();
+		}
+		--it;
+		return prev_valid();
+	}
+	iterator& operator-- (int) { iterator tmp = *this; --(*this); return tmp; }
+
+	bool operator== (const iterator &that) {
+		return map == that.map && i == that.i && it == that.it;
+	}
+	bool operator!= (const iterator &that) { return !( *this == that ); }
+
+private:
+	ErasableScopedMap< Key, Value > const *map;
+	wrapped_iterator it;
+	size_type i;
+};
+
+template<typename Key, typename Value>
+class ErasableScopedMap<Key, Value>::const_iterator :
+		public std::iterator< std::bidirectional_iterator_tag, value_type > {
+	friend class ErasableScopedMap;
+	typedef typename std::map< Key, Value >::iterator wrapped_iterator;
+	typedef typename std::map< Key, Value >::const_iterator wrapped_const_iterator;
+	typedef typename std::vector< std::map< Key, Value > > scope_list;
+	typedef typename scope_list::size_type size_type;
+
+	/// Checks if this iterator points to a valid item
+	bool is_valid() const {
+		return it != map->scopes[i].end() && it->second != map->erased;
+	}
+
+	/// Increments on invalid
+	const_iterator& next_valid() {
+		if ( ! is_valid() ) { ++(*this); }
+		return *this;
+	}
+
+	/// Decrements on invalid
+	const_iterator& prev_valid() {
+		if ( ! is_valid() ) { --(*this); }
+		return *this;
+	}
+
+	const_iterator(ErasableScopedMap< Key, Value > const &_map, const wrapped_const_iterator &_it, size_type _i)
+			: map(&_map), it(_it), i(_i) {}
+public:
+	const_iterator(const iterator &that) : map(that.map), it(that.it), i(that.i) {}
+	const_iterator(const const_iterator &that) : map(that.map), it(that.it), i(that.i) {}
+	const_iterator& operator= (const iterator &that) {
+		map = that.map; i = that.i; it = that.it;
+		return *this;
+	}
+	const_iterator& operator= (const const_iterator &that) {
+		map = that.map; i = that.i; it = that.it;
+		return *this;
+	}
+
+	const_reference operator* () { return *it; }
+	const_pointer operator-> () { return it.operator->(); }
+
+	const_iterator& operator++ () {
+		if ( it == map->scopes[i].end() ) {
+			if ( i == 0 ) return *this;
+			--i;
+			it = map->scopes[i].begin();
+		} else {
+			++it;
+		}
+		return next_valid();
+	}
+	const_iterator& operator++ (int) { const_iterator tmp = *this; ++(*this); return tmp; }
+
+	const_iterator& operator-- () {
+		// may fail if this is the begin iterator; allowed by STL spec
+		if ( it == map->scopes[i].begin() ) {
+			++i;
+			it = map->scopes[i].end();
+		}
+		--it;
+		return prev_valid();
+	}
+	const_iterator& operator-- (int) { const_iterator tmp = *this; --(*this); return tmp; }
+
+	bool operator== (const const_iterator &that) {
+		return map == that.map && i == that.i && it == that.it;
+	}
+	bool operator!= (const const_iterator &that) { return !( *this == that ); }
+
+private:
+	ErasableScopedMap< Key, Value > const *map;
+	wrapped_const_iterator it;
+	size_type i;
+};
+
 } // namespace GenPoly
 
Index: src/Validate/EnumAndPointerDecay.cpp
===================================================================
--- src/Validate/EnumAndPointerDecay.cpp	(revision e4d7c1c357a5b1b2a17a980a263be977539b988b)
+++ src/Validate/EnumAndPointerDecay.cpp	(revision db6cdc0f7e39fa424be65d849107ecd0c1e8e90b)
@@ -41,22 +41,25 @@
 	auto mut = ast::mutate( decl );
 	std::vector<ast::ptr<ast::Decl>> buffer;
-	for ( auto it = decl->members.begin(); it != decl->members.end(); ++it ) {
-		if ( ast::ObjectDecl const * object = (*it).as<ast::ObjectDecl>() ) {
-			buffer.push_back( ast::mutate_field( object, &ast::ObjectDecl::type, new ast::EnumInstType( decl, ast::CV::Const ) ) );
-		} else if ( ast::InlineMemberDecl const * value = (*it).as<ast::InlineMemberDecl>() ) {
+	for ( auto member : decl->members ) {
+		if ( ast::ObjectDecl const * object = member.as<ast::ObjectDecl>() ) {
+			buffer.push_back( ast::mutate_field( object,
+				&ast::ObjectDecl::type,
+				new ast::EnumInstType( decl, ast::CV::Const ) ) );
+		} else if ( auto value = member.as<ast::InlineMemberDecl>() ) {
 			if ( auto targetEnum = symtab.lookupEnum( value->name ) ) {
-				for ( auto singleMember : targetEnum->members ) {
-					auto copyingMember = singleMember.as<ast::ObjectDecl>();
+				for ( auto enumMember : targetEnum->members ) {
+					auto enumObject = enumMember.strict_as<ast::ObjectDecl>();
 					buffer.push_back( new ast::ObjectDecl(
-						value->location, // use the "inline" location
-						copyingMember->name,
+						// Get the location from the "inline" declaration.
+						value->location,
+						enumObject->name,
+						// Construct a new EnumInstType as the type.
 						new ast::EnumInstType( decl, ast::CV::Const ),
-						// Construct a new EnumInstType as the type
-						copyingMember->init,
-						copyingMember->storage,
-						copyingMember->linkage,
-						copyingMember->bitfieldWidth,
+						enumObject->init,
+						enumObject->storage,
+						enumObject->linkage,
+						enumObject->bitfieldWidth,
 						{},
-						copyingMember->funcSpec
+						enumObject->funcSpec
 					) );
 				}
Index: sts/.expect/ifwhileCtl.txt
===================================================================
--- tests/.expect/ifwhileCtl.txt	(revision e4d7c1c357a5b1b2a17a980a263be977539b988b)
+++ 	(revision )
@@ -1,7 +1,0 @@
-x != 0 correct
-x != 0 && y != 0 correct
-x == y correct
-s.i < 4 correct
-x != 0 correct
-x == y correct
-s.i < 4 correct
Index: sts/.expect/loop-inc.txt
===================================================================
--- tests/.expect/loop-inc.txt	(revision e4d7c1c357a5b1b2a17a980a263be977539b988b)
+++ 	(revision )
@@ -1,3 +1,0 @@
-loop
-loop
-done
Index: sts/.expect/loop_else.txt
===================================================================
--- tests/.expect/loop_else.txt	(revision e4d7c1c357a5b1b2a17a980a263be977539b988b)
+++ 	(revision )
@@ -1,64 +1,0 @@
-empty
-empty
-empty
-
-false else
-
-else zero
-A else
-A A A A A A A A A A else
-A A A A A A A A A A A else
-B B B B B else
-C C C C C else
-D D D D D else
-E E E E E else
-
-0 1 2 3 4 5 6 7 8 9 else
-0 1 2 3 4 5 6 7 8 9 10 else
-1 3 5 7 9 else
-10 8 6 4 2 else
-0.5 1.5 2.5 3.5 4.5 else
-5.5 4.5 3.5 2.5 1.5 else
-2 4 6 8 10 else
-10 8 6 4 2 else
-
-1 2 3 4 5 6 7 8 9 10
-10 9 8 7 6 5 4 3 2 1 0
-2 4 6 8 10
-2.1 3.8 5.5 7.2 8.9
-10 8 6 4 2 0
-12.1 10.4 8.7 7. 5.3 3.6
-
-N N N N N N N N N N else
-0 1 2 3 4 5 6 7 8 9 else
-0 1 2 3 4 5 6 7 8 9 10 else
-10 9 8 7 6 5 4 3 2 1 0 else
-
-3 6 9 else
-
-0 -5 1 -4 2 -3 3 -2 4 -1 5 0 6 1 7 2 8 3 9 4 else
-0 -5 1 -6 2 -7 3 -8 4 -9 5 -10 6 -11 7 -12 8 -13 9 -14 else
-0 -5 1 -3 2 -1 3 1 4 3 5 5 6 7 7 9 8 11 9 13 else
-0 -5 1 -7 2 -9 3 -11 4 -13 5 -15 6 -17 7 -19 8 -21 9 -23 else
-
-0 -5 1 -4 2 -3 3 -2 4 -1 5 0 6 1 7 2 8 3 9 4 else
-0 -5 1 -6 2 -7 3 -8 4 -9 5 -10 6 -11 7 -12 8 -13 9 -14 else
-0 -5 1 -3 2 -1 3 1 4 3 5 5 6 7 7 9 8 11 9 13 else
-0 -5 1 -7 2 -9 3 -11 4 -13 5 -15 6 -17 7 -19 8 -21 9 -23 else
-
-0 -5 1.5 1 -7 2.5 2 -9 3.5 3 -11 4.5 4 -13 5.5 5 -15 6.5 6 -17 7.5 7 -19 8.5 8 -21 9.5 9 -23 10.5 else
-0 -5 1.5 1 -7 2.5 2 -9 3.5 3 -11 4.5 4 -13 5.5 5 -15 6.5 6 -17 7.5 7 -19 8.5 8 -21 9.5 9 -23 10.5 else
-0 -5 1.5 1 -7 2.5 2 -9 3.5 3 -11 4.5 4 -13 5.5 5 -15 6.5 6 -17 7.5 7 -19 8.5 8 -21 9.5 9 -23 10.5 else
-(0 0)(1 1)(2 2)(3 3)(4 4)(5 5)(6 6)(7 7)(8 8)(9 9)else
-(0 0)(1 1)(2 2)(3 3)(4 4)(5 5)(6 6)(7 7)(8 8)(9 9)else
-
-(0 0)(1 1)(2 2)(3 3)(4 4)(5 5)(6 6)(7 7)(8 8)(9 9)else
-(0 0)(1 1)(2 2)(3 3)(4 4)(5 5)(6 6)(7 7)(8 8)(9 9)else
-(0 0)(1 1)(2 2)(3 3)(4 4)(5 5)(6 6)(7 7)(8 8)(9 9)(10 10)else
-(0 0)(1 1)(2 2)(3 3)(4 4)(5 5)(6 6)(7 7)(8 8)(9 9)(10 10)else
-
-(10 10)(9 9)(8 8)(7 7)(6 6)(5 5)(4 4)(3 3)(2 2)(1 1)else
-(10 10)(9 9)(8 8)(7 7)(6 6)(5 5)(4 4)(3 3)(2 2)(1 1)else
-(10 10)(9 9)(8 8)(7 7)(6 6)(5 5)(4 4)(3 3)(2 2)(1 1)(0 0)else
-(10 10)(9 9)(8 8)(7 7)(6 6)(5 5)(4 4)(3 3)(2 2)(1 1)(0 0)else
-
Index: sts/.expect/loopctrl.txt
===================================================================
--- tests/.expect/loopctrl.txt	(revision e4d7c1c357a5b1b2a17a980a263be977539b988b)
+++ 	(revision )
@@ -1,109 +1,0 @@
-empty
-empty
-empty
-
-zero
-A
-A A A A A A A A A A
-A A A A A A A A A A A
-B B B B B
-C C C C C
-D D D D D
-E E E E E
-
-0 1 2 3 4 5 6 7 8 9
-0 1 2 3 4 5 6 7 8 9 10
-1 3 5 7 9
-10 8 6 4 2
-0.5 1.5 2.5 3.5 4.5
-5.5 4.5 3.5 2.5 1.5
-2 4 6 8 10
-10 8 6 4 2
-
-1 2 3 4 5 6 7 8 9 10
-10 9 8 7 6 5 4 3 2 1 0
-2 4 6 8 10
-2.1 3.8 5.5 7.2 8.9
-10 8 6 4 2 0
-12.1 10.4 8.7 7. 5.3 3.6
-
-N N N N N N N N N N
-0 1 2 3 4 5 6 7 8 9
-0 1 2 3 4 5 6 7 8 9 10
-10 9 8 7 6 5 4 3 2 1 0
-
-3 6 9
-
-0 -5 1 -4 2 -3 3 -2 4 -1 5 0 6 1 7 2 8 3 9 4
-0 -5 1 -6 2 -7 3 -8 4 -9 5 -10 6 -11 7 -12 8 -13 9 -14
-0 -5 1 -3 2 -1 3 1 4 3 5 5 6 7 7 9 8 11 9 13
-0 -5 1 -7 2 -9 3 -11 4 -13 5 -15 6 -17 7 -19 8 -21 9 -23
-
-0 -5 1 -4 2 -3 3 -2 4 -1 5 0 6 1 7 2 8 3 9 4
-0 -5 1 -6 2 -7 3 -8 4 -9 5 -10 6 -11 7 -12 8 -13 9 -14
-0 -5 1 -3 2 -1 3 1 4 3 5 5 6 7 7 9 8 11 9 13
-0 -5 1 -7 2 -9 3 -11 4 -13 5 -15 6 -17 7 -19 8 -21 9 -23
-
-0 -5 1.5 1 -7 2.5 2 -9 3.5 3 -11 4.5 4 -13 5.5 5 -15 6.5 6 -17 7.5 7 -19 8.5 8 -21 9.5 9 -23 10.5
-0 -5 1.5 1 -7 2.5 2 -9 3.5 3 -11 4.5 4 -13 5.5 5 -15 6.5 6 -17 7.5 7 -19 8.5 8 -21 9.5 9 -23 10.5
-0 -5 1.5 1 -7 2.5 2 -9 3.5 3 -11 4.5 4 -13 5.5 5 -15 6.5 6 -17 7.5 7 -19 8.5 8 -21 9.5 9 -23 10.5
-(0 0)(1 1)(2 2)(3 3)(4 4)(5 5)(6 6)(7 7)(8 8)(9 9)
-(0 0)(1 1)(2 2)(3 3)(4 4)(5 5)(6 6)(7 7)(8 8)(9 9)
-
-(0 0)(1 1)(2 2)(3 3)(4 4)(5 5)(6 6)(7 7)(8 8)(9 9)
-(0 0)(1 1)(2 2)(3 3)(4 4)(5 5)(6 6)(7 7)(8 8)(9 9)
-(0 0)(1 1)(2 2)(3 3)(4 4)(5 5)(6 6)(7 7)(8 8)(9 9)(10 10)
-(0 0)(1 1)(2 2)(3 3)(4 4)(5 5)(6 6)(7 7)(8 8)(9 9)(10 10)
-
-(10 10)(9 9)(8 8)(7 7)(6 6)(5 5)(4 4)(3 3)(2 2)(1 1)
-(10 10)(9 9)(8 8)(7 7)(6 6)(5 5)(4 4)(3 3)(2 2)(1 1)
-(10 10)(9 9)(8 8)(7 7)(6 6)(5 5)(4 4)(3 3)(2 2)(1 1)(0 0)
-(10 10)(9 9)(8 8)(7 7)(6 6)(5 5)(4 4)(3 3)(2 2)(1 1)(0 0)
-
-A A A A A A A A A A
-B B B B B B B B B B B
-C C C C C C C C C C
-D D D D D D D D D D D
-A A A A A A A A A A
-B B B B B B B B B B B
-C C C C C C C C C C
-D D D D D D D D D D D
-A A A A A
-B B B B B B
-C C C C C
-D D D D D D
-0 1 2 3 4 5 6 7 8 9
-0 1 2 3 4 5 6 7 8 9 10
-10 9 8 7 6 5 4 3 2 1
-10 9 8 7 6 5 4 3 2 1 0
-0 1 2 3 4 5 6 7 8 9
-0 1 2 3 4 5 6 7 8 9 10
-10 9 8 7 6 5 4 3 2 1
-10 9 8 7 6 5 4 3 2 1 0
-0 2 4 6 8
-0 2 4 6 8 10
-10 8 6 4 2
-10 8 6 4 2 0
-0 1 2 3 4 5 6 7 8 9
-0 1 2 3 4 5 6 7 8 9
-0 1 2 3 4 5 6 7 8 9 10
-10 9 8 7 6 5 4 3 2 1
-10 9 8 7 6 5 4 3 2 1 0
-0 1 2 3 4 5 6 7 8 9
-0 1 2 3 4 5 6 7 8 9 10
-10 9 8 7 6 5 4 3 2 1
-10 9 8 7 6 5 4 3 2 1 0
-0 2 4 6 8
-0 2 4 6 8 10
-10 8 6 4 2
-10 8 6 4 2 0
-0 1 2 3 4 5 6 7 8 9
-0 -1 -2 -3 -4 -5 -6 -7 -8 -9
-0 2 4 6 8
-0 -2 -4 -6 -8
-0 1 2 3 4 5 6 7 8 9
-0 2 4 6 8
-0 -2 -4 -6 -8
-0 2 4 6 8
-0 -2 -4 -6 -8
-0 1 2 3 4 5 6 7 8 9
Index: tests/ctrl-flow/.expect/ifwhileCtl.txt
===================================================================
--- tests/ctrl-flow/.expect/ifwhileCtl.txt	(revision db6cdc0f7e39fa424be65d849107ecd0c1e8e90b)
+++ tests/ctrl-flow/.expect/ifwhileCtl.txt	(revision db6cdc0f7e39fa424be65d849107ecd0c1e8e90b)
@@ -0,0 +1,7 @@
+x != 0 correct
+x != 0 && y != 0 correct
+x == y correct
+s.i < 4 correct
+x != 0 correct
+x == y correct
+s.i < 4 correct
Index: tests/ctrl-flow/.expect/loop-inc.txt
===================================================================
--- tests/ctrl-flow/.expect/loop-inc.txt	(revision db6cdc0f7e39fa424be65d849107ecd0c1e8e90b)
+++ tests/ctrl-flow/.expect/loop-inc.txt	(revision db6cdc0f7e39fa424be65d849107ecd0c1e8e90b)
@@ -0,0 +1,3 @@
+loop
+loop
+done
Index: tests/ctrl-flow/.expect/loop_else.txt
===================================================================
--- tests/ctrl-flow/.expect/loop_else.txt	(revision db6cdc0f7e39fa424be65d849107ecd0c1e8e90b)
+++ tests/ctrl-flow/.expect/loop_else.txt	(revision db6cdc0f7e39fa424be65d849107ecd0c1e8e90b)
@@ -0,0 +1,64 @@
+empty
+empty
+empty
+
+false else
+
+else zero
+A else
+A A A A A A A A A A else
+A A A A A A A A A A A else
+B B B B B else
+C C C C C else
+D D D D D else
+E E E E E else
+
+0 1 2 3 4 5 6 7 8 9 else
+0 1 2 3 4 5 6 7 8 9 10 else
+1 3 5 7 9 else
+10 8 6 4 2 else
+0.5 1.5 2.5 3.5 4.5 else
+5.5 4.5 3.5 2.5 1.5 else
+2 4 6 8 10 else
+10 8 6 4 2 else
+
+1 2 3 4 5 6 7 8 9 10
+10 9 8 7 6 5 4 3 2 1 0
+2 4 6 8 10
+2.1 3.8 5.5 7.2 8.9
+10 8 6 4 2 0
+12.1 10.4 8.7 7. 5.3 3.6
+
+N N N N N N N N N N else
+0 1 2 3 4 5 6 7 8 9 else
+0 1 2 3 4 5 6 7 8 9 10 else
+10 9 8 7 6 5 4 3 2 1 0 else
+
+3 6 9 else
+
+0 -5 1 -4 2 -3 3 -2 4 -1 5 0 6 1 7 2 8 3 9 4 else
+0 -5 1 -6 2 -7 3 -8 4 -9 5 -10 6 -11 7 -12 8 -13 9 -14 else
+0 -5 1 -3 2 -1 3 1 4 3 5 5 6 7 7 9 8 11 9 13 else
+0 -5 1 -7 2 -9 3 -11 4 -13 5 -15 6 -17 7 -19 8 -21 9 -23 else
+
+0 -5 1 -4 2 -3 3 -2 4 -1 5 0 6 1 7 2 8 3 9 4 else
+0 -5 1 -6 2 -7 3 -8 4 -9 5 -10 6 -11 7 -12 8 -13 9 -14 else
+0 -5 1 -3 2 -1 3 1 4 3 5 5 6 7 7 9 8 11 9 13 else
+0 -5 1 -7 2 -9 3 -11 4 -13 5 -15 6 -17 7 -19 8 -21 9 -23 else
+
+0 -5 1.5 1 -7 2.5 2 -9 3.5 3 -11 4.5 4 -13 5.5 5 -15 6.5 6 -17 7.5 7 -19 8.5 8 -21 9.5 9 -23 10.5 else
+0 -5 1.5 1 -7 2.5 2 -9 3.5 3 -11 4.5 4 -13 5.5 5 -15 6.5 6 -17 7.5 7 -19 8.5 8 -21 9.5 9 -23 10.5 else
+0 -5 1.5 1 -7 2.5 2 -9 3.5 3 -11 4.5 4 -13 5.5 5 -15 6.5 6 -17 7.5 7 -19 8.5 8 -21 9.5 9 -23 10.5 else
+(0 0)(1 1)(2 2)(3 3)(4 4)(5 5)(6 6)(7 7)(8 8)(9 9)else
+(0 0)(1 1)(2 2)(3 3)(4 4)(5 5)(6 6)(7 7)(8 8)(9 9)else
+
+(0 0)(1 1)(2 2)(3 3)(4 4)(5 5)(6 6)(7 7)(8 8)(9 9)else
+(0 0)(1 1)(2 2)(3 3)(4 4)(5 5)(6 6)(7 7)(8 8)(9 9)else
+(0 0)(1 1)(2 2)(3 3)(4 4)(5 5)(6 6)(7 7)(8 8)(9 9)(10 10)else
+(0 0)(1 1)(2 2)(3 3)(4 4)(5 5)(6 6)(7 7)(8 8)(9 9)(10 10)else
+
+(10 10)(9 9)(8 8)(7 7)(6 6)(5 5)(4 4)(3 3)(2 2)(1 1)else
+(10 10)(9 9)(8 8)(7 7)(6 6)(5 5)(4 4)(3 3)(2 2)(1 1)else
+(10 10)(9 9)(8 8)(7 7)(6 6)(5 5)(4 4)(3 3)(2 2)(1 1)(0 0)else
+(10 10)(9 9)(8 8)(7 7)(6 6)(5 5)(4 4)(3 3)(2 2)(1 1)(0 0)else
+
Index: tests/ctrl-flow/.expect/loopctrl.txt
===================================================================
--- tests/ctrl-flow/.expect/loopctrl.txt	(revision db6cdc0f7e39fa424be65d849107ecd0c1e8e90b)
+++ tests/ctrl-flow/.expect/loopctrl.txt	(revision db6cdc0f7e39fa424be65d849107ecd0c1e8e90b)
@@ -0,0 +1,109 @@
+empty
+empty
+empty
+
+zero
+A
+A A A A A A A A A A
+A A A A A A A A A A A
+B B B B B
+C C C C C
+D D D D D
+E E E E E
+
+0 1 2 3 4 5 6 7 8 9
+0 1 2 3 4 5 6 7 8 9 10
+1 3 5 7 9
+10 8 6 4 2
+0.5 1.5 2.5 3.5 4.5
+5.5 4.5 3.5 2.5 1.5
+2 4 6 8 10
+10 8 6 4 2
+
+1 2 3 4 5 6 7 8 9 10
+10 9 8 7 6 5 4 3 2 1 0
+2 4 6 8 10
+2.1 3.8 5.5 7.2 8.9
+10 8 6 4 2 0
+12.1 10.4 8.7 7. 5.3 3.6
+
+N N N N N N N N N N
+0 1 2 3 4 5 6 7 8 9
+0 1 2 3 4 5 6 7 8 9 10
+10 9 8 7 6 5 4 3 2 1 0
+
+3 6 9
+
+0 -5 1 -4 2 -3 3 -2 4 -1 5 0 6 1 7 2 8 3 9 4
+0 -5 1 -6 2 -7 3 -8 4 -9 5 -10 6 -11 7 -12 8 -13 9 -14
+0 -5 1 -3 2 -1 3 1 4 3 5 5 6 7 7 9 8 11 9 13
+0 -5 1 -7 2 -9 3 -11 4 -13 5 -15 6 -17 7 -19 8 -21 9 -23
+
+0 -5 1 -4 2 -3 3 -2 4 -1 5 0 6 1 7 2 8 3 9 4
+0 -5 1 -6 2 -7 3 -8 4 -9 5 -10 6 -11 7 -12 8 -13 9 -14
+0 -5 1 -3 2 -1 3 1 4 3 5 5 6 7 7 9 8 11 9 13
+0 -5 1 -7 2 -9 3 -11 4 -13 5 -15 6 -17 7 -19 8 -21 9 -23
+
+0 -5 1.5 1 -7 2.5 2 -9 3.5 3 -11 4.5 4 -13 5.5 5 -15 6.5 6 -17 7.5 7 -19 8.5 8 -21 9.5 9 -23 10.5
+0 -5 1.5 1 -7 2.5 2 -9 3.5 3 -11 4.5 4 -13 5.5 5 -15 6.5 6 -17 7.5 7 -19 8.5 8 -21 9.5 9 -23 10.5
+0 -5 1.5 1 -7 2.5 2 -9 3.5 3 -11 4.5 4 -13 5.5 5 -15 6.5 6 -17 7.5 7 -19 8.5 8 -21 9.5 9 -23 10.5
+(0 0)(1 1)(2 2)(3 3)(4 4)(5 5)(6 6)(7 7)(8 8)(9 9)
+(0 0)(1 1)(2 2)(3 3)(4 4)(5 5)(6 6)(7 7)(8 8)(9 9)
+
+(0 0)(1 1)(2 2)(3 3)(4 4)(5 5)(6 6)(7 7)(8 8)(9 9)
+(0 0)(1 1)(2 2)(3 3)(4 4)(5 5)(6 6)(7 7)(8 8)(9 9)
+(0 0)(1 1)(2 2)(3 3)(4 4)(5 5)(6 6)(7 7)(8 8)(9 9)(10 10)
+(0 0)(1 1)(2 2)(3 3)(4 4)(5 5)(6 6)(7 7)(8 8)(9 9)(10 10)
+
+(10 10)(9 9)(8 8)(7 7)(6 6)(5 5)(4 4)(3 3)(2 2)(1 1)
+(10 10)(9 9)(8 8)(7 7)(6 6)(5 5)(4 4)(3 3)(2 2)(1 1)
+(10 10)(9 9)(8 8)(7 7)(6 6)(5 5)(4 4)(3 3)(2 2)(1 1)(0 0)
+(10 10)(9 9)(8 8)(7 7)(6 6)(5 5)(4 4)(3 3)(2 2)(1 1)(0 0)
+
+A A A A A A A A A A
+B B B B B B B B B B B
+C C C C C C C C C C
+D D D D D D D D D D D
+A A A A A A A A A A
+B B B B B B B B B B B
+C C C C C C C C C C
+D D D D D D D D D D D
+A A A A A
+B B B B B B
+C C C C C
+D D D D D D
+0 1 2 3 4 5 6 7 8 9
+0 1 2 3 4 5 6 7 8 9 10
+10 9 8 7 6 5 4 3 2 1
+10 9 8 7 6 5 4 3 2 1 0
+0 1 2 3 4 5 6 7 8 9
+0 1 2 3 4 5 6 7 8 9 10
+10 9 8 7 6 5 4 3 2 1
+10 9 8 7 6 5 4 3 2 1 0
+0 2 4 6 8
+0 2 4 6 8 10
+10 8 6 4 2
+10 8 6 4 2 0
+0 1 2 3 4 5 6 7 8 9
+0 1 2 3 4 5 6 7 8 9
+0 1 2 3 4 5 6 7 8 9 10
+10 9 8 7 6 5 4 3 2 1
+10 9 8 7 6 5 4 3 2 1 0
+0 1 2 3 4 5 6 7 8 9
+0 1 2 3 4 5 6 7 8 9 10
+10 9 8 7 6 5 4 3 2 1
+10 9 8 7 6 5 4 3 2 1 0
+0 2 4 6 8
+0 2 4 6 8 10
+10 8 6 4 2
+10 8 6 4 2 0
+0 1 2 3 4 5 6 7 8 9
+0 -1 -2 -3 -4 -5 -6 -7 -8 -9
+0 2 4 6 8
+0 -2 -4 -6 -8
+0 1 2 3 4 5 6 7 8 9
+0 2 4 6 8
+0 -2 -4 -6 -8
+0 2 4 6 8
+0 -2 -4 -6 -8
+0 1 2 3 4 5 6 7 8 9
Index: tests/ctrl-flow/ifwhileCtl.cfa
===================================================================
--- tests/ctrl-flow/ifwhileCtl.cfa	(revision db6cdc0f7e39fa424be65d849107ecd0c1e8e90b)
+++ tests/ctrl-flow/ifwhileCtl.cfa	(revision db6cdc0f7e39fa424be65d849107ecd0c1e8e90b)
@@ -0,0 +1,75 @@
+//
+// Cforall Version 1.0.0 Copyright (C) 2017 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+//
+// ifwhileCtl.cfa --
+//
+// Author           : Peter A. Buhr
+// Created On       : Sat Aug 26 10:13:11 2017
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Dec  4 21:39:18 2018
+// Update Count     : 23
+//
+
+#include <fstream.hfa>
+
+int f( int r ) { return r; }
+
+int main( void ) {
+	int x = 4, y = 3;
+
+	if ( int x = 1 ) {
+		sout | "x != 0 correct";
+	} else {
+		sout | "x == 0 incorrect";
+	} // if
+
+	if ( int x = 4, y = 0 ) {
+		sout | "x != 0 && y != 0 incorrect";
+	} else if ( int x = 4, y = 1 ) {
+		sout | "x != 0 && y != 0 correct";
+	} else {
+		sout | "x == 0 || y == 0 incorrect";
+	} // if
+
+	if ( int x = 5, y = f( x ); x == y ) {
+		sout | "x == y correct";
+	} else {
+		sout | "x != y incorrect";
+	} // if
+
+	if ( struct S { int i; } s = { 3 }; s.i < 4 ) {
+		S s1;
+		sout | "s.i < 4 correct";
+	} else {
+		S s1;
+		sout | "s.i >= 4 incorrect";
+	} // if
+
+	while ( int x = 1 ) {
+		sout | "x != 0 correct";
+		break;
+	} // while
+
+	while ( int x = 4, y = 0 ) {
+		sout | "x != 0 && y != 0 incorrect";
+	} // while
+
+	while ( int x = 5, y = f( x ); x == y ) {
+		sout | "x == y correct";
+		break;
+	} // while
+
+	while ( struct S { int i; } s = { 3 }; s.i < 4 ) {
+		S s1;
+		sout | "s.i < 4 correct";
+		break;
+	} // while
+} // main
+
+// Local Variables: //
+// tab-width: 4 //
+// compile-command: "cfa ifwhileCtl.cfa" //
+// End: //
Index: tests/ctrl-flow/loop-inc.cfa
===================================================================
--- tests/ctrl-flow/loop-inc.cfa	(revision db6cdc0f7e39fa424be65d849107ecd0c1e8e90b)
+++ tests/ctrl-flow/loop-inc.cfa	(revision db6cdc0f7e39fa424be65d849107ecd0c1e8e90b)
@@ -0,0 +1,20 @@
+forall(T &)
+struct A {
+    T * next;
+};
+
+struct B {
+    A(B) link;
+};
+
+int main(void) {
+	B end = { { 0p } };
+	B two = { { &end } };
+	B one = { { &two } };
+	B * head = &one;
+
+	for (B ** it = &head ; (*it)->link.next ; it = &(*it)->link.next) {
+		printf("loop\n");
+	}
+	printf("done\n");
+}
Index: tests/ctrl-flow/loop_else.cfa
===================================================================
--- tests/ctrl-flow/loop_else.cfa	(revision db6cdc0f7e39fa424be65d849107ecd0c1e8e90b)
+++ tests/ctrl-flow/loop_else.cfa	(revision db6cdc0f7e39fa424be65d849107ecd0c1e8e90b)
@@ -0,0 +1,112 @@
+#include <fstream.hfa>
+
+struct S { int i, j; };
+void ?{}( S & s ) { s.[i, j] = 0; }
+void ?{}( S & s, int i ) { s.[i, j] = [i, 0]; }
+void ?{}( S & s, int i, int j ) { s.[i, j] = [i, j]; }
+void ?{}( S & s, zero_t ) { s.[i, j] = 0; }
+void ?{}( S & s, one_t ) { s.[i, j] = 1; }
+int ?<?( S t1, S t2 ) { return t1.i < t2.i && t1.j < t2.j; }
+int ?<=?( S t1, S t2 ) { return t1.i <= t2.i && t1.j <= t2.j; }
+int ?>?( S t1, S t2 ) { return t1.i > t2.i && t1.j > t2.j; }
+int ?>=?( S t1, S t2 ) { return t1.i >= t2.i && t1.j >= t2.j; }
+S ?=?( S & t1, S t2 ) { t1.i = t2.i; t1.j = t2.j; return t1; }
+S ?+=?( S & t1, S t2 ) { t1.i += t2.i; t1.j += t2.j; return t1; }
+S ?+=?( S & t, one_t ) { t.i += 1; t.j += 1; return t; }
+S ?-=?( S & t1, S t2 ) { t1.i -= t2.i; t1.j -= t2.j; return t1; }
+S ?-=?( S & t, one_t ) { t.i -= 1; t.j -= 1; return t; }
+ofstream & ?|?( ofstream & os, S v ) { return os | '(' | v.i | v.j | ')'; }
+void & ?|?( ofstream & os, S v ) { (ofstream &)(os | v); ends( os ); }
+
+int main() {
+	// Test some loop options.
+
+	sout | nlOff;										// turn off auto newline
+	while () { sout | "empty"; break; } else { sout | "else"; }						sout | nl;
+	do { sout | "empty"; break; } while () else { sout | "else"; }					sout | nl;
+	for () { sout | "empty"; break; } else { sout | "else"; }						sout | nl | nl;
+
+	do { sout | "false"; } while (false) else { sout | "else"; }					sout | nl | nl;
+
+	for ( 0 ) { sout | "A"; } else { sout | "else"; }								sout | "zero" | nl;
+	for ( 1 ) { sout | "A"; } else { sout | "else"; }								sout | nl;
+	for ( 10 ) { sout | "A"; } else { sout | "else"; }								sout | nl;
+	for ( ~= 10 ) { sout | "A"; } else { sout | "else"; }							sout | nl;
+	for ( 1 ~= 10 ~ 2 ) { sout | "B"; } else { sout | "else"; }						sout | nl;
+	for ( 1 -~= 10 ~ 2 ) { sout | "C"; } else { sout | "else"; }					sout | nl;
+	for ( 0.5 ~ 5.5 ) { sout | "D"; } else { sout | "else"; }						sout | nl;
+	for ( 0.5 -~ 5.5 ) { sout | "E"; } else { sout | "else"; }						sout | nl | nl;
+
+	for ( i; 10 ) { sout | i; } else { sout | "else"; }								sout | nl;
+	for ( i; ~= 10 ) { sout | i; } else { sout | "else"; }							sout | nl;
+	for ( i; 1 ~= 10 ~ 2 ) { sout | i; } else { sout | "else"; }					sout | nl;
+	for ( i; 1 -~= 10 ~ 2 ) { sout | i; } else { sout | "else"; }					sout | nl;
+	for ( i; 0.5 ~ 5.5 ) { sout | i; } else { sout | "else"; }						sout | nl;
+	for ( i; 0.5 -~ 5.5 ) { sout | i; } else { sout | "else"; }						sout | nl;
+	for ( ui; 2u ~= 10u ~ 2u ) { sout | ui; } else { sout | "else"; }				sout | nl;
+	for ( ui; 2u -~= 10u ~ 2u ) { sout | ui; } else { sout | "else"; }				sout | nl | nl;
+
+	// @ means do nothing
+	for ( i; 1 ~ @ ) {
+	  if ( i > 10 ) break;
+		sout | i;
+	} else { sout | "else"; }														sout | nl;
+	for ( i; @ -~ 10 ) {
+	  if ( i < 0 ) break;
+		sout | i;
+	} else { sout | "else"; }														sout | nl;
+	for ( i; 2 ~ @ ~ 2 ) {
+	  if ( i > 10 ) break;
+		sout | i;
+	} else { sout | "else"; }														sout | nl;
+	for ( i; 2.1 ~ @ ~ @ ) {
+	  if ( i > 10.5 ) break;
+		sout | i;
+		i += 1.7;
+	} else { sout | "else"; }														sout | nl;
+	for ( i; @ -~ 10 ~ 2 ) {
+	  if ( i < 0 ) break;
+		sout | i;
+	} else { sout | "else"; }														sout | nl;
+	for ( i; 12.1 ~ @ ~ @ ) {
+	  if ( i < 2.5 ) break;
+		sout | i;
+		i -= 1.7;
+	} else { sout | "else"; }														sout | nl | nl;
+	
+	enum { N = 10 };
+	for ( N ) { sout | "N"; } else { sout | "else"; }							sout | nl;
+	for ( i; N ) { sout | i; } else { sout | "else"; }							sout | nl;
+	for ( i; ~= N ) { sout | i; } else { sout | "else"; }						sout | nl;
+	for ( i; -~= N ) { sout | i; } else { sout | "else"; }						sout | nl | nl;
+
+	const int start = 3, comp = 10, inc = 2;
+	for ( i; start ~ comp ~ inc + 1 ) { sout | i; } else { sout | "else"; }		sout | nl | nl;
+
+	for ( i; 10 : j; -5 ~ @ ) { sout | i | j; } else { sout | "else"; } sout | nl;
+	for ( i; 10 : j; @ -~ -5 ) { sout | i | j; } else { sout | "else"; } sout | nl;
+	for ( i; 10 : j; -5 ~ @ ~ 2 ) { sout | i | j; } else { sout | "else"; } sout | nl;
+	for ( i; 10 : j; @ -~ -5 ~ 2 ) { sout | i | j; } else { sout | "else"; } sout | nl | nl;
+
+	for ( j; -5 ~ @ : i; 10 ) { sout | i | j; } else { sout | "else"; } sout | nl;
+	for ( j; @ -~ -5 : i; 10 ) { sout | i | j; } else { sout | "else"; } sout | nl;
+	for ( j; -5 ~ @ ~ 2 : i; 10 ) { sout | i | j; } else { sout | "else"; } sout | nl;
+	for ( j; @ -~ -5 ~ 2 : i; 10 ) { sout | i | j; } else { sout | "else"; } sout | nl | nl;
+
+	for ( j; @ -~ -5 ~ 2 : i; 10 : k; 1.5 ~ @ ) { sout | i | j | k; } else { sout | "else"; } sout | nl;
+	for ( j; @ -~ -5 ~ 2 : k; 1.5 ~ @ : i; 10 ) { sout | i | j | k; } else { sout | "else"; } sout | nl;
+	for ( k; 1.5 ~ @ : j; @ -~ -5 ~ 2 : i; 10 ) { sout | i | j | k; } else { sout | "else"; } sout | nl;
+
+	for ( S s = (S){0}; s < (S){10,10}; s += (S){1} ) { sout | s; } else { sout | "else"; } sout | nl;
+	for ( s; (S){10,10} ) { sout | s; } else { sout | "else"; } sout | nl;
+	sout | nl;
+	for ( s; (S){0} ~ (S){10,10} ) { sout | s; } else { sout | "else"; }		 sout | nl;
+	for ( s; (S){0} ~ (S){10,10} ~ (S){1} ) { sout | s; } else { sout | "else"; } sout | nl;
+	for ( s; (S){0} ~= (S){10,10} ) { sout | s; } else { sout | "else"; }		 sout | nl;
+	for ( s; (S){0} ~= (S){10,10} ~ (S){1} ) { sout | s; } else { sout | "else"; } sout | nl;
+	sout | nl;
+	for ( s; (S){0} -~  (S){10,10} ) { sout | s; } else { sout | "else"; }		 sout | nl;
+	for ( s; (S){0} -~  (S){10,10} ~ (S){1} ) { sout | s; } else { sout | "else"; } sout | nl;
+	for ( s; (S){0} -~= (S){10,10} ) { sout | s; } else { sout | "else"; }		 sout | nl;
+	for ( s; (S){0} -~= (S){10,10} ~ (S){1} ) { sout | s; } else { sout | "else"; } sout | nl | nl;
+}
Index: tests/ctrl-flow/loopctrl.cfa
===================================================================
--- tests/ctrl-flow/loopctrl.cfa	(revision db6cdc0f7e39fa424be65d849107ecd0c1e8e90b)
+++ tests/ctrl-flow/loopctrl.cfa	(revision db6cdc0f7e39fa424be65d849107ecd0c1e8e90b)
@@ -0,0 +1,205 @@
+// 
+// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+// 
+// loopctrl.cfa -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Wed Aug  8 18:32:59 2018
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Aug 11 23:04:35 2022
+// Update Count     : 160
+// 
+
+#include <fstream.hfa>
+
+void fred() {
+	// Test all possible loop syntax.
+
+	int s = 0, c = 10, i = 2;
+
+	for ( c ) { sout | "A"; }						sout | nl;
+	for ( ~= c ) { sout | "B"; }					sout | nl;
+	for ( -~ c ) { sout | "C"; }					sout | nl;
+	for ( -~= c ) { sout | "D"; }					sout | nl;
+
+	for ( s ~ c ) { sout | "A"; }					sout | nl;
+	for ( s ~= c ) { sout | "B"; }					sout | nl;
+	for ( s -~ c ) { sout | "C"; }					sout | nl;
+	for ( s -~= c ) { sout | "D"; }					sout | nl;
+
+	for ( s ~ c ~ i ) { sout | "A"; }				sout | nl;
+	for ( s ~= c ~ i ) { sout | "B"; }				sout | nl;
+	for ( s -~ c ~ i ) { sout | "C"; }				sout | nl;
+	for ( s -~= c ~ i ) { sout | "D"; }				sout | nl;
+
+	for ( j; c ) { sout | j; }							sout | nl;
+	for ( j; ~= c ) { sout | j; }					sout | nl;
+	for ( j; -~ c ) { sout | j; }					sout | nl;
+	for ( j; -~= c ) { sout | j; }					sout | nl;
+
+	for ( j; s ~ c ) { sout | j; }					sout | nl;
+	for ( j; s ~= c ) { sout | j; }					sout | nl;
+	for ( j; s -~ c ) { sout | j; }					sout | nl;
+	for ( j; s -~= c ) { sout | j; }				sout | nl;
+
+	for ( j; s ~ c ~ i ) { sout | j; }				sout | nl;
+	for ( j; s ~= c ~ i ) { sout | j; }				sout | nl;
+	for ( j; s -~ c ~ i ) { sout | j; }				sout | nl;
+	for ( j; s -~= c ~ i ) { sout | j; }			sout | nl;
+
+	// CANNOT DIRECTLY INITIALIZE INDEX VARIABLE, ONLY SINGLE LOOP INDEX VARIABLE IN DECLARATION
+
+	for ( j; c ) { sout | j; }						sout | nl;
+	for ( int j; c ) { sout | j; }					sout | nl;
+	for ( int j; ~= c ) { sout | j; }				sout | nl;
+	for ( int j; -~ c ) { sout | j; }				sout | nl;
+	for ( int j; -~= c ) { sout | j; }				sout | nl;
+
+	for ( int j; s ~ c ) { sout | j; }				sout | nl;
+	for ( int j; s ~= c ) { sout | j; }				sout | nl;
+	for ( int j; s -~ c ) { sout | j; }				sout | nl;
+	for ( int j; s -~= c ) { sout | j; }			sout | nl;
+
+	for ( int j; s ~ c ~ i ) { sout | j; }			sout | nl;
+	for ( int j; s ~= c ~ i ) { sout | j; }			sout | nl;
+	for ( int j; s -~ c ~ i ) { sout | j; }			sout | nl;
+	for ( int j; s -~= c ~ i ) { sout | j; }		sout | nl;
+
+	for ( j; s ~ @ ) { if ( j == 10 ) break; sout | j; }				sout | nl;
+	for ( j; @ -~ s ) { if ( j == -10 ) break; sout | j; }				sout | nl;
+	for ( j; s ~ @ ~ i ) { if ( j == 10 ) break; sout | j; }			sout | nl;
+	for ( j; @ -~ s ~ i ) { if ( j == -10 ) break; sout | j; }			sout | nl;
+	for ( j; s ~ @ ~ @ ) { if ( j == 10 ) break; sout | j; j += 1; }	sout | nl;
+
+	for ( int j; s ~ @ ) { if ( j == 10 ) break; sout | j; j += 1; }	sout | nl;
+	for ( int j; @ -~ s ) { if ( j == -10 ) break; sout | j; j -= 1; }	sout | nl;
+	for ( int j; s ~ @ ~ i ) { if ( j == 10 ) break; sout | j; }		sout | nl;
+	for ( int j; @ -~ s ~ i ) { if ( j == -10 ) break; sout | j; }		sout | nl;
+	for ( int j; s ~ @ ~ @ ) { if ( j == 10 ) break; sout | j; j += 1; } sout | nl;
+
+	// enum E { A, B, C, D };
+	// for ( e; A ~= C ) { sout | j; }
+	// for ( e; A ~= D ) { sout | j; }
+	// for ( e; A -~= D ~ 2 ) { sout | j; }
+	// for ( e; E ) { sout | j; }
+	// for ( e; -~ E ) { sout | j; }
+}
+
+struct S { int i, j; };
+void ?{}( S & s ) { s.[i, j] = 0; }
+void ?{}( S & s, int i ) { s.[i, j] = [i, 0]; }
+void ?{}( S & s, int i, int j ) { s.[i, j] = [i, j]; }
+void ?{}( S & s, zero_t ) { s.[i, j] = 0; }
+void ?{}( S & s, one_t ) { s.[i, j] = 1; }
+int ?<?( S t1, S t2 ) { return t1.i < t2.i && t1.j < t2.j; }
+int ?<=?( S t1, S t2 ) { return t1.i <= t2.i && t1.j <= t2.j; }
+int ?>?( S t1, S t2 ) { return t1.i > t2.i && t1.j > t2.j; }
+int ?>=?( S t1, S t2 ) { return t1.i >= t2.i && t1.j >= t2.j; }
+S ?=?( S & t1, S t2 ) { t1.i = t2.i; t1.j = t2.j; return t1; }
+S ?+=?( S & t1, S t2 ) { t1.i += t2.i; t1.j += t2.j; return t1; }
+S ?+=?( S & t, one_t ) { t.i += 1; t.j += 1; return t; }
+S ?-=?( S & t1, S t2 ) { t1.i -= t2.i; t1.j -= t2.j; return t1; }
+S ?-=?( S & t, one_t ) { t.i -= 1; t.j -= 1; return t; }
+ofstream & ?|?( ofstream & os, S v ) { return os | '(' | v.i | v.j | ')'; }
+void & ?|?( ofstream & os, S v ) { (ofstream &)(os | v); ends( os ); }
+
+int main() {
+	// Test some loop options.
+
+	sout | nlOff;										// turn off auto newline
+	while () { sout | "empty"; break; }					sout | nl;
+	do { sout | "empty"; break; } while ();				sout | nl;
+	for () { sout | "empty"; break; }					sout | nl | nl;
+
+	for ( 0 ) { sout | "A"; }							sout | "zero" | nl;
+	for ( 1 ) { sout | "A"; }							sout | nl;
+	for ( 10 ) { sout | "A"; }							sout | nl;
+	for ( ~= 10 ) { sout | "A"; }						sout | nl;
+	for ( 1 ~= 10 ~ 2 ) { sout | "B"; }					sout | nl;
+	for ( 1 -~= 10 ~ 2 ) { sout | "C"; }				sout | nl;
+	for ( 0.5 ~ 5.5 ) { sout | "D"; }					sout | nl;
+	for ( 0.5 -~ 5.5 ) { sout | "E"; }					sout | nl | nl;
+
+	for ( i; 10 ) { sout | i; }							sout | nl;
+	for ( i; ~= 10 ) { sout | i; }						sout | nl;
+	for ( i; 1 ~= 10 ~ 2 ) { sout | i; }				sout | nl;
+	for ( i; 1 -~= 10 ~ 2 ) { sout | i; }				sout | nl;
+	for ( i; 0.5 ~ 5.5 ) { sout | i; }					sout | nl;
+	for ( i; 0.5 -~ 5.5 ) { sout | i; }					sout | nl;
+	for ( ui; 2u ~= 10u ~ 2u ) { sout | ui; }			sout | nl;
+	for ( ui; 2u -~= 10u ~ 2u ) { sout | ui; }			sout | nl | nl;
+
+	// @ means do nothing
+	for ( i; 1 ~ @ ) {
+	  if ( i > 10 ) break;
+		sout | i;
+	}													sout | nl;
+	for ( i; @ -~ 10 ) {
+	  if ( i < 0 ) break;
+		sout | i;
+	}													sout | nl;
+	for ( i; 2 ~ @ ~ 2 ) {
+	  if ( i > 10 ) break;
+		sout | i;
+	}													sout | nl;
+	for ( i; 2.1 ~ @ ~ @ ) {
+	  if ( i > 10.5 ) break;
+		sout | i;
+		i += 1.7;
+	}													sout | nl;
+	for ( i; @ -~ 10 ~ 2 ) {
+	  if ( i < 0 ) break;
+		sout | i;
+	}													sout | nl;
+	for ( i; 12.1 ~ @ ~ @ ) {
+	  if ( i < 2.5 ) break;
+		sout | i;
+		i -= 1.7;
+	}													sout | nl | nl;
+	
+	enum { N = 10 };
+	for ( N ) { sout | "N"; }							sout | nl;
+	for ( i; N ) { sout | i; }							sout | nl;
+	for ( i; ~= N ) { sout | i; }						sout | nl;
+	for ( i; -~= N ) { sout | i; }						sout | nl | nl;
+
+	const int start = 3, comp = 10, inc = 2;
+	for ( i; start ~ comp ~ inc + 1 ) { sout | i; }		sout | nl | nl;
+
+	for ( i; 10 : j; -5 ~ @ ) { sout | i | j; } sout | nl;
+	for ( i; 10 : j; @ -~ -5 ) { sout | i | j; } sout | nl;
+	for ( i; 10 : j; -5 ~ @ ~ 2 ) { sout | i | j; } sout | nl;
+	for ( i; 10 : j; @ -~ -5 ~ 2 ) { sout | i | j; } sout | nl | nl;
+
+	for ( j; -5 ~ @ : i; 10 ) { sout | i | j; } sout | nl;
+	for ( j; @ -~ -5 : i; 10 ) { sout | i | j; } sout | nl;
+	for ( j; -5 ~ @ ~ 2 : i; 10 ) { sout | i | j; } sout | nl;
+	for ( j; @ -~ -5 ~ 2 : i; 10 ) { sout | i | j; } sout | nl | nl;
+
+	for ( j; @ -~ -5 ~ 2 : i; 10 : k; 1.5 ~ @ ) { sout | i | j | k; } sout | nl;
+	for ( j; @ -~ -5 ~ 2 : k; 1.5 ~ @ : i; 10 ) { sout | i | j | k; } sout | nl;
+	for ( k; 1.5 ~ @ : j; @ -~ -5 ~ 2 : i; 10 ) { sout | i | j | k; } sout | nl;
+
+	for ( S s = (S){0}; s < (S){10,10}; s += (S){1} ) { sout | s; } sout | nl;
+	for ( s; (S){10,10} ) { sout | s; } sout | nl;
+	sout | nl;
+	for ( s; (S){0} ~ (S){10,10} ) { sout | s; }		 sout | nl;
+	for ( s; (S){0} ~ (S){10,10} ~ (S){1} ) { sout | s; } sout | nl;
+	for ( s; (S){0} ~= (S){10,10} ) { sout | s; }		 sout | nl;
+	for ( s; (S){0} ~= (S){10,10} ~ (S){1} ) { sout | s; } sout | nl;
+	sout | nl;
+	for ( s; (S){0} -~  (S){10,10} ) { sout | s; }		 sout | nl;
+	for ( s; (S){0} -~  (S){10,10} ~ (S){1} ) { sout | s; } sout | nl;
+	for ( s; (S){0} -~= (S){10,10} ) { sout | s; }		 sout | nl;
+	for ( s; (S){0} -~= (S){10,10} ~ (S){1} ) { sout | s; } sout | nl | nl;
+
+	fred();
+}
+
+// Local Variables: //
+// tab-width: 4 //
+// compile-command: "cfa loopctrl.cfa" //
+// End: //
Index: sts/ifwhileCtl.cfa
===================================================================
--- tests/ifwhileCtl.cfa	(revision e4d7c1c357a5b1b2a17a980a263be977539b988b)
+++ 	(revision )
@@ -1,75 +1,0 @@
-//
-// Cforall Version 1.0.0 Copyright (C) 2017 University of Waterloo
-//
-// The contents of this file are covered under the licence agreement in the
-// file "LICENCE" distributed with Cforall.
-//
-// ifwhileCtl.cfa --
-//
-// Author           : Peter A. Buhr
-// Created On       : Sat Aug 26 10:13:11 2017
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Dec  4 21:39:18 2018
-// Update Count     : 23
-//
-
-#include <fstream.hfa>
-
-int f( int r ) { return r; }
-
-int main( void ) {
-	int x = 4, y = 3;
-
-	if ( int x = 1 ) {
-		sout | "x != 0 correct";
-	} else {
-		sout | "x == 0 incorrect";
-	} // if
-
-	if ( int x = 4, y = 0 ) {
-		sout | "x != 0 && y != 0 incorrect";
-	} else if ( int x = 4, y = 1 ) {
-		sout | "x != 0 && y != 0 correct";
-	} else {
-		sout | "x == 0 || y == 0 incorrect";
-	} // if
-
-	if ( int x = 5, y = f( x ); x == y ) {
-		sout | "x == y correct";
-	} else {
-		sout | "x != y incorrect";
-	} // if
-
-	if ( struct S { int i; } s = { 3 }; s.i < 4 ) {
-		S s1;
-		sout | "s.i < 4 correct";
-	} else {
-		S s1;
-		sout | "s.i >= 4 incorrect";
-	} // if
-
-	while ( int x = 1 ) {
-		sout | "x != 0 correct";
-		break;
-	} // while
-
-	while ( int x = 4, y = 0 ) {
-		sout | "x != 0 && y != 0 incorrect";
-	} // while
-
-	while ( int x = 5, y = f( x ); x == y ) {
-		sout | "x == y correct";
-		break;
-	} // while
-
-	while ( struct S { int i; } s = { 3 }; s.i < 4 ) {
-		S s1;
-		sout | "s.i < 4 correct";
-		break;
-	} // while
-} // main
-
-// Local Variables: //
-// tab-width: 4 //
-// compile-command: "cfa ifwhileCtl.cfa" //
-// End: //
Index: sts/loop-inc.cfa
===================================================================
--- tests/loop-inc.cfa	(revision e4d7c1c357a5b1b2a17a980a263be977539b988b)
+++ 	(revision )
@@ -1,20 +1,0 @@
-forall(T &)
-struct A {
-    T * next;
-};
-
-struct B {
-    A(B) link;
-};
-
-int main(void) {
-	B end = { { 0p } };
-	B two = { { &end } };
-	B one = { { &two } };
-	B * head = &one;
-
-	for (B ** it = &head ; (*it)->link.next ; it = &(*it)->link.next) {
-		printf("loop\n");
-	}
-	printf("done\n");
-}
Index: sts/loop_else.cfa
===================================================================
--- tests/loop_else.cfa	(revision e4d7c1c357a5b1b2a17a980a263be977539b988b)
+++ 	(revision )
@@ -1,112 +1,0 @@
-#include <fstream.hfa>
-
-struct S { int i, j; };
-void ?{}( S & s ) { s.[i, j] = 0; }
-void ?{}( S & s, int i ) { s.[i, j] = [i, 0]; }
-void ?{}( S & s, int i, int j ) { s.[i, j] = [i, j]; }
-void ?{}( S & s, zero_t ) { s.[i, j] = 0; }
-void ?{}( S & s, one_t ) { s.[i, j] = 1; }
-int ?<?( S t1, S t2 ) { return t1.i < t2.i && t1.j < t2.j; }
-int ?<=?( S t1, S t2 ) { return t1.i <= t2.i && t1.j <= t2.j; }
-int ?>?( S t1, S t2 ) { return t1.i > t2.i && t1.j > t2.j; }
-int ?>=?( S t1, S t2 ) { return t1.i >= t2.i && t1.j >= t2.j; }
-S ?=?( S & t1, S t2 ) { t1.i = t2.i; t1.j = t2.j; return t1; }
-S ?+=?( S & t1, S t2 ) { t1.i += t2.i; t1.j += t2.j; return t1; }
-S ?+=?( S & t, one_t ) { t.i += 1; t.j += 1; return t; }
-S ?-=?( S & t1, S t2 ) { t1.i -= t2.i; t1.j -= t2.j; return t1; }
-S ?-=?( S & t, one_t ) { t.i -= 1; t.j -= 1; return t; }
-ofstream & ?|?( ofstream & os, S v ) { return os | '(' | v.i | v.j | ')'; }
-void & ?|?( ofstream & os, S v ) { (ofstream &)(os | v); ends( os ); }
-
-int main() {
-	// Test some loop options.
-
-	sout | nlOff;										// turn off auto newline
-	while () { sout | "empty"; break; } else { sout | "else"; }						sout | nl;
-	do { sout | "empty"; break; } while () else { sout | "else"; }					sout | nl;
-	for () { sout | "empty"; break; } else { sout | "else"; }						sout | nl | nl;
-
-	do { sout | "false"; } while (false) else { sout | "else"; }					sout | nl | nl;
-
-	for ( 0 ) { sout | "A"; } else { sout | "else"; }								sout | "zero" | nl;
-	for ( 1 ) { sout | "A"; } else { sout | "else"; }								sout | nl;
-	for ( 10 ) { sout | "A"; } else { sout | "else"; }								sout | nl;
-	for ( ~= 10 ) { sout | "A"; } else { sout | "else"; }							sout | nl;
-	for ( 1 ~= 10 ~ 2 ) { sout | "B"; } else { sout | "else"; }						sout | nl;
-	for ( 1 -~= 10 ~ 2 ) { sout | "C"; } else { sout | "else"; }					sout | nl;
-	for ( 0.5 ~ 5.5 ) { sout | "D"; } else { sout | "else"; }						sout | nl;
-	for ( 0.5 -~ 5.5 ) { sout | "E"; } else { sout | "else"; }						sout | nl | nl;
-
-	for ( i; 10 ) { sout | i; } else { sout | "else"; }								sout | nl;
-	for ( i; ~= 10 ) { sout | i; } else { sout | "else"; }							sout | nl;
-	for ( i; 1 ~= 10 ~ 2 ) { sout | i; } else { sout | "else"; }					sout | nl;
-	for ( i; 1 -~= 10 ~ 2 ) { sout | i; } else { sout | "else"; }					sout | nl;
-	for ( i; 0.5 ~ 5.5 ) { sout | i; } else { sout | "else"; }						sout | nl;
-	for ( i; 0.5 -~ 5.5 ) { sout | i; } else { sout | "else"; }						sout | nl;
-	for ( ui; 2u ~= 10u ~ 2u ) { sout | ui; } else { sout | "else"; }				sout | nl;
-	for ( ui; 2u -~= 10u ~ 2u ) { sout | ui; } else { sout | "else"; }				sout | nl | nl;
-
-	// @ means do nothing
-	for ( i; 1 ~ @ ) {
-	  if ( i > 10 ) break;
-		sout | i;
-	} else { sout | "else"; }														sout | nl;
-	for ( i; @ -~ 10 ) {
-	  if ( i < 0 ) break;
-		sout | i;
-	} else { sout | "else"; }														sout | nl;
-	for ( i; 2 ~ @ ~ 2 ) {
-	  if ( i > 10 ) break;
-		sout | i;
-	} else { sout | "else"; }														sout | nl;
-	for ( i; 2.1 ~ @ ~ @ ) {
-	  if ( i > 10.5 ) break;
-		sout | i;
-		i += 1.7;
-	} else { sout | "else"; }														sout | nl;
-	for ( i; @ -~ 10 ~ 2 ) {
-	  if ( i < 0 ) break;
-		sout | i;
-	} else { sout | "else"; }														sout | nl;
-	for ( i; 12.1 ~ @ ~ @ ) {
-	  if ( i < 2.5 ) break;
-		sout | i;
-		i -= 1.7;
-	} else { sout | "else"; }														sout | nl | nl;
-	
-	enum { N = 10 };
-	for ( N ) { sout | "N"; } else { sout | "else"; }							sout | nl;
-	for ( i; N ) { sout | i; } else { sout | "else"; }							sout | nl;
-	for ( i; ~= N ) { sout | i; } else { sout | "else"; }						sout | nl;
-	for ( i; -~= N ) { sout | i; } else { sout | "else"; }						sout | nl | nl;
-
-	const int start = 3, comp = 10, inc = 2;
-	for ( i; start ~ comp ~ inc + 1 ) { sout | i; } else { sout | "else"; }		sout | nl | nl;
-
-	for ( i; 10 : j; -5 ~ @ ) { sout | i | j; } else { sout | "else"; } sout | nl;
-	for ( i; 10 : j; @ -~ -5 ) { sout | i | j; } else { sout | "else"; } sout | nl;
-	for ( i; 10 : j; -5 ~ @ ~ 2 ) { sout | i | j; } else { sout | "else"; } sout | nl;
-	for ( i; 10 : j; @ -~ -5 ~ 2 ) { sout | i | j; } else { sout | "else"; } sout | nl | nl;
-
-	for ( j; -5 ~ @ : i; 10 ) { sout | i | j; } else { sout | "else"; } sout | nl;
-	for ( j; @ -~ -5 : i; 10 ) { sout | i | j; } else { sout | "else"; } sout | nl;
-	for ( j; -5 ~ @ ~ 2 : i; 10 ) { sout | i | j; } else { sout | "else"; } sout | nl;
-	for ( j; @ -~ -5 ~ 2 : i; 10 ) { sout | i | j; } else { sout | "else"; } sout | nl | nl;
-
-	for ( j; @ -~ -5 ~ 2 : i; 10 : k; 1.5 ~ @ ) { sout | i | j | k; } else { sout | "else"; } sout | nl;
-	for ( j; @ -~ -5 ~ 2 : k; 1.5 ~ @ : i; 10 ) { sout | i | j | k; } else { sout | "else"; } sout | nl;
-	for ( k; 1.5 ~ @ : j; @ -~ -5 ~ 2 : i; 10 ) { sout | i | j | k; } else { sout | "else"; } sout | nl;
-
-	for ( S s = (S){0}; s < (S){10,10}; s += (S){1} ) { sout | s; } else { sout | "else"; } sout | nl;
-	for ( s; (S){10,10} ) { sout | s; } else { sout | "else"; } sout | nl;
-	sout | nl;
-	for ( s; (S){0} ~ (S){10,10} ) { sout | s; } else { sout | "else"; }		 sout | nl;
-	for ( s; (S){0} ~ (S){10,10} ~ (S){1} ) { sout | s; } else { sout | "else"; } sout | nl;
-	for ( s; (S){0} ~= (S){10,10} ) { sout | s; } else { sout | "else"; }		 sout | nl;
-	for ( s; (S){0} ~= (S){10,10} ~ (S){1} ) { sout | s; } else { sout | "else"; } sout | nl;
-	sout | nl;
-	for ( s; (S){0} -~  (S){10,10} ) { sout | s; } else { sout | "else"; }		 sout | nl;
-	for ( s; (S){0} -~  (S){10,10} ~ (S){1} ) { sout | s; } else { sout | "else"; } sout | nl;
-	for ( s; (S){0} -~= (S){10,10} ) { sout | s; } else { sout | "else"; }		 sout | nl;
-	for ( s; (S){0} -~= (S){10,10} ~ (S){1} ) { sout | s; } else { sout | "else"; } sout | nl | nl;
-}
Index: sts/loopctrl.cfa
===================================================================
--- tests/loopctrl.cfa	(revision e4d7c1c357a5b1b2a17a980a263be977539b988b)
+++ 	(revision )
@@ -1,205 +1,0 @@
-// 
-// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
-//
-// The contents of this file are covered under the licence agreement in the
-// file "LICENCE" distributed with Cforall.
-// 
-// loopctrl.cfa -- 
-// 
-// Author           : Peter A. Buhr
-// Created On       : Wed Aug  8 18:32:59 2018
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug 11 23:04:35 2022
-// Update Count     : 160
-// 
-
-#include <fstream.hfa>
-
-void fred() {
-	// Test all possible loop syntax.
-
-	int s = 0, c = 10, i = 2;
-
-	for ( c ) { sout | "A"; }						sout | nl;
-	for ( ~= c ) { sout | "B"; }					sout | nl;
-	for ( -~ c ) { sout | "C"; }					sout | nl;
-	for ( -~= c ) { sout | "D"; }					sout | nl;
-
-	for ( s ~ c ) { sout | "A"; }					sout | nl;
-	for ( s ~= c ) { sout | "B"; }					sout | nl;
-	for ( s -~ c ) { sout | "C"; }					sout | nl;
-	for ( s -~= c ) { sout | "D"; }					sout | nl;
-
-	for ( s ~ c ~ i ) { sout | "A"; }				sout | nl;
-	for ( s ~= c ~ i ) { sout | "B"; }				sout | nl;
-	for ( s -~ c ~ i ) { sout | "C"; }				sout | nl;
-	for ( s -~= c ~ i ) { sout | "D"; }				sout | nl;
-
-	for ( j; c ) { sout | j; }							sout | nl;
-	for ( j; ~= c ) { sout | j; }					sout | nl;
-	for ( j; -~ c ) { sout | j; }					sout | nl;
-	for ( j; -~= c ) { sout | j; }					sout | nl;
-
-	for ( j; s ~ c ) { sout | j; }					sout | nl;
-	for ( j; s ~= c ) { sout | j; }					sout | nl;
-	for ( j; s -~ c ) { sout | j; }					sout | nl;
-	for ( j; s -~= c ) { sout | j; }				sout | nl;
-
-	for ( j; s ~ c ~ i ) { sout | j; }				sout | nl;
-	for ( j; s ~= c ~ i ) { sout | j; }				sout | nl;
-	for ( j; s -~ c ~ i ) { sout | j; }				sout | nl;
-	for ( j; s -~= c ~ i ) { sout | j; }			sout | nl;
-
-	// CANNOT DIRECTLY INITIALIZE INDEX VARIABLE, ONLY SINGLE LOOP INDEX VARIABLE IN DECLARATION
-
-	for ( j; c ) { sout | j; }						sout | nl;
-	for ( int j; c ) { sout | j; }					sout | nl;
-	for ( int j; ~= c ) { sout | j; }				sout | nl;
-	for ( int j; -~ c ) { sout | j; }				sout | nl;
-	for ( int j; -~= c ) { sout | j; }				sout | nl;
-
-	for ( int j; s ~ c ) { sout | j; }				sout | nl;
-	for ( int j; s ~= c ) { sout | j; }				sout | nl;
-	for ( int j; s -~ c ) { sout | j; }				sout | nl;
-	for ( int j; s -~= c ) { sout | j; }			sout | nl;
-
-	for ( int j; s ~ c ~ i ) { sout | j; }			sout | nl;
-	for ( int j; s ~= c ~ i ) { sout | j; }			sout | nl;
-	for ( int j; s -~ c ~ i ) { sout | j; }			sout | nl;
-	for ( int j; s -~= c ~ i ) { sout | j; }		sout | nl;
-
-	for ( j; s ~ @ ) { if ( j == 10 ) break; sout | j; }				sout | nl;
-	for ( j; @ -~ s ) { if ( j == -10 ) break; sout | j; }				sout | nl;
-	for ( j; s ~ @ ~ i ) { if ( j == 10 ) break; sout | j; }			sout | nl;
-	for ( j; @ -~ s ~ i ) { if ( j == -10 ) break; sout | j; }			sout | nl;
-	for ( j; s ~ @ ~ @ ) { if ( j == 10 ) break; sout | j; j += 1; }	sout | nl;
-
-	for ( int j; s ~ @ ) { if ( j == 10 ) break; sout | j; j += 1; }	sout | nl;
-	for ( int j; @ -~ s ) { if ( j == -10 ) break; sout | j; j -= 1; }	sout | nl;
-	for ( int j; s ~ @ ~ i ) { if ( j == 10 ) break; sout | j; }		sout | nl;
-	for ( int j; @ -~ s ~ i ) { if ( j == -10 ) break; sout | j; }		sout | nl;
-	for ( int j; s ~ @ ~ @ ) { if ( j == 10 ) break; sout | j; j += 1; } sout | nl;
-
-	// enum E { A, B, C, D };
-	// for ( e; A ~= C ) { sout | j; }
-	// for ( e; A ~= D ) { sout | j; }
-	// for ( e; A -~= D ~ 2 ) { sout | j; }
-	// for ( e; E ) { sout | j; }
-	// for ( e; -~ E ) { sout | j; }
-}
-
-struct S { int i, j; };
-void ?{}( S & s ) { s.[i, j] = 0; }
-void ?{}( S & s, int i ) { s.[i, j] = [i, 0]; }
-void ?{}( S & s, int i, int j ) { s.[i, j] = [i, j]; }
-void ?{}( S & s, zero_t ) { s.[i, j] = 0; }
-void ?{}( S & s, one_t ) { s.[i, j] = 1; }
-int ?<?( S t1, S t2 ) { return t1.i < t2.i && t1.j < t2.j; }
-int ?<=?( S t1, S t2 ) { return t1.i <= t2.i && t1.j <= t2.j; }
-int ?>?( S t1, S t2 ) { return t1.i > t2.i && t1.j > t2.j; }
-int ?>=?( S t1, S t2 ) { return t1.i >= t2.i && t1.j >= t2.j; }
-S ?=?( S & t1, S t2 ) { t1.i = t2.i; t1.j = t2.j; return t1; }
-S ?+=?( S & t1, S t2 ) { t1.i += t2.i; t1.j += t2.j; return t1; }
-S ?+=?( S & t, one_t ) { t.i += 1; t.j += 1; return t; }
-S ?-=?( S & t1, S t2 ) { t1.i -= t2.i; t1.j -= t2.j; return t1; }
-S ?-=?( S & t, one_t ) { t.i -= 1; t.j -= 1; return t; }
-ofstream & ?|?( ofstream & os, S v ) { return os | '(' | v.i | v.j | ')'; }
-void & ?|?( ofstream & os, S v ) { (ofstream &)(os | v); ends( os ); }
-
-int main() {
-	// Test some loop options.
-
-	sout | nlOff;										// turn off auto newline
-	while () { sout | "empty"; break; }					sout | nl;
-	do { sout | "empty"; break; } while ();				sout | nl;
-	for () { sout | "empty"; break; }					sout | nl | nl;
-
-	for ( 0 ) { sout | "A"; }							sout | "zero" | nl;
-	for ( 1 ) { sout | "A"; }							sout | nl;
-	for ( 10 ) { sout | "A"; }							sout | nl;
-	for ( ~= 10 ) { sout | "A"; }						sout | nl;
-	for ( 1 ~= 10 ~ 2 ) { sout | "B"; }					sout | nl;
-	for ( 1 -~= 10 ~ 2 ) { sout | "C"; }				sout | nl;
-	for ( 0.5 ~ 5.5 ) { sout | "D"; }					sout | nl;
-	for ( 0.5 -~ 5.5 ) { sout | "E"; }					sout | nl | nl;
-
-	for ( i; 10 ) { sout | i; }							sout | nl;
-	for ( i; ~= 10 ) { sout | i; }						sout | nl;
-	for ( i; 1 ~= 10 ~ 2 ) { sout | i; }				sout | nl;
-	for ( i; 1 -~= 10 ~ 2 ) { sout | i; }				sout | nl;
-	for ( i; 0.5 ~ 5.5 ) { sout | i; }					sout | nl;
-	for ( i; 0.5 -~ 5.5 ) { sout | i; }					sout | nl;
-	for ( ui; 2u ~= 10u ~ 2u ) { sout | ui; }			sout | nl;
-	for ( ui; 2u -~= 10u ~ 2u ) { sout | ui; }			sout | nl | nl;
-
-	// @ means do nothing
-	for ( i; 1 ~ @ ) {
-	  if ( i > 10 ) break;
-		sout | i;
-	}													sout | nl;
-	for ( i; @ -~ 10 ) {
-	  if ( i < 0 ) break;
-		sout | i;
-	}													sout | nl;
-	for ( i; 2 ~ @ ~ 2 ) {
-	  if ( i > 10 ) break;
-		sout | i;
-	}													sout | nl;
-	for ( i; 2.1 ~ @ ~ @ ) {
-	  if ( i > 10.5 ) break;
-		sout | i;
-		i += 1.7;
-	}													sout | nl;
-	for ( i; @ -~ 10 ~ 2 ) {
-	  if ( i < 0 ) break;
-		sout | i;
-	}													sout | nl;
-	for ( i; 12.1 ~ @ ~ @ ) {
-	  if ( i < 2.5 ) break;
-		sout | i;
-		i -= 1.7;
-	}													sout | nl | nl;
-	
-	enum { N = 10 };
-	for ( N ) { sout | "N"; }							sout | nl;
-	for ( i; N ) { sout | i; }							sout | nl;
-	for ( i; ~= N ) { sout | i; }						sout | nl;
-	for ( i; -~= N ) { sout | i; }						sout | nl | nl;
-
-	const int start = 3, comp = 10, inc = 2;
-	for ( i; start ~ comp ~ inc + 1 ) { sout | i; }		sout | nl | nl;
-
-	for ( i; 10 : j; -5 ~ @ ) { sout | i | j; } sout | nl;
-	for ( i; 10 : j; @ -~ -5 ) { sout | i | j; } sout | nl;
-	for ( i; 10 : j; -5 ~ @ ~ 2 ) { sout | i | j; } sout | nl;
-	for ( i; 10 : j; @ -~ -5 ~ 2 ) { sout | i | j; } sout | nl | nl;
-
-	for ( j; -5 ~ @ : i; 10 ) { sout | i | j; } sout | nl;
-	for ( j; @ -~ -5 : i; 10 ) { sout | i | j; } sout | nl;
-	for ( j; -5 ~ @ ~ 2 : i; 10 ) { sout | i | j; } sout | nl;
-	for ( j; @ -~ -5 ~ 2 : i; 10 ) { sout | i | j; } sout | nl | nl;
-
-	for ( j; @ -~ -5 ~ 2 : i; 10 : k; 1.5 ~ @ ) { sout | i | j | k; } sout | nl;
-	for ( j; @ -~ -5 ~ 2 : k; 1.5 ~ @ : i; 10 ) { sout | i | j | k; } sout | nl;
-	for ( k; 1.5 ~ @ : j; @ -~ -5 ~ 2 : i; 10 ) { sout | i | j | k; } sout | nl;
-
-	for ( S s = (S){0}; s < (S){10,10}; s += (S){1} ) { sout | s; } sout | nl;
-	for ( s; (S){10,10} ) { sout | s; } sout | nl;
-	sout | nl;
-	for ( s; (S){0} ~ (S){10,10} ) { sout | s; }		 sout | nl;
-	for ( s; (S){0} ~ (S){10,10} ~ (S){1} ) { sout | s; } sout | nl;
-	for ( s; (S){0} ~= (S){10,10} ) { sout | s; }		 sout | nl;
-	for ( s; (S){0} ~= (S){10,10} ~ (S){1} ) { sout | s; } sout | nl;
-	sout | nl;
-	for ( s; (S){0} -~  (S){10,10} ) { sout | s; }		 sout | nl;
-	for ( s; (S){0} -~  (S){10,10} ~ (S){1} ) { sout | s; } sout | nl;
-	for ( s; (S){0} -~= (S){10,10} ) { sout | s; }		 sout | nl;
-	for ( s; (S){0} -~= (S){10,10} ~ (S){1} ) { sout | s; } sout | nl | nl;
-
-	fred();
-}
-
-// Local Variables: //
-// tab-width: 4 //
-// compile-command: "cfa loopctrl.cfa" //
-// End: //