[C#] Use @ for keyword escaping (#6834)

11 files changed, 12 insertions, 288 deletions

diff --git a/tests/keyword_test/ABC.cs b/tests/keyword_test/ABC.cs
deleted file mode 100644
index 8fc58fb6..00000000
--- a/tests/keyword_test/ABC.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-// <auto-generated>
-//  automatically generated by the FlatBuffers compiler, do not modify
-// </auto-generated>
-
-[Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.StringEnumConverter))]
-public enum ABC : int
-{
-  void_ = 0,
-  where = 1,
-  stackalloc_ = 2,
-};
-
diff --git a/tests/keyword_test/KeywordsInTable.cs b/tests/keyword_test/KeywordsInTable.cs
deleted file mode 100644
index 88019bab..00000000
--- a/tests/keyword_test/KeywordsInTable.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-// <auto-generated>
-//  automatically generated by the FlatBuffers compiler, do not modify
-// </auto-generated>
-
-using global::System;
-using global::System.Collections.Generic;
-using global::FlatBuffers;
-
-public struct KeywordsInTable : IFlatbufferObject
-{
-  private Table __p;
-  public ByteBuffer ByteBuffer { get { return __p.bb; } }
-  public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_2_0_0(); }
-  public static KeywordsInTable GetRootAsKeywordsInTable(ByteBuffer _bb) { return GetRootAsKeywordsInTable(_bb, new KeywordsInTable()); }
-  public static KeywordsInTable GetRootAsKeywordsInTable(ByteBuffer _bb, KeywordsInTable obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); }
-  public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); }
-  public KeywordsInTable __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; }
-
-  public ABC Is { get { int o = __p.__offset(4); return o != 0 ? (ABC)__p.bb.GetInt(o + __p.bb_pos) : ABC.void_; } }
-  public bool MutateIs(ABC is_) { int o = __p.__offset(4); if (o != 0) { __p.bb.PutInt(o + __p.bb_pos, (int)is_); return true; } else { return false; } }
-  public public_ Private { get { int o = __p.__offset(6); return o != 0 ? (public_)__p.bb.GetInt(o + __p.bb_pos) : public_.NONE; } }
-  public bool MutatePrivate(public_ private_) { int o = __p.__offset(6); if (o != 0) { __p.bb.PutInt(o + __p.bb_pos, (int)private_); return true; } else { return false; } }
-  public int Type { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } }
-  public bool MutateType(int type) { int o = __p.__offset(8); if (o != 0) { __p.bb.PutInt(o + __p.bb_pos, type); return true; } else { return false; } }
-
-  public static Offset<KeywordsInTable> CreateKeywordsInTable(FlatBufferBuilder builder,
-      ABC is_ = ABC.void_,
-      public_ private_ = public_.NONE,
-      int type = 0) {
-    builder.StartTable(3);
-    KeywordsInTable.AddType(builder, type);
-    KeywordsInTable.AddPrivate(builder, private_);
-    KeywordsInTable.AddIs(builder, is_);
-    return KeywordsInTable.EndKeywordsInTable(builder);
-  }
-
-  public static void StartKeywordsInTable(FlatBufferBuilder builder) { builder.StartTable(3); }
-  public static void AddIs(FlatBufferBuilder builder, ABC is_) { builder.AddInt(0, (int)is_, 0); }
-  public static void AddPrivate(FlatBufferBuilder builder, public_ private_) { builder.AddInt(1, (int)private_, 0); }
-  public static void AddType(FlatBufferBuilder builder, int type) { builder.AddInt(2, type, 0); }
-  public static Offset<KeywordsInTable> EndKeywordsInTable(FlatBufferBuilder builder) {
-    int o = builder.EndTable();
-    return new Offset<KeywordsInTable>(o);
-  }
-  public KeywordsInTableT UnPack() {
-    var _o = new KeywordsInTableT();
-    this.UnPackTo(_o);
-    return _o;
-  }
-  public void UnPackTo(KeywordsInTableT _o) {
-    _o.Is = this.Is;
-    _o.Private = this.Private;
-    _o.Type = this.Type;
-  }
-  public static Offset<KeywordsInTable> Pack(FlatBufferBuilder builder, KeywordsInTableT _o) {
-    if (_o == null) return default(Offset<KeywordsInTable>);
-    return CreateKeywordsInTable(
-      builder,
-      _o.Is,
-      _o.Private,
-      _o.Type);
-  }
-}
-
-public class KeywordsInTableT
-{
-  [Newtonsoft.Json.JsonProperty("is")]
-  public ABC Is { get; set; }
-  [Newtonsoft.Json.JsonProperty("private")]
-  public public_ Private { get; set; }
-  [Newtonsoft.Json.JsonProperty("type")]
-  public int Type { get; set; }
-
-  public KeywordsInTableT() {
-    this.Is = ABC.void_;
-    this.Private = public_.NONE;
-    this.Type = 0;
-  }
-}
-
diff --git a/tests/keyword_test/KeywordsInUnion.cs b/tests/keyword_test/KeywordsInUnion.cs
deleted file mode 100644
index 24b126ee..00000000
--- a/tests/keyword_test/KeywordsInUnion.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-// <auto-generated>
-//  automatically generated by the FlatBuffers compiler, do not modify
-// </auto-generated>
-
-[Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.StringEnumConverter))]
-public enum KeywordsInUnion : byte
-{
-  NONE = 0,
-  static_ = 1,
-  internal_ = 2,
-};
-
-public class KeywordsInUnionUnion {
-  public KeywordsInUnion Type { get; set; }
-  public object Value { get; set; }
-
-  public KeywordsInUnionUnion() {
-    this.Type = KeywordsInUnion.NONE;
-    this.Value = null;
-  }
-
-  public T As<T>() where T : class { return this.Value as T; }
-  public KeywordsInTableT Asstatic() { return this.As<KeywordsInTableT>(); }
-  public static KeywordsInUnionUnion Fromstatic(KeywordsInTableT _static) { return new KeywordsInUnionUnion{ Type = KeywordsInUnion.static_, Value = _static }; }
-  public KeywordsInTableT Asinternal() { return this.As<KeywordsInTableT>(); }
-  public static KeywordsInUnionUnion Frominternal(KeywordsInTableT _internal) { return new KeywordsInUnionUnion{ Type = KeywordsInUnion.internal_, Value = _internal }; }
-
-  public static int Pack(FlatBuffers.FlatBufferBuilder builder, KeywordsInUnionUnion _o) {
-    switch (_o.Type) {
-      default: return 0;
-      case KeywordsInUnion.static_: return KeywordsInTable.Pack(builder, _o.Asstatic()).Value;
-      case KeywordsInUnion.internal_: return KeywordsInTable.Pack(builder, _o.Asinternal()).Value;
-    }
-  }
-}
-
-public class KeywordsInUnionUnion_JsonConverter : Newtonsoft.Json.JsonConverter {
-  public override bool CanConvert(System.Type objectType) {
-    return objectType == typeof(KeywordsInUnionUnion) || objectType == typeof(System.Collections.Generic.List<KeywordsInUnionUnion>);
-  }
-  public override void WriteJson(Newtonsoft.Json.JsonWriter writer, object value, Newtonsoft.Json.JsonSerializer serializer) {
-    var _olist = value as System.Collections.Generic.List<KeywordsInUnionUnion>;
-    if (_olist != null) {
-      writer.WriteStartArray();
-      foreach (var _o in _olist) { this.WriteJson(writer, _o, serializer); }
-      writer.WriteEndArray();
-    } else {
-      this.WriteJson(writer, value as KeywordsInUnionUnion, serializer);
-    }
-  }
-  public void WriteJson(Newtonsoft.Json.JsonWriter writer, KeywordsInUnionUnion _o, Newtonsoft.Json.JsonSerializer serializer) {
-    if (_o == null) return;
-    serializer.Serialize(writer, _o.Value);
-  }
-  public override object ReadJson(Newtonsoft.Json.JsonReader reader, System.Type objectType, object existingValue, Newtonsoft.Json.JsonSerializer serializer) {
-    var _olist = existingValue as System.Collections.Generic.List<KeywordsInUnionUnion>;
-    if (_olist != null) {
-      for (var _j = 0; _j < _olist.Count; ++_j) {
-        reader.Read();
-        _olist[_j] = this.ReadJson(reader, _olist[_j], serializer);
-      }
-      reader.Read();
-      return _olist;
-    } else {
-      return this.ReadJson(reader, existingValue as KeywordsInUnionUnion, serializer);
-    }
-  }
-  public KeywordsInUnionUnion ReadJson(Newtonsoft.Json.JsonReader reader, KeywordsInUnionUnion _o, Newtonsoft.Json.JsonSerializer serializer) {
-    if (_o == null) return null;
-    switch (_o.Type) {
-      default: break;
-      case KeywordsInUnion.static_: _o.Value = serializer.Deserialize<KeywordsInTableT>(reader); break;
-      case KeywordsInUnion.internal_: _o.Value = serializer.Deserialize<KeywordsInTableT>(reader); break;
-    }
-    return _o;
-  }
-}
-
diff --git a/tests/keyword_test/abc_generated.rs b/tests/keyword_test/keyword_test/abc_generated.rs
index 99b43e46..99b43e46 100644
--- a/tests/keyword_test/abc_generated.rs
+++ b/tests/keyword_test/keyword_test/abc_generated.rs
diff --git a/tests/keyword_test/keywords_in_table_generated.rs b/tests/keyword_test/keyword_test/keywords_in_table_generated.rs
index 5ced5c0a..17bcd0c0 100644
--- a/tests/keyword_test/keywords_in_table_generated.rs
+++ b/tests/keyword_test/keyword_test/keywords_in_table_generated.rs
@@ -25,7 +25,7 @@ impl<'a> KeywordsInTable<'a> {
   pub const VT_TYPE_: flatbuffers::VOffsetT = 8;
 
   pub const fn get_fully_qualified_name() -> &'static str {
-    "KeywordsInTable"
+    "KeywordTest.KeywordsInTable"
   }
 
   #[inline]
