Don't overuse token.NoPos

esimonov · Feb 20, 2021 · 17e1ecd · 17e1ecd
1 parent 0ee1452
commit 17e1ecd
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/pkg/analyzer/analyzer.go b/pkg/analyzer/analyzer.go
@@ -101,7 +101,7 @@ func (nom namedOccurrenceMap) checkStatement(stmt ast.Stmt, ifPos token.Pos) {
 		nom.checkStatement(v.Post, ifPos)
 	case *ast.GoStmt:
 		for _, a := range v.Call.Args {
-			nom.checkExpression(a, token.NoPos)
+			nom.checkExpression(a, ifPos)
 		}
 	case *ast.IfStmt:
 		for _, el := range v.Body.List {
@@ -124,21 +124,21 @@ func (nom namedOccurrenceMap) checkStatement(stmt ast.Stmt, ifPos token.Pos) {
 	case *ast.IncDecStmt:
 		nom.checkExpression(v.X, ifPos)
 	case *ast.RangeStmt:
-		nom.checkExpression(v.X, token.NoPos)
+		nom.checkExpression(v.X, ifPos)
 		if v.Body != nil {
 			for _, e := range v.Body.List {
 				nom.checkStatement(e, ifPos)
 			}
 		}
 	case *ast.ReturnStmt:
 		for _, r := range v.Results {
-			nom.checkExpression(r, token.NoPos)
+			nom.checkExpression(r, ifPos)
 		}
 	case *ast.SendStmt:
-		nom.checkExpression(v.Chan, token.NoPos)
-		nom.checkExpression(v.Value, token.NoPos)
+		nom.checkExpression(v.Chan, ifPos)
+		nom.checkExpression(v.Value, ifPos)
 	case *ast.SwitchStmt:
-		nom.checkExpression(v.Tag, token.NoPos)
+		nom.checkExpression(v.Tag, ifPos)
 
 		for _, el := range v.Body.List {
 			clauses, ok := el.(*ast.CaseClause)
@@ -149,25 +149,25 @@ func (nom namedOccurrenceMap) checkStatement(stmt ast.Stmt, ifPos token.Pos) {
 			for _, c := range clauses.List {
 				switch v := c.(type) {
 				case *ast.BinaryExpr:
-					nom.checkExpression(v.X, token.NoPos)
-					nom.checkExpression(v.Y, token.NoPos)
+					nom.checkExpression(v.X, ifPos)
+					nom.checkExpression(v.Y, ifPos)
 				case *ast.Ident:
-					nom.checkExpression(v, token.NoPos)
+					nom.checkExpression(v, ifPos)
 				}
 			}
 
 			for _, c := range clauses.Body {
 				if est, ok := c.(*ast.ExprStmt); ok {
-					nom.checkExpression(est.X, token.NoPos)
+					nom.checkExpression(est.X, ifPos)
 				}
 
 				switch v := c.(type) {
 				case *ast.AssignStmt:
 					for _, el := range v.Rhs {
-						nom.checkExpression(el, token.NoPos)
+						nom.checkExpression(el, ifPos)
 					}
 				case *ast.ExprStmt:
-					nom.checkExpression(v.X, token.NoPos)
+					nom.checkExpression(v.X, ifPos)
 				}
 			}
 		}
@@ -204,7 +204,7 @@ func (nom namedOccurrenceMap) checkExpression(candidate ast.Expr, ifPos token.Po
 			nom.checkStatement(el, ifPos)
 		}
 	case *ast.Ident:
-		if nom[v.Name].isEmponymousKey(ifPos) {
+		if _, ok := nom[v.Name]; !ok || nom[v.Name].isEmponymousKey(ifPos) {
 			return
 		}