source: refactor code generator with TypeHandler class hierarchy

.gitignore

@@ -1,6 +1,23 @@
 *.a
 aclocal.m4
 autom4te.cache/
+
+# Generated files in root directory
+/config_*.c
+/config_*.h
+/defs*.c
+/defs*.h
+/features_*.c
+/features_*.h
+/state_*.c
+/state_*.h
+/basic_test_*
+/test_*
+/*_schema.c
+/*_schema.h
+/libocispec-*.tar.*
+/libocispec-*/
+/target/
 build-aux/compile
 build-aux/config.guess
 build-aux/config.sub
@@ -24,87 +41,34 @@ Makefile
 Makefile.in
 *.o
 ocispec.pc
-src/basic_test_double_array.c
-src/basic_test_double_array.h
-src/basic_test_double_array_item.c
-src/basic_test_double_array_item.h
-src/basic-test_stamp
-src/basic_test_top_array_int.c
-src/basic_test_top_array_int.h
-src/basic_test_top_array_string.c
-src/basic_test_top_array_string.h
-src/basic_test_top_double_array_int.c
-src/basic_test_top_double_array_int.h
-src/basic_test_top_double_array_obj.c
-src/basic_test_top_double_array_obj.h
-src/basic_test_top_double_array_refobj.c
-src/basic_test_top_double_array_refobj.h
-src/basic_test_top_double_array_string.c
-src/basic_test_top_double_array_string.h
-src/.deps/
-src/.dirstamp
-src/image_manifest_items_image_manifest_items_schema.c
-src/image_manifest_items_image_manifest_items_schema.h
-src/image_manifest_stamp
-src/image_spec_schema_config_schema.c
-src/image_spec_schema_config_schema.h
-src/image_spec_schema_content_descriptor.c
-src/image_spec_schema_content_descriptor.h
-src/image_spec_schema_defs.c
-src/image_spec_schema_defs_descriptor.c
-src/image_spec_schema_defs_descriptor.h
-src/image_spec_schema_defs.h
-src/image_spec_schema_image_index_schema.c
-src/image_spec_schema_image_index_schema.h
-src/image_spec_schema_image_layout_schema.c
-src/image_spec_schema_image_layout_schema.h
-src/image_spec_schema_image_manifest_schema.c
-src/image_spec_schema_image_manifest_schema.h
-src/image_spec_stamp
-src/*.lo
-src/__pycache__/
-src/runtime_spec_schema_config_linux.c
-src/runtime_spec_schema_config_linux.h
-src/runtime_spec_schema_config_zos.c
-src/runtime_spec_schema_config_zos.h
-src/runtime_spec_schema_config_schema.c
-src/runtime_spec_schema_config_schema.h
-src/runtime_spec_schema_config_solaris.c
-src/runtime_spec_schema_config_solaris.h
-src/runtime_spec_schema_config_vm.c
-src/runtime_spec_schema_config_vm.h
-src/runtime_spec_schema_config_windows.c
-src/runtime_spec_schema_config_windows.h
-src/runtime_spec_schema_defs.c
-src/runtime_spec_schema_defs.h
-src/runtime_spec_schema_defs_linux.c
-src/runtime_spec_schema_defs_linux.h
-src/runtime_spec_schema_defs_zos.c
-src/runtime_spec_schema_defs_zos.h
-src/runtime_spec_schema_defs_vm.c
-src/runtime_spec_schema_defs_vm.h
-src/runtime_spec_schema_defs_windows.c
-src/runtime_spec_schema_defs_windows.h
-src/runtime_spec_schema_state_schema.c
-src/runtime_spec_schema_state_schema.h
-src/runtime_spec_stamp
-src/validate
 stamp-h1
+*_stamp
+
+# Generated files in src/ocispec/
+src/ocispec/.dirstamp
+src/ocispec/.deps/
+src/ocispec/__pycache__/
+src/ocispec/*.lo
+src/ocispec/*.o
+src/ocispec/*_stamp
+src/ocispec/basic_test_*
+src/ocispec/test_*
+src/ocispec/image_manifest_*
+src/ocispec/image_spec_*
+src/ocispec/runtime_spec_*
+src/ocispec/*_schema.*
+src/ocispec/config_*
+src/ocispec/defs_*
+src/ocispec/defs.*
+src/ocispec/features_*
+src/ocispec/state_*
+src/ocispec/validate
+
 tests/.deps/
 tests/.dirstamp
-tests/test-1
-tests/test-10
-tests/test-11
-tests/test-2
-tests/test-3
-tests/test-4
-tests/test-5
-tests/test-6
-tests/test-7
-tests/test-8
-tests/test-9
-tests/test-*.log
-tests/test-*.trs
+tests/test-[0-9]*
+tests/*.log
+tests/*.trs
 test-suite.log
 build-aux/config.guess~
 build-aux/config.sub~

src/ocispec/generate.py

@@ -404,7 +404,7 @@ def gen_type_arr_typnode(node_info, src, typ, refname):
                         subtyp=item_type.subtyp,
                         subtypobj=item_type.subtypobj,
                         subtypname=item_type.subtypname,
-                        required=item_type.required, doublearray=True), src
+                        required=item_type.required, nested_array=True), src
     else:
         return helpers.SchemaNode(name,
                         typ,
@@ -650,7 +650,7 @@ def parse_schema(schema_info, schema, prefix):
         item_type, _ = resolve_type(schema_info, helpers.HierarchicalName(""), \
                                     schema['items'], schema['items'], schema_info.name.name)
         if item_type.typ == 'array' and not helpers.valid_basic_map_name(item_type.subtyp):
-            item_type.doublearray = True
+            item_type.nested_array = True
             return item_type
         else:
             return helpers.SchemaNode(helpers.HierarchicalName(prefix), 'array', None, item_type.typ, \

src/ocispec/headers.py

@@ -55,7 +55,7 @@ def append_header_arr(obj, header, prefix):
                 helpers.get_map_c_types(i.typ)
             header.append(f"    {c_typ}{' ' if '*' not in c_typ else ''}{i.fixname};\n")
     for i in obj.subtypobj:
-        if helpers.judge_data_type(i.typ) or i.typ == 'boolean':
+        if helpers.is_numeric_type(i.typ) or i.typ == 'boolean':
             header.append(f"    unsigned int {i.fixname}_present : 1;\n")
     typename = helpers.get_name_substr(obj.name, prefix)
     header.append(f"}}\n{typename};\n\n")
@@ -100,7 +100,7 @@ def append_header_child_arr(child, header, prefix):
         c_typ = helpers.get_prefixed_pointer(child.name, child.subtyp, prefix)
 
     dflag = ""
-    if child.doublearray:
+    if child.nested_array:
         dflag = "*"
 
     if helpers.valid_basic_map_name(child.subtyp):
@@ -110,7 +110,7 @@ def append_header_child_arr(child, header, prefix):
     else:
         header.append(f"    {c_typ}{' ' if '*' not in c_typ else ''}**{dflag}{child.fixname};\n")
 
-    if child.doublearray and not helpers.valid_basic_map_name(child.subtyp):
+    if child.nested_array and not helpers.valid_basic_map_name(child.subtyp):
         header.append(f"    size_t *{child.fixname + '_item_lens'};\n")
 
     header.append(f"    size_t {child.fixname + '_len'};\n\n")
@@ -157,7 +157,7 @@ def append_type_c_header(obj, header, prefix):
             header.append("    char unuseful; // unuseful definition to avoid empty struct\n")
         present_tags = []
         for i in obj.children or []:
-            if helpers.judge_data_type(i.typ) or i.typ == 'boolean':
+            if helpers.is_numeric_type(i.typ) or i.typ == 'boolean':
                 present_tags.append(f"    unsigned int {i.fixname}_present : 1;\n")
             if i.typ == 'array':
                 append_header_child_arr(i, header, prefix)
@@ -180,7 +180,7 @@ def header_reflect_top_array(obj, prefix, header):
     c_typ = helpers.get_prefixed_pointer(obj.name, obj.subtyp, prefix) or \
         helpers.get_map_c_types(obj.subtyp)
     if obj.subtypobj is not None:
-        if obj.doublearray and obj.subtypname is not None:
+        if obj.nested_array and obj.subtypname is not None:
             c_typ = obj.subtypname + " *"
         else:
             c_typ = helpers.get_name_substr(obj.name, prefix) + " *"
@@ -189,7 +189,7 @@ def header_reflect_top_array(obj, prefix, header):
 
     typename = helpers.get_top_array_type_name(obj.name, prefix)
     header.append("typedef struct {\n")
-    if obj.doublearray:
+    if obj.nested_array:
         header.append(f"    {c_typ}{' ' if '*' not in c_typ else ''}**items;\n")
         header.append("    size_t *subitem_lens;\n\n")
     else:

src/ocispec/helpers.py

@@ -192,33 +192,21 @@ def is_compound_type(typ):
     '''
     return typ in ('object', 'array', 'mapStringObject')
 
-def judge_data_type(typ):
-    '''
-    Description: Check numeric type
-    Interface: None
-    History: 2019-06-17
-    '''
+def is_numeric_type(typ):
+    '''Check if typ is a numeric type (int, uint, double, etc.).'''
     if (typ.startswith("int") or typ.startswith("uint")) and \
             "Pointer" not in typ:
         return True
     return typ in ("integer", "UID", "GID", "double")
 
-def judge_data_pointer_type(typ):
-    '''
-    Description: Check numeric pointer type
-    Interface: None
-    History: 2019-06-17
-    '''
+def is_numeric_pointer_type(typ):
+    '''Check if typ is a pointer to a numeric type.'''
     if (typ.startswith("int") or typ.startswith("uint")) and "Pointer" in typ:
         return True
     return False
 
-def obtain_data_pointer_type(typ):
-    '''
-    Description: Get numeric pointer type
-    Interface: None
-    History: 2019-06-17
-    '''
+def get_pointer_base_type(typ):
+    '''Extract the base type from a pointer type (e.g., "int64Pointer" -> "int64").'''
     index = typ.find("Pointer")
     return typ[0:index] if index != -1 else ""
 
@@ -266,7 +254,7 @@ class SchemaNode:
     History: 2019-06-17
     '''
     def __init__(self, name, typ, children, subtyp=None, subtypobj=None, subtypname=None, \
-        required=None, doublearray=False):
+        required=None, nested_array=False):
         self.typ = typ
         self.children = children
         self.subtyp = subtyp
@@ -276,7 +264,7 @@ def __init__(self, name, typ, children, subtyp=None, subtypobj=None, subtypname=
         self.name = conv_to_c_style(name.name.replace('.', '_'))
         self.origname = name.leaf or name.name
         self.fixname = conv_to_c_style(self.origname.replace('.', '_'))
-        self.doublearray = doublearray
+        self.nested_array = nested_array