fix order pkey fields

.gitea/workflows/build_composer.yaml

@@ -1,30 +0,0 @@
-
-
-name: Publish PHP Package
-
-on:
-  push:
-    tags:
-      - 'v*'
-
-jobs:
-  docker:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Get tag name
-      run: echo "TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-
-    - name: zip and send
-      run: |
-        ls -la
-        apt-get update -y
-        apt-get install -y zip
-        cd ../
-        zip -r ${{ gitea.event.repository.name }}.zip ${{ gitea.event.repository.name }} -x '*.git*'
-        curl -v \
-        --user composer-pbl:${{ secrets.COMPOSER_PSWD }} \
-        --upload-file ${{ gitea.event.repository.name }}.zip \
-        https://git.bit5.ru/api/packages/bit/composer?version=${{ env.TAG }}              

CHANGELOG.md

@@ -1,17 +0,0 @@
-## v4.10.0
-- Added @flt_i18n token to support translations
-## v4.9.2
-- Added @cs_obsolete token, that mark fields with [Obsolete]. @cs_obsolete:"Comment" will add summary with "Comment" to field
-
-## v4.9.1
-- Fixing nested diffable POD structs being incorrectly marked as clean in GetDiff
-
-## v4.8.2
-- Fixing thread safety possible issue when reading an array of enums 
-- Fixing bug when the target enum array property wouldn't be cleared before reading data 
-
-## v4.8.0
-- Using C# built-in initialization routines instead of MetaIO's methods
-
-## v4.7.0
-- Array comparison generated code now takes bitfields token into account for array entries 

README.md

@@ -2,9 +2,12 @@ This package is used for code generation of C# meta structs using Twig templates
 
 Usage example:
 
-    $code = \metagen_cs\codegen(null, get_meta(), 
-    [
-      'namespace' => 'BitGames.Autogen'
-    ]);
-    file_put_contents('bundle.cs', $code);
-
+    $twig = \metagen_cs\get_twig();
+    file_put_contents('bundle.cs', 
+      $twig->render("codegen_bundle.twig", 
+        [
+         'namespace' => 'BitGames.Autogen',
+         'meta' => get_meta()
+        ]
+      )
+    );

composer.json

