dwarflint: Shuffle code

diff --git a/dwarflint/dwarf_version-imp.hh b/dwarflint/dwarf_version-imp.hh
index e2d1b601c72f5247118e01d4586c97c118e276f9..126850d7f41c936c9de87c8cb4f84655c2a70281 100644 (file)
--- a/dwarflint/dwarf_version-imp.hh
+++ b/dwarflint/dwarf_version-imp.hh
@@ -77,6 +77,25 @@ public:
   storage_class_t storage_class () const;
 };
 
+template<storage_class_t StorClass, dw_class... Classes>
+struct preset_form
+  : public full_form
+{
+  preset_form (int a_name, form_width_t a_width)
+    : full_form (a_name, dw_class_set (Classes...), a_width, StorClass)
+  {}
+};
+
+template<dw_class... Classes>
+struct preset_attribute
+  : public basic_attribute
+{
+  preset_attribute (int a_name)
+    : basic_attribute (a_name, dw_class_set (Classes...))
+  {}
+};
+
+\f
 struct offset_form
   : public basic_form
 {
@@ -95,30 +114,12 @@ struct address_form
   storage_class_t storage_class () const;
 };
 
-template<storage_class_t StorClass, dw_class... Classes>
-struct preset_form
-  : public full_form
-{
-  preset_form (int a_name, form_width_t a_width)
-    : full_form (a_name, dw_class_set (Classes...), a_width, StorClass)
-  {}
-};
-
 struct string_form
   : public preset_form<sc_string, cl_string>
 {
   string_form (int a_name);
 };
 
-template<dw_class... Classes>
-struct preset_attribute
-  : public basic_attribute
-{
-  preset_attribute (int a_name)
-    : basic_attribute (a_name, dw_class_set (Classes...))
-  {}
-};
-
 typedef preset_form<sc_block, cl_block> block_form;
 typedef preset_form<sc_value, cl_constant> const_form;
 typedef preset_form<sc_value, cl_reference> ref_form;