diff --git a/tests/keyword_test/keywords_in_union_generated.rs b/tests/keyword_test/keyword_test/keywords_in_union_generated.rs
index cf03797f..cf03797f 100644
--- a/tests/keyword_test/keywords_in_union_generated.rs
+++ b/tests/keyword_test/keyword_test/keywords_in_union_generated.rs
diff --git a/tests/keyword_test/public_generated.rs b/tests/keyword_test/keyword_test/public_generated.rs
index 2de4c0b2..2de4c0b2 100644
--- a/tests/keyword_test/public_generated.rs
+++ b/tests/keyword_test/keyword_test/public_generated.rs
diff --git a/tests/keyword_test/mod.rs b/tests/keyword_test/mod.rs
index 02506f8e..94ce6504 100644
--- a/tests/keyword_test/mod.rs
+++ b/tests/keyword_test/mod.rs
@@ -1,9 +1,12 @@
 // Automatically generated by the Flatbuffers compiler. Do not modify.
-mod abc_generated;
-pub use self::abc_generated::*;
-mod public_generated;
-pub use self::public_generated::*;
-mod keywords_in_union_generated;
-pub use self::keywords_in_union_generated::*;
-mod keywords_in_table_generated;
-pub use self::keywords_in_table_generated::*;
+pub mod keyword_test {
+  use super::*;
+  mod abc_generated;
+  pub use self::abc_generated::*;
+  mod public_generated;
+  pub use self::public_generated::*;
+  mod keywords_in_union_generated;
+  pub use self::keywords_in_union_generated::*;
+  mod keywords_in_table_generated;
+  pub use self::keywords_in_table_generated::*;
+} // keyword_test
diff --git a/tests/keyword_test/public.cs b/tests/keyword_test/public.cs
deleted file mode 100644
index c2f5a022..00000000
--- a/tests/keyword_test/public.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-// <auto-generated>
-//  automatically generated by the FlatBuffers compiler, do not modify
-// </auto-generated>
-
-[Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.StringEnumConverter))]
-public enum public_ : int
-{
-  NONE = 0,
-};
-
diff --git a/tests/keyword_test/type.cs b/tests/keyword_test/type.cs
deleted file mode 100644
index 9938a2fa..00000000
--- a/tests/keyword_test/type.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-// <auto-generated>
-//  automatically generated by the FlatBuffers compiler, do not modify
-// </auto-generated>
-
-[Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.StringEnumConverter))]
-public enum type : sbyte
-{
-  NONE = 0,
-};
-
diff --git a/tests/keyword_test/type_generated.rs b/tests/keyword_test/type_generated.rs
deleted file mode 100644
index ff932391..00000000
--- a/tests/keyword_test/type_generated.rs
+++ /dev/null
@@ -1,89 +0,0 @@
-// automatically generated by the FlatBuffers compiler, do not modify
-extern crate flatbuffers;
-use std::mem;
-use std::cmp::Ordering;
-use self::flatbuffers::{EndianScalar, Follow};
-use super::*;
-#[deprecated(since = "2.0.0", note = "Use associated constants instead. This will no longer be generated in 2021.")]
-pub const ENUM_MIN_TYPE_: i8 = 0;
-#[deprecated(since = "2.0.0", note = "Use associated constants instead. This will no longer be generated in 2021.")]
-pub const ENUM_MAX_TYPE_: i8 = 0;
-#[deprecated(since = "2.0.0", note = "Use associated constants instead. This will no longer be generated in 2021.")]
-#[allow(non_camel_case_types)]
-pub const ENUM_VALUES_TYPE_: [type_; 1] = [
-  type_::NONE,
-];
-
-#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Default)]
-#[repr(transparent)]
-pub struct type_(pub i8);
-#[allow(non_upper_case_globals)]
-impl type_ {
-  pub const NONE: Self = Self(0);
-
-  pub const ENUM_MIN: i8 = 0;
-  pub const ENUM_MAX: i8 = 0;
-  pub const ENUM_VALUES: &'static [Self] = &[
-    Self::NONE,
-  ];
-  /// Returns the variant's name or "" if unknown.
-  pub fn variant_name(self) -> Option<&'static str> {
-    match self {
-      Self::NONE => Some("NONE"),
-      _ => None,
-    }
-  }
-}
-impl std::fmt::Debug for type_ {
-  fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-    if let Some(name) = self.variant_name() {
-      f.write_str(name)
-    } else {
-      f.write_fmt(format_args!("<UNKNOWN {:?}>", self.0))
-    }
-  }
-}
-impl<'a> flatbuffers::Follow<'a> for type_ {
-  type Inner = Self;
-  #[inline]
-  fn follow(buf: &'a [u8], loc: usize) -> Self::Inner {
-    let b = unsafe {
-      flatbuffers::read_scalar_at::<i8>(buf, loc)
-    };
-    Self(b)
-  }
-}
-
-impl flatbuffers::Push for type_ {
-    type Output = type_;
-    #[inline]
-    fn push(&self, dst: &mut [u8], _rest: &[u8]) {
-        unsafe { flatbuffers::emplace_scalar::<i8>(dst, self.0); }
-    }
-}
-
-impl flatbuffers::EndianScalar for type_ {
-  #[inline]
-  fn to_little_endian(self) -> Self {
-    let b = i8::to_le(self.0);
-    Self(b)
-  }
-  #[inline]
-  #[allow(clippy::wrong_self_convention)]
-  fn from_little_endian(self) -> Self {
-    let b = i8::from_le(self.0);
-    Self(b)
-  }
-}
-
-impl<'a> flatbuffers::Verifiable for type_ {
-  #[inline]
-  fn run_verifier(
-    v: &mut flatbuffers::Verifier, pos: usize
-  ) -> Result<(), flatbuffers::InvalidFlatbuffer> {
-    use self::flatbuffers::Verifiable;
-    i8::run_verifier(v, pos)
-  }
-}
-
-impl flatbuffers::SimpleToVerifyInSlice for type_ {}