Merge pull request #28 from bbredesen/bugfix/26

Bugfix/26
bbredesen · Mar 9, 2023 · 741310c · 741310c
2 parents 28cb403 + dd5d182
commit 741310c
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 26 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/internal_type.go b/def/internal_type.go
@@ -39,10 +39,6 @@ func (t *internalType) Resolve(tr TypeRegistry, vr ValueRegistry) *IncludeSet {
 func (t *internalType) PrintPublicDeclaration(w io.Writer) {
 	t.PrintDocLink(w)
 
-	if t.comment != "" {
-		fmt.Fprintln(w, "// ", t.comment)
-	}
-
 	if t.IsAlias() {
 		fmt.Fprintf(w, "type %s = %s\n", t.PublicName(), t.resolvedAliasType.PublicName())
 	} else {

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/exceptions.json b/exceptions.json
@@ -32,13 +32,15 @@
 
         "VK_USE_64_BIT_PTR_DEFINES": {
             "constantValue": "unsafe.Sizeof(uintptr(0))",
-            "comment": "Included for completeness, but this value is only used in a macro to determine how VK_NULL_HANDLE should be defined in C, based on architecture and compiler."
+            "!comment": "Included for completeness, but this value is only used in a macro to determine how VK_NULL_HANDLE should be defined in C, based on architecture and compiler."
         }
 
     },
 
     "handle": {
-        "VK_DEFINE_HANDLE": { "publicName": "handle", "underlyingType": "uintptr_t",
+        "VK_DEFINE_HANDLE": { 
+            "publicName": "handle", 
+            "underlyingType": "uintptr_t",
             "constants": {
                 "VK_NULL_HANDLE" : "0"
             }
@@ -50,7 +52,7 @@
         },
         "VK_USE_64_BIT_PTR_DEFINES": {
             "publicName": "!ignore",
-            "comment": "This and several following entries are defined as types in the spec, though they're really values. !ignore allows this type to be created for resolving the feature set, but it will not be output to the generated code."
+            "!comment": "This and several following entries are defined as types in the spec, though they're really values. !ignore allows this type to be created for resolving the feature set, but it will not be output to the generated code."
         },
         "VK_NULL_HANDLE": {
             "publicName": "!ignore"
@@ -128,7 +130,7 @@
 
     "external" : {
         "int8_t":  { "go:type": "int8", "primitive": true, 
-            "comment": "Primitive indicates a direct replacement? Necessary or not?" },
+            "!comment": "Primitive indicates a direct replacement? Necessary or not?" },
         "uint8_t": { "go:type": "uint8", "primitive": true },
         "int16_t":  { "go:type": "int16", "primitive": true },
         "uint16_t":  { "go:type": "uint16", "primitive": 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