Fix various bugs in nested match patterns listed in issue #83

1 files changed, 6 insertions, 2 deletions

diff --git a/Source/Dafny/Cloner.cs b/Source/Dafny/Cloner.cs
index 9b7bb12e..f13aa2f4 100644
--- a/Source/Dafny/Cloner.cs
+++ b/Source/Dafny/Cloner.cs
@@ -294,8 +294,7 @@ namespace Microsoft.Dafny
         return new MapDisplayExpr(Tok(expr.tok), e.Finite, pp);

 

       } else if (expr is NameSegment) {

-        var e = (NameSegment)expr;

-        return new NameSegment(Tok(e.tok), e.Name, e.OptTypeArguments == null ? null : e.OptTypeArguments.ConvertAll(CloneType));

+        return CloneNameSegment(expr);

       } else if (expr is ExprDotName) {

         var e = (ExprDotName)expr;

         return new ExprDotName(Tok(e.tok), CloneExpr(e.Lhs), e.SuffixName, e.OptTypeArguments == null ? null : e.OptTypeArguments.ConvertAll(CloneType));

@@ -449,6 +448,11 @@ namespace Microsoft.Dafny
       }

     }

 

+    public virtual NameSegment CloneNameSegment(Expression expr) {

+      var e = (NameSegment)expr;

+      return new NameSegment(Tok(e.tok), e.Name, e.OptTypeArguments == null ? null : e.OptTypeArguments.ConvertAll(CloneType));

+    }

+

     public virtual AssignmentRhs CloneRHS(AssignmentRhs rhs) {

       AssignmentRhs c;

       if (rhs is ExprRhs) {