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

Compare commits

base: bit:master
Branches Tags
bit:master
bit:v2.4.1
bit:v2.4.0
bit:v2.3.0
bit:v2.2.0
bit:v2.1.0
bit:v2.0.0
bit:v1.4.5
bit:v1.4.4
bit:v1.4.3
bit:v1.4.2
bit:v1.4.1
bit:v1.4.0
bit:v1.3.4
bit:v1.3.3
bit:v1.3.2
bit:v1.3.1
bit:v1.3.0
bit:v1.2.1
bit:v1.1.1
bit:v1.1.0
bit:v1.0.4
bit:v1.0.3
bit:v1.0.2
bit:v1.0.1
bit:v1.0.0
..
compare: bit:v2.1.0
Branches Tags
bit:master
bit:v2.4.1
bit:v2.4.0
bit:v2.3.0
bit:v2.2.0
bit:v2.1.0
bit:v2.0.0
bit:v1.4.5
bit:v1.4.4
bit:v1.4.3
bit:v1.4.2
bit:v1.4.1
bit:v1.4.0
bit:v1.3.4
bit:v1.3.3
bit:v1.3.2
bit:v1.3.1
bit:v1.3.0
bit:v1.2.1
bit:v1.1.1
bit:v1.1.0
bit:v1.0.4
bit:v1.0.3
bit:v1.0.2
bit:v1.0.1
bit:v1.0.0

No commits in common. "master" and "v2.1.0" have entirely different histories.
master ... v2.1.0

2 changed files with 25 additions and 46 deletions
Show Stats Expand all files Collapse all files

41
src/codegen.inc.php
View File

