Update to bsnes v062r07 release.

This is source code only, no binaries. Sorry, worn out after spending
four hours straight writing crazy ass Julian<>Gregorian date
functions. Holy fucking hell that is crazy shit. Tell me, how many
days have passed since 01-01-4731 BC on the Julian calendar?

Okay, this really was just about taking advantage of vectors inside of
vectors. I've updated the XML parser to use vectors of actual objects
instead of pointers. This makes cleanup free, and turns countless ->'s
into .'s -- much nicer to look at. I may take advantage of overloaded
operators for something now, not sure yet.

src/base.hpp

@@ -1,4 +1,4 @@
-static const char bsnesVersion[] = "062.06";
+static const char bsnesVersion[] = "062.07";
 static const char bsnesTitle[] = "bsnes";
 static const unsigned bsnesSerializerVersion = 8;
 

src/cartridge/cartridge.hpp

@@ -79,22 +79,22 @@ private:
   void parse_xml_sufami_turbo(const char*, bool);
   void parse_xml_gameboy(const char*);
 
-  void xml_parse_rom(xml_element*);
-  void xml_parse_ram(xml_element*);
-  void xml_parse_superfx(xml_element*);
-  void xml_parse_sa1(xml_element*);
-  void xml_parse_bsx(xml_element*);
-  void xml_parse_sufamiturbo(xml_element*);
-  void xml_parse_supergameboy(xml_element*);
-  void xml_parse_srtc(xml_element*);
-  void xml_parse_sdd1(xml_element*);
-  void xml_parse_spc7110(xml_element*);
-  void xml_parse_cx4(xml_element*);
-  void xml_parse_necdsp(xml_element*);
-  void xml_parse_obc1(xml_element*);
-  void xml_parse_setadsp(xml_element*);
-  void xml_parse_setarisc(xml_element*);
-  void xml_parse_msu1(xml_element*);
+  void xml_parse_rom(xml_element&);
+  void xml_parse_ram(xml_element&);
+  void xml_parse_superfx(xml_element&);
+  void xml_parse_sa1(xml_element&);
+  void xml_parse_bsx(xml_element&);
+  void xml_parse_sufamiturbo(xml_element&);
+  void xml_parse_supergameboy(xml_element&);
+  void xml_parse_srtc(xml_element&);
+  void xml_parse_sdd1(xml_element&);
+  void xml_parse_spc7110(xml_element&);
+  void xml_parse_cx4(xml_element&);
+  void xml_parse_necdsp(xml_element&);
+  void xml_parse_obc1(xml_element&);
+  void xml_parse_setadsp(xml_element&);
+  void xml_parse_setarisc(xml_element&);
+  void xml_parse_msu1(xml_element&);
 
   void xml_parse_address(Mapping&, const string&);
   void xml_parse_mode(Mapping&, const string&);

src/cartridge/xml.cpp

