mirror of
https://github.com/google/flatbuffers.git
synced 2026-06-02 04:04:19 +00:00
Fixed inconsistent use of namespace directory prefixing.
Change-Id: I2cab7a1f68b8e643c1057e0a366572421a94ed41 Tested: on Linux.
This commit is contained in:
@@ -1392,8 +1392,7 @@ std::string GeneralMakeRule(const Parser &parser, const std::string &path,
|
||||
auto &enum_def = **it;
|
||||
if (make_rule != "") make_rule += " ";
|
||||
std::string directory =
|
||||
BaseGenerator::NamespaceDir(parser, path, *enum_def.defined_namespace) +
|
||||
kPathSeparator;
|
||||
BaseGenerator::NamespaceDir(parser, path, *enum_def.defined_namespace);
|
||||
make_rule += directory + enum_def.name + lang.file_extension;
|
||||
}
|
||||
|
||||
@@ -1402,8 +1401,8 @@ std::string GeneralMakeRule(const Parser &parser, const std::string &path,
|
||||
auto &struct_def = **it;
|
||||
if (make_rule != "") make_rule += " ";
|
||||
std::string directory =
|
||||
BaseGenerator::NamespaceDir(parser, path, *struct_def.defined_namespace) +
|
||||
kPathSeparator;
|
||||
BaseGenerator::NamespaceDir(parser, path,
|
||||
*struct_def.defined_namespace);
|
||||
make_rule += directory + struct_def.name + lang.file_extension;
|
||||
}
|
||||
|
||||
|
||||
@@ -89,10 +89,10 @@ namespace php {
|
||||
code += classcode;
|
||||
|
||||
std::string filename = NamespaceDir(*def.defined_namespace) +
|
||||
kPathSeparator + def.name + ".php";
|
||||
def.name + ".php";
|
||||
return SaveFile(filename.c_str(), code, false);
|
||||
}
|
||||
|
||||
|
||||
// Begin a class declaration.
|
||||
static void BeginClass(const StructDef &struct_def, std::string *code_ptr) {
|
||||
std::string &code = *code_ptr;
|
||||
@@ -955,7 +955,7 @@ namespace php {
|
||||
code += Indent + Indent + "return $builder->offset();\n";
|
||||
code += Indent + "}\n";
|
||||
}
|
||||
|
||||
|
||||
};
|
||||
} // namespace php
|
||||
|
||||
|
||||
@@ -655,7 +655,7 @@ class PythonGenerator : public BaseGenerator {
|
||||
BeginFile(LastNamespacePart(*def.defined_namespace), needs_imports, &code);
|
||||
code += classcode;
|
||||
std::string filename = NamespaceDir(*def.defined_namespace) +
|
||||
kPathSeparator + def.name + ".py";
|
||||
def.name + ".py";
|
||||
return SaveFile(filename.c_str(), code, false);
|
||||
}
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user