@@ -5,7 +5,7 @@
     "require": {
         "php": ">=7.4",
         "twig/twig" : "v3.4.3",
-        "bit/metagen" : "^v3.0.0"
+        "bit/metagen" : "^v2.0.2"
     },
     "autoload": {
         "files": [

src/codegen.inc.php

@@ -2,23 +2,7 @@
 namespace metagen_cs;
 use Exception;
 
-function codegen(?string $cache_dir, \mtgMetaInfo $meta, array $options = []) : string
-{
-  $twig = get_twig();
-
-  if(!empty($cache_dir))
-    $twig->setCache($cache_dir);
-
-  $twig->addGlobal('meta', $meta);
-
-  $options['meta'] = $meta;
-  if(!isset($options['namespace']))
-    $options['namespace'] = 'BitGames.Autogen';
-
-  return $twig->render('codegen_bundle.twig', $options);
-}
-
-function get_twig(array $inc_path = []) : \Twig\Environment
+function get_twig(array $inc_path = [])
 {
   array_unshift($inc_path, __DIR__ . "/../tpl/");
   $loader = new \Twig\Loader\FilesystemLoader($inc_path);
@@ -35,27 +19,26 @@ function get_twig(array $inc_path = []) : \Twig\Environment
   return $twig;
 }
 
-function supported_tokens() : array
+function supported_tokens()
 {
   return [
     'POD',
     'default',
-    'alias',
-    'virtual',
+    'optional',
     'bitfields',
     'cloneable',
+    'virtual',
+    'id',
+    'owner',
+    'pkey',
     'obscured',
     'diffable',
-    //TODO: this should be in a different package as a plugin
-    'table_pkey',
-    'cs_embed',
-    'cs_implements',
+    'bhl_bind',
     'cs_attributes',
     'cs_accessor_interface',
     'cs_propget_interface',
     'cs_propset_interface',
     'cs_propgetset_interface',
-    'cs_obsolete',
     //TODO:
     //'i18n'
   ];
@@ -78,7 +61,7 @@ function _add_twig_support(\Twig\Environment $twig)
   $twig->addFunction(new \Twig\TwigFunction('has_token', 
     function($o, $token) 
     { 
-      return (($o instanceof \mtgMetaUnit) || ($o instanceof \mtgMetaField)) && $o->hasToken($token);
+      return $o->hasToken($token);
     }
   ));
   $twig->addFunction(new \Twig\TwigFunction('has_token_in_parent', 
@@ -102,26 +85,6 @@ function _add_twig_support(\Twig\Environment $twig)
         return $v;
     }
   ));
-  $twig->addFunction(new \Twig\TwigFunction('field_index', 
-    function(\mtgMetaStruct $s, string $f): int
-    {
-      $idx = get_field_index($s, $f);
-      if($idx == -1)
-      {
-        throw new Exception("field `$f` not found in `{$s->getName()}`");
-      }
-
-      return $idx;
-    }
-  ));
-  $twig->addFunction(new \Twig\TwigFunction('find_struct', 
-    function(string $name) use ($twig): \mtgMetaStruct
-    {
-      $meta = $twig->getGlobals()['meta'];
-      $unit = $meta->findUnit($name);
-      return $unit->object;
-    }
-  ));
   $twig->addFilter(new \Twig\TwigFilter('cs_type', 
     function($type) 
     {
@@ -173,13 +136,13 @@ function _add_twig_support(\Twig\Environment $twig)
   $twig->addFunction(new \Twig\TwigFunction('get_diff_related_units', 
     function($o) 
     { 
-      return get_diff_all_related_structs($o);
+      return get_diff_related_units($o);
     }
   ));
-  $twig->addFunction(new \Twig\TwigFunction('get_all_declarable_accessor_interfaces', 
+  $twig->addFunction(new \Twig\TwigFunction('get_all_accessor_interfaces', 
     function($o) 
     { 
-      return get_all_declarable_accessor_interfaces($o);
+      return get_all_accessor_interfaces($o);
     }
   ));
   $twig->addFunction(new \Twig\TwigFunction('get_accessor_interfaces', 
@@ -197,7 +160,7 @@ function cs_type(\mtgType $type)
   else if($type instanceof \mtgArrType)
     return "List<" . cs_simple_type($type->getValue()) . ">";
   else
-    throw new Exception("Unknown type '{$type->getName()}'");
+    throw new Exception("Unknown type '{$type}'");
 }
 
 function cs_simple_type(\mtgType $type)
@@ -237,7 +200,7 @@ function cs_simple_type(\mtgType $type)
     }
     throw new Exception("Unknown type '{$type}'");
   }
-  if($type instanceof \mtgUserType && $type->hasToken("bhl_native_class"))
+  if($type->hasToken("bhl_native_class"))
     return $type->getToken("bhl_native_class");
   return $type->getName();
 }
@@ -275,7 +238,7 @@ function cs_type_prefix(\mtgType $type)
     case "blob":
       return "Blob";
     default:
-      throw new Exception("Unknown type '{$type->getName()}'");
+      throw new Exception("Unknown type '{$type}'");
   }
 }
 
@@ -351,7 +314,7 @@ function var_reset($name, \mtgType $type, $default = null)
   }
   else if($type instanceof \mtgArrType) 
   {
-    $str = "if($name == null) $name = new(); else $name.Clear();";
+    $str = "Meta.ClearList(ref $name);";
 
     if($default)
     {
@@ -389,9 +352,9 @@ function var_reset($name, \mtgType $type, $default = null)
     {
       $is_pod = $type->hasToken('POD');
       if($is_pod)
-        $str .= "$name.Reset(); ";
+        $str .= "$name.reset(); ";
       else
-        $str .= "if($name == null) $name = new(); else $name.Reset(); ";
+        $str .= "Meta.Reset(ref $name); ";
     }
 
     if($default)
@@ -412,7 +375,7 @@ function var_reset($name, \mtgType $type, $default = null)
     }
   }
   else
-    throw new Exception("Bad type '{$type->getName()}'");
+    throw new Exception("Bad type '$type'");
   return $str;
 }
 
@@ -423,46 +386,46 @@ function is_null_str($default)
 
 function var_sync($fname, \mtgType $type, $buf, array $tokens, $opts)
 {
-  $key_name = array_key_exists('alias', $tokens) ? $tokens['alias'] : $fname; 
+  $optional = array_key_exists('optional', $tokens);
+  if($optional)
+    $opts .= " | MetaSyncFieldOpts.SKIP_OPTIONAL";
 
   $str = '';
   if($type instanceof \mtgBuiltinType)
   {
-    $str .= "MetaIO.Sync({$buf}, ref {$fname}, \"{$key_name}\", {$opts});\n";
+    $str .= "Meta.Sync({$buf}, ref {$fname}, {$opts});\n";
   }
   else if($type instanceof \mtgMetaStruct)
   {
     if(array_key_exists('virtual', $tokens))
-      $str .= "{$fname} = MetaIO.SyncGeneric({$buf}, {$fname}, \"{$key_name}\", {$opts});\n";
+      $str .= "{$fname} = ({$type->getName()})Meta.SyncGeneric({$buf}, {$fname}, {$opts});\n";
     else
-      $str .= "MetaIO.Sync({$buf}, ref {$fname}, \"{$key_name}\", {$opts});\n";
+      $str .= "Meta.Sync({$buf}, ref {$fname}, {$opts});\n";
   }
   else if($type instanceof \mtgMetaEnum)
   {
     $str .= "int __tmp_{$fname} = (int)$fname;\n";
-    $str .= "MetaIO.Sync({$buf}, ref __tmp_{$fname}, \"{$key_name}\", {$opts});\n";
-    $str .= "if($buf.is_read) {$fname} = (".cs_type($type).")__tmp_{$fname};\n";
+    $str .= "Meta.Sync({$buf}, ref __tmp_{$fname}, {$opts});\n";
+    $str .= "if($buf.is_read) {$fname} = ({$type->getName()})__tmp_{$fname};\n";
   }
   else if($type instanceof \mtgArrType)
   {
     if(array_key_exists('virtual', $tokens))
-      $str .= "MetaIO.SyncGeneric({$buf}, {$fname}, \"{$key_name}\", {$opts});\n";
+      $str .= "Meta.SyncGeneric({$buf}, {$fname}, {$opts});\n";
     else
     {
       if($type->getValue() instanceof \mtgMetaEnum)
       {
-        $str .= "{\n";
-        $str .= "var tmp_enums_list = new List<int>(); if(!{$buf}.is_read) { foreach(var _enum_tmp in {$fname}) tmp_enums_list.Add((int)_enum_tmp); }\n";
-        $str .= "MetaIO.Sync({$buf}, tmp_enums_list, \"{$key_name}\", {$opts});\n";
-        $str .= "if({$buf}.is_read) { {$fname}.Clear(); foreach(var _int_tmp in tmp_enums_list) {$fname}.Add(({$type->getValue()->getName()}) _int_tmp); }\n";
-        $str .= "}\n";
+        $str .= "Meta.tmp_enums_list.Clear(); if(!{$buf}.is_read) { foreach(var _enum_tmp in {$fname}) Meta.tmp_enums_list.Add((int)_enum_tmp); }\n";
+        $str .= "Meta.Sync({$buf}, Meta.tmp_enums_list, {$opts});\n";
+        $str .= "if({$buf}.is_read) foreach(var _int_tmp in Meta.tmp_enums_list) { {$fname}.Add(({$type->getValue()->getName()}) _int_tmp); }\n";
       }
       else
-        $str .= "MetaIO.Sync({$buf}, {$fname}, \"{$key_name}\", {$opts});\n";
+        $str .= "Meta.Sync({$buf}, {$fname}, {$opts});\n";
     }
   }
   else
-    throw new Exception("Unknown type '{$type->getName()}'");
+    throw new Exception("Unknown type '$type'");
 
   return $str;
 }
@@ -512,8 +475,17 @@ function fields_count_self(\mtgMetaStruct $struct)
 function is_primary_field(\mtgMetaStruct $struct, $fld)
 {
   $primary_fields = array();  
-  if($struct->hasToken("table_pkey"))
-    $primary_fields = explode(",", $struct->getToken("table_pkey"));
+  if($struct->hasToken("id"))
+    $primary_fields[] = $struct->getToken("id");
+
+  if($struct->hasToken("owner"))
+    $primary_fields[] = $struct->getToken("owner");
+
+  if($struct->hasToken("pkey"))
+  {
+    foreach(explode(",", $struct->getToken("pkey")) as $name)
+      $primary_fields[] = $name;
+  }
 
   return in_array($fld->getName(), $primary_fields);
 }
@@ -540,36 +512,6 @@ function get_diff_related_units(\mtgMetaStruct $struct)
   return $result;
 }
 