@ -90,9 +90,9 @@ function _add_twig_support(\Twig\Environment $twig)
}
));
$twig->addFunction(new \Twig\TwigFunction('value2data',
function($val, $name, \mtgType $type, $data, $tokens = array())
function($val, \mtgType $type, $data, $tokens = array())
{
return value2data($val, $name, $type, $data, $tokens);
return value2data($val, $type, $data, $tokens);
}
));
$twig->addFunction(new \Twig\TwigFunction('data_normalize',
@ -261,24 +261,24 @@ function data2value(string $val, \mtgType $type, string $data, array $tokens, bo
}
//TODO: move it to template
function value2data(string $val, string $name, \mtgType $type, string $data, $tokens = array(), $assoc = '$assoc')
function value2data(string $val, \mtgType $type, string $data, $tokens = array())
{
$str = '';
if($type instanceof \mtgBuiltinType)
{
$str .= "\metagen_php\array_set_value({$data}, {$assoc}, '$name', $val);\n";
$str .= "{$data}[] = $val;\n";
}
else if($type instanceof \mtgMetaStruct)
{
if(array_key_exists('virtual', $tokens))
$str .= "\metagen_php\array_set_value({$data}, {$assoc}, '$name', {$val}->export(\$assoc, true/*virtual*/));\n";
$str .= "{$data}[] = {$val}->export(true/*virtual*/);\n";
else
$str .= "\metagen_php\array_set_value({$data}, {$assoc}, '$name', {$val}->export(\$assoc));\n";
$str .= "{$data}[] = {$val}->export();\n";
}
else if($type instanceof \mtgMetaEnum)
{
$str .= "\metagen_php\array_set_value({$data}, {$assoc}, '$name', $val);\n";
$str .= "{$data}[] = $val;\n";
}
else if($type instanceof \mtgArrType)
{
@ -289,9 +289,9 @@ function value2data(string $val, string $name, \mtgType $type, string $data, $to
$str .= "else\n";
$str .= " foreach({$val} as \$arr_tmp_item__)\n";
$str .= " {\n";
$str .= value2data("\$arr_tmp_item__", '', $type->getValue(), "\$arr_tmp__", $tokens, 'false') . "\n";
$str .= value2data("\$arr_tmp_item__", $type->getValue(), "\$arr_tmp__", $tokens) . "\n";
$str .= " }\n";
$str .= "\metagen_php\array_set_value({$data}, \$assoc, '$name', \$arr_tmp__);\n";
$str .= "{$data}[] = \$arr_tmp__;\n";
}
else
throw new Exception("Unknown type '{$type->getName()}'");
@ -304,10 +304,11 @@ function is_null_str($default)
return is_string($default) && json_decode($default, true) === null;
}
function get_default_value_arg(\mtgType $type, array $tokens, bool &$has_default = true) : string
function data_normalize($name, \mtgType $type, $buf, $dst, $tokens = array(), $tmp_val = '$tmp_val__')
{
$has_default = array_key_exists('default', $tokens);
$default_value_arg = $has_default ? default_value($tokens['default']) : "null";
$str = '';
$default_value_arg = array_key_exists('default', $tokens) ? default_value($tokens['default']) : "null";
if($type instanceof \mtgMetaStruct)
{
@ -329,25 +330,10 @@ function get_default_value_arg(\mtgType $type, array $tokens, bool &$has_default
}
}
return $default_value_arg;
}
function data_normalize($name, \mtgType $type, $buf, $dst, $tokens = array(), $tmp_val = '$tmp_val__')
{
$str = '';
$has_default = false;
$default_value_arg = get_default_value_arg($type, $tokens, $has_default);
$str .= "\n";
if($name !== null)
{
$str .= "{$tmp_val} = {$buf}['{$name}'] ?? {$default_value_arg};\n";
if(!$has_default)
$str .= "if({$tmp_val} === null) throw new Exception(\"'{$name}' is missing\");\n";
$str .= "if(\$check_junk) unset({$buf}['{$name}']);\n";
}
if($type instanceof \mtgBuiltinType)
{
@ -364,7 +350,6 @@ 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";

30
tpl/macro.twig
View File

@ -58,15 +58,9 @@ class {{o.name}} {{o.parent ? 'extends ' ~ o.parent.name}}
return self::CLASS_ID;
}
function import(array &$data, bool $assoc = false)
function import(array &$data)
{
if($assoc)
{
self::normalize($data, $normalized);
$this->_import($normalized, true);
}
else
$this->_import($data, true);
$this->_import($data, true);
}
function _import(array &$data, $root = true) : int
@ -92,14 +86,14 @@ class {{o.name}} {{o.parent ? 'extends ' ~ o.parent.name}}
return $IDX;
}
function export(bool $assoc = false, bool $virtual = false) : array
function export($virtual = false) : array
{
$data = array();
$this->_export($data, $assoc, $virtual);
$this->_export($data, $virtual);
return $data;
}
function _export(array &$data, bool $assoc = false, $virtual = false)
function _export(array &$data, $virtual = false)
{
if($virtual)
$data[] = $this->getClassId();
@ -107,7 +101,7 @@ class {{o.name}} {{o.parent ? 'extends ' ~ o.parent.name}}
{{_self.export_fields(o)}}
}
static function normalize(array &$data, array &$mapped, bool $check_junk = true, bool $root = true) : int
static function normalize(array &$data, array &$mapped, bool $root = true, bool $check_junk = false) : int
{
$IDX = -1;
@ -115,7 +109,7 @@ class {{o.name}} {{o.parent ? 'extends ' ~ o.parent.name}}
{
$IDX = 0;
{%- if o.parent ~%}
$IDX = parent::normalize($data, $mapped, $check_junk, false);
$IDX = parent::normalize($data, $mapped, false, false);
{%- endif ~%}
{%- for f in o.fields ~%}
@ -129,8 +123,8 @@ class {{o.name}} {{o.parent ? 'extends ' ~ o.parent.name}}
throw new Exception($e->getMessage() . " < {$FIELDS[$IDX]} < ({{o.name}})");
}
if($root && $check_junk && sizeof($data) > 0)
throw new Exception("Junk fields: " . implode(',', array_keys($data)));
if($root && $check_junk)
\metagen_php\check_junk_fields($data, self::CLASS_FIELDS());
return $IDX;
}
@ -227,7 +221,7 @@ array_merge(parent::CLASS_FIELDS_PROPS(),
[]
{%- elseif f.type is instanceof('\\mtgBuiltinType') ~%}
{%- if has_token(f, 'default') -%}
{{token(f, 'default')|default_value}}
\metagen_php\val_{{f.type}}({{apply_value_filters(f.name, f.tokens, token(f, 'default')|default_value, false)}})
{%- elseif f.type.isstring -%}
''
{%- else -%}
@ -263,10 +257,10 @@ array_merge(parent::CLASS_FIELDS_PROPS(),
{% macro export_fields(o) %}
{%- if o.parent -%}
parent::_export($data, $assoc, false);
parent::_export($data, false);
{%- endif -%}
{%- for f in o.fields ~%}
{{value2data('$this->'~f.name, f.name, f.type, '$data', f.tokens)}}
{{value2data('$this->'~f.name, f.type, '$data', f.tokens)}}
{%- endfor -%}
{% endmacro %}