Fixed a small parser profile parsing error + used correct binding namespaces

Author: andesyv

khrgenerator/cpp/templates/booleanF.h

@@ -2,9 +2,9 @@
 #pragma once
 
 
-#include <{{binding.baseNamespace}}binding/no{{binding.baseNamespace}}.h>
+#include <{{profile.bindingNamespace}}/no{{binding.baseNamespace}}.h>
 
-#include <{{binding.baseNamespace}}binding/{{binding.baseNamespace}}/boolean.h>
+#include <{{profile.bindingNamespace}}/{{binding.baseNamespace}}/boolean.h>
 
 
 namespace {{apiString}}{{memberSet}}

khrgenerator/cpp/templates/entrypointF.h

@@ -2,13 +2,13 @@
 #pragma once
 
 
-#include <{{binding.baseNamespace}}binding/no{{binding.baseNamespace}}.h>
+#include <{{profile.bindingNamespace}}/no{{binding.baseNamespace}}.h>
 
-#include <{{binding.baseNamespace}}binding/{{apiString}}{{memberSet}}/types.h>
-#include <{{binding.baseNamespace}}binding/{{apiString}}{{memberSet}}/values.h>
-#include <{{binding.baseNamespace}}binding/{{apiString}}{{memberSet}}/boolean.h>
-#include <{{binding.baseNamespace}}binding/{{apiString}}{{memberSet}}/bitfield.h>
-#include <{{binding.baseNamespace}}binding/{{apiString}}{{memberSet}}/enum.h>
-#include <{{binding.baseNamespace}}binding/{{apiString}}{{memberSet}}/functions.h>
+#include <{{profile.bindingNamespace}}/{{apiString}}{{memberSet}}/types.h>
+#include <{{profile.bindingNamespace}}/{{apiString}}{{memberSet}}/values.h>
+#include <{{profile.bindingNamespace}}/{{apiString}}{{memberSet}}/boolean.h>
+#include <{{profile.bindingNamespace}}/{{apiString}}{{memberSet}}/bitfield.h>
+#include <{{profile.bindingNamespace}}/{{apiString}}{{memberSet}}/enum.h>
+#include <{{profile.bindingNamespace}}/{{apiString}}{{memberSet}}/functions.h>
 
-#include <{{binding.baseNamespace}}binding/{{binding.baseNamespace}}/extension.h>
+#include <{{profile.bindingNamespace}}/{{binding.baseNamespace}}/extension.h>

khrgenerator/cpp/templates/enumF.h

@@ -2,9 +2,9 @@
 #pragma once
 
 
-#include <{{binding.baseNamespace}}binding/no{{binding.baseNamespace}}.h>
+#include <{{profile.bindingNamespace}}/no{{binding.baseNamespace}}.h>
 
-#include <{{binding.baseNamespace}}binding/{{binding.baseNamespace}}/enum.h>
+#include <{{profile.bindingNamespace}}/{{binding.baseNamespace}}/enum.h>
 
 
 namespace {{apiString}}{{memberSet}}

khrgenerator/cpp/templates/partials/types_bitfieldStreamable.cpp.tpl

@@ -4,7 +4,7 @@ namespace {{binding.baseNamespace}}
 
 std::ostream & operator<<(std::ostream & stream, const {{identifier}} & value)
 {
-    stream << {{binding.baseNamespace}}binding::aux::bitfieldString<{{identifier}}>(value);
+    stream << {{profile.bindingNamespace}}::aux::bitfieldString<{{identifier}}>(value);
     return stream;
 }
 

khrgenerator/cpp/templates/partials/types_streamable.cpp.tpl

@@ -4,7 +4,7 @@ namespace {{binding.baseNamespace}}
 
 std::ostream & operator<<(std::ostream & stream, const {{identifier}} & value)
 {
-    stream << {{binding.baseNamespace}}binding::aux::Meta::getString(value);
+    stream << {{profile.bindingNamespace}}::aux::Meta::getString(value);
     return stream;
 }
 

khrgenerator/cpp/templates/typesF.h

@@ -2,8 +2,8 @@
 #pragma once
 
 
-#include <{{binding.baseNamespace}}binding/no{{binding.baseNamespace}}.h>
-#include <{{binding.baseNamespace}}binding/{{binding.baseNamespace}}/types.h>
+#include <{{profile.bindingNamespace}}/no{{binding.baseNamespace}}.h>
+#include <{{profile.bindingNamespace}}/{{binding.baseNamespace}}/types.h>
 
 
 namespace {{apiString}}{{memberSet}}

khrgenerator/cpp/templates/valuesF.h

@@ -2,9 +2,9 @@
 #pragma once
 
 
-#include <{{binding.baseNamespace}}binding/no{{binding.baseNamespace}}.h>
+#include <{{profile.bindingNamespace}}/no{{binding.baseNamespace}}.h>
 
-#include <{{binding.baseNamespace}}binding/{{binding.baseNamespace}}/values.h>
+#include <{{profile.bindingNamespace}}/{{binding.baseNamespace}}/values.h>
 
 
 namespace {{apiString}}{{memberSet}}

khrparser/Profile.py

@@ -38,7 +38,7 @@ def __init__(self, jsonObject, targetDir):
 
         # Compatibility with old profile JSON format:
         elif jsonObject["apiIdentifier"]:
-            self.apis = { jsonObject["apiIdentifier"]: { "entryPointHeader": self.baseNamespace } }
+            self.apis = { jsonObject["apiIdentifier"]: { "entryPointHeader": f"{self.baseNamespace}.h" } }
             if jsonObject["coreProfileSince"]:
                 self.apis[jsonObject["apiIdentifier"]]["coreProfileSince"] = jsonObject["coreProfileSince"]