make unions with type aliases more usable (#5019)

Some generic C++ and Rust code is not generated when unions use type
aliases because of potential ambiguity. Actually check for this
ambiguity and only disable offending code only if it is found.
This commit is contained in:
Frank Benkstein
2018-11-01 20:51:25 +01:00
committed by Wouter van Oortmerssen
parent 4c3b6c247d
commit 91fe9ba93f
33 changed files with 1773 additions and 37 deletions

View File

@@ -43,6 +43,26 @@ MyGame.Example.Any = {
MyGame_Example2_Monster: 3, 3: 'MyGame_Example2_Monster'
};
/**
* @enum
*/
MyGame.Example.AnyUniqueAliases = {
NONE: 0, 0: 'NONE',
M: 1, 1: 'M',
T: 2, 2: 'T',
M2: 3, 3: 'M2'
};
/**
* @enum
*/
MyGame.Example.AnyAmbiguousAliases = {
NONE: 0, 0: 'NONE',
M1: 1, 1: 'M1',
M2: 2, 2: 'M2',
M3: 3, 3: 'M3'
};
/**
* @constructor
*/
@@ -1654,11 +1674,75 @@ MyGame.Example.Monster.prototype.vectorOfNonOwningReferencesLength = function()
return offset ? this.bb.__vector_len(this.bb_pos + offset) : 0;
};
/**
* @returns {MyGame.Example.AnyUniqueAliases}
*/
MyGame.Example.Monster.prototype.anyUniqueType = function() {
var offset = this.bb.__offset(this.bb_pos, 90);
return offset ? /** @type {MyGame.Example.AnyUniqueAliases} */ (this.bb.readUint8(this.bb_pos + offset)) : MyGame.Example.AnyUniqueAliases.NONE;
};
/**
* @param {MyGame.Example.AnyUniqueAliases} value
* @returns {boolean}
*/
MyGame.Example.Monster.prototype.mutate_any_unique_type = function(value) {
var offset = this.bb.__offset(this.bb_pos, 90);
if (offset === 0) {
return false;
}
this.bb.writeUint8(this.bb_pos + offset, value);
return true;
};
/**
* @param {flatbuffers.Table} obj
* @returns {?flatbuffers.Table}
*/
MyGame.Example.Monster.prototype.anyUnique = function(obj) {
var offset = this.bb.__offset(this.bb_pos, 92);
return offset ? this.bb.__union(obj, this.bb_pos + offset) : null;
};
/**
* @returns {MyGame.Example.AnyAmbiguousAliases}
*/
MyGame.Example.Monster.prototype.anyAmbiguousType = function() {
var offset = this.bb.__offset(this.bb_pos, 94);
return offset ? /** @type {MyGame.Example.AnyAmbiguousAliases} */ (this.bb.readUint8(this.bb_pos + offset)) : MyGame.Example.AnyAmbiguousAliases.NONE;
};
/**
* @param {MyGame.Example.AnyAmbiguousAliases} value
* @returns {boolean}
*/
MyGame.Example.Monster.prototype.mutate_any_ambiguous_type = function(value) {
var offset = this.bb.__offset(this.bb_pos, 94);
if (offset === 0) {
return false;
}
this.bb.writeUint8(this.bb_pos + offset, value);
return true;
};
/**
* @param {flatbuffers.Table} obj
* @returns {?flatbuffers.Table}
*/
MyGame.Example.Monster.prototype.anyAmbiguous = function(obj) {
var offset = this.bb.__offset(this.bb_pos, 96);
return offset ? this.bb.__union(obj, this.bb_pos + offset) : null;
};
/**
* @param {flatbuffers.Builder} builder
*/
MyGame.Example.Monster.startMonster = function(builder) {
builder.startObject(43);
builder.startObject(47);
};
/**
@@ -2315,6 +2399,38 @@ MyGame.Example.Monster.startVectorOfNonOwningReferencesVector = function(builder
builder.startVector(8, numElems, 8);
};
/**
* @param {flatbuffers.Builder} builder
* @param {MyGame.Example.AnyUniqueAliases} anyUniqueType
*/
MyGame.Example.Monster.addAnyUniqueType = function(builder, anyUniqueType) {
builder.addFieldInt8(43, anyUniqueType, MyGame.Example.AnyUniqueAliases.NONE);
};
/**
* @param {flatbuffers.Builder} builder
* @param {flatbuffers.Offset} anyUniqueOffset
*/
MyGame.Example.Monster.addAnyUnique = function(builder, anyUniqueOffset) {
builder.addFieldOffset(44, anyUniqueOffset, 0);
};
/**
* @param {flatbuffers.Builder} builder
* @param {MyGame.Example.AnyAmbiguousAliases} anyAmbiguousType
*/
MyGame.Example.Monster.addAnyAmbiguousType = function(builder, anyAmbiguousType) {
builder.addFieldInt8(45, anyAmbiguousType, MyGame.Example.AnyAmbiguousAliases.NONE);
};
/**
* @param {flatbuffers.Builder} builder
* @param {flatbuffers.Offset} anyAmbiguousOffset
*/
MyGame.Example.Monster.addAnyAmbiguous = function(builder, anyAmbiguousOffset) {
builder.addFieldOffset(46, anyAmbiguousOffset, 0);
};
/**
* @param {flatbuffers.Builder} builder
* @returns {flatbuffers.Offset}