Merge

1 files changed, 3 insertions, 3 deletions

diff --git a/Source/Dafny/DafnyAst.cs b/Source/Dafny/DafnyAst.cs
index 269c8069..d43eea1f 100644
--- a/Source/Dafny/DafnyAst.cs
+++ b/Source/Dafny/DafnyAst.cs
@@ -1216,7 +1216,7 @@ namespace Microsoft.Dafny {
             return name + nm.Substring(i);

           }

         } else {

-          string nxt = nm.Substring(i, j);

+          string nxt = nm.Substring(i, j - i);

           name = name == null ? nxt : name + nxt;

           switch (nm[j]) {

             case '\'': name += "_k"; break;

@@ -2103,13 +2103,13 @@ namespace Microsoft.Dafny {
     [ContractInvariantMethod]

     void ObjectInvariant() {

       Contract.Invariant(Thn != null);

-      Contract.Invariant(Els == null || Els is BlockStmt || Els is IfStmt);

+      Contract.Invariant(Els == null || Els is BlockStmt || Els is IfStmt || Els is SkeletonStatement);

     }

     public IfStmt(IToken tok, Expression guard, BlockStmt thn, Statement els)

       : base(tok) {

       Contract.Requires(tok != null);

       Contract.Requires(thn != null);

-      Contract.Requires(els == null || els is BlockStmt || els is IfStmt);

+      Contract.Requires(els == null || els is BlockStmt || els is IfStmt || els is SkeletonStatement);

       this.Guard = guard;

       this.Thn = thn;

       this.Els = els;