DafnyExtension: don't duplicate names of inherited identifiers

atomb · Aug 31, 2012 · a0e6787 · a0e6787
1 parent dcc10fd
commit a0e6787
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/Util/VS2010/DafnyExtension/DafnyExtension/IdentifierTagger.cs b/Util/VS2010/DafnyExtension/DafnyExtension/IdentifierTagger.cs
@@ -285,11 +285,16 @@ class IdRegion
  public enum OccurrenceKind { Use, Definition, WildDefinition }
  public readonly OccurrenceKind Kind;
 
+ static bool SurfaceSyntaxToken(Bpl.IToken tok) {
+ Contract.Requires(tok != null);
+ return !(tok is TokenWrapper);
+ }
+
  public static void Add(List<IdRegion> regions, Bpl.IToken tok, IVariable v, bool isDefinition, ModuleDefinition context) {
  Contract.Requires(regions != null);
  Contract.Requires(tok != null);
  Contract.Requires(v != null);
- if (!(tok is AutoGeneratedToken)) {
+ if (SurfaceSyntaxToken(tok)) {
  regions.Add(new IdRegion(tok, v, isDefinition, context));
  }
  }
@@ -298,7 +303,7 @@ public enum OccurrenceKind { Use, Definition, WildDefinition }
  Contract.Requires(tok != null);
  Contract.Requires(decl != null);
  Contract.Requires(kind != null);
- if (!(tok is AutoGeneratedToken)) {
+ if (SurfaceSyntaxToken(tok)) {
  regions.Add(new IdRegion(tok, decl, kind, isDefinition, context));
  }
  }