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

Add C#/Java generator behaviour for 'private' attribute (#4882)

Browse Source 
* Added 'private' attribute, supported when generating C# and Java

* Added use of 'private' attribute in monster_test
This commit is contained in:
Andy Martin
2018-08-16 23:25:33 +01:00
committed by Wouter van Oortmerssen
parent 1f03becd24
commit c2c3a84aaf
5 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/flatbuffers/idl.h
View File

@@ -564,6 +564,7 @@ class Parser : public ParserState {
known_attributes_["native_type"] = true;
known_attributes_["native_default"] = true;
known_attributes_["flexbuffer"] = true;
known_attributes_["private"] = true;
}
~Parser() {

21
src/idl_gen_general.cpp
View File

@@ -504,7 +504,16 @@ class GeneralGenerator : public BaseGenerator {
// to map directly to how they're used in C/C++ and file formats.
// That, and Java Enums are expensive, and not universally liked.
GenComment(enum_def.doc_comment, code_ptr, &lang_.comment_config);
code += std::string("public ") + lang_.enum_decl + enum_def.name;
if (enum_def.attributes.Lookup("private")) {
// For Java, we leave the enum unmarked to indicate package-private
// For C# we mark the enum as internal
if (lang_.language == IDLOptions::kCSharp) {
code += "internal ";
}
} else {
code += "public ";
}
code += lang_.enum_decl + enum_def.name;
if (lang_.language == IDLOptions::kCSharp) {
code += lang_.inheritance_marker +
GenTypeBasic(enum_def.underlying_type, false);
@@ -773,7 +782,15 @@ class GeneralGenerator : public BaseGenerator {
// int o = __offset(offset); return o != 0 ? bb.getType(o + i) : default;
// }
GenComment(struct_def.doc_comment, code_ptr, &lang_.comment_config);
code += "public ";
if (struct_def.attributes.Lookup("private")) {
// For Java, we leave the struct unmarked to indicate package-private
// For C# we mark the struct as internal
if (lang_.language == IDLOptions::kCSharp) {
code += "internal ";
}
} else {
code += "public ";
}
if (lang_.language == IDLOptions::kCSharp &&
struct_def.attributes.Lookup("csharp_partial")) {
// generate a partial class for this C# struct/table

2
tests/MyGame/Example/TestSimpleTableWithEnum.cs
View File

@@ -8,7 +8,7 @@ namespace MyGame.Example
using global::System;
using global::FlatBuffers;
public partial struct TestSimpleTableWithEnum : IFlatbufferObject
internal partial struct TestSimpleTableWithEnum : IFlatbufferObject
{
private Table __p;
public ByteBuffer ByteBuffer { get { return __p.bb; } }

2
tests/MyGame/Example/TestSimpleTableWithEnum.java
View File

@@ -8,7 +8,7 @@ import java.util.*;
import com.google.flatbuffers.*;
@SuppressWarnings("unused")
public final class TestSimpleTableWithEnum extends Table {
final class TestSimpleTableWithEnum extends Table {
public static TestSimpleTableWithEnum getRootAsTestSimpleTableWithEnum(ByteBuffer _bb) { return getRootAsTestSimpleTableWithEnum(_bb, new TestSimpleTableWithEnum()); }
public static TestSimpleTableWithEnum getRootAsTestSimpleTableWithEnum(ByteBuffer _bb, TestSimpleTableWithEnum obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
public void __init(int _i, ByteBuffer _bb) { bb_pos = _i; bb = _bb; }

2
tests/monster_test.fbs
View File

@@ -20,7 +20,7 @@ union Any { Monster, TestSimpleTableWithEnum, MyGame.Example2.Monster }
struct Test { a:short; b:byte; }
table TestSimpleTableWithEnum (csharp_partial) {
table TestSimpleTableWithEnum (csharp_partial, private) {
color: Color = Green;
}