Fixes for #26, ignore !comment, minor cleanup

bbredesen · Mar 9, 2023 · 0ff7bb7 · 0ff7bb7
1 parent a2ae182
commit 0ff7bb7
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 18 deletions.
diff --git a/def/base_type.go b/def/base_type.go
@@ -129,13 +129,6 @@ func ReadBaseTypeExceptionsFromJSON(exceptions gjson.Result, tr TypeRegistry, vr
 		entry := NewOrUpdateBaseTypeFromJSON(key.String(), exVal, tr, vr)
 		tr[key.String()] = entry
 
-		// exVal.Get("constants").ForEach(func(ck, cv gjson.Result) bool {
-		// 	newVal := NewConstantValue(ck.String(), cv.String(), key.String())
-
-		// 	vr[newVal.RegistryName()] = newVal
-		// 	return true
-		// })
-
 		return true
 	})
 

diff --git a/def/command_type.go b/def/command_type.go
@@ -764,7 +764,7 @@ func NewCommandParamFromXML(elt *xmlquery.Node, forCommand *commandType) *comman
 
 func ReadCommandExceptionsFromJSON(exceptions gjson.Result, tr TypeRegistry, vr ValueRegistry) {
 	exceptions.Get("command").ForEach(func(key, exVal gjson.Result) bool {
-		if key.String() == "comment" {
+		if key.String() == "!comment" {
 			return true
 		} // Ignore comments
 

diff --git a/def/external_type.go b/def/external_type.go
@@ -78,10 +78,6 @@ func NewOrUpdateExternalTypeFromJSON(key string, exception gjson.Result, tr Type
 	existing := tr[key]
 	var updatedEntry *externalType
 
-	if key == "!comment" {
-		return nil
-	}
-
 	if existing == nil {
 		logrus.WithField("registry type", key).Info("no existing registry entry for external type")
 		updatedEntry = &externalType{}

diff --git a/def/handle_type.go b/def/handle_type.go
@@ -71,7 +71,7 @@ func NewHandleTypeFromXML(node *xmlquery.Node) TypeDefiner {
 
 func ReadHandleExceptionsFromJSON(exceptions gjson.Result, tr TypeRegistry, vr ValueRegistry) {
 	exceptions.Get("handle").ForEach(func(key, exVal gjson.Result) bool {
-		if key.String() == "comment" {
+		if key.String() == "!comment" {
 			return true
 		} // Ignore comments
 
@@ -101,5 +101,7 @@ func NewHandleTypeFromJSON(key, json gjson.Result) TypeDefiner {
 	rval.publicName = json.Get("publicName").String()
 	rval.underlyingTypeName = json.Get("underlyingType").String()
 
+	rval.comment = json.Get("comment").String()
+
 	return &rval
 }
diff --git a/def/struct_type.go b/def/struct_type.go
@@ -510,11 +510,7 @@ func ReadStructExceptionsFromJSON(exceptions gjson.Result, tr TypeRegistry, vr V
 		}
 
 		entry := NewOrUpdateStructTypeFromJSON(key, exVal, existing)
-		// if entry == nil {
-		// 	delete(tr, key.String())
-		// } else {
 		tr[key.String()] = entry
-		// }
 
 		return true
 	})

diff --git a/def/union_type.go b/def/union_type.go
@@ -158,7 +158,6 @@ func ReadUnionExceptionsFromJSON(exceptions gjson.Result, tr TypeRegistry, vr Va
 		} // Ignore comments
 
 		UpdateUnionTypeFromJSON(key, exVal, tr[key.String()].(*unionType))
-		// tr[key.String()] = entry
 
 		return true
 	})

diff --git a/main.go b/main.go
@@ -111,6 +111,9 @@ func main() {
 		platforms[plat.Name()] = plat
 	}
 	jsonDoc.Get("platform").ForEach(func(key, value gjson.Result) bool {
+		if key.String() == "!comment" {
+			return true
+		}
 		r := feat.NewOrUpdatePlatformFromJSON(key.String(), value, platforms[key.String()])
 		platforms[r.Name()] = r
 		return true