Merge branch 'develop' into rtti

Author: alexanderoster

Source/buildbindingccpp.go

@@ -412,7 +412,7 @@ func buildDynamicCLoadTableCode(component ComponentDefinition, w LanguageWriter,
 
 	w.Writeln("#ifdef _WIN32")
 	w.Writeln("// Convert filename to UTF16-string")
-	w.Writeln("int nLength = (int)strlen(pLibraryFileName);")
+	w.Writeln("int nLength = static_cast<int>(strnlen_s(pLibraryFileName, MAX_PATH));")
 	w.Writeln("int nBufferSize = nLength * 2 + 2;")
 	if (!useStrictC) {
 		w.Writeln("std::vector<wchar_t> wsLibraryFileName(nBufferSize);")
@@ -966,7 +966,7 @@ func writeCPPInputVector(w LanguageWriter, NameSpace string, ClassIdentifier str
 	w.Writeln("  ")
 	w.Writeln("public:")
 	w.Writeln("  ")
-	w.Writeln("  C%sInputVector( const std::vector<T>& vec)", ClassIdentifier)
+	w.Writeln("  explicit C%sInputVector( const std::vector<T>& vec)", ClassIdentifier)
 	w.Writeln("    : m_data( vec.data() ), m_size( vec.size() )")
 	w.Writeln("  {")
 	w.Writeln("  }")
@@ -1281,7 +1281,7 @@ func buildCppHeader(component ComponentDefinition, w LanguageWriter, NameSpace s
 	w.Writeln("  ")
 
 	if ExplicitLinking {
-		w.Writeln("  %s%sWrapper(void* pSymbolLookupMethod)", cppClassPrefix, ClassIdentifier)
+		w.Writeln("  explicit %s%sWrapper(void* pSymbolLookupMethod)", cppClassPrefix, ClassIdentifier)
 		w.Writeln("  {")
 		w.Writeln("    CheckError(nullptr, initWrapperTable(&m_WrapperTable));")
 		w.Writeln("    CheckError(nullptr, loadWrapperTableFromSymbolLookupMethod(&m_WrapperTable, pSymbolLookupMethod));")
@@ -1290,7 +1290,7 @@ func buildCppHeader(component ComponentDefinition, w LanguageWriter, NameSpace s
 		w.Writeln("  }")
 		w.Writeln("  ")
 
-		w.Writeln("  %s%sWrapper(const std::string &sFileName)", cppClassPrefix, ClassIdentifier)
+		w.Writeln("  explicit %s%sWrapper(const std::string &sFileName)", cppClassPrefix, ClassIdentifier)
 		w.Writeln("  {")
 		w.Writeln("    CheckError(nullptr, initWrapperTable(&m_WrapperTable));")
 		w.Writeln("    CheckError(nullptr, loadWrapperTable(&m_WrapperTable, sFileName.c_str()));")

Source/componentdefinition.go

@@ -158,13 +158,15 @@ type ComponentDefinitionEnumOption struct {
 	XMLName xml.Name `xml:"option"`
 	Name string `xml:"name,attr"`
 	Value int `xml:"value,attr"`
+	Description string `xml:"description,attr"`
 }
 
 // ComponentDefinitionEnum definition of all enums used in the component's API
 type ComponentDefinitionEnum struct {
 	ComponentDiffableElement
 	XMLName xml.Name `xml:"enum"`
 	Name string `xml:"name,attr"`
+	Description string `xml:"description,attr"`
 	Options []ComponentDefinitionEnumOption `xml:"option"`
 }
 

Source/languagec.go

@@ -140,7 +140,11 @@ func buildSharedCCPPTypesHeader(component ComponentDefinition, w LanguageWriter,
 	w.Writeln("#define %s_SUCCESS 0", strings.ToUpper (NameSpace));
 	for i := 0; i < len(component.Errors.Errors); i++ {
 		errorcode := component.Errors.Errors[i];
-		w.Writeln("#define %s_ERROR_%s %d", strings.ToUpper (NameSpace), errorcode.Name, errorcode.Code);
+		if (errorcode.Description != "") {
+			w.Writeln("#define %s_ERROR_%s %d /** %s */", strings.ToUpper (NameSpace), errorcode.Name, errorcode.Code, errorcode.Description);
+		} else {
+			w.Writeln("#define %s_ERROR_%s %d", strings.ToUpper (NameSpace), errorcode.Name, errorcode.Code);
+		}
 	}
 
 	w.Writeln("");
@@ -511,8 +515,18 @@ func buildCCPPEnums(component ComponentDefinition, w LanguageWriter, NameSpace s
 	for i := 0; i < len(component.Enums); i++ {
 		enum := component.Enums[i];
 		if (useCPPTypes) {
+			if (enum.Description != "") {
+				w.Writeln("/**");
+				w.Writeln("* enum class e%s - %s", enum.Name, enum.Description);
+				w.Writeln("*/");
+			}
 			w.Writeln("enum class e%s : %s_int32 {", enum.Name, NameSpace);
 		} else {
+			if (enum.Description != "") {
+				w.Writeln("/**");
+				w.Writeln("* enum e%s%s - %s", NameSpace, enum.Name, enum.Description);
+				w.Writeln("*/");
+			}
 			w.Writeln("typedef enum e%s%s {", NameSpace, enum.Name);
 		}
 
@@ -523,9 +537,17 @@ func buildCCPPEnums(component ComponentDefinition, w LanguageWriter, NameSpace s
 			}
 			option := enum.Options[j];
 			if (useCPPTypes) {
-				w.Writeln("  %s = %d%s", option.Name, option.Value, comma);
+				if (option.Description != "") {
+					w.Writeln("  %s = %d%s /** %s */", option.Name, option.Value, comma, option.Description);
+				} else {
+					w.Writeln("  %s = %d%s", option.Name, option.Value, comma);
+				}
 			} else {
-				w.Writeln("  e%s%s = %d%s", enum.Name, option.Name, option.Value, comma);
+				if (option.Description != "") {
+					w.Writeln("  e%s%s = %d%s /** %s */", enum.Name, option.Name, option.Value, comma, option.Description);
+				} else {
+					w.Writeln("  e%s%s = %d%s", enum.Name, option.Name, option.Value, comma);
+				}
 			}
 		}
 		if (useCPPTypes) {