Merge pull request #768 from myk002/myk_union

don't publicly export structs and unions that have no names
DFHack · May 28, 2024 · 9c7c2fb · 9c7c2fb
2 parents a0b9fd7 + 4c4c1d6
commit 9c7c2fb
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 4 deletions.
diff --git a/StructFields.pm b/StructFields.pm
@@ -38,7 +38,7 @@ sub with_struct_block(&$;$%) {
 
     my $is_union = is_attr_true($tag,'is-union');
     my $kwd = ($is_union ? "union" : "struct");
-    my $exp = $export_prefix; #$flags{-export} ? $export_prefix : '';
+    my $exp = $name ? $export_prefix : '';
     header_ref("Export.h");
     header_ref("DataDefs.h");
     my $prefix = $kwd.' '.$exp.($name ? $name.' ' : '');

diff --git a/df.advmode.xml b/df.advmode.xml
@@ -429,11 +429,60 @@
         <pointer type-name='witness_incidentst' name='witness_incident'/>
         <compound is-union='true'>
             <int32_t name='variable1'/>
+            <enum name="adventure_desire" type-name='adventure_desire_state_type'/>
+            <enum name="opinion" type-name='opinion_type'/>
             <pointer name='sleep_permission_zone' comment='building_civzonest but the pointer is only valid for specific conversation topics'/>
+            <int32_t name='main_relevant_id'/>
+            <int32_t name='banter_item_id' ref-target='item'/>
+            <enum name="trouble_type" type-name='conversation_trouble_type'/>
+            <int32_t name='squad_id' ref-target='squad'/>
+            <int32_t name='agreement_id' ref-target='agreement'/>
+            <int32_t name='giver_entity_id' ref-target='historical_entity'/>
+            <int32_t name='asker_entity_id' ref-target='historical_entity'/>
+            <enum name="emotion" type-name='emotion_type'/>
+            <int32_t name='position_entity_id' ref-target='historical_entity'/>
+            <int32_t name='invocation_target_hfid' ref-target='historical_figure'/>
+            <int32_t name='service_order_id'/>
+            <enum name="value_type" type-name='value_type'/>
+            <enum name="squad_order_type" type-name='squad_order_type'/>
+            <int32_t name='belief_system_id'/>
+        </compound>
+        <compound is-union='true'>
+            <int32_t name='variable2'/>
+            <enum name="reason" type-name='history_event_reason'/>
+            <int32_t name='site_id2' ref-target='world_site'/>
+            <int32_t name='banter_bld_id'/>
+            <int32_t name='trouble_amount'/>
+            <int32_t name='dipstate_holder_enid' ref-target='historical_entity'/>
+            <int32_t name='squad_joiner_unid' ref-target='unit'/>
+            <int32_t name='taker_entity_id' ref-target='historical_entity'/>
+            <int32_t name='considerer_entity_id' ref-target='historical_entity'/>
+            <enum name="circumstance" type-name='unit_thought_type'/>
+            <enum name="witness" type-name='witness_type'/>
+            <int32_t name='position_profile_id'/>
+            <int32_t name='invocation_target_identity_id'/>
+            <int32_t name='service_order_occid'/>
+            <int32_t name='value_level'/>
+            <int32_t name='squad_order_target_hfid' ref-target='historical_figure'/>
+            <int32_t name='story_index'/>
+            <int32_t name='question_identity_id'/>
+        </compound>
+        <compound is-union='true'>
+            <int32_t name='variable3'/>
+            <int32_t name='banter_entity_id' ref-target='historical_entity'/>
+            <int32_t name='agreement_subject_id'/>
+            <int32_t name='order_squad_id' ref-target='squad'/>
+            <int32_t name='circumstance_id'/>
+            <enum name="occupation_type" type-name='occupation_type'/>
+            <int32_t name='squad_order_target_stid' ref-target='world_site'/>
+            <int32_t name='story_frame_index'/>
+        </compound>
+        <compound is-union='true'>
+            <int32_t name='variable4'/>
+            <int32_t name='circumstance_value'/>
+            <int32_t name='occupation_unid' ref-target='unit'/>
+            <int32_t name='squad_order_target_enid' ref-target='historical_entity'/>
         </compound>
-        <int32_t name='variable2'/>
-        <int32_t name='variable3'/>
-        <int32_t name='variable4'/>
         <int32_t name='value' init-value='-1'/>
     </struct-type>