For now using Val.New(..) instead of Val.NewNoReset() since the latter introduces some ownership related bug

CHANGELOG.md

@@ -1,3 +1,14 @@
+## v17.1.0
+- Splitting one huge codegenerated file into multiple ones
+
+## v16.0.0
+- Migrating to IList from ValList for []any bindings since it is more generic
+
+## v15.5.2
+- Proper retain for any Val in args 
+- A bit optimizing setters/getters codegen
+- Adding @bhl_blob support
+
 ## v15.4.2
 -  Using local static functions instead of lambdas for better stack traces
 

README.md

@@ -38,12 +38,12 @@ Usage example:
 
     $meta = \bhl_bind\prepare_meta($meta);
 
-    file_put_contents('autobind.cs', 
-      \bhl_bind\codegen(null, $meta,
+    $output = \bhl_bind\codegen(null, $meta,
         [
          'imports' => ['UnityEngine'], 
          'register_class' => 'BHL_AutoBindings',
         ]
-      )
-    );
+      );
+    foreach($output as $name => $text)
+      file_put_contents($name, $text);  
 

src/bind.inc.php

@@ -22,6 +22,7 @@ function supported_tokens()
     'bhl_ref_arg',
     'bhl_bin_op',
     'bhl_blob',
+    'bhl_refc',
   ];
 }
 
