Fix for "Ambiguous reference to type 'fully:Qualified'" errors.

grammars/silver/compiler/definition/core/QName.sv

@@ -75,7 +75,8 @@ attribute typeScheme {} occurs on a,
 annotation sourceLocation occurs on a =>
 top::QNameLookup<a> ::= kindOfLookup::String dcls::[a] name::String l::Location 
 {
-  top.dcls = dcls;
+  top.dcls = uniqBy(\l::a r::a -> l.fullName == r.fullName,
+                    sortBy(\l::a r::a -> l.fullName <= r.fullName, dcls));
   top.found = !null(top.dcls); -- currently accurate
   top.dcl =
     if top.found then head(top.dcls)

grammars/silver/compiler/definition/env/Env.sv

@@ -136,9 +136,12 @@ top::Env ::= d::[OccursDclInfo]  e::Decorated Env
 ----------------------------------------------------------------------------------------------------
 
 function searchEnvAll
+attribute fullName {} occurs on a =>
 [a] ::= search::String e::[EnvTree<a>]
 {
-  return flatMap(searchEnvTree(search, _), e);
+  return uniqBy(\l::a r::a -> l.fullName == r.fullName,
+    sortBy(\l::a r::a -> l.fullName <= r.fullName,
+      flatMap(searchEnvTree(search, _), e)));
 }
 
 function searchEnv

grammars/silver/compiler/driver/BuildProcess.sv

@@ -113,7 +113,7 @@ IOErrorable<Decorated Compilation> ::=
 
 {--
  - Given an environment and a grammar to build, returns a Compilation.
- - Note that it's the caller's responsibility to actually evaluation that
+ - Note that it's the caller's responsibility to actually evaluate that
  - compilation's actions.
  -}
 function buildRun

grammars/silver/core/List.sv

@@ -419,6 +419,21 @@ function mergeBy -- do not use
               else head(l2) :: mergeBy(lte, l1, tail(l2));
 }
 
+function uniq
+Eq a => [a] ::= l::[a]
+{ return uniqBy(eq, l); }
+function uniqBy
+[a] ::= eq::(Boolean ::= a a) l::[a]
+{
+  return case l of
+         | [] -> []
+         | [x] -> [x]
+         | x1::x2::xs -> if eq(x1, x2)
+                         then uniqBy(eq, x2::xs)
+                         else x1::uniqBy(eq, x2::xs)
+         end;
+}
+
 function groupBy
 [[a]] ::= eq::(Boolean ::= a a) l::[a]
 {

support/vim/syntax/sv.vim

@@ -89,10 +89,10 @@ hi def link svlangDocParam		Function
 hi def link svlangDocSeeTagParam	Function
 hi def link svlangTermAttr		Keyword
 
-set autoindent
-set expandtab
-set shiftwidth=2
-set softtabstop=2
+setlocal autoindent
+setlocal expandtab
+setlocal shiftwidth=2
+setlocal softtabstop=2
 
 let b:current_syntax = "sv"