Skip to content

Commit

Permalink
Merge pull request #32175 from vespa-engine/toregge/use-std-string-in…
Browse files Browse the repository at this point in the history 
…-generated-config-classes

Use std::string in generated config classes.
  • Loading branch information
@baldersheim
baldersheim authored Aug 19, 2024
2 parents 95bc9e6 + a37b034 commit 6a8b134
Showing 1 changed file with 29 additions and 29 deletions.
58 changes: 29 additions & 29 deletions configgen/src/main/java/com/yahoo/config/codegen/CppClassBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ public class CppClassBuilder implements ClassBuilder {
"int32_t", "::config::IntVector",
"int64_t", "::config::LongVector",
"double", "::config::DoubleVector",
"vespalib::string", "::config::StringVector"
"std::string", "::config::StringVector"
);
private static final Map<String, String> mapTypeDefs = Map.of(
"bool", "::config::BoolMap",
"int32_t", "::config::IntMap",
"int64_t", "::config::LongMap",
"double", "::config::DoubleMap",
"vespalib::string", "::config::StringMap"
"std::string", "::config::StringMap"
);

private static final Map<String, String> slimeTypeMap = Map.of(
Expand Down Expand Up @@ -302,15 +302,15 @@ void writeTypeDeclarations(Writer w, CNode node, String indent) throws IOExcepti
+ indent + "typedef std::vector<" + typeName + "> "
+ typeName + "Vector;"
+ "\n"
+ indent + "typedef std::map<vespalib::string, " + typeName + "> "
+ indent + "typedef std::map<std::string, " + typeName + "> "
+ typeName + "Map;"
+ "\n"
+ indent + "static " + typeName + " get" + typeName + "(const vespalib::string&);\n"
+ indent + "static vespalib::string get" + typeName + "Name(" + typeName + " e);\n"
+ indent + "static " + typeName + " get" + typeName + "(const std::string&);\n"
+ indent + "static std::string get" + typeName + "Name(" + typeName + " e);\n"
+ "\n"
);
w.write(indent + "struct Internal" + typeName + "Converter {\n");
w.write(indent + " " + typeName + " operator()(const ::vespalib::string & __fieldName, const ::vespalib::slime::Inspector & __inspector);\n");
w.write(indent + " " + typeName + " operator()(const ::std::string & __fieldName, const ::vespalib::slime::Inspector & __inspector);\n");
w.write(indent + " " + typeName + " operator()(const ::vespalib::slime::Inspector & __inspector);\n");
w.write(indent + " " + typeName + " operator()(const ::vespalib::slime::Inspector & __inspector, " + typeName + " __eDefault);\n");
w.write(indent + "};\n");
Expand All @@ -322,17 +322,17 @@ void writeTypeDeclarations(Writer w, CNode node, String indent) throws IOExcepti
writeMembers(w, child, indent + " ");
w.write(indent + "};\n");
w.write(indent + "typedef std::vector<" + typeName + "> " + typeName + "Vector;\n\n");
w.write(indent + "typedef std::map<vespalib::string, " + typeName + "> " + typeName + "Map;\n\n");
w.write(indent + "typedef std::map<std::string, " + typeName + "> " + typeName + "Map;\n\n");
}
}
}
}

void writeHeaderFunctionDeclarations(Writer w, String className, CNode node, String indent) throws IOException {
w.write(""
+ indent + "const vespalib::string & defName() const override { return CONFIG_DEF_NAME; }\n"
+ indent + "const vespalib::string & defMd5() const override { return CONFIG_DEF_MD5; }\n"
+ indent + "const vespalib::string & defNamespace() const override { return CONFIG_DEF_NAMESPACE; }\n"
+ indent + "const std::string & defName() const override { return CONFIG_DEF_NAME; }\n"
+ indent + "const std::string & defMd5() const override { return CONFIG_DEF_MD5; }\n"
+ indent + "const std::string & defNamespace() const override { return CONFIG_DEF_NAMESPACE; }\n"
+ indent + "void serialize(::config::ConfigDataBuffer & __buffer) const override;\n");
writeConfigClassFunctionDeclarations(w, "Internal" + className + "Type", node, indent);
}
Expand All @@ -345,7 +345,7 @@ void writeConfigClassFunctionDeclarations(Writer w, String className, CNode node
}

