clean-code halfway, pulling for quick merge to avoid innumerable conflicts

aql/hierarchy.go

@@ -14,24 +14,6 @@ type pdict struct {
 
 type pdictList []pdict
 
-func (p pdictList) Len() int {
-	return len(p)
-}
-
-func (p pdictList) Less(i, j int) bool {
-	if p[i].typename < p[j].typename {
-		return true
-	} else if p[i].typename == p[j].typename && p[i].pointer < p[j].pointer {
-		return true
-	} else {
-		return false
-	}
-}
-
-func (p pdictList) Swap(i, j int) {
-	p[i], p[j] = p[j], p[i]
-}
-
 var listoflists []pdictList
 var reldone map[int]bool
 var entdone map[int]bool

entity/hierarchyStruct.go

+package entity
+
+type PdictList []Pdict
+
+type Pdict struct {
+	Typename string
+	Pointer  int
+}
+
+func (p PdictList) Len() int {
+	return len(p)
+}
+
+func (p PdictList) Less(i, j int) bool {
+	if p[i].Typename < p[j].Typename {
+		return true
+	} else if p[i].Typename == p[j].Typename && p[i].Pointer < p[j].Pointer {
+		return true
+	} else {
+		return false
+	}
+}
+
+func (p PdictList) Swap(i, j int) {
+	p[i], p[j] = p[j], p[i]
+}