BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-30 01:32:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed JS/TS codegen to use stable non-compiler dependent hash.

Browse Source 
Different implementations of std::hash kept littering commits with
namespace changes.

Change-Id: Ic2d4fdcd76f8fef9802bc1572eb74ae7427085e3
This commit is contained in:
Wouter van Oortmerssen
2018-09-21 09:41:11 -07:00
parent e317b148dc
commit 4b10656f9b
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/idl_gen_js.cpp
View File

@@ -507,8 +507,7 @@ class JsGenerator : public BaseGenerator {
} }
static std::string GenFileNamespacePrefix(const std::string &file) { static std::string GenFileNamespacePrefix(const std::string &file) {
return "NS" + std::to_string(static_cast<unsigned long long>( return "NS" + std::to_string(HashFnv1a<uint64_t>(file.c_str()));
std::hash<std::string>()(file)));
} }
static std::string GenPrefixedImport(const std::string &full_file_name, static std::string GenPrefixedImport(const std::string &full_file_name,

20
tests/namespace_test/namespace_test2_generated.ts
View File

@@ -1,6 +1,6 @@
// automatically generated by the FlatBuffers compiler, do not modify // automatically generated by the FlatBuffers compiler, do not modify
import * as NS9459827973991502386 from "./namespace_test1_generated"; import * as NS8755221360535654258 from "./namespace_test1_generated";
/** /**
* @constructor * @constructor
*/ */
@@ -33,24 +33,24 @@ static getRootAsTableInFirstNS(bb:flatbuffers.ByteBuffer, obj?:TableInFirstNS):T
* @param NamespaceA.NamespaceB.TableInNestedNS= obj * @param NamespaceA.NamespaceB.TableInNestedNS= obj
* @returns NamespaceA.NamespaceB.TableInNestedNS|null * @returns NamespaceA.NamespaceB.TableInNestedNS|null
*/ */
fooTable(obj?:NS9459827973991502386.NamespaceA.NamespaceB.TableInNestedNS):NS9459827973991502386.NamespaceA.NamespaceB.TableInNestedNS|null { fooTable(obj?:NS8755221360535654258.NamespaceA.NamespaceB.TableInNestedNS):NS8755221360535654258.NamespaceA.NamespaceB.TableInNestedNS|null {
var offset = this.bb!.__offset(this.bb_pos, 4); var offset = this.bb!.__offset(this.bb_pos, 4);
return offset ? (obj || new NS9459827973991502386.NamespaceA.NamespaceB.TableInNestedNS).__init(this.bb!.__indirect(this.bb_pos + offset), this.bb!) : null; return offset ? (obj || new NS8755221360535654258.NamespaceA.NamespaceB.TableInNestedNS).__init(this.bb!.__indirect(this.bb_pos + offset), this.bb!) : null;
}; };
/** /**
* @returns NamespaceA.NamespaceB.EnumInNestedNS * @returns NamespaceA.NamespaceB.EnumInNestedNS
*/ */
fooEnum():NS9459827973991502386.NamespaceA.NamespaceB.EnumInNestedNS { fooEnum():NS8755221360535654258.NamespaceA.NamespaceB.EnumInNestedNS {
var offset = this.bb!.__offset(this.bb_pos, 6); var offset = this.bb!.__offset(this.bb_pos, 6);
return offset ? /** */ (this.bb!.readInt8(this.bb_pos + offset)) : NS9459827973991502386.NamespaceA.NamespaceB.EnumInNestedNS.A; return offset ? /** */ (this.bb!.readInt8(this.bb_pos + offset)) : NS8755221360535654258.NamespaceA.NamespaceB.EnumInNestedNS.A;
}; };
/** /**
* @param NamespaceA.NamespaceB.EnumInNestedNS value * @param NamespaceA.NamespaceB.EnumInNestedNS value
* @returns boolean * @returns boolean
*/ */
mutate_foo_enum(value:NS9459827973991502386.NamespaceA.NamespaceB.EnumInNestedNS):boolean { mutate_foo_enum(value:NS8755221360535654258.NamespaceA.NamespaceB.EnumInNestedNS):boolean {
var offset = this.bb!.__offset(this.bb_pos, 6); var offset = this.bb!.__offset(this.bb_pos, 6);
if (offset === 0) { if (offset === 0) {
@@ -65,9 +65,9 @@ mutate_foo_enum(value:NS9459827973991502386.NamespaceA.NamespaceB.EnumInNestedNS
* @param NamespaceA.NamespaceB.StructInNestedNS= obj * @param NamespaceA.NamespaceB.StructInNestedNS= obj
* @returns NamespaceA.NamespaceB.StructInNestedNS|null * @returns NamespaceA.NamespaceB.StructInNestedNS|null
*/ */
fooStruct(obj?:NS9459827973991502386.NamespaceA.NamespaceB.StructInNestedNS):NS9459827973991502386.NamespaceA.NamespaceB.StructInNestedNS|null { fooStruct(obj?:NS8755221360535654258.NamespaceA.NamespaceB.StructInNestedNS):NS8755221360535654258.NamespaceA.NamespaceB.StructInNestedNS|null {
var offset = this.bb!.__offset(this.bb_pos, 8); var offset = this.bb!.__offset(this.bb_pos, 8);
return offset ? (obj || new NS9459827973991502386.NamespaceA.NamespaceB.StructInNestedNS).__init(this.bb_pos + offset, this.bb!) : null; return offset ? (obj || new NS8755221360535654258.NamespaceA.NamespaceB.StructInNestedNS).__init(this.bb_pos + offset, this.bb!) : null;
}; };
/** /**
@@ -89,8 +89,8 @@ static addFooTable(builder:flatbuffers.Builder, fooTableOffset:flatbuffers.Offse
* @param flatbuffers.Builder builder * @param flatbuffers.Builder builder
* @param NamespaceA.NamespaceB.EnumInNestedNS fooEnum * @param NamespaceA.NamespaceB.EnumInNestedNS fooEnum
*/ */
static addFooEnum(builder:flatbuffers.Builder, fooEnum:NS9459827973991502386.NamespaceA.NamespaceB.EnumInNestedNS) { static addFooEnum(builder:flatbuffers.Builder, fooEnum:NS8755221360535654258.NamespaceA.NamespaceB.EnumInNestedNS) {
builder.addFieldInt8(1, fooEnum, NS9459827973991502386.NamespaceA.NamespaceB.EnumInNestedNS.A); builder.addFieldInt8(1, fooEnum, NS8755221360535654258.NamespaceA.NamespaceB.EnumInNestedNS.A);
}; };
/** /**