Convert the makeset configuration files from JSON to TOML.

Converted: stringset, nodeset, intset
Discarded: byteset

7 files changed, 47 insertions, 51 deletions

diff --git a/makeset/byteset.json b/makeset/byteset.json
deleted file mode 100644
index 71db95c..0000000
--- a/makeset/byteset.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "desc": "A set of byte values (for demo purposes; not optimal for real work).",
-  "type": "byte",
-  "zero": "0",
-  "package": "byteset"
-}
diff --git a/makeset/intset.json b/makeset/intset.json
deleted file mode 100644
index 46f33db..0000000
--- a/makeset/intset.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "desc": "A set of int values.",
-  "type": "int",
-  "package": "intset",
-  "zero": "0",
-  "toString": "return strconv.Itoa(x)",
-  "imports": ["strconv"],
-  "transforms": true,
-  "testValues": [0, 1, 2, 3, 5, 7, 11, 13, 17, 19]
-}
diff --git a/makeset/intset.toml b/makeset/intset.toml
new file mode 100644
index 0000000..e5ff5c4
--- /dev/null
+++ b/makeset/intset.toml
@@ -0,0 +1,8 @@
+desc       = "A set of int values."
+type       = "int"
+package    = "intset"
+zero       = "0"
+toString   = 'return strconv.Itoa(x)'
+imports    = ["strconv"]
+transforms = true
+testValues = [0, 1, 2, 3, 5, 7, 11, 13, 17, 19]
diff --git a/makeset/nodeset.json b/makeset/nodeset.json
deleted file mode 100644
index dfb348b..0000000
--- a/makeset/nodeset.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "desc": "A set of Go AST nodes from the go/ast package.",
-  "package": "nodeset",
-  "type": "ast.Node",
-  "zero": "nil",
-  "less": "if x.Pos() == y.Pos() { return x.End() > y.End() }\nreturn x.Pos() < y.Pos()",
-  "imports": ["go/ast"],
-  "testImports": ["go/ast"],
-  "transforms": true,
-  "testValues": [
-      "&ast.Ident{Name: \"amy\", NamePos: 1}",
-      "&ast.Ident{Name: \"basil\", NamePos: 3}",
-      "&ast.Ident{Name: \"clara\", NamePos: 5}",
-      "&ast.Ident{Name: \"desmond\", NamePos: 9}",
-      "&ast.Ident{Name: \"ernest\", NamePos: 10}",
-      "&ast.Ident{Name: \"fanny\", NamePos: 12}",
-      "&ast.Ident{Name: \"george\", NamePos: 14}",
-      "&ast.Ident{Name: \"hector\", NamePos: 17}",
-      "&ast.Ident{Name: \"ida\", NamePos: 19}",
-      "&ast.Ident{Name: \"james\", NamePos: 25}"
-  ]
-}
diff --git a/makeset/nodeset.toml b/makeset/nodeset.toml
new file mode 100644
index 0000000..fd0f733
--- /dev/null
+++ b/makeset/nodeset.toml
@@ -0,0 +1,28 @@
+desc    = "A set of Go AST nodes from the go/ast package."
+package = "nodeset"
+type    = "ast.Node"
+zero    = "nil"
+
+less = """
+if x.Pos() == y.Pos() {
+  return x.End() > y.End()
+}
+return x.Pos() < y.Pos()
+"""
+
+imports     = ["go/ast"]
+testImports = ["go/ast"]
+transforms  = true
+
+testValues = [
+  '&ast.Ident{Name: "amy", NamePos: 1}',
+  '&ast.Ident{Name: "basil", NamePos: 3}',
+  '&ast.Ident{Name: "clara", NamePos: 5}',
+  '&ast.Ident{Name: "desmond", NamePos: 9}',
+  '&ast.Ident{Name: "ernest", NamePos: 10}',
+  '&ast.Ident{Name: "fanny", NamePos: 12}',
+  '&ast.Ident{Name: "george", NamePos: 14}',
+  '&ast.Ident{Name: "hector", NamePos: 17}',
+  '&ast.Ident{Name: "ida", NamePos: 19}',
+  '&ast.Ident{Name: "james", NamePos: 25}',
+]
diff --git a/makeset/stringset.json b/makeset/stringset.json
deleted file mode 100644
index ff9df6f..0000000
--- a/makeset/stringset.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "desc": "A set of strings, the main package of this module.",
-  "package": "stringset",
-  "type": "string",
-  "zero": "\"\"",
-  "toString": "return strconv.Quote(x)",
-  "imports": ["strconv"],
-  "transforms": true,
-  "testValues": [
-     "\"eight\"", "\"five\"", "\"four\"", "\"nine\"", "\"one\"",
-     "\"seven\"", "\"six\"", "\"ten\"", "\"three\"", "\"two\""
-  ]
-}
diff --git a/makeset/stringset.toml b/makeset/stringset.toml
new file mode 100644
index 0000000..400758b
--- /dev/null
+++ b/makeset/stringset.toml
@@ -0,0 +1,11 @@
+desc       = "A set of strings, the main package of this module."
+package    = "stringset"
+type       = "string"
+zero       = '""'
+transforms = true
+toString   = "return strconv.Quote(x)"
+imports    = ["strconv"]
+testValues = [
+  '"eight"', '"five"', '"four"', '"nine"', '"one"',
+  '"seven"', '"six"', '"ten"', '"three"', '"two"'
+]