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

Make Monster's Color unsigned (#5318)

Browse Source 
- update C++ monster_test::Color to unsigned type
- update Go Color:ubyte in the go_test.go
- add workaround for unsigned enum in java test
- sync generate.bat and generate.sh
This commit is contained in:
Vladimir Glavnyy
2019-05-10 00:07:38 +07:00
committed by Wouter van Oortmerssen
parent b701c7d56e
commit f9ebfcb9c4
37 changed files with 177 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/monster_test_generated.rs
View File

@@ -164,7 +164,7 @@ pub mod example {
use self::flatbuffers::EndianScalar;
#[allow(non_camel_case_types)]
#[repr(i8)]
#[repr(u8)]
#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Debug)]
pub enum Color {
Red = 1,
@@ -173,8 +173,8 @@ pub enum Color {
}
const ENUM_MIN_COLOR: i8 = 1;
const ENUM_MAX_COLOR: i8 = 8;
const ENUM_MIN_COLOR: u8 = 1;
const ENUM_MAX_COLOR: u8 = 8;
impl<'a> flatbuffers::Follow<'a> for Color {
type Inner = Self;
@@ -187,14 +187,14 @@ impl<'a> flatbuffers::Follow<'a> for Color {
impl flatbuffers::EndianScalar for Color {
#[inline]
fn to_little_endian(self) -> Self {
let n = i8::to_le(self as i8);
let p = &n as *const i8 as *const Color;
let n = u8::to_le(self as u8);
let p = &n as *const u8 as *const Color;
unsafe { *p }
}
#[inline]
fn from_little_endian(self) -> Self {
let n = i8::from_le(self as i8);
let p = &n as *const i8 as *const Color;
let n = u8::from_le(self as u8);
let p = &n as *const u8 as *const Color;
unsafe { *p }
}
}
@@ -227,7 +227,7 @@ const ENUM_NAMES_COLOR:[&'static str; 8] = [
];
pub fn enum_name_color(e: Color) -> &'static str {
let index = e as i8 - Color::Red as i8;
let index = e as u8 - Color::Red as u8;
ENUM_NAMES_COLOR[index as usize]
}