From b0ceb9e1b4c51fbe0b51b061dadd34bce793efc3 Mon Sep 17 00:00:00 2001
From: Jeff Carr <jcarr@wit.com>
Date: Thu, 9 Jan 2025 06:09:09 -0600
Subject: rename

---
 main.go    |  2 +-
 newsort.go | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 sortnew.go | 58 ----------------------------------------------------------
 3 files changed, 59 insertions(+), 59 deletions(-)
 create mode 100644 newsort.go
 delete mode 100644 sortnew.go

diff --git a/main.go b/main.go
index 8feef5a..e0d22c6 100644
--- a/main.go
+++ b/main.go
@@ -167,7 +167,7 @@ func main() {
 		sortmap["Bases"] = sortmap["Base"] + "s"
 	}
 
-	pb.makeSortfile(f)
+	// pb.makeSortfile(f)
 	pb.makeNewSortfile(f)
 }
 
diff --git a/newsort.go b/newsort.go
new file mode 100644
index 0000000..5b6084b
--- /dev/null
+++ b/newsort.go
@@ -0,0 +1,58 @@
+package main
+
+import (
+	"os"
+	"strings"
+)
+
+func (pb *Files) makeNewSortfile(pf *File) {
+	f, _ := os.OpenFile(pf.Filebase+".newsort.pb.go", os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644)
+
+	header(f, pf)
+
+	if sortmap["lock"] == "all" {
+		// if the lock is set to 'all' this means the mutex was put in the protoc-gen-go struct
+	} else {
+		syncLock(f, sortmap)
+	}
+	iterTop(f, sortmap)
+	iterNext(f, sortmap)
+	iterAppend(f, sortmap) // Append() enforce no unique keys
+	iterSortAll(f, sortmap)
+
+	if argv.Append != "" {
+		sortmap["append"] = string(argv.Append)
+		iterAppend(f, sortmap) // Append() enforce unique key argv.Append
+	}
+
+	for _, s := range uniqueKeys {
+		// log.Info("found unique key in .proto", s)
+		sortmap["sortBy"] = s
+		sortmap["sortKey"] = s
+
+		iterSortBy(f, sortmap)
+
+		sortmap["append"] = sortmap["sortKey"]
+		iterAppend(f, sortmap) // Append() enforce unique key argv.Append
+
+		iterDelete(f, sortmap)
+		iterReplace(f, sortmap)
+		iterFind(f, sortmap)
+	}
+
+	for _, s := range argv.Sort {
+		sortparts := strings.Split(s, ",")
+		sortmap["sortBy"] = sortparts[0]
+		sortmap["sortKey"] = sortparts[1]
+
+		iterSortBy(f, sortmap)
+
+		sortmap["append"] = sortmap["sortKey"]
+		iterAppend(f, sortmap) // Append() enforce unique key argv.Append
+
+		iterDelete(f, sortmap)
+		iterReplace(f, sortmap)
+		iterFind(f, sortmap)
+	}
+	iterEnd(f, sortmap)
+}
diff --git a/sortnew.go b/sortnew.go
deleted file mode 100644
index 5b6084b..0000000
--- a/sortnew.go
+++ /dev/null
@@ -1,58 +0,0 @@
-package main
-
-import (
-	"os"
-	"strings"
-)
-
-func (pb *Files) makeNewSortfile(pf *File) {
-	f, _ := os.OpenFile(pf.Filebase+".newsort.pb.go", os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644)
-
-	header(f, pf)
-
-	if sortmap["lock"] == "all" {
-		// if the lock is set to 'all' this means the mutex was put in the protoc-gen-go struct
-	} else {
-		syncLock(f, sortmap)
-	}
-	iterTop(f, sortmap)
-	iterNext(f, sortmap)
-	iterAppend(f, sortmap) // Append() enforce no unique keys
-	iterSortAll(f, sortmap)
-
-	if argv.Append != "" {
-		sortmap["append"] = string(argv.Append)
-		iterAppend(f, sortmap) // Append() enforce unique key argv.Append
-	}
-
-	for _, s := range uniqueKeys {
-		// log.Info("found unique key in .proto", s)
-		sortmap["sortBy"] = s
-		sortmap["sortKey"] = s
-
-		iterSortBy(f, sortmap)
-
-		sortmap["append"] = sortmap["sortKey"]
-		iterAppend(f, sortmap) // Append() enforce unique key argv.Append
-
-		iterDelete(f, sortmap)
-		iterReplace(f, sortmap)
-		iterFind(f, sortmap)
-	}
-
-	for _, s := range argv.Sort {
-		sortparts := strings.Split(s, ",")
-		sortmap["sortBy"] = sortparts[0]
-		sortmap["sortKey"] = sortparts[1]
-
-		iterSortBy(f, sortmap)
-
-		sortmap["append"] = sortmap["sortKey"]
-		iterAppend(f, sortmap) // Append() enforce unique key argv.Append
-
-		iterDelete(f, sortmap)
-		iterReplace(f, sortmap)
-		iterFind(f, sortmap)
-	}
-	iterEnd(f, sortmap)
-}
-- 
cgit v1.2.3