Merge.

Changes that were needed included preventing the InductionRewriter from
iterating on a SplitQuantifier and using the new error reporting engine.

1 files changed, 3 insertions, 3 deletions

diff --git a/Source/Dafny/Parser.cs b/Source/Dafny/Parser.cs
index 2507cacc..7dafb572 100644
--- a/Source/Dafny/Parser.cs
+++ b/Source/Dafny/Parser.cs
@@ -1033,13 +1033,13 @@ bool IsType(ref IToken pt) {
 	}

 

 	void Attribute(ref Attributes attrs) {

-		string name;

+		IToken x; string name;

 		var args = new List<Expression>();

 		

 		Expect(45);

 		Expect(21);

-		Expect(1);

-		name = t.val; 

+		NoUSIdent(out x);

+		name = x.val; 

 		if (StartOf(7)) {

 			Expressions(args);

 		}