void writeStructFunctionDeclarations(Writer w, String className, CNode node, String indent) throws IOException {
w.write(indent + className + "(const " + vectorTypeDefs.get("vespalib::string") + " & __lines);\n");
w.write(indent + className + "(const " + vectorTypeDefs.get("std::string") + " & __lines);\n");
w.write(indent + className + "(const vespalib::slime::Inspector & __inspector);\n");
w.write(indent + className + "(const ::config::ConfigPayload & __payload);\n");
writeCommonFunctionDeclarations(w, className, node, indent);
Expand Down Expand Up @@ -438,11 +438,11 @@ static String getTypeName(CNode node, boolean includeArray) {
} else if (leaf.getType().equals("enum")) {
type = getTypeName(node.getName());
} else if (leaf.getType().equals("string")) {
type = "vespalib::string";
type = "std::string";
} else if (leaf.getType().equals("reference")) {
type = "vespalib::string";
type = "std::string";
} else if (leaf.getType().equals("file")) {
type = "vespalib::string";
type = "std::string";
} else {
throw new IllegalArgumentException("Unknown leaf datatype " + leaf.getType());
}
Expand All @@ -468,9 +468,9 @@ static String getTypeName(CNode node, boolean includeArray) {

void writeStaticMemberDeclarations(Writer w, String indent) throws IOException {
w.write(""
+ indent + "static const vespalib::string CONFIG_DEF_MD5;\n"
+ indent + "static const vespalib::string CONFIG_DEF_NAME;\n"
+ indent + "static const vespalib::string CONFIG_DEF_NAMESPACE;\n"
+ indent + "static const std::string CONFIG_DEF_MD5;\n"
+ indent + "static const std::string CONFIG_DEF_NAME;\n"
+ indent + "static const std::string CONFIG_DEF_NAMESPACE;\n"
+ indent + "static const ::config::StringVector CONFIG_DEF_SCHEMA;\n"
+ indent + "static const int64_t CONFIG_DEF_SERIALIZE_VERSION;\n"
+ "\n"
Expand Down Expand Up @@ -616,11 +616,11 @@ void writeBodyHeader(Writer w, CNode root, String subdir) throws IOException {

void writeStaticMemberDefinitions(Writer w, CNode root, NormalizedDefinition nd) throws IOException {
String typeName = getInternalClassName(root);
w.write("const vespalib::string " + typeName + "::CONFIG_DEF_MD5(\"" + root.defMd5 + "\");\n"
+ "const vespalib::string " + typeName + "::CONFIG_DEF_NAME(\"" + root.defName + "\");\n"
+ "const vespalib::string " + typeName + "::CONFIG_DEF_NAMESPACE(\"" + root.getNamespace() + "\");\n"
w.write("const std::string " + typeName + "::CONFIG_DEF_MD5(\"" + root.defMd5 + "\");\n"
+ "const std::string " + typeName + "::CONFIG_DEF_NAME(\"" + root.defName + "\");\n"
+ "const std::string " + typeName + "::CONFIG_DEF_NAMESPACE(\"" + root.getNamespace() + "\");\n"
+ "const int64_t " + typeName + "::CONFIG_DEF_SERIALIZE_VERSION(1);\n");
w.write("const static vespalib::string __internalDefSchema[] = {\n");
w.write("const static std::string __internalDefSchema[] = {\n");
for (String line : nd.getNormalizedContent()) {
w.write("\"" + line.replace("\"", "\\\"") + "\",\n");
}
Expand Down Expand Up @@ -648,7 +648,7 @@ void writeDefinition(Writer w, CNode node, String fullClassName) throws IOExcept
LeafCNode.EnumLeaf leaf = (LeafCNode.EnumLeaf) child;
// Definition of getType(string)
w.write(parent + typeName + "\n"
+ parent + "get" + typeName + "(const vespalib::string& name)\n"
+ parent + "get" + typeName + "(const std::string& name)\n"
+ "{\n"
);
for (int i=0; i<leaf.getLegalValues().length; ++i) {
Expand All @@ -663,7 +663,7 @@ void writeDefinition(Writer w, CNode node, String fullClassName) throws IOExcept
+ "\n"
);
// Definition of getTypeName(enum)
w.write("vespalib::string\n"
w.write("std::string\n"
+ parent + "get" + typeName + "Name(" + typeName + " t)\n"
+ "{\n"
+ " switch (t) {\n"
Expand All @@ -681,7 +681,7 @@ void writeDefinition(Writer w, CNode node, String fullClassName) throws IOExcept
+ "}\n"
+ "\n"
);
w.write(parent + typeName + " " + parent + "Internal" + typeName + "Converter::operator()(const ::vespalib::string & __fieldName, const ::vespalib::slime::Inspector & __inspector) {\n");
w.write(parent + typeName + " " + parent + "Internal" + typeName + "Converter::operator()(const ::std::string & __fieldName, const ::vespalib::slime::Inspector & __inspector) {\n");
w.write(" if (__inspector.valid()) {\n");
w.write(" return " + parent + "get" + typeName + "(__inspector.asString().make_string());\n");
w.write(" }\n");
Expand Down Expand Up @@ -770,12 +770,12 @@ void writeDefinition(Writer w, CNode node, String fullClassName) throws IOExcept
+ "{\n"
+ indent + "try {\n");
indent = " ";
w.write(indent + "const " + vectorTypeDefs.get("vespalib::string") + " & __lines(__value.getLines());\n");
w.write(indent + "const " + vectorTypeDefs.get("std::string") + " & __lines(__value.getLines());\n");
} else {
w.write(parent + typeName + "(const " + vectorTypeDefs.get("vespalib::string") +" & __lines)\n"
w.write(parent + typeName + "(const " + vectorTypeDefs.get("std::string") +" & __lines)\n"
+ "{\n");
}
w.write(indent + "std::set<vespalib::string> __remainingValuesToParse = ConfigParser::getUniqueNonWhiteSpaceLines(__lines);\n");
w.write(indent + "std::set<std::string> __remainingValuesToParse = ConfigParser::getUniqueNonWhiteSpaceLines(__lines);\n");
for (CNode child : node.getChildren()) {
String childType = getTypeName(child, false);
String childName = getIdentifier(child.getName());
Expand All @@ -785,11 +785,11 @@ void writeDefinition(Writer w, CNode node, String fullClassName) throws IOExcept
childVectorType = "::config::StringVector";
w.write(indent + childVectorType + " " + childName + "__ValueList(\n ");
} else if (child.isMap) {
w.write(indent + "std::map<vespalib::string, vespalib::string> " + childName + "__ValueMap(\n ");
w.write(indent + "std::map<std::string, std::string> " + childName + "__ValueMap(\n ");
} else {
w.write(indent + childName + " = get" + childType + "(");
}
childType = "vespalib::string";
childType = "std::string";
} else {
w.write(indent + childName + " = ");
}
Expand Down

0 comments on commit 6a8b134

Please sign in to comment.