Accept all ranges of values for Indices

If a sequence works when passed to Integer, it should also work when it
is the values keyword passed to Indices. The validation code really only
needs to run on expressions that are not sequences.

Signed-off-by: Connor Behan <[email protected]>

Author: cbehan

core/properties/Indices.cc

@@ -65,6 +65,12 @@ bool Indices::parse(Kernel& kernel, std::shared_ptr<Ex> ex, keyval_t& keyvals)
 			}
 		else if(ki->first=="values") {
 			//std::cerr << "got values keyword " << *(ki->second->name) << std::endl;
+			if(*ki->second->name=="\\sequence") {
+				auto args = std::make_shared<cadabra::Ex>(ki->second);
+				kernel.inject_property(new Integer(), ex, args);
+				++ki;
+				continue;
+				}
 			collect_index_values(ki->second);
 
 			// If all values are indices, add an `Integer' property for the object,
@@ -125,24 +131,6 @@ void Indices::validate(const Kernel& k, const Ex& ex) const
 
 void Indices::collect_index_values(Ex::iterator ind_values)
 	{
-	if(*ind_values->name=="\\sequence") {
-		// We have been given a sequence, not a list.
-		// FIXME: guard against errors or large ranges.
-		auto ch = Ex::begin(ind_values);
-		size_t start = to_long(*ch->multiplier);
-		++ch;
-		size_t end   = to_long(*ch->multiplier);
-		if(end<start)
-			throw ArgumentException("Index range must be increasing.");
-		if(end-start > 100)
-			throw ArgumentException("Number of index values larger than 100, probably a typo.");
-			
-		for(size_t i=start; i<=end; ++i) {
-			values.push_back(Ex(i));
-			}
-		return;
-		}
-	
 	Ex tmp;
 	cadabra::do_list(tmp, ind_values, [&](Ex::iterator ind) {
 		values.push_back(Ex(ind));