Merge branch 'master' into field_order

Author: ab9rf

.pre-commit-config.yaml

@@ -20,7 +20,7 @@ repos:
       args: ['--fix=lf']
     - id: trailing-whitespace
 - repo: https://github.com/python-jsonschema/check-jsonschema
-  rev: 0.36.1
+  rev: 0.37.0
   hooks:
     - id: check-github-workflows
 - repo: https://github.com/Lucas-C/pre-commit-hooks

Common.pm

@@ -177,13 +177,14 @@ my @primitive_type_list =
        size_t ssize_t
        s-float d-float
        bool flag-bit
-       padding static-string);
+       padding static-string static-wstring);
 
 my %primitive_aliases = (
     'ulong' => 'unsigned long',
     's-float' => 'float',
     'd-float' => 'double',
     'static-string' => 'char',
+    'static-wstring' => 'wchar_t',
     'flag-bit' => 'void',
     'padding' => 'void',
 );

SYNTAX.rst

@@ -234,6 +234,7 @@ Primitive fields can be classified as following:
 4)  String::
 
         <static-string name='id' size='bytes'.../>
+        <static-wstring name='id' size='words'.../>
         <ptr-string name='id'.../>
         <stl-string name='id'.../>
 

StructFields.pm

@@ -294,6 +294,10 @@ sub get_struct_field_type($;%) {
                 my $count = $tag->getAttribute('size') || 0;
                 $prefix = "char";
                 $suffix = "[$count]";
+            } elsif ($subtype eq 'static-wstring') {
+                my $count = $tag->getAttribute('size') || 0;
+                $prefix = "wchar_t";
+                $suffix = "[$count]";
             } elsif ($subtype eq 'padding') {
                 my $count = $tag->getAttribute('size') || 0;
                 my $alignment = $tag->getAttribute('alignment') || 1;
@@ -572,6 +576,9 @@ sub render_field_metadata_rec($$) {
         if ($subtype eq 'static-string') {
             my $count = $field->getAttribute('size') || 0;
             push @field_defs, [ "${FLD}(STATIC_STRING, $name)", 'NULL', $count, $extra ];
+        } elsif ($subtype eq 'static-wstring') {
+            my $count = $field->getAttribute('size') || 0;
+            push @field_defs, [ "${FLD}(PRIMITIVE, $name)", 'NULL', $count, $extra ];
         }
     } elsif ($meta eq 'global' || $meta eq 'compound') {
         if (is_attr_true($field, 'ld:enum-size-forced')) {

changelog.txt

@@ -19,6 +19,15 @@ Template for new versions:
 # Future
 - reordered XML attributes for consistency: ret-type, base-type, type-name, and pointer-type now appear first (and in that exact order)
 
+## Structures
+
+# 53.11-r1
+
+## Structures
+- added codegen support for ``static-wstring`` (``wchar_t *``), required to support DF 53.11
+
+# 53.10-r2
+
 ## Structures
 - added ``original-name`` attributes to all relevant objects
 - fixed numerous structure errors

data-definition.xsd

@@ -239,6 +239,7 @@
             <xs:element name="pointer" type="PointerField" />
             <xs:element name="ptr-string" type="PtrStringField" />
             <xs:element name="static-string" type="StaticStringField" />
+            <xs:element name="static-wstring" type="StaticWStringField" />
             <xs:element name="padding" type="PaddingField" />
         </xs:choice>
     </xs:group>
@@ -555,6 +556,14 @@
             </xs:extension>
         </xs:complexContent>
     </xs:complexType>
+    <xs:complexType name="StaticWStringField">
+        <xs:complexContent>
+            <xs:extension base="SimpleFieldType">
+                <xs:attribute name="size" type="xs:positiveInteger" use="required">
+                </xs:attribute>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
     <xs:complexType name="PaddingField">
         <xs:complexContent>
             <xs:extension base="SimpleFieldType">

df.g_src.enabler.xml

@@ -202,8 +202,8 @@
                         <int32_t name='y'/>
                     </compound>
                     <compound>
-                        <pointer type-name='static-string' name='text'/>
-                        <pointer type-name='static-string' name='caption'/>
+                        <pointer type-name='static-wstring' name='text'/>
+                        <pointer type-name='static-wstring' name='caption'/>
                         <uint32_t name='type'/>
                     </compound>
                 </compound>

lower-1.xslt

@@ -207,12 +207,17 @@ Error: field <xsl:value-of select='$enum-key'/> corresponds to an enum value of
 
         <prim-type ld:meta='bytes' ld:subtype='padding'/>
         <prim-type ld:meta='bytes' ld:subtype='static-string'/>
+        <prim-type ld:meta='bytes' ld:subtype='static-wstring'/>
 
         <prim-type ld:meta='pointer' ld:subtype='pointer'/>
         <prim-type ld:meta='pointer' ld:subtype='ptr-string' ld:is-container='true'>
             <static-string/>
         </prim-type>
 
+        <prim-type ld:meta='pointer' ld:subtype='ptr-wstring' ld:is-container='true'>
+            <static-wstring/>
+        </prim-type>
+
         <prim-type ld:meta='primitive' ld:subtype='stl-string'/>
         <prim-type ld:meta='primitive' ld:subtype='stl-fstream'/>
         <prim-type ld:meta='primitive' ld:subtype='stl-mutex'/>