@@ -29,7 +30,7 @@ function codegen(
   $tpl_cache_dir,
   \mtgMetaInfo $meta, 
   array $options = array()
-)
+) : array
 {
   validate_meta($meta);
 
@@ -57,14 +58,30 @@ function codegen(
   
   $twig->addGlobal('plugins', $options['plugins']);
 
-  $str = $twig->render('codegen_autobind.twig', $options);
+  $sliced_units = slice_units($meta->getUnits(), 20);
+  $options['sliced_units'] = $sliced_units;
+
+  $output = array();
+
+  $output['types.cs'] = $twig->render('codegen_types.twig', $options);
+  $output['decl_units.cs'] = $twig->render('codegen_decl_units.twig', $options);
+
+  foreach($sliced_units as $slice_idx => $slice_units)
+  {
+    $slice_options = $options;
+    $slice_options['slice_idx'] = $slice_idx;
+    $slice_options['slice_units'] = $slice_units;
+    $output['register_'.$slice_idx.'.cs'] = $twig->render('codegen_register_slice.twig', $slice_options);
+  }
+
+  $output['register.cs'] = $twig->render('codegen_register.twig', $options);
 
   print_warnings();
 
-  return $str;
+  return $output;
 }
 
-function get_twig(array $inc_path = [])
+function get_twig(array $inc_path = []) : \Twig\Environment
 {
   array_unshift($inc_path, __DIR__ . "/../tpl/");
   $loader = new \Twig\Loader\FilesystemLoader($inc_path);
@@ -266,7 +283,7 @@ function add_twig_support(\Twig\Environment $twig)
   $twig->addFunction(new \Twig\TwigFunction('has_token', 
     function($o, $token) 
     { 
-      return $o->hasToken($token);
+      return method_exists($o, 'hasToken') && $o->hasToken($token);
     }
   ));
   $twig->addFunction(new \Twig\TwigFunction('token', 
@@ -535,7 +552,7 @@ function native_type(\mtgType $type)
   if($type instanceof \mtgArrType)
   {
     if($type->getValue()->getName() == "any")
-      return "bhl.ValList";
+      return "IList";
     else
       return "IList<".native_type($type->getValue()).">"; 
   }

tpl/bhl_bind_macro.twig

@@ -14,13 +14,27 @@
     #if !BHL_FRONT
     static bhl.Coroutine {{local_fn_name}}(VM.Frame frm, ValStack stack, FuncArgsInfo args_info, ref BHS status)  {
 
-      {{ _self.read_args2natives(o, '__', this_type) }}
+      {{ _self.read_args2natives(o, '__') }}
+
+      {%- if this_type and not has_token(o, 'bhl_static') ~%}
+        
+          var dv_self = stack.Pop();
+          {%if has_token(this_type, 'bhl_blob')%}ref{%endif%} var {{ _self.val2native(this_type, 'dv_self', '__self', true, has_token(this_type, 'bhl_blob')) }};
+        
+      {%- endif ~%}
 
       {%~ if o.returntype %}
       var return_val = 
       {%- endif ~%} 
       {{this_prefix}}{{ _self.call_native_prefix_func(o, '__') }}
 
+      {%- if this_type and not has_token(o, 'bhl_static') ~%}
+          {%if has_token(this_type, 'bhl_custom_rw')%}
+          dv_self.Encode(__self);
+          {%- endif ~%}
+          dv_self.Release();
+      {%- endif ~%}
+
       {# pass back and release ref args #}
       {%- for arg in o.args -%}
         {%- if has_token(arg, 'bhl_ref_arg') ~%}
@@ -320,7 +334,6 @@ Script_{{o.name|norm_name}}.Method_{{m.name}}.ReturnValue(frm, stack
   {%- if this_type ~%}
     {{this_type|native_type}} {{prefix}}self = default;
   {%- endif -%}
-
   {%- for v in vars -%}
     {%- if has_token(v, 'bhl_ref_arg') -%}
       bhl.Val {{prefix}}{{v.name}} = default;
@@ -350,6 +363,7 @@ Script_{{o.name|norm_name}}.Method_{{m.name}}.ReturnValue(frm, stack
     {%- set default_counter = default_counter + 1 -%}
     if(!args_info.IsDefaultArgUsed({{o.args|length - count_required_args(o) - default_counter}}))
     {%- endif ~%}
+
     {
     {%- if has_token(arg, 'bhl_ref_arg') ~%}
       var dv = stack.Pop();
@@ -363,6 +377,7 @@ Script_{{o.name|norm_name}}.Method_{{m.name}}.ReturnValue(frm, stack
       dv.Release();
     {%- endif ~%}
     }
+
     {#-default arg value-#}
     {%- if has_token(arg, 'default') ~%}
     else
@@ -384,16 +399,11 @@ Script_{{o.name|norm_name}}.Method_{{m.name}}.ReturnValue(frm, stack
 {%- macro dispose_args(o, arg_prefix = '') -%}
   {%- for arg in o.args -%}
   {% if arg.type is instanceof('\\mtgArrType') %}
-    {% if arg.type.value.name == 'any' %}
-     {{arg_prefix}}{{arg.name}}?.Release();
-     {{arg_prefix}}{{arg.name}} = default;
-    {% else %}
     {
       if({{arg_prefix}}{{arg.name}} is IValRefcounted rfc)
         rfc.Release();
      {{arg_prefix}}{{arg.name}} = default;
     }
-    {% endif %}
   {% endif %}
 
   {% if arg.type.name == 'any' %}
@@ -445,7 +455,7 @@ Script_{{o.name|norm_name}}.Method_{{m.name}}.ReturnValue(frm, stack
   {%- endfor -%}
 {%- endmacro -%}
 
-{%- macro val2native(type, value, native, is_arg = false) -%}
+{%- macro val2native(type, value, native, is_arg = false, is_ref = false) -%}
   {# any special case #}
   {%- if type == 'any' -%}
     {{native}} = {{value}};
@@ -463,7 +473,7 @@ Script_{{o.name|norm_name}}.Method_{{m.name}}.ReturnValue(frm, stack
 
       {%~ if type == 'any[]'-%}
 
-      {{native}} = (ValList){{value}}._obj;
+      {{native}} = (IList){{value}}._obj;
 
       {%~ else ~%}
 
@@ -497,8 +507,7 @@ Script_{{o.name|norm_name}}.Method_{{m.name}}.ReturnValue(frm, stack
      for(int i=0;i<_src_arr_count;++i)
      {
        var _arr_item = _src_arr_type.ArrGetAt({{value}}, i);
-       {#TODO: get rid of replace hack below#}
-       {{('var ' ~ _self.val2native(type.value, '_arr_item', 'tmp'))|replace({'tmp = tmp' : '', 'var var' : 'var'})}};
+       var {{_self.val2native(type.value, '_arr_item', 'tmp')}};
        if(i < _dst_before_count)
          {{native}}[i] = tmp;
        else
@@ -537,9 +546,9 @@ Script_{{o.name|norm_name}}.Method_{{m.name}}.ReturnValue(frm, stack
         {{native}} = ({{type|native_class_name}})((int){{value}}._num)
       {%- else -%}
         {%- if has_token(type, 'bhl_custom_rw') -%}
-          var tmp = new {{type|native_class_name}}(); {{value}}.Decode(ref tmp); {{native}} = tmp
+          {{native}} = {{value}}.Decode(new {{type|native_class_name}}())
         {%- elseif has_token(type, 'bhl_blob') -%}
-        {{native}} = {{value}}.GetBlob<{{type|native_class_name}}>()
+          {{native}} = {%if is_ref%}ref{%endif%} {{value}}.GetBlob<{{type|native_class_name}}>()
         {%- else -%}
           {{native}} = ({{type|native_class_name}}){{value}}._obj
         {%- endif -%}
@@ -556,7 +565,7 @@ Script_{{o.name|norm_name}}.Method_{{m.name}}.ReturnValue(frm, stack
   {%- else -%}
 
     {%- if type is instanceof('\\mtgMetaFunc') -%}
-      {{value}}.SetObj({{native}}, Types.Any)
+      {{value}}.SetObj({{native}}, Types.Any/*TODO: use real type?*/)
     {%- endif -%}
 
     {%- if type is instanceof('\\mtgArrType') -%}
@@ -598,8 +607,10 @@ Script_{{o.name|norm_name}}.Method_{{m.name}}.ReturnValue(frm, stack
           {{value}}.Encode({{native}})
         {%- elseif has_token(type, 'bhl_blob') -%}
           {{value}}.SetBlob({{native}}, Types_{{type.name|norm_name}}.Value)
-        {%- else -%}
+        {%- elseif has_token(type, 'bhl_refc') -%}
           {{value}}.SetObj({{native}}, Types_{{type.name|norm_name}}.Value)
+        {%- else -%}
+          {{value}}.SetObjNoRefc({{native}}, Types_{{type.name|norm_name}}.Value)
         {%- endif -%}
       {%- endif -%}
     {%- endif -%}
@@ -621,8 +632,7 @@ Script_{{o.name|norm_name}}.Method_{{m.name}}.ReturnValue(frm, stack
       "{{o.name}}",
       (v) => { 
 #if !BHL_FRONT
-        {#TODO: get rid of replace hack below#}
-        {{('var ' ~ _self.val2native(token(o, 'bhl_native_arr_proxy'), 'v', 'tmp'))|replace({'tmp = tmp' : '', 'var var' : 'var'})}};
+        var {{_self.val2native(token(o, 'bhl_native_arr_proxy'), 'v', 'tmp')}};
         return tmp;
 #else
         return null;
@@ -691,8 +701,10 @@ Script_{{o.name|norm_name}}.Method_{{m.name}}.ReturnValue(frm, stack
        v.Encode(o);
      {% elseif has_token(o, 'bhl_blob') %}
        v.SetBlob(ref o, type);
-     {% else %}
+     {% elseif has_token(o, 'bhl_refc') %}
        v.SetObj(o, type);
+     {% else %}
+       v.SetObjNoRefc(o, type);
      {% endif %}
      #endif
     }
@@ -723,9 +735,7 @@ Script_{{o.name|norm_name}}.Method_{{m.name}}.ReturnValue(frm, stack
       , native_type: typeof({{o|native_class_name}})
     {% if has_token(o, 'bhl_custom_rw')  %}
       , native_object_getter: (v) => { 
-          var tmp = new {{o|native_class_name}}();
-          v.Decode(ref tmp);
-          return tmp;
+          return v.Decode(new {{o|native_class_name}}());
       }
     {% elseif has_token(o, 'bhl_blob')  %}
       , native_object_getter: (v) => { 
@@ -772,8 +782,7 @@ Script_{{o.name|norm_name}}.Method_{{m.name}}.ReturnValue(frm, stack
     static void get_{{o.name|norm_name}}_{{f.name}}(VM.Frame frm, Val ctx, ref Val v, FieldSymbol fld)  {
     #if !BHL_FRONT
       {%~ if has_token(o, 'bhl_custom_rw') ~%}
-      {{class}} f = new {{class}}(); 
-      ctx.Decode(ref f);
+      {{class}} f = ctx.Decode(new {{class}}());
       {%- elseif has_token(o, 'bhl_blob') ~%}
       ref var f = ref ctx.GetBlob<{{class}}>();
       {%- else ~%}
@@ -798,8 +807,7 @@ Script_{{o.name|norm_name}}.Method_{{m.name}}.ReturnValue(frm, stack
     static void set_{{o.name|norm_name}}_{{f.name}}(VM.Frame frm, ref Val ctx, Val v, FieldSymbol fld) {
     #if !BHL_FRONT
       {%~ if has_token(o, 'bhl_custom_rw') ~%}
-      {{class}} f = new {{class}}(); 
-      ctx.Decode(ref f);
+      {{class}} f = ctx.Decode(new {{class}}());
       {%- elseif has_token(o, 'bhl_blob') ~%}
       ref var f = ref ctx.GetBlob<{{class}}>();
       {%- else ~%}
@@ -807,7 +815,7 @@ Script_{{o.name|norm_name}}.Method_{{m.name}}.ReturnValue(frm, stack
       {%- endif ~%}
 
       {% if token(f, 'bhl_set') == 2 %}
-      {{_self.val2native(f.type, 'v', 'var nv')}};
+      var {{_self.val2native(f.type, 'v', 'nv')}};
       Script_{{o.name|norm_name}}.Set_{{f.name}}(ref f, nv);
       {% else %}
         {%- if has_token(f, 'bhl_native_prefix') -%}
@@ -922,21 +930,6 @@ public partial class Script_{{u.object.name}} {
 
 {%- endmacro -%}
 
-{%- macro call_reg_units(sliced_units) ~%}
- {%- for idx,units in sliced_units -%}
-    Register_{{idx}}(types);
- {%~ endfor -%}
-{%- endmacro -%}
-
-{%- macro decl_reg_units(sliced_units) ~%}
- {%- for idx,units in sliced_units -%}
- public static void Register_{{idx}}(Types types) 
- {
-  {{ _self.reg_units(units) }}
- } 
- {%~ endfor -%}
-{%- endmacro -%}
-
 {%- macro reg_units(units) ~%}
 
   {%- for u in units -%}
@@ -976,18 +969,7 @@ public partial class Script_{{u.object.name}} {
   //assign global static types
   {%- for u in units -%}
     {%- if u.object is instanceof('\\mtgMetaStruct') or u.object is instanceof('\\mtgMetaInterface') ~%}
-  { 
-    var tmp = types.T("{{u.object.name}}").Get(); 
-    if(tmp == null)
-      throw new System.Exception("Type '{{u.object.name}}' not resolved");
-    {%- if u.object is instanceof('\\mtgMetaStruct') ~%}
-    (tmp as ClassSymbolNative)?.Setup();
-    {%- endif ~%}
-    {%- if u.object is instanceof('\\mtgMetaInterface') ~%}
-    (tmp as InterfaceSymbolNative)?.Setup();
-    {%- endif ~%}
-    Types_{{u.object.name|norm_name}}.Value = tmp; 
-  }
+  Types_{{u.object.name|norm_name}}.Value = SetupType(types, "{{u.object.name}}"); 
     {%- endif -%}
 
   {%- endfor -%}

tpl/codegen_decl_units.twig

@@ -0,0 +1,26 @@
+#pragma warning disable CS0162
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using bhl;
+#if !BHL_FRONT
+{%- for imp in imports ~%}
+using {{imp}};
+{%- endfor ~%}
+#endif
+using Types = bhl.Types;
+
+{% import "bhl_bind_macro.twig" as macro %}
+
+namespace {{namespace}} {
+
+#if !BHL_FRONT
+
+{{ macro.decl_units(meta.units) }}
+
+{{ plugins_codegen_decls() }}
+
+#endif
+
+}

tpl/codegen_register.twig

@@ -9,6 +9,7 @@ using bhl;
 using {{imp}};
 {%- endfor ~%}
 #endif
+using Types = bhl.Types;
 
 {{custom_code}}
 
@@ -16,23 +17,7 @@ using {{imp}};
 
 namespace {{namespace}} {
 
-{%- for u in meta.units ~%}
-  {%- if u.object is instanceof('\\mtgMetaStruct') or u.object is instanceof('\\mtgMetaInterface') ~%}
-static public class Types_{{u.object.name|norm_name}} {
-  static public IType Value;
-}
-  {%- endif ~%}
-{%- endfor ~%}
-
-#if !BHL_FRONT
-
-{{ macro.decl_units(meta.units) }}
-
-{{ plugins_codegen_decls() }}
-
-#endif
-
-static public class {{register_class}} {
+static public partial class {{register_class}} {
 
 {%- for mk,mv in get_modules(meta) ~%}
   static public Module Module{{mv}}; 
@@ -55,7 +40,23 @@ public static void RegisterBegin(Types types)
   types.RegisterModule(Module{{mv}});
 {%- endfor ~%}
 
-{{ macro.call_reg_units(slice_units(meta.units, 20)) }}
+ {%- for idx,units in sliced_units -%}
+  Register_{{idx}}(types);
+ {%~ endfor -%}
+}
+
+static IType SetupType(Types types, string name)
+{
+  var tmp = types.T(name).Get(); 
+  if(tmp == null)
+    throw new System.Exception("Type '" + name + "' not resolved");
+
+  if(tmp is ClassSymbolNative csn)
+    csn.Setup();
+  else if(tmp is InterfaceSymbolNative isn)
+    isn.Setup();
+
+  return tmp;
 }
 
 public static void RegisterEnd(Types types)
@@ -63,8 +64,6 @@ public static void RegisterEnd(Types types)
 {{ macro.setup_global_types(meta.units) }}
 }
 
-{{ macro.decl_reg_units(slice_units(meta.units, 20)) }}
-
 }
 
 }

tpl/codegen_register_slice.twig

@@ -0,0 +1,26 @@
+#pragma warning disable CS0162
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using bhl;
+#if !BHL_FRONT
+{%- for imp in imports ~%}
+using {{imp}};
+{%- endfor ~%}
+#endif
+using Types = bhl.Types;
+
+{% import "bhl_bind_macro.twig" as macro %}
+
+namespace {{namespace}} {
+
+static public partial class {{register_class}} {
+
+ public static void Register_{{slice_idx}}(Types types) 
+ {
+  {{ macro.reg_units(slice_units) }}
+ } 
+}
+
+}

tpl/codegen_types.twig

@@ -0,0 +1,24 @@
+#pragma warning disable CS0162
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using bhl;
+#if !BHL_FRONT
+{%- for imp in imports ~%}
+using {{imp}};
+{%- endfor ~%}
+#endif
+using Types = bhl.Types;
+
+namespace {{namespace}} {
+
+{%- for u in meta.units ~%}
+  {%- if u.object is instanceof('\\mtgMetaStruct') or u.object is instanceof('\\mtgMetaInterface') ~%}
+static public class Types_{{u.object.name|norm_name}} {
+  static public IType Value;
+}
+  {%- endif ~%}
+{%- endfor ~%}
+
+}