From b0116661fdd4d03a121566f2a2d9d67c8e786273 Mon Sep 17 00:00:00 2001
From: Rustan Leino <unknown>
Date: Mon, 17 Mar 2014 16:17:59 -0700
Subject: Refactoring: renamed VarDecl to LocalVariable, and renamed
 VarDeclStmt.Lhss to VarDeclStmt.Locals

---
 Source/DafnyExtension/IdentifierTagger.cs | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'Source/DafnyExtension/IdentifierTagger.cs')

diff --git a/Source/DafnyExtension/IdentifierTagger.cs b/Source/DafnyExtension/IdentifierTagger.cs
index 962dec3c..4cf752fb 100644
--- a/Source/DafnyExtension/IdentifierTagger.cs
+++ b/Source/DafnyExtension/IdentifierTagger.cs
@@ -278,8 +278,8 @@ namespace DafnyLanguage
       if (stmt is VarDeclStmt) {
         var s = (VarDeclStmt)stmt;
         // Add the variables here, once, and then go directly to the RHS's (without letting the sub-statements re-do the LHS's)
-        foreach (var lhs in s.Lhss) {
-          IdRegion.Add(regions, lhs.Tok, lhs, true, module);
+        foreach (var local in s.Locals) {
+          IdRegion.Add(regions, local.Tok, local, true, module);
         }
         if (s.Update == null) {
           // the VarDeclStmt has no associated assignment
@@ -296,9 +296,6 @@ namespace DafnyLanguage
         }
         // we're done, so don't do the sub-statements/expressions again
         return;
-      } else  if (stmt is VarDecl) {
-        var s = (VarDecl)stmt;
-        IdRegion.Add(regions, s.Tok, s, true, module);
       } else if (stmt is ForallStmt) {
         var s = (ForallStmt)stmt;
         s.BoundVars.ForEach(bv => IdRegion.Add(regions, bv.tok, bv, true, module));
@@ -385,7 +382,7 @@ namespace DafnyLanguage
         Length = v.DisplayName.Length;
         if (kind == null) {
           // use default
-          if (v is VarDecl) {
+          if (v is LocalVariable) {
             kind = "local variable";
           } else if (v is BoundVar) {
             kind = "bound variable";
@@ -399,7 +396,7 @@ namespace DafnyLanguage
         }
         Variable = v;
         HoverText = string.Format("({2}{3}) {0}: {1}", v.DisplayName, v.Type.TypeName(context), v.IsGhost ? "ghost " : "", kind);
-        Kind = !isDefinition ? OccurrenceKind.Use : VarDecl.HasWildcardName(v) ? OccurrenceKind.WildDefinition : OccurrenceKind.Definition;
+        Kind = !isDefinition ? OccurrenceKind.Use : LocalVariable.HasWildcardName(v) ? OccurrenceKind.WildDefinition : OccurrenceKind.Definition;
       }
       private IdRegion(Bpl.IToken tok, Field decl, Microsoft.Dafny.Type showType, string kind, bool isDefinition, ModuleDefinition context) {
         Contract.Requires(tok != null);
-- 
cgit v1.2.3