-function get_diff_all_related_structs(\mtgMetaStruct $struct): array
-{
-  $result = array_reduce($struct->getFields(), function(array $structs, \mtgMetaField $field) {
-    if($field->hasToken('nodiff'))
-    {
-      return $structs;
-    }
-
-    $type = $field->getType();
-    if($type instanceof \mtgArrType)
-    {
-      $type = $type->getValue();
-    }
-
-    if($type instanceof \mtgMetaStruct)
-    {
-      $structs[] = $type;
-    }
-
-    return $structs;
-  }, []);
-
-  foreach($result as $s)
-  {
-    $result = array_merge(get_diff_all_related_structs($s), $result);
-  }
-
-  return $result;
-}
-
 class AccessorInterfaceField
 {
   public $field;
@@ -608,26 +550,9 @@ class AccessorInterface
   }
 }
 
-//NOTE: by default, accessor interface declarations will be generated in the autogen bundle.
-//If you want your metagen struct to implement some existing C# inteface
-//use quotes and prefix the fully-qualified interface name with "!", e.g. like this:
-//
-// ticket : string @cs_accessor_interface:"!BitGames.ServerIntegration.IRpcWithAuth"
-//
 function get_accessor_interfaces(\mtgMetaStruct $struct)
-{
-  return get_accessor_interfaces_ex($struct, /* declarable_only = */ false);
-}
-
-function get_accessor_interfaces_declarable(\mtgMetaStruct $struct)
-{
-  return get_accessor_interfaces_ex($struct, /* declarable_only = */ true); 
-}
-
-function get_accessor_interfaces_ex(\mtgMetaStruct $struct, $declarable_only)
 {
   $ifs = array();
-  $external_mark = '"!';
   foreach($struct->getFields() as $field)
   {
     $is_accessor = $field->hasToken('cs_accessor_interface');
@@ -647,14 +572,6 @@ function get_accessor_interfaces_ex(\mtgMetaStruct $struct, $declarable_only)
       elseif($is_propgetset)
         $ai->cs_interface_name = $field->getToken('cs_propgetset_interface');
 
-      $is_external = strpos($ai->cs_interface_name, $external_mark) === 0;
-      if($is_external)
-      {
-         $ai->cs_interface_name = trim($ai->cs_interface_name, $external_mark);
-         if($declarable_only)
-           continue;
-      }
-
       if(array_key_exists($ai->getUID(), $ifs))
         $ai = $ifs[$ai->getUID()];
 
@@ -675,32 +592,19 @@ function get_accessor_interfaces_ex(\mtgMetaStruct $struct, $declarable_only)
   return $ifs;
 }
 
-function get_all_declarable_accessor_interfaces(\mtgMetaInfo $info)
+function get_all_accessor_interfaces(\mtgMetaInfo $info)
 {
   $all = array();
   foreach($info->getUnits() as $unit)
   {
     if($unit->object instanceof \mtgMetaStruct)
-      $all = array_merge($all, get_accessor_interfaces_declarable($unit->object));
+      $all = array_merge($all, get_accessor_interfaces($unit->object));
     else if($unit->object instanceof \mtgMetaRPC)
     {
-      $all = array_merge($all, get_accessor_interfaces_declarable($unit->object->getReq()));
-      $all = array_merge($all, get_accessor_interfaces_declarable($unit->object->getRsp()));
+      $all = array_merge($all, get_accessor_interfaces($unit->object->getReq()));
+      $all = array_merge($all, get_accessor_interfaces($unit->object->getRsp()));
     }
   }
   return $all;
 }
 
-function get_field_index(\mtgMetaStruct $struct, string $field_name): int
-{
-  $idx = -1;
-  foreach($struct->getFields() as $field)
-  {
-    $idx++;
-    if($field->getName() == $field_name)
-    {
-      return $idx;
-    }
-  }
-  return -1;
-}

tpl/codegen_bundle.twig

@@ -1,7 +1,6 @@
 //THIS FILE IS GENERATED AUTOMATICALLY, DO NOT TOUCH IT!
 using System.Collections.Generic;
 using metagen;
-using System;
 
 {%- import "macro.twig" as macro -%}
 

tpl/macro.twig

@@ -1,3 +1,4 @@
+
 {% macro decl_units(meta) %}
 
 {%- for u in meta.getunits ~%}
@@ -10,7 +11,7 @@
   {%- endif ~%}
 {%- endfor ~%}
 
-{%- for ai in get_all_declarable_accessor_interfaces(meta) ~%}
+{%- for ai in get_all_accessor_interfaces(meta) ~%}
   {{ _self.decl_accessor_interface(ai) }}
 {%- endfor ~%}
 
@@ -18,8 +19,10 @@
 
 {% macro decl_struct(o, extra = '') %}
 
-{% set pkey_fields = token(o, 'table_pkey')|split(',') %}
-{% set pkey = pkey_fields|filter(f => f|length > 0)|map(f => o.getField(f)) %}
+  {% if has_token(o, 'table') %}
+    {% set pkey_fields = token(o, 'table_pkey')|split(',') %}
+    {% set pkey = pkey_fields|map(f => o.fields[f]) %}
+  {% endif %}
 
   {%- if o.parent and has_token(o, 'POD') -%}
   {{Error("@POD structs can't have a parent: " ~ o.name)}}
@@ -31,8 +34,6 @@
 {{_self.attributes(o)}}
 public {{_self.struct_type(o)}} {{o.name}} {{_self.base_struct_class(o)}} 
 {
-  {{token(o, 'cs_embed', '')}}
-
   {{_self.decl_struct_fields(o)}}
 
   public {{o.parent ? 'new'}} const uint STATIC_CLASS_ID = {{o.classid}};
@@ -45,45 +46,58 @@ public {{_self.struct_type(o)}} {{o.name}} {{_self.base_struct_class(o)}}
   {{_self.comment_POD_begin(o)}}
   public {{o.name}}()
   {
-    Reset();
+    reset();
   }
   {{_self.comment_POD_end(o)}}
 
-  public {{_self.override(o)}} void Reset() 
+  public {{_self.override(o)}} void reset() 
   {
     {{_self.struct_fields_reset(o)}}
   }
 
   {{_self.comment_non_cloneable_begin(o)}}
-  public void CloneTo(ref {{o.name}} dst)
+  public {{_self.virtual_clone(o)}} void copy(IMetaStruct other)
   {
-    MetaIO.Clone(this, ref dst, AutogenBundle.createById);
+    copyFrom(({{o.name}})other);
   }
 
-  public {{_self.virtual_clone(o)}} IMetaStruct Clone()
+  public void copyFrom({{o.name}} other)
   {
-    var dst = new {{o.name}}();
-    CloneTo(ref dst);
-    return dst;
+    var ctx = Meta.PrepareForClone(ref other);
+    ctx.factory = AutogenBundle.createById;
+    ctx.reader.BeginContainer();
+    reset();
+    syncFields(ctx);
+    ctx.reader.EndContainer();
+{%- if has_token(o, 'bitfields') ~%} 
+    fields_mask = other.fields_mask;
+{%- endif ~%}
+  }
+
+  public {{_self.virtual_clone(o)}} IMetaStruct clone()
+  {
+    var copy = new {{o.name}}();
+    copy.copy(this);
+    return copy;
   }
   {{_self.comment_non_cloneable_end(o)}}
 
-  public {{_self.override(o)}} void SyncFields(MetaSyncContext ctx) 
+  public {{_self.override(o)}} void syncFields(MetaSyncContext ctx) 
   {
     {{_self.sync_fields(o)}}
   }
   
-  public {{_self.override(o)}} int GetFieldsCount() 
+  public {{_self.override(o)}} int getFieldsCount() 
   {
     return {{fields_count(o)}};
   }
   
-  public {{_self.override(o)}} int GetDirtyFieldsCount() 
+  public {{_self.override(o)}} int getWritableFieldsCount() 
   {
 {%~ if has_token(o, 'bitfields') ~%}
-    return fields_mask.GetDirtyFieldsCount();
+    return fields_mask.GetDirtyFieldsCount() + Meta.MASK_HEADER_FIELDS_COUNT;
 {% else %}
-    return GetFieldsCount();
+    return {{fields_count(o)}};
 {%- endif ~%}
   }
 
@@ -130,12 +144,7 @@ public class {{o.name}}Comparer : IComparer<{{o.name}}>
   {
     int result;
 
-    {% set comparable = pkey %}
-    {% if comparable|length > 1 %}
-      {% set comparable = comparable [1:] %}
-    {% endif %}
-
-    {% for f in comparable %}
+    {% for f in pkey %}
       {% if not loop.first %}
       if(result == 0)
       {% endif %}
@@ -160,23 +169,12 @@ public FieldsMask fields_mask;
 
 {%- macro decl_struct_field(o, f) -%}
 {{_self.attributes(f)}}
-{% if has_token(f, 'flt_i18n') -%}
-{{f.type}} _{{f.name}} = "";
-List<{{f.type}}> __{{f.name}} = new List<{{f.type}}>();
-{%- endif ~%}
-public {{f.type|cs_type|obscure_type(f)}} {{f.name}} {% if not has_token(o, 'POD') -%} {{_self.decl_init_value(f)}} {%- endif -%} {% if not has_token(f, 'flt_i18n') -%};{%- endif -%}
+public {{f.type|cs_type|obscure_type(f)}} {{f.name}} {% if not has_token(o, 'POD') -%} {{_self.decl_init_value(f)}} {%- endif -%};
 {%- endmacro -%}
 
 {% macro decl_init_value(f) %}
 {%- if f.type is instanceof('\\mtgBuiltinType') -%}
-{%- if f.type.isstring -%}
-{% if has_token(f, 'flt_i18n') -%}
-{get{return plural_{{f.name}}(double.NaN);}set{_{{f.name}}=value;}}
-{{f.type}} plural_{{f.name}}(double force_n){return MetaI18N.I18NPick(_{{f.name}},__{{f.name}},"#",force_n);}
-{%- else -%}
-= ""
-{%- endif ~%}
-{%- endif -%}
+{%- if f.type.isstring -%} = ""{%- endif -%}
 {%- else -%}
 {%- if has_token(f, 'default') and token(f, 'default') == 'null'  -%}
 /*null*/
@@ -188,15 +186,10 @@ public {{f.type|cs_type|obscure_type(f)}} {{f.name}} {% if not has_token(o, 'POD
 
 {% macro struct_fields_reset(o) %}
 {%- if o.parent ~%} 
-base.Reset();
+base.reset();
 {%- endif -%}
 {%- for f in o.fields ~%}
-{% set fname = f.name %}
-{% if has_token(f, 'flt_i18n') -%}
-{% set fname = '_' ~ f.name %}
-if(_{{fname}} == null) _{{fname}} = new(); else _{{fname}}.Clear();
-{%- endif ~%}
-{{var_reset(fname, f.type, token_or(f, 'default', null))}}
+{{var_reset(f.name, f.type, token_or(f, 'default', null))}}
 {%- endfor -%}
 {%- if has_token(o, 'bitfields') ~%} 
 ResetFieldMask();
@@ -204,12 +197,6 @@ ResetFieldMask();
 {% endmacro %}
 
 {%- macro attributes(o) %}
-{% if has_token(o, "cs_obsolete") %}
-/// <summary>
-/// {{token(o, "cs_obsolete")}}
-/// </summary>
-[Obsolete]
-{% endif %}
 {%- if has_token(o, 'cs_attributes') -%} 
 {%- for attr in token(o, 'cs_attributes')|split(',') -%} 
 [{{attr}}]
@@ -228,12 +215,6 @@ ResetFieldMask();
 : {{o.parent ? o.parent.name : 'BaseMetaStruct'}}
 {{- has_token(o, 'cloneable') and not o.parent ? ', IMetaCloneable' -}}
 {%- endif -%}
-{%- if has_token(o, "cs_implements") -%}
-{%- for ifs in token(o, "cs_implements")|split(',') -%} 
-, {{ifs}}
-{%- endfor -%} 
-{%- endif -%} 
-
 {%- for ai in get_accessor_interfaces(o) -%} 
 , {{ai.interfacename}}
 {%- endfor -%} 
@@ -288,18 +269,14 @@ override
 
 {%- macro sync_fields(o) -%}
 {%- if has_token(o, 'bitfields') ~%}
-var bitctx = new MetaIO.BitfieldsContext(ctx, fields_mask);
+var bitctx = new Meta.BitfieldsContext(ctx, fields_mask);
 bitctx.SyncMaskHeader();
 {%- endif -%}
 {%- if o.parent ~%} 
-base.SyncFields(ctx);
+base.syncFields(ctx);
 {%- endif -%}
 {%- for f in o.fields ~%}
-{% set fname = f.name %}
-{% if has_token(f, 'flt_i18n') -%}
-{% set fname = '_' ~ f.name %}
-{%- endif -%}
-{{var_sync(fname, f.type, 'ctx', f.tokens, get_sync_opts(o, 'bitctx'))}}
+{{var_sync(f.name, f.type, 'ctx', f.tokens, get_sync_opts(o, 'bitctx'))}}
 {%- endfor -%}
 {%- endmacro -%}
 
@@ -311,34 +288,14 @@ base.SyncFields(ctx);
   }
 
   public void SetPrimaryFieldsChanged()
-  {
-    SetPrimaryFieldsChanged(ref this.fields_mask);
-  }
-
-  static void SetPrimaryFieldsChanged(ref FieldsMask mask)
   {
 {%- for f in o.fields ~%}
 {%- if is_primary_field(o, f) ~%}
-    MetaIO.SetFieldDirty(ref mask, {{loop.index0}});
+    Meta.SetFieldDirty(ref fields_mask, {{loop.index0}});
 {%- endif -%}
 {%- endfor ~%}
   }
 
-  public bool IsContentDirty()
-  {
-    int fields_amount = {{fields_count(o)}};
-    var primary_id_mask = FieldsMask.MakeClean(fields_amount); 
-    SetPrimaryFieldsChanged(ref primary_id_mask);
-    for(int i = 0; i < fields_amount; i++)
-    {
-      bool is_primary_id = primary_id_mask.IsDirty(i);
-      if(!is_primary_id && fields_mask.IsDirty(i))
-        return true;
-    }
-    
-    return false;
-  }
-
   public void SetDirtyMask()
   {
     fields_mask = FieldsMask.MakeDirty(fields_amount: {{fields_count(o)}});
@@ -375,45 +332,38 @@ public enum {{o.name}}
 }
 {% endmacro %}
 
-{% macro decl_rpc(o, is_global = true) %}
+{% macro decl_rpc(o) %}
 
-{% if is_global %}
 {{_self.decl_struct(o.req)}}
 {{_self.decl_struct(o.rsp)}}
-{% endif %}
 
 public class {{o.name}} : IRpc
 {
-{% if not is_global %}
-  {{_self.decl_struct(o.req)}}
-  {{_self.decl_struct(o.rsp)}}
-{% endif %}
-
   public IRpcError error = null;
   public {{o.req.name}} req = new {{o.req.name}}();
   public {{o.rsp.name}} rsp = new {{o.rsp.name}}();
 
-  public int GetCode() 
+  public int getCode() 
   {
     return {{o.code}};
   }
 
-  public void SetError(IRpcError error)
+  public void setError(IRpcError error)
   {
     this.error = error;
   }
 
-  public IRpcError GetError()
+  public IRpcError getError()
   {
     return error;
   }
 
-  public IMetaStruct GetRequest()
+  public IMetaStruct getRequest()
   {
     return req as IMetaStruct;
   }
 
-  public IMetaStruct GetResponse()
+  public IMetaStruct getResponse()
   {
     return rsp as IMetaStruct;
   }
@@ -426,9 +376,9 @@ public class {{o.name}} : IRpc
     public bool GetDiff({{o.name}} old, {{o.name}} diff = null, {{o.name}}RemovedIds removed = null)
     {
       if(diff != null) 
-        diff.Reset();
+        diff.reset();
       if(removed != null)
-        removed.Reset();
+        removed.reset();
       bool no_changes = true;
 
     {% set field_idx = -1 %}
@@ -436,25 +386,20 @@ public class {{o.name}} : IRpc
       {% set field_idx = field_idx + 1 %}
       
       {%- if not has_token(f, 'nodiff') -%}
-      {{_self.field_diff(f, field_idx, o)}}
+      {{_self.field_diff(f, field_idx)}}
       {%- endif -%}
     {% endfor %}
 
      return !no_changes;
     }
     
-    {% set unique_diff_units = [] %}
     {% for u in get_diff_related_units(o) %}
-      {% if u not in unique_diff_units %}
-        {{_self.diff_methods_for(u)}}
-        {% set unique_diff_units = unique_diff_units|merge([u]) %}
-      {% endif %}
+    {{_self.diff_methods_for(u)}}
     {% endfor %}
 
 {% endmacro %}
 
 {%- macro diff_methods_for(u) -%}
-  {% if has_token(u, 'table') %}
   static public bool DiffOne(ref {{u.name}} curr, {{u.name}} old)
   {
     return !{{_self.compare_func_name(u)}}(ref curr, old);
@@ -478,14 +423,13 @@ public class {{o.name}} : IRpc
 
       if(old < item)
       {
-        if(removed != null)
-          removed.Add(old.MakeId());
+        removed.Add(old.MakeId());
         old_i++;
         has_diff = true;
       }
       else if(old > item)
       {
-        item.SetDirtyMaskDeep();
+        item.SetDirtyMask();
         if(changed != null)
           changed.Add(item);
         i++;
@@ -493,7 +437,7 @@ public class {{o.name}} : IRpc
       }
       else
       {
-        if(!{{_self.compare_func_name(u)}}(ref item, old) && item.IsContentDirty())
+        if(!{{_self.compare_func_name(u)}}(ref item, old))
         {
           if(changed != null)
             changed.Add(item);
@@ -509,7 +453,7 @@ public class {{o.name}} : IRpc
     for(; i < items.Count; i++)
     {
       var item = items[i];
-      item.SetDirtyMaskDeep();
+      item.SetDirtyMask();
       if(changed != null)
         changed.Add(item);
       has_diff = true;
@@ -518,19 +462,17 @@ public class {{o.name}} : IRpc
     //old items leftovers are considered removed
     for(; old_i < old_items.Count; old_i++)
     {
-      if(removed != null)
-        removed.Add(old_items[old_i].MakeId());
+      removed.Add(old_items[old_i].MakeId());
       has_diff = true;
     }
 
     //if(changed.Count > 0)
-    //  MetaIO.LogDebug("Changed in collection {{u.name}}");
+    //  Meta.LogDebug("Changed in collection {{u.name}}");
     //if(removed_ids.Count > 0)
-    //  MetaIO.LogDebug("Removed in collection {{u.name}}");
+    //  Meta.LogDebug("Removed in collection {{u.name}}");
 
     return has_diff;
   }
-  {% endif %}
 
   public static bool {{_self.compare_func_name(u)}}(ref {{u.name}} a, {{u.name}} b)
   {
@@ -558,127 +500,33 @@ public class {{o.name}} : IRpc
 {{has_token(o, 'bitfields')?'CompareAndMarkFields':'IsEqual'}}
 {%- endmacro %}
 
-{% macro field_compare_array_bitfields_nested_diffable(o, f, field_idx) %}
-    {
-      int {{f.name}}_count_a = a.{{f.name}} == null ? 0 : a.{{f.name}}.Count;
-      int {{f.name}}_count_b = b.{{f.name}} == null ? 0 : b.{{f.name}}.Count;
+{%- macro field_compare(o, f, field_idx) -%}
 
-      //For NESTED arrays of DIFFABLE structs:
-      //for DB compatibility we must add the WHOLE ARRAY to the diff if ANY ELEMENT of the array has changed.
-      //That means marking each element's fields_mask as dirty
-
-      //Changed size means the array has changed, no furhter checks required.
-      bool {{f.name}}_equal = {{f.name}}_count_a == {{f.name}}_count_b;
-
-      //For same size arrays - check contents for changes.
-      if({{f.name}}_equal)
-      {
-        for(int i=0;i<{{f.name}}_count_a && i<{{f.name}}_count_b;++i)
-        {
-          var tmp_{{f.name}} = a.{{f.name}}[i];
-          if(!CompareAndMarkFields(ref tmp_{{f.name}}, b.{{f.name}}[i]))
-          {
-            {{f.name}}_equal = false;
-            break;
-          }
-        }
-      }
-
-      //If change detected - mark top-level field as changed and add the whole array to the diff
-      if(!{{f.name}}_equal)
-      {
-        MetaIO.SetFieldDirty(ref a.fields_mask, {{field_idx}});
-        for(int i=0; i<{{f.name}}_count_a;++i)
-        {
-          var tmp_{{f.name}} = a.{{f.name}}[i];
-          tmp_{{f.name}}.SetDirtyMaskDeep();
-          a.{{f.name}}[i] = tmp_{{f.name}};
-          is_equal = false;
-        }
-      }
-    }
-{%- endmacro %}
-
-{% macro field_compare_array_bitfields_nested_plain(o, f, field_idx) %}
-    if(a.{{f.name}} == null ||
-       b.{{f.name}} == null ||
-       a.{{f.name}}.Count != b.{{f.name}}.Count)
-    {
-      MetaIO.SetFieldDirty(ref a.fields_mask, {{field_idx}});
-      is_equal = false;
-    }
-    else
-    {
-      for(int i=0;i<a.{{f.name}}.Count;++i)
-      {
-        {%- if f.type.value is instanceof('\\mtgMetaStruct') ~%}
-          var tmp_{{f.name}} = a.{{f.name}}[i];
-          if(!{{_self.compare_func_name(f.type.value)}}(ref tmp_{{f.name}}, b.{{f.name}}[i]))
-          {
-            MetaIO.SetFieldDirty(ref a.fields_mask, {{field_idx}});
-            is_equal = false;
-            break;
-          }
-        {%- else -%}
-          if(a.{{f.name}}[i] != b.{{f.name}}[i])
-          {
-            MetaIO.SetFieldDirty(ref a.fields_mask, {{field_idx}});
-            is_equal = false;
-            break;
-          }
-        {%- endif -%}
-      }
-    }
-{%- endmacro %}
-
-{% macro field_compare_array_plain(o, f, field_idx) %}
+  {% if f.type is instanceof('\\mtgArrType') ~%}
     if(a.{{f.name}} == null || 
        b.{{f.name}} == null || 
        a.{{f.name}}.Count != b.{{f.name}}.Count) 
       return false;
+
     for(int i=0;i<a.{{f.name}}.Count;++i) 
     {
       {%- if f.type.value is instanceof('\\mtgMetaStruct') ~%}
-        var tmp_{{f.name}} = a.{{f.name}}[i];
-        if(!{{_self.compare_func_name(f.type.value)}}(ref tmp_{{f.name}}, b.{{f.name}}[i]))
+        if(!IsEqual(ref a.{{f.name}}[i], b.{{f.name}}[i])) 
           return false;
       {%- else -%}
-        if(a.{{f.name}}[i] != b.{{f.name}}[i])
+        if(a.{{f.name}}[i] != b.{{f.name}}[i]) 
           return false;
       {%- endif -%}
     }
-{%- endmacro %}
-
-{%- macro field_compare(o, f, field_idx) -%}
-
-  {% if f.type is instanceof('\\mtgArrType') ~%}
-    {% if has_token(o, 'bitfields') ~%}
-      {% if has_token(f.type.value, 'bitfields') ~%}
-        {{_self.field_compare_array_bitfields_nested_diffable(o, f, field_idx)}}
-      {% else ~%}
-        {{_self.field_compare_array_bitfields_nested_plain(o, f, field_idx)}}
-      {% endif ~%}
-    {% else ~%}
-      {{_self.field_compare_array_plain(o, f, field_idx)}}
-    {% endif ~%}
-
   {% elseif f.type is instanceof('\\mtgMetaStruct') ~%}
-    var tmp_{{f.name}} = a.{{f.name}}[i];
-    if(!{{_self.compare_func_name(f.type.value)}}(ref tmp_{{f.name}}, b.{{f.name}}))
-    {% if has_token(o, 'bitfields') ~%}
-    {
-      MetaIO.SetFieldDirty(ref a.fields_mask, {{field_idx}});
-      is_equal = false;
-    }
-    {% else ~%}
+    if(!IsEqual(ref a.{{f.name}}, b.{{f.name}})) 
       return false;
-    {% endif ~%}
   {% elseif f.type is instanceof('\\mtgBuiltinType') and f.type.isstring ~%}
       if((a.{{f.name}} == null ? "" : a.{{f.name}}) 
       != (b.{{f.name}} == null ? "" : b.{{f.name}}))
       {% if has_token(o, 'bitfields') ~%}
       {
-        MetaIO.SetFieldDirty(ref a.fields_mask, {{field_idx}});
+        Meta.SetFieldDirty(ref a.fields_mask, {{field_idx}});
         is_equal = false;
       }
       {% else ~%}
@@ -688,7 +536,7 @@ public class {{o.name}} : IRpc
       if(a.{{f.name}} != b.{{f.name}})
       {% if has_token(o, 'bitfields') ~%}
       {
-        MetaIO.SetFieldDirty(ref a.fields_mask, {{field_idx}});
+        Meta.SetFieldDirty(ref a.fields_mask, {{field_idx}});
         is_equal = false;
       }
       {% else ~%}
@@ -698,11 +546,11 @@ public class {{o.name}} : IRpc
 
 {% endmacro %}
 
-{%- macro field_diff(f, field_idx, o) -%}
+{%- macro field_diff(f, field_idx) -%}
 
 {% if f.type is instanceof('\\mtgMetaStruct') %}
   {%- if not has_token(f.type, 'POD') -%}
-  {{Error("Diffable struct '" ~ f.type ~ "' must be POD")}}
+    Error("Diffable struct '" ~ f.type ~ "' must be POD");
   {%- endif -%}
 
   {
@@ -713,13 +561,13 @@ public class {{o.name}} : IRpc
       if(diff != null) 
       { 
         diff.{{f.name}} = __tmp; 
-        MetaIO.SetFieldDirty(ref diff.fields_mask, {{field_idx}}); 
+        Meta.SetFieldDirty(ref diff.fields_mask, {{field_idx}}); 
       } 
     }
   }
 {% elseif f.type is instanceof('\\mtgArrType') %}
   {%- if not has_token(f.type.value, 'POD') -%}
-  {{Error("Diffable struct '" ~ f.type.value ~ "' must be POD")}}
+    Error("Diffable struct '" ~ f.type.value ~ "' must be POD");
   {%- endif -%}
 
   if(DiffCollection({{f.name}}, old.{{f.name}}, 
@@ -729,9 +577,9 @@ public class {{o.name}} : IRpc
   { 
     no_changes &= false; 
     if(diff != null) 
-      MetaIO.SetFieldDirty(ref diff.fields_mask, {{field_idx}});
+      Meta.SetFieldDirty(ref diff.fields_mask, {{field_idx}});
     if(removed != null && removed.{{f.name}}.Count > 0)
-      MetaIO.SetFieldDirty(ref removed.fields_mask, {{ field_index(find_struct(o.name ~ 'RemovedIds'), f.name) }});
+      Meta.SetFieldDirty(ref removed.fields_mask, {{field_idx}});
   }
 {% elseif f.type is instanceof('\\mtgBuiltinType') %}
   if(diff != null) 
@@ -741,10 +589,10 @@ public class {{o.name}} : IRpc
   { 
     no_changes &= false; 
     if(diff != null) 
-      MetaIO.SetFieldDirty(ref diff.fields_mask, {{field_idx}}); 
+      Meta.SetFieldDirty(ref diff.fields_mask, {{field_idx}}); 
   }
 {% else %}
-  {{Error("Diff for field '"~ f.name ~"' is not supported") }}
+    Error("Diff for field '"~ f.name ~"' is not supported");
 {% endif %}
 
 {% endmacro %}
@@ -799,3 +647,4 @@ public interface {{ai.interfacename}}
 {% endfor %}
 {%- endfor ~%}
 {% endmacro %}
+