Support some last missing features from Kaitai: bit fields, instance search order and stream EOF.

1 files changed, 0 insertions, 335 deletions

diff --git a/plugins/kaitai/python/records/value.c b/plugins/kaitai/python/records/value.c
deleted file mode 100644
index bd4ad74..0000000
--- a/plugins/kaitai/python/records/value.c
+++ /dev/null
@@ -1,335 +0,0 @@
-
-/* Chrysalide - Outil d'analyse de fichiers binaires
- * value.c - équivalent Python du fichier "plugins/kaitai/parsers/value.c"
- *
- * Copyright (C) 2019 Cyrille Bagard
- *
- *  This file is part of Chrysalide.
- *
- *  Chrysalide is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Chrysalide is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-
-#include "value.h"
-
-
-#include <assert.h>
-#include <pygobject.h>
-
-
-#include <i18n.h>
-#include <plugins/pychrysalide/access.h>
-#include <plugins/pychrysalide/helpers.h>
-#include <plugins/pychrysalide/analysis/content.h>
-#include <plugins/pychrysalide/arch/vmpa.h>
-#include <plugins/yaml/python/node.h>
-
-
-#include "../record.h"
-#include "../scope.h"
-#include "../parsers/instance.h"
-#include "../../records/value-int.h"
-
-
-
-CREATE_DYN_CONSTRUCTOR(record_value, G_TYPE_RECORD_VALUE);
-
-/* Initialise une instance sur la base du dérivé de GObject. */
-static int py_record_value_init(PyObject *, PyObject *, PyObject *);
-
-/* Lit la valeur d'un élément Kaitai entier représenté. */
-static PyObject *py_record_value_get_value(PyObject *, void *);
-
-
-
-/******************************************************************************
-*                                                                             *
-*  Paramètres  : self = objet à initialiser (théoriquement).                  *
-*                args = arguments fournis à l'appel.                          *
-*                kwds = arguments de type key=val fournis.                    *
-*                                                                             *
-*  Description : Initialise une instance sur la base du dérivé de GObject.    *
-*                                                                             *
-*  Retour      : 0.                                                           *
-*                                                                             *
-*  Remarques   : -                                                            *
-*                                                                             *
-******************************************************************************/
-
-static int py_record_value_init(PyObject *self, PyObject *args, PyObject *kwds)
-{
-    GKaitaiInstance *inst;                  /* Instance définie créatrice  */
-    kaitai_scope_t *locals;                 /* Environnement local         */
-    int ret;                                /* Bilan de lecture des args.  */
-    GRecordValue *value;                    /* Création GLib à transmettre */
-
-#define RECORD_VALUE_DOC                                                        \
-    "The RecordValue class stores a link to an instance used to compute a"      \
-    " given value."                                                             \
-    "\n"                                                                        \
-    "Instances can be created using the following constructor:\n"               \
-    "\n"                                                                        \
-    "    RecordValue(inst, locals)"                                             \
-    "\n"                                                                        \
-    "Where the *inst* arguments refers to a"                                    \
-    " pychrysalide.plugins.kaitai.parsers.KaitaiInstance instance as the"       \
-    " creator of the newly created object, *locals* points to a"                \
-    " pychrysalide.plugins.kaitai.KaitaiScope structure used as current scope."
-
-    /* Récupération des paramètres */
-
-    ret = PyArg_ParseTuple(args, "O&O&",
-                           convert_to_kaitai_instance, &inst,
-                           convert_to_kaitai_scope, &locals);
-    if (!ret) return -1;
-
-    /* Initialisation d'un objet GLib */
-
-    ret = forward_pygobjet_init(self);
-    if (ret == -1) return -1;
-
-    /* Eléments de base */
-
-    value = G_RECORD_VALUE(pygobject_get(self));
-
-    if (!g_record_value_create(value, inst, locals))
-    {
-        PyErr_SetString(PyExc_ValueError, _("Unable to create record value."));
-        return -1;
-    }
-
-    return 0;
-
-}
-
-
-/******************************************************************************
-*                                                                             *
-*  Paramètres  : self    = objet Python concerné par l'appel.                 *
-*                closure = non utilisé ici.                                   *
-*                                                                             *
-*  Description : Lit la valeur d'un élément Kaitai entier représenté.         *
-*                                                                             *
-*  Retour      : Bilan de l'opération.                                        *
-*                                                                             *
-*  Remarques   : -                                                            *
-*                                                                             *
-******************************************************************************/
-
-static PyObject *py_record_value_get_value(PyObject *self, void *closure)
-{
-    PyObject *result;                       /* Valeur à retourner          */
-    GRecordValue *value;                    /* Version native de l'élément */
-    resolved_value_t resolved;              /* Valeur sous forme générique */
-    bool status;                            /* Bilan d'opération           */
-
-#define RECORD_VALUE_VALUE_ATTRIB PYTHON_GET_DEF_FULL               \
-(                                                                   \
-    value, py_record_value,                                         \
-    "Carried value (as integer, bytes), or None in case of error."  \
-)
-
-    result = NULL;
-
-    value = G_RECORD_VALUE(pygobject_get(self));
-
-    status = g_record_value_compute_and_aggregate_value(value, &resolved);
-
-    if (status)
-        switch (resolved.type)
-        {
-            case GVT_ERROR:
-                assert(false);
-                PyErr_Format(PyExc_RuntimeError,
-                             _("Error got while parsing Kaitai definition should not have been exported!"));
-                result = NULL;
-                break;
-
-            case GVT_UNSIGNED_INTEGER:
-                result = PyLong_FromUnsignedLongLong(resolved.unsigned_integer);
-                break;
-
-            case GVT_SIGNED_INTEGER:
-                result = PyLong_FromLongLong(resolved.signed_integer);
-                break;
-
-            case GVT_FLOAT:
-                result = PyFloat_FromDouble(resolved.floating_number);
-                break;
-
-            case GVT_BOOLEAN:
-                result = resolved.status ? Py_True : Py_False;
-                Py_INCREF(result);
-                break;
-
-            case GVT_BYTES:
-                result = PyBytes_FromStringAndSize(resolved.bytes.data, resolved.bytes.len);
-                exit_szstr(&resolved.bytes);
-                break;
-
-            case GVT_ARRAY:
-                result = pygobject_new(G_OBJECT(resolved.array));
-                break;
-
-            case GVT_RECORD:
-                result = pygobject_new(G_OBJECT(resolved.record));
-                break;
-
-            case GVT_STREAM:
-                result = pygobject_new(G_OBJECT(resolved.stream));
-                break;
-
-        }
-
-    else
-    {
-        result = Py_None;
-        Py_INCREF(result);
-    }
-
-    return result;
-
-}
-
-
-/******************************************************************************
-*                                                                             *
-*  Paramètres  : -                                                            *
-*                                                                             *
-*  Description : Fournit un accès à une définition de type à diffuser.        *
-*                                                                             *
-*  Retour      : Définition d'objet pour Python.                              *
-*                                                                             *
-*  Remarques   : -                                                            *
-*                                                                             *
-******************************************************************************/
-
-PyTypeObject *get_python_record_value_type(void)
-{
-    static PyMethodDef py_record_value_methods[] = {
-        { NULL }
-    };
-
-    static PyGetSetDef py_record_value_getseters[] = {
-        RECORD_VALUE_VALUE_ATTRIB,
-        { NULL }
-    };
-
-    static PyTypeObject py_record_value_type = {
-
-        PyVarObject_HEAD_INIT(NULL, 0)
-
-        .tp_name        = "pychrysalide.plugins.kaitai.records.RecordValue",
-        .tp_basicsize   = sizeof(PyGObject),
-
-        .tp_flags       = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
-
-        .tp_doc         = RECORD_VALUE_DOC,
-
-        .tp_methods     = py_record_value_methods,
-        .tp_getset      = py_record_value_getseters,
-
-        .tp_init        = py_record_value_init,
-        .tp_new         = py_record_value_new,
-
-    };
-
-    return &py_record_value_type;
-
-}
-
-
-/******************************************************************************
-*                                                                             *
-*  Paramètres  : -                                                            *
-*                                                                             *
-*  Description : Prend en charge l'objet 'pychrysalide...records.RecordValue. *
-*                                                                             *
-*  Retour      : Bilan de l'opération.                                        *
-*                                                                             *
-*  Remarques   : -                                                            *
-*                                                                             *
-******************************************************************************/
-
-bool ensure_python_record_value_is_registered(void)
-{
-    PyTypeObject *type;                     /* Type Python 'RecordValue'   */
-    PyObject *module;                       /* Module à recompléter        */
-    PyObject *dict;                         /* Dictionnaire du module      */
-
-    type = get_python_record_value_type();
-
-    if (!PyType_HasFeature(type, Py_TPFLAGS_READY))
-    {
-        module = get_access_to_python_module("pychrysalide.plugins.kaitai.records");
-
-        dict = PyModule_GetDict(module);
-
-        if (!ensure_python_match_record_is_registered())
-            return false;
-
-        if (!register_class_for_pygobject(dict, G_TYPE_RECORD_VALUE, type))
-            return false;
-
-    }
-
-    return true;
-
-}
-
-
-/******************************************************************************
-*                                                                             *
-*  Paramètres  : arg = argument quelconque à tenter de convertir.             *
-*                dst = destination des valeurs récupérées en cas de succès.   *
-*                                                                             *
-*  Description : Tente de convertir en valeur calculée.                       *
-*                                                                             *
-*  Retour      : Bilan de l'opération, voire indications supplémentaires.     *
-*                                                                             *
-*  Remarques   : -                                                            *
-*                                                                             *
-******************************************************************************/
-
-int convert_to_record_value(PyObject *arg, void *dst)
-{
-    int result;                             /* Bilan à retourner           */
-
-    result = PyObject_IsInstance(arg, (PyObject *)get_python_record_value_type());
-
-    switch (result)
-    {
-        case -1:
-            /* L'exception est déjà fixée par Python */
-            result = 0;
-            break;
-
-        case 0:
-            PyErr_SetString(PyExc_TypeError, "unable to convert the provided argument to record value");
-            break;
-
-        case 1:
-            *((GRecordValue **)dst) = G_RECORD_VALUE(pygobject_get(arg));
-            break;
-
-        default:
-            assert(false);
-            break;
-
-    }
-
-    return result;
-
-}