@@ -17,35 +17,35 @@ void Cartridge::parse_xml(const lstring &list) {
 }
 
 void Cartridge::parse_xml_cartridge(const char *data) {
-  xml_element *document = xml_parse(data);
-  if(document == 0) return;
+  xml_element document = xml_parse(data);
+  if(document.element.size() == 0) return;
 
-  foreach(head, document->element) {
-    if(head->name == "cartridge") {
-      foreach(attr, head->attribute) {
-        if(attr->name == "region") {
-          if(attr->content == "NTSC") region = Region::NTSC;
-          if(attr->content == "PAL") region = Region::PAL;
+  foreach(head, document.element) {
+    if(head.name == "cartridge") {
+      foreach(attr, head.attribute) {
+        if(attr.name == "region") {
+          if(attr.content == "NTSC") region = Region::NTSC;
+          if(attr.content == "PAL") region = Region::PAL;
         }
       }
 
-      foreach(node, head->element) {
-        if(node->name == "rom") xml_parse_rom(node);
-        if(node->name == "ram") xml_parse_ram(node);
-        if(node->name == "superfx") xml_parse_superfx(node);
-        if(node->name == "sa1") xml_parse_sa1(node);
-        if(node->name == "bsx") xml_parse_bsx(node);
-        if(node->name == "sufamiturbo") xml_parse_sufamiturbo(node);
-        if(node->name == "supergameboy") xml_parse_supergameboy(node);
-        if(node->name == "srtc") xml_parse_srtc(node);
-        if(node->name == "sdd1") xml_parse_sdd1(node);
-        if(node->name == "spc7110") xml_parse_spc7110(node);
-        if(node->name == "cx4") xml_parse_cx4(node);
-        if(node->name == "necdsp") xml_parse_necdsp(node);
-        if(node->name == "obc1") xml_parse_obc1(node);
-        if(node->name == "setadsp") xml_parse_setadsp(node);
-        if(node->name == "setarisc") xml_parse_setarisc(node);
-        if(node->name == "msu1") xml_parse_msu1(node);
+      foreach(node, head.element) {
+        if(node.name == "rom") xml_parse_rom(node);
+        if(node.name == "ram") xml_parse_ram(node);
+        if(node.name == "superfx") xml_parse_superfx(node);
+        if(node.name == "sa1") xml_parse_sa1(node);
+        if(node.name == "bsx") xml_parse_bsx(node);
+        if(node.name == "sufamiturbo") xml_parse_sufamiturbo(node);
+        if(node.name == "supergameboy") xml_parse_supergameboy(node);
+        if(node.name == "srtc") xml_parse_srtc(node);
+        if(node.name == "sdd1") xml_parse_sdd1(node);
+        if(node.name == "spc7110") xml_parse_spc7110(node);
+        if(node.name == "cx4") xml_parse_cx4(node);
+        if(node.name == "necdsp") xml_parse_necdsp(node);
+        if(node.name == "obc1") xml_parse_obc1(node);
+        if(node.name == "setadsp") xml_parse_setadsp(node);
+        if(node.name == "setarisc") xml_parse_setarisc(node);
+        if(node.name == "msu1") xml_parse_msu1(node);
       }
     }
   }
@@ -58,106 +58,104 @@ void Cartridge::parse_xml_sufami_turbo(const char *data, bool slot) {
 }
 
 void Cartridge::parse_xml_gameboy(const char *data) {
-  xml_element *document = xml_parse(data);
-  if(document == 0) return;
+  xml_element document = xml_parse(data);
+  if(document.element.size() == 0) return;
 
-  foreach(head, document->element) {
-    if(head->name == "cartridge") {
-      foreach(attr, head->attribute) {
-        if(attr->name == "rtc") {
-          supergameboy_rtc_size = (attr->content == "true") ? 4 : 0;
+  foreach(head, document.element) {
+    if(head.name == "cartridge") {
+      foreach(attr, head.attribute) {
+        if(attr.name == "rtc") {
+          supergameboy_rtc_size = (attr.content == "true") ? 4 : 0;
         }
       }
 
-      foreach(leaf, head->element) {
-        if(leaf->name == "ram") {
-          foreach(attr, leaf->attribute) {
-            if(attr->name == "size") {
-              supergameboy_ram_size = strhex(attr->content);
+      foreach(leaf, head.element) {
+        if(leaf.name == "ram") {
+          foreach(attr, leaf.attribute) {
+            if(attr.name == "size") {
+              supergameboy_ram_size = strhex(attr.content);
             }
           }
         }
       }
     }
   }
-
-  delete document;
 }
 
-void Cartridge::xml_parse_rom(xml_element *root) {
-  foreach(leaf, root->element) {
-    if(leaf->name == "map") {
+void Cartridge::xml_parse_rom(xml_element &root) {
+  foreach(leaf, root.element) {
+    if(leaf.name == "map") {
       Mapping m(memory::cartrom);
-      foreach(attr, leaf->attribute) {
-        if(attr->name == "address") xml_parse_address(m, attr->content);
-        if(attr->name == "mode") xml_parse_mode(m, attr->content);
-        if(attr->name == "offset") m.offset = strhex(attr->content);
-        if(attr->name == "size") m.size = strhex(attr->content);
+      foreach(attr, leaf.attribute) {
+        if(attr.name == "address") xml_parse_address(m, attr.content);
+        if(attr.name == "mode") xml_parse_mode(m, attr.content);
+        if(attr.name == "offset") m.offset = strhex(attr.content);
+        if(attr.name == "size") m.size = strhex(attr.content);
       }
       mapping.add(m);
     }
   }
 }
 
-void Cartridge::xml_parse_ram(xml_element *root) {
-  foreach(attr, root->attribute) {
-    if(attr->name == "size") ram_size = strhex(attr->content);
+void Cartridge::xml_parse_ram(xml_element &root) {
+  foreach(attr, root.attribute) {
+    if(attr.name == "size") ram_size = strhex(attr.content);
   }
 
-  foreach(leaf, root->element) {
-    if(leaf->name == "map") {
+  foreach(leaf, root.element) {
+    if(leaf.name == "map") {
       Mapping m(memory::cartram);
-      foreach(attr, leaf->attribute) {
-        if(attr->name == "address") xml_parse_address(m, attr->content);
-        if(attr->name == "mode") xml_parse_mode(m, attr->content);
-        if(attr->name == "offset") m.offset = strhex(attr->content);
-        if(attr->name == "size") m.size = strhex(attr->content);
+      foreach(attr, leaf.attribute) {
+        if(attr.name == "address") xml_parse_address(m, attr.content);
+        if(attr.name == "mode") xml_parse_mode(m, attr.content);
+        if(attr.name == "offset") m.offset = strhex(attr.content);
+        if(attr.name == "size") m.size = strhex(attr.content);
       }
       mapping.add(m);
     }
   }
 }
 
-void Cartridge::xml_parse_superfx(xml_element *root) {
+void Cartridge::xml_parse_superfx(xml_element &root) {
   has_superfx = true;
 
-  foreach(node, root->element) {
-    if(node->name == "rom") {
-      foreach(leaf, node->element) {
-        if(leaf->name == "map") {
+  foreach(node, root.element) {
+    if(node.name == "rom") {
+      foreach(leaf, node.element) {
+        if(leaf.name == "map") {
           Mapping m(memory::fxrom);
-          foreach(attr, leaf->attribute) {
-            if(attr->name == "address") xml_parse_address(m, attr->content);
-            if(attr->name == "mode") xml_parse_mode(m, attr->content);
-            if(attr->name == "offset") m.offset = strhex(attr->content);
-            if(attr->name == "size") m.size = strhex(attr->content);
+          foreach(attr, leaf.attribute) {
+            if(attr.name == "address") xml_parse_address(m, attr.content);
+            if(attr.name == "mode") xml_parse_mode(m, attr.content);
+            if(attr.name == "offset") m.offset = strhex(attr.content);
+            if(attr.name == "size") m.size = strhex(attr.content);
           }
           mapping.add(m);
         }
       }
-    } else if(node->name == "ram") {
-      foreach(attr, node->attribute) {
-        if(attr->name == "size") ram_size = strhex(attr->content);
+    } else if(node.name == "ram") {
+      foreach(attr, node.attribute) {
+        if(attr.name == "size") ram_size = strhex(attr.content);
       }
 
-      foreach(leaf, node->element) {
-        if(leaf->name == "map") {
+      foreach(leaf, node.element) {
+        if(leaf.name == "map") {
           Mapping m(memory::fxram);
-          foreach(attr, leaf->attribute) {
-            if(attr->name == "address") xml_parse_address(m, attr->content);
-            if(attr->name == "mode") xml_parse_mode(m, attr->content);
-            if(attr->name == "offset") m.offset = strhex(attr->content);
-            if(attr->name == "size") m.size = strhex(attr->content);
+          foreach(attr, leaf.attribute) {
+            if(attr.name == "address") xml_parse_address(m, attr.content);
+            if(attr.name == "mode") xml_parse_mode(m, attr.content);
+            if(attr.name == "offset") m.offset = strhex(attr.content);
+            if(attr.name == "size") m.size = strhex(attr.content);
           }
           mapping.add(m);
         }
       }
-    } else if(node->name == "mmio") {
-      foreach(leaf, node->element) {
-        if(leaf->name == "map") {
+    } else if(node.name == "mmio") {
+      foreach(leaf, node.element) {
+        if(leaf.name == "map") {
           Mapping m(superfx);
-          foreach(attr, leaf->attribute) {
-            if(attr->name == "address") xml_parse_address(m, attr->content);
+          foreach(attr, leaf.attribute) {
+            if(attr.name == "address") xml_parse_address(m, attr.content);
           }
           mapping.add(m);
         }
@@ -166,59 +164,59 @@ void Cartridge::xml_parse_superfx(xml_element *root) {
   }
 }
 
-void Cartridge::xml_parse_sa1(xml_element *root) {
+void Cartridge::xml_parse_sa1(xml_element &root) {
   has_sa1 = true;
 
-  foreach(node, root->element) {
-    if(node->name == "rom") {
-      foreach(leaf, node->element) {
-        if(leaf->name == "map") {
+  foreach(node, root.element) {
+    if(node.name == "rom") {
+      foreach(leaf, node.element) {
+        if(leaf.name == "map") {
           Mapping m(memory::vsprom);
-          foreach(attr, leaf->attribute) {
-            if(attr->name == "address") xml_parse_address(m, attr->content);
-            if(attr->name == "mode") xml_parse_mode(m, attr->content);
-            if(attr->name == "offset") m.offset = strhex(attr->content);
-            if(attr->name == "size") m.size = strhex(attr->content);
+          foreach(attr, leaf.attribute) {
+            if(attr.name == "address") xml_parse_address(m, attr.content);
+            if(attr.name == "mode") xml_parse_mode(m, attr.content);
+            if(attr.name == "offset") m.offset = strhex(attr.content);
+            if(attr.name == "size") m.size = strhex(attr.content);
           }
           mapping.add(m);
         }
       }
-    } else if(node->name == "iram") {
-      foreach(leaf, node->element) {
-        if(leaf->name == "map") {
+    } else if(node.name == "iram") {
+      foreach(leaf, node.element) {
+        if(leaf.name == "map") {
           Mapping m(memory::cpuiram);
-          foreach(attr, leaf->attribute) {
-            if(attr->name == "address") xml_parse_address(m, attr->content);
-            if(attr->name == "mode") xml_parse_mode(m, attr->content);
-            if(attr->name == "offset") m.offset = strhex(attr->content);
-            if(attr->name == "size") m.size = strhex(attr->content);
+          foreach(attr, leaf.attribute) {
+            if(attr.name == "address") xml_parse_address(m, attr.content);
+            if(attr.name == "mode") xml_parse_mode(m, attr.content);
+            if(attr.name == "offset") m.offset = strhex(attr.content);
+            if(attr.name == "size") m.size = strhex(attr.content);
           }
           mapping.add(m);
         }
       }
-    } else if(node->name == "bwram") {
-      foreach(attr, node->attribute) {
-        if(attr->name == "size") ram_size = strhex(attr->content);
+    } else if(node.name == "bwram") {
+      foreach(attr, node.attribute) {
+        if(attr.name == "size") ram_size = strhex(attr.content);
       }
 
-      foreach(leaf, node->element) {
-        if(leaf->name == "map") {
+      foreach(leaf, node.element) {
+        if(leaf.name == "map") {
           Mapping m(memory::cc1bwram);
-          foreach(attr, leaf->attribute) {
-            if(attr->name == "address") xml_parse_address(m, attr->content);
-            if(attr->name == "mode") xml_parse_mode(m, attr->content);
-            if(attr->name == "offset") m.offset = strhex(attr->content);
-            if(attr->name == "size") m.size = strhex(attr->content);
+          foreach(attr, leaf.attribute) {
+            if(attr.name == "address") xml_parse_address(m, attr.content);
+            if(attr.name == "mode") xml_parse_mode(m, attr.content);
+            if(attr.name == "offset") m.offset = strhex(attr.content);
+            if(attr.name == "size") m.size = strhex(attr.content);
           }
           mapping.add(m);
         }
       }
-    } else if(node->name == "mmio") {
-      foreach(leaf, node->element) {
-        if(leaf->name == "map") {
+    } else if(node.name == "mmio") {
+      foreach(leaf, node.element) {
+        if(leaf.name == "map") {
           Mapping m(sa1);
-          foreach(attr, leaf->attribute) {
-            if(attr->name == "address") xml_parse_address(m, attr->content);
+          foreach(attr, leaf.attribute) {
+            if(attr.name == "address") xml_parse_address(m, attr.content);
           }
           mapping.add(m);
         }
@@ -227,27 +225,27 @@ void Cartridge::xml_parse_sa1(xml_element *root) {
   }
 }
 
-void Cartridge::xml_parse_bsx(xml_element *root) {
-  foreach(node, root->element) {
-    if(node->name == "slot") {
-      foreach(leaf, node->element) {
-        if(leaf->name == "map") {
+void Cartridge::xml_parse_bsx(xml_element &root) {
+  foreach(node, root.element) {
+    if(node.name == "slot") {
+      foreach(leaf, node.element) {
+        if(leaf.name == "map") {
           Mapping m(memory::bsxflash);
-          foreach(attr, leaf->attribute) {
-            if(attr->name == "address") xml_parse_address(m, attr->content);
-            if(attr->name == "mode") xml_parse_mode(m, attr->content);
-            if(attr->name == "offset") m.offset = strhex(attr->content);
-            if(attr->name == "size") m.size = strhex(attr->content);
+          foreach(attr, leaf.attribute) {
+            if(attr.name == "address") xml_parse_address(m, attr.content);
+            if(attr.name == "mode") xml_parse_mode(m, attr.content);
+            if(attr.name == "offset") m.offset = strhex(attr.content);
+            if(attr.name == "size") m.size = strhex(attr.content);
           }
           mapping.add(m);
         }
       }
-    } else if(node->name == "mmio") {
-      foreach(leaf, node->element) {
-        if(leaf->name == "map") {
+    } else if(node.name == "mmio") {
+      foreach(leaf, node.element) {
+        if(leaf.name == "map") {
           Mapping m(bsxcart);
-          foreach(attr, leaf->attribute) {
-            if(attr->name == "address") xml_parse_address(m, attr->content);
+          foreach(attr, leaf.attribute) {
+            if(attr.name == "address") xml_parse_address(m, attr.content);
           }
           mapping.add(m);
         }
@@ -256,40 +254,40 @@ void Cartridge::xml_parse_bsx(xml_element *root) {
   }
 }
 
-void Cartridge::xml_parse_sufamiturbo(xml_element *root) {
-  foreach(node, root->element) {
-    if(node->name == "slot") {
+void Cartridge::xml_parse_sufamiturbo(xml_element &root) {
+  foreach(node, root.element) {
+    if(node.name == "slot") {
       bool slotid = 0;
-      foreach(attr, node->attribute) {
-        if(attr->name == "id") {
-          if(attr->content == "A") slotid = 0;
-          if(attr->content == "B") slotid = 1;
+      foreach(attr, node.attribute) {
+        if(attr.name == "id") {
+          if(attr.content == "A") slotid = 0;
+          if(attr.content == "B") slotid = 1;
         }
       }
 
-      foreach(slot, node->element) {
-        if(slot->name == "rom") {
-          foreach(leaf, slot->element) {
-            if(leaf->name == "map") {
+      foreach(slot, node.element) {
+        if(slot.name == "rom") {
+          foreach(leaf, slot.element) {
+            if(leaf.name == "map") {
               Mapping m(slotid == 0 ? memory::stArom : memory::stBrom);
-              foreach(attr, leaf->attribute) {
-                if(attr->name == "address") xml_parse_address(m, attr->content);
-                if(attr->name == "mode") xml_parse_mode(m, attr->content);
-                if(attr->name == "offset") m.offset = strhex(attr->content);
-                if(attr->name == "size") m.size = strhex(attr->content);
+              foreach(attr, leaf.attribute) {
+                if(attr.name == "address") xml_parse_address(m, attr.content);
+                if(attr.name == "mode") xml_parse_mode(m, attr.content);
+                if(attr.name == "offset") m.offset = strhex(attr.content);
+                if(attr.name == "size") m.size = strhex(attr.content);
               }
               if(m.memory->size() > 0) mapping.add(m);
             }
           }
-        } else if(slot->name == "ram") {
-          foreach(leaf, slot->element) {
-            if(leaf->name == "map") {
+        } else if(slot.name == "ram") {
+          foreach(leaf, slot.element) {
+            if(leaf.name == "map") {
               Mapping m(slotid == 0 ? memory::stAram : memory::stBram);
-              foreach(attr, leaf->attribute) {
-                if(attr->name == "address") xml_parse_address(m, attr->content);
-                if(attr->name == "mode") xml_parse_mode(m, attr->content);
-                if(attr->name == "offset") m.offset = strhex(attr->content);
-                if(attr->name == "size") m.size = strhex(attr->content);
+              foreach(attr, leaf.attribute) {
+                if(attr.name == "address") xml_parse_address(m, attr.content);
+                if(attr.name == "mode") xml_parse_mode(m, attr.content);
+                if(attr.name == "offset") m.offset = strhex(attr.content);
+                if(attr.name == "size") m.size = strhex(attr.content);
               }
               if(m.memory->size() > 0) mapping.add(m);
             }
@@ -300,21 +298,21 @@ void Cartridge::xml_parse_sufamiturbo(xml_element *root) {
   }
 }
 
-void Cartridge::xml_parse_supergameboy(xml_element *root) {
-  foreach(attr, root->attribute) {
-    if(attr->name == "revision") {
-      if(attr->content == "1") supergameboy_version = SuperGameBoyVersion::Version1;
-      if(attr->content == "2") supergameboy_version = SuperGameBoyVersion::Version2;
+void Cartridge::xml_parse_supergameboy(xml_element &root) {
+  foreach(attr, root.attribute) {
+    if(attr.name == "revision") {
+      if(attr.content == "1") supergameboy_version = SuperGameBoyVersion::Version1;
+      if(attr.content == "2") supergameboy_version = SuperGameBoyVersion::Version2;
     }
   }
 
-  foreach(node, root->element) {
-    if(node->name == "mmio") {
-      foreach(leaf, node->element) {
-        if(leaf->name == "map") {
+  foreach(node, root.element) {
+    if(node.name == "mmio") {
+      foreach(leaf, node.element) {
+        if(leaf.name == "map") {
           Mapping m((Memory&)supergameboy);
-          foreach(attr, leaf->attribute) {
-            if(attr->name == "address") xml_parse_address(m, attr->content);
+          foreach(attr, leaf.attribute) {
+            if(attr.name == "address") xml_parse_address(m, attr.content);
           }
           mapping.add(m);
         }
@@ -323,16 +321,16 @@ void Cartridge::xml_parse_supergameboy(xml_element *root) {
   }
 }
 
-void Cartridge::xml_parse_srtc(xml_element *root) {
+void Cartridge::xml_parse_srtc(xml_element &root) {
   has_srtc = true;
 
-  foreach(node, root->element) {
-    if(node->name == "mmio") {
-      foreach(leaf, node->element) {
-        if(leaf->name == "map") {
+  foreach(node, root.element) {
+    if(node.name == "mmio") {
+      foreach(leaf, node.element) {
+        if(leaf.name == "map") {
           Mapping m(srtc);
-          foreach(attr, leaf->attribute) {
-            if(attr->name == "address") xml_parse_address(m, attr->content);
+          foreach(attr, leaf.attribute) {
+            if(attr.name == "address") xml_parse_address(m, attr.content);
           }
           mapping.add(m);
         }
@@ -341,26 +339,26 @@ void Cartridge::xml_parse_srtc(xml_element *root) {
   }
 }
 
-void Cartridge::xml_parse_sdd1(xml_element *root) {
+void Cartridge::xml_parse_sdd1(xml_element &root) {
   has_sdd1 = true;
 
-  foreach(node, root->element) {
-    if(node->name == "mcu") {
-      foreach(leaf, node->element) {
-        if(leaf->name == "map") {
+  foreach(node, root.element) {
+    if(node.name == "mcu") {
+      foreach(leaf, node.element) {
+        if(leaf.name == "map") {
           Mapping m((Memory&)sdd1);
-          foreach(attr, leaf->attribute) {
-            if(attr->name == "address") xml_parse_address(m, attr->content);
+          foreach(attr, leaf.attribute) {
+            if(attr.name == "address") xml_parse_address(m, attr.content);
           }
           mapping.add(m);
         }
       }
-    } else if(node->name == "mmio") {
-      foreach(leaf, node->element) {
-        if(leaf->name == "map") {
+    } else if(node.name == "mmio") {
+      foreach(leaf, node.element) {
+        if(leaf.name == "map") {
           Mapping m((MMIO&)sdd1);
-          foreach(attr, leaf->attribute) {
-            if(attr->name == "address") xml_parse_address(m, attr->content);
+          foreach(attr, leaf.attribute) {
+            if(attr.name == "address") xml_parse_address(m, attr.content);
           }
           mapping.add(m);
         }
@@ -369,66 +367,66 @@ void Cartridge::xml_parse_sdd1(xml_element *root) {
   }
 }
 
-void Cartridge::xml_parse_spc7110(xml_element *root) {
+void Cartridge::xml_parse_spc7110(xml_element &root) {
   has_spc7110 = true;
 
-  foreach(node, root->element) {
-    if(node->name == "dcu") {
-      foreach(leaf, node->element) {
-        if(leaf->name == "map") {
+  foreach(node, root.element) {
+    if(node.name == "dcu") {
+      foreach(leaf, node.element) {
+        if(leaf.name == "map") {
           Mapping m(spc7110dcu);
-          foreach(attr, leaf->attribute) {
-            if(attr->name == "address") xml_parse_address(m, attr->content);
+          foreach(attr, leaf.attribute) {
+            if(attr.name == "address") xml_parse_address(m, attr.content);
           }
           mapping.add(m);
         }
       }
-    } else if(node->name == "mcu") {
-      foreach(leaf, node->element) {
-        if(leaf->name == "map") {
+    } else if(node.name == "mcu") {
+      foreach(leaf, node.element) {
+        if(leaf.name == "map") {
           Mapping m(spc7110mcu);
-          foreach(attr, leaf->attribute) {
-            if(attr->name == "address") xml_parse_address(m, attr->content);
-            if(attr->name == "offset") spc7110_data_rom_offset = strhex(attr->content);
+          foreach(attr, leaf.attribute) {
+            if(attr.name == "address") xml_parse_address(m, attr.content);
+            if(attr.name == "offset") spc7110_data_rom_offset = strhex(attr.content);
           }
           mapping.add(m);
         }
       }
-    } else if(node->name == "mmio") {
-      foreach(leaf, node->element) {
-        if(leaf->name == "map") {
+    } else if(node.name == "mmio") {
+      foreach(leaf, node.element) {
+        if(leaf.name == "map") {
           Mapping m(spc7110);
-          foreach(attr, leaf->attribute) {
-            if(attr->name == "address") xml_parse_address(m, attr->content);
+          foreach(attr, leaf.attribute) {
+            if(attr.name == "address") xml_parse_address(m, attr.content);
           }
           mapping.add(m);
         }
       }
-    } else if(node->name == "ram") {
-      foreach(attr, node->attribute) {
-        if(attr->name == "size") ram_size = strhex(attr->content);
+    } else if(node.name == "ram") {
+      foreach(attr, node.attribute) {
+        if(attr.name == "size") ram_size = strhex(attr.content);
       }
 
-      foreach(leaf, node->element) {
-        if(leaf->name == "map") {
+      foreach(leaf, node.element) {
+        if(leaf.name == "map") {
           Mapping m(spc7110ram);
-          foreach(attr, leaf->attribute) {
-            if(attr->name == "address") xml_parse_address(m, attr->content);
-            if(attr->name == "mode") xml_parse_mode(m, attr->content);
-            if(attr->name == "offset") m.offset = strhex(attr->content);
-            if(attr->name == "size") m.size = strhex(attr->content);
+          foreach(attr, leaf.attribute) {
+            if(attr.name == "address") xml_parse_address(m, attr.content);
+            if(attr.name == "mode") xml_parse_mode(m, attr.content);
+            if(attr.name == "offset") m.offset = strhex(attr.content);
+            if(attr.name == "size") m.size = strhex(attr.content);
           }
           mapping.add(m);
         }
       }
-    } else if(node->name == "rtc") {
+    } else if(node.name == "rtc") {
       has_spc7110rtc = true;
 
-      foreach(leaf, node->element) {
-        if(leaf->name == "map") {
+      foreach(leaf, node.element) {
+        if(leaf.name == "map") {
           Mapping m(spc7110);
-          foreach(attr, leaf->attribute) {
-            if(attr->name == "address") xml_parse_address(m, attr->content);
+          foreach(attr, leaf.attribute) {
+            if(attr.name == "address") xml_parse_address(m, attr.content);
           }
           mapping.add(m);
         }
@@ -437,16 +435,16 @@ void Cartridge::xml_parse_spc7110(xml_element *root) {
   }
 }
 
-void Cartridge::xml_parse_cx4(xml_element *root) {
+void Cartridge::xml_parse_cx4(xml_element &root) {
   has_cx4 = true;
 
-  foreach(node, root->element) {
-    if(node->name == "mmio") {
-      foreach(leaf, node->element) {
-        if(leaf->name == "map") {
+  foreach(node, root.element) {
+    if(node.name == "mmio") {
+      foreach(leaf, node.element) {
+        if(leaf.name == "map") {
           Mapping m(cx4);
-          foreach(attr, leaf->attribute) {
-            if(attr->name == "address") xml_parse_address(m, attr->content);
+          foreach(attr, leaf.attribute) {
+            if(attr.name == "address") xml_parse_address(m, attr.content);
           }
           mapping.add(m);
         }
@@ -455,21 +453,21 @@ void Cartridge::xml_parse_cx4(xml_element *root) {
   }
 }
 
-void Cartridge::xml_parse_necdsp(xml_element *root) {
+void Cartridge::xml_parse_necdsp(xml_element &root) {
   unsigned program = 0;
 
-  foreach(attr, root->attribute) {
-    if(attr->name == "program") {
-      if(attr->content == "DSP-1" || attr->content == "DSP-1A" || attr->content == "DSP-1B") {
+  foreach(attr, root.attribute) {
+    if(attr.name == "program") {
+      if(attr.content == "DSP-1" || attr.content == "DSP-1A" || attr.content == "DSP-1B") {
         program = 1;
         has_dsp1 = true;
-      } else if(attr->content == "DSP-2") {
+      } else if(attr.content == "DSP-2") {
         program = 2;
         has_dsp2 = true;
-      } else if(attr->content == "DSP-3") {
+      } else if(attr.content == "DSP-3") {
         program = 3;
         has_dsp3 = true;
-      } else if(attr->content == "DSP-4") {
+      } else if(attr.content == "DSP-4") {
         program = 4;
         has_dsp4 = true;
       }
@@ -479,23 +477,23 @@ void Cartridge::xml_parse_necdsp(xml_element *root) {
   Memory *dr[5] = { 0, &dsp1dr, &dsp2dr, &dsp3, &dsp4 };
   Memory *sr[5] = { 0, &dsp1sr, &dsp2sr, &dsp3, &dsp4 };
 
-  foreach(node, root->element) {
-    if(node->name == "dr" && dr[program]) {
-      foreach(leaf, node->element) {
-        if(leaf->name == "map") {
+  foreach(node, root.element) {
+    if(node.name == "dr" && dr[program]) {
+      foreach(leaf, node.element) {
+        if(leaf.name == "map") {
           Mapping m(*dr[program]);
-          foreach(attr, leaf->attribute) {
-            if(attr->name == "address") xml_parse_address(m, attr->content);
+          foreach(attr, leaf.attribute) {
+            if(attr.name == "address") xml_parse_address(m, attr.content);
           }
           mapping.add(m);
         }
       }
-    } else if(node->name == "sr" && sr[program]) {
-      foreach(leaf, node->element) {
-        if(leaf->name == "map") {
+    } else if(node.name == "sr" && sr[program]) {
+      foreach(leaf, node.element) {
+        if(leaf.name == "map") {
           Mapping m(*sr[program]);
-          foreach(attr, leaf->attribute) {
-            if(attr->name == "address") xml_parse_address(m, attr->content);
+          foreach(attr, leaf.attribute) {
+            if(attr.name == "address") xml_parse_address(m, attr.content);
           }
           mapping.add(m);
         }
@@ -504,16 +502,16 @@ void Cartridge::xml_parse_necdsp(xml_element *root) {
   }
 }
 
-void Cartridge::xml_parse_obc1(xml_element *root) {
+void Cartridge::xml_parse_obc1(xml_element &root) {
   has_obc1 = true;
 
-  foreach(node, root->element) {
-    if(node->name == "mmio") {
-      foreach(leaf, node->element) {
-        if(leaf->name == "map") {
+  foreach(node, root.element) {
+    if(node.name == "mmio") {
+      foreach(leaf, node.element) {
+        if(leaf.name == "map") {
           Mapping m(obc1);
-          foreach(attr, leaf->attribute) {
-            if(attr->name == "address") xml_parse_address(m, attr->content);
+          foreach(attr, leaf.attribute) {
+            if(attr.name == "address") xml_parse_address(m, attr.content);
           }
           mapping.add(m);
         }
@@ -522,15 +520,15 @@ void Cartridge::xml_parse_obc1(xml_element *root) {
   }
 }
 
-void Cartridge::xml_parse_setadsp(xml_element *root) {
+void Cartridge::xml_parse_setadsp(xml_element &root) {
   unsigned program = 0;
 
-  foreach(attr, root->attribute) {
-    if(attr->name == "program") {
-      if(attr->content == "ST-0010") {
+  foreach(attr, root.attribute) {
+    if(attr.name == "program") {
+      if(attr.content == "ST-0010") {
         program = 1;
         has_st0010 = true;
-      } else if(attr->content == "ST-0011") {
+      } else if(attr.content == "ST-0011") {
         program = 2;
         has_st0011 = true;
       }
@@ -539,13 +537,13 @@ void Cartridge::xml_parse_setadsp(xml_element *root) {
 
   Memory *map[3] = { 0, &st0010, 0 };
 
-  foreach(node, root->element) {
-    if(node->name == "mmio" && map[program]) {
-      foreach(leaf, node->element) {
-        if(leaf->name == "map") {
+  foreach(node, root.element) {
+    if(node.name == "mmio" && map[program]) {
+      foreach(leaf, node.element) {
+        if(leaf.name == "map") {
           Mapping m(*map[program]);
-          foreach(attr, leaf->attribute) {
-            if(attr->name == "address") xml_parse_address(m, attr->content);
+          foreach(attr, leaf.attribute) {
+            if(attr.name == "address") xml_parse_address(m, attr.content);
           }
           mapping.add(m);
         }
@@ -554,12 +552,12 @@ void Cartridge::xml_parse_setadsp(xml_element *root) {
   }
 }
 
-void Cartridge::xml_parse_setarisc(xml_element *root) {
+void Cartridge::xml_parse_setarisc(xml_element &root) {
   unsigned program = 0;
 
-  foreach(attr, root->attribute) {
-    if(attr->name == "program") {
-      if(attr->content == "ST-0018") {
+  foreach(attr, root.attribute) {
+    if(attr.name == "program") {
+      if(attr.content == "ST-0018") {
         program = 1;
         has_st0018 = true;
       }
@@ -568,13 +566,13 @@ void Cartridge::xml_parse_setarisc(xml_element *root) {
 
   MMIO *map[2] = { 0, &st0018 };
 
-  foreach(node, root->element) {
-    if(node->name == "mmio" && map[program]) {
-      foreach(leaf, node->element) {
-        if(leaf->name == "map") {
+  foreach(node, root.element) {
+    if(node.name == "mmio" && map[program]) {
+      foreach(leaf, node.element) {
+        if(leaf.name == "map") {
           Mapping m(*map[program]);
-          foreach(attr, leaf->attribute) {
-            if(attr->name == "address") xml_parse_address(m, attr->content);
+          foreach(attr, leaf.attribute) {
+            if(attr.name == "address") xml_parse_address(m, attr.content);
           }
           mapping.add(m);
         }
@@ -583,16 +581,16 @@ void Cartridge::xml_parse_setarisc(xml_element *root) {
   }
 }
 
-void Cartridge::xml_parse_msu1(xml_element *root) {
+void Cartridge::xml_parse_msu1(xml_element &root) {
   has_msu1 = true;
 
-  foreach(node, root->element) {
-    if(node->name == "mmio") {
-      foreach(leaf, node->element) {
-        if(leaf->name == "map") {
+  foreach(node, root.element) {
+    if(node.name == "mmio") {
+      foreach(leaf, node.element) {
+        if(leaf.name == "map") {
           Mapping m(msu1);
-          foreach(attr, leaf->attribute) {
-            if(attr->name == "address") xml_parse_address(m, attr->content);
+          foreach(attr, leaf.attribute) {
+            if(attr.name == "address") xml_parse_address(m, attr.content);
           }
           mapping.add(m);
         }

src/lib/nall/serializer.hpp

@@ -18,9 +18,6 @@ namespace nall {
   //- only plain-old-data can be stored. complex classes must provide serialize(serializer&);
   //- floating-point usage is not portable across platforms
 
-  template<typename T> struct is_bool { enum { value = false }; };
-  template<> struct is_bool<bool> { enum { value = true }; };
-
   class serializer {
   public:
     enum mode_t { Load, Save, Size };
@@ -56,7 +53,7 @@ namespace nall {
     }
 
     template<typename T> void integer(T &value) {
-      enum { size = is_bool<T>::value ? 1 : sizeof(T) };
+      enum { size = std::is_same<bool, T>::value ? 1 : sizeof(T) };
       if(imode == Save) {
         for(unsigned n = 0; n < size; n++) idata[isize++] = value >> (n << 3);
       } else if(imode == Load) {

src/lib/nall/string/xml.hpp

@@ -2,9 +2,9 @@
 #define NALL_STRING_XML_HPP
 
 //XML subset parser
-//version 0.04
+//version 0.05
 
-#include <nall/array.hpp>
+#include <nall/vector.hpp>
 
 namespace nall {
 
@@ -16,15 +16,14 @@ struct xml_attribute {
 
 struct xml_element : xml_attribute {
   string parse() const;
-  array<xml_attribute*> attribute;
-  array<xml_element*> element;
-  ~xml_element();
+  linear_vector<xml_attribute> attribute;
+  linear_vector<xml_element> element;
 
 protected:
   void parse_doctype(const char *&data);
   bool parse_head(string data);
   bool parse_body(const char *&data);
-  friend xml_element *xml_parse(const char *data);
+  friend xml_element xml_parse(const char *data);
 };
 
 inline string xml_attribute::parse() const {
@@ -134,11 +133,11 @@ inline bool xml_element::parse_head(string data) {
     side.qsplit("=", part[i]);
     if(side.size() != 2) throw "...";
 
-    xml_attribute *attr = new xml_attribute;
-    attr->name = side[0];
-    attr->content = side[1];
-    if(strbegin(attr->content, "\"") && strend(attr->content, "\"")) trim_once(attr->content, "\"");
-    else if(strbegin(attr->content, "'") && strend(attr->content, "'")) trim_once(attr->content, "'");
+    xml_attribute attr;
+    attr.name = side[0];
+    attr.content = side[1];
+    if(strbegin(attr.content, "\"") && strend(attr.content, "\"")) trim_once(attr.content, "\"");
+    else if(strbegin(attr.content, "'") && strend(attr.content, "'")) trim_once(attr.content, "'");
     else throw "...";
     attribute.add(attr);
   }
@@ -191,10 +190,8 @@ inline bool xml_element::parse_body(const char *&data) {
 
     while(*data) {
       unsigned index = element.size();
-      xml_element *elem = new xml_element;
-      if(elem->parse_body(data) == false) {
-        delete elem;
-
+      xml_element node;
+      if(node.parse_body(data) == false) {
         if(*data == '/') {
           signed length = data - content_begin - 1;
           if(length > 0) content = substr(content_begin, 0, length);
@@ -216,23 +213,18 @@ inline bool xml_element::parse_body(const char *&data) {
           return true;
         }
       } else {
-        element.add(elem);
+        element.add(node);
       }
     }
   }
 }
 
-inline xml_element::~xml_element() {
-  for(unsigned i = 0; i < attribute.size(); i++) delete attribute[i];
-  for(unsigned i = 0; i < element.size(); i++) delete element[i];
-}
-
 //ensure there is only one root element
-inline bool xml_validate(xml_element *document) {
+inline bool xml_validate(xml_element &document) {
   unsigned root_counter = 0;
 
-  for(unsigned i = 0; i < document->element.size(); i++) {
-    string &name = document->element[i]->name;
+  for(unsigned i = 0; i < document.element.size(); i++) {
+    string &name = document.element[i].name;
     if(strbegin(name, "?")) continue;
     if(strbegin(name, "!")) continue;
     if(++root_counter > 1) return false;
@@ -241,25 +233,24 @@ inline bool xml_validate(xml_element *document) {
   return true;
 }
 
-inline xml_element* xml_parse(const char *data) {
-  xml_element *self = new xml_element;
+inline xml_element xml_parse(const char *data) {
+  xml_element self;
 
   try {
     while(*data) {
-      xml_element *elem = new xml_element;
-      if(elem->parse_body(data) == false) {
-        delete elem;
+      xml_element node;
+      if(node.parse_body(data) == false) {
         break;
       } else {
-        self->element.add(elem);
+        self.element.add(node);
       }
     }
 
     if(xml_validate(self) == false) throw "...";
     return self;
   } catch(const char*) {
-    delete self;
-    return 0;
+    xml_element empty;
+    return empty;
   }
 }
 

src/lib/nall/utility.hpp

@@ -2,6 +2,7 @@
 #define NALL_UTILITY_HPP
 
 #include <type_traits>
+#include <utility>
 
 namespace nall {
   template<bool C, typename T = bool> struct enable_if { typedef T type; };

src/ui_qt/tools/cheateditor.cpp

@@ -250,10 +250,10 @@ void CheatEditorWindow::findCheatCodes() {
     const char *block = (const char*)data + position;
     position = strpos(block, "</cartridge>");
     if(position >= 0) {
-      xml_element *document = xml_parse(substr(block, 0, position + 12));
-      if(!document) return;
+      xml_element document = xml_parse(substr(block, 0, position + 12));
+      if(document.element.size() == 0) return;
 
-      cheatImportWindow->refresh(document->element[0]);
+      cheatImportWindow->refresh(document.element[0]);
       cheatImportWindow->show();
       return;
     }
@@ -284,22 +284,22 @@ void CheatEditorWindow::clearSelected() {
 //CheatImportWindow
 //=================
 
-void CheatImportWindow::refresh(xml_element *root) {
+void CheatImportWindow::refresh(xml_element &root) {
   list->clear();
 
-  foreach(node, root->element) {
-    if(node->name == "name") {
-      title->setText(string() << "<b>Name:</b> " << node->parse());
-    } else if(node->name == "cheat") {
+  foreach(node, root.element) {
+    if(node.name == "name") {
+      title->setText(string() << "<b>Name:</b> " << node.parse());
+    } else if(node.name == "cheat") {
       string description = "<undefined>";
       string code = "";
 
-      foreach(leaf, node->element) {
-        if(leaf->name == "description") {
-          description = leaf->parse();
-        } else if(leaf->name == "code") {
+      foreach(leaf, node.element) {
+        if(leaf.name == "description") {
+          description = leaf.parse();
+        } else if(leaf.name == "code") {
           if(code != "") code << "+";
-          code << leaf->content;
+          code << leaf.content;
         }
       }
 

src/ui_qt/tools/cheateditor.moc.hpp

@@ -51,7 +51,7 @@ public:
   QPushButton *okButton;
   QPushButton *cancelButton;
 
-  void refresh(xml_element*);
+  void refresh(xml_element&);
 
   CheatImportWindow();