bit
/
metagen_php
25
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Making junk check more efficient
Publish PHP Package / docker (push) Successful in 6s Details

This commit is contained in:
Pavel Shevaev 2025-02-27 20:26:04 +03:00
parent bd5a403d37
commit 3275b0b724
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/codegen.inc.php
View File

@ -304,10 +304,8 @@ function is_null_str($default)
return is_string($default) && json_decode($default, true) === null;
}
function data_normalize($name, \mtgType $type, $buf, $dst, $tokens = array(), $tmp_val = '$tmp_val__')
function get_default_value_arg(\mtgType $type, array $tokens) : string
{
$str = '';
$default_value_arg = array_key_exists('default', $tokens) ? default_value($tokens['default']) : "null";
if($type instanceof \mtgMetaStruct)
@ -330,10 +328,22 @@ function data_normalize($name, \mtgType $type, $buf, $dst, $tokens = array(), $t
}
}
return $default_value_arg;
}
function data_normalize($name, \mtgType $type, $buf, $dst, $tokens = array(), $tmp_val = '$tmp_val__')
{
$str = '';
$default_value_arg = get_default_value_arg($type, $tokens);
$str .= "\n";
if($name !== null)
{
$str .= "{$tmp_val} = {$buf}['{$name}'] ?? {$default_value_arg};\n";
$str .= "if(\$check_junk) unset({$buf}['{$name}']);\n";
}
if($type instanceof \mtgBuiltinType)
{
@ -350,6 +360,7 @@ function data_normalize($name, \mtgType $type, $buf, $dst, $tokens = array(), $t
if(array_key_exists('virtual', $tokens))
{
$str .= "\$vclass_id__ = \metagen_php\\val_uint32(\$tmp_sub_arr__['\$id'] ?? {$type->getClassId()});\n";
$str .= "if(\$check_junk) unset(\$tmp_sub_arr__['\$id']);\n";
$str .= "\$vclass__ = AutogenBundle::getClassName(\$vclass_id__);\n";
$str .= "if(!is_a(\$vclass__, '{$type->getName()}', true)) throw new Exception(\"'\$vclass__' is not subclass of '{$type->getName()}'\");\n";
$str .= "\$tmp_sub_mapped__ = array(\$vclass_id__);\n";

8
tpl/macro.twig
View File

@ -107,7 +107,7 @@ class {{o.name}} {{o.parent ? 'extends ' ~ o.parent.name}}
{{_self.export_fields(o)}}
}
static function normalize(array &$data, array &$mapped, bool $root = true, bool $check_junk = false) : int
static function normalize(array &$data, array &$mapped, bool $check_junk = true, bool $root = true) : int
{
$IDX = -1;
@ -115,7 +115,7 @@ class {{o.name}} {{o.parent ? 'extends ' ~ o.parent.name}}
{
$IDX = 0;
{%- if o.parent ~%}
$IDX = parent::normalize($data, $mapped, false, false);
$IDX = parent::normalize($data, $mapped, $check_junk, false);
{%- endif ~%}
{%- for f in o.fields ~%}
@ -129,8 +129,8 @@ class {{o.name}} {{o.parent ? 'extends ' ~ o.parent.name}}
throw new Exception($e->getMessage() . " < {$FIELDS[$IDX]} < ({{o.name}})");
}
if($root && $check_junk)
\metagen_php\check_junk_fields($data, self::CLASS_FIELDS());
if($root && $check_junk && sizeof($data) > 0)
throw new Exception("Junk fields: " . implode(',', array_keys($data)));
return $IDX;
}