Update to v094r20 release.

byuu says:

Main reason for this WIP was because of all the added lines to hiro for
selective component disabling. May as well get all the diff-noise apart
from code changes.

It also merges something I've been talking to Cydrak about ... making
nall::string::(integer,decimal) do built-in binary,octal,hex decoding
instead of just failing on those. This will have fun little side effects
all over the place, like being able to view a topic on my forum via
"forum.byuu.org/topic/0b10010110", heh.

There are two small changes to higan itself, though. First up, I fixed
the resampler ratio when loading non-SNES games. Tested and I can play
Game Boy games fine now. Second, I hooked up menu option hiding for
reset and controller selection. Right now, this works like higan v094,
but I'm thinking I might want to show the "Device -> Controller" even if
that's all that's there. It kind of jives nicer with the input settings
window to see the labels there, I think. And if we ever do add more
stuff, it'll be nice that people already always expect that menu there.

Remaining issues:
* add slotted cart loader (SGB, BSX, ST)
* add DIP switch selection window (NSS)
* add timing configuration (video/audio sync)

nall/atoi.hpp

@@ -81,19 +81,6 @@ constexpr inline uintmax_t hex(const char* s) {
   );
 }
 
-constexpr inline intmax_t numeral(const char* s) {
-  return (
-    *s == '0' && *(s + 1) == 'X' ? hex_(s + 2) :
-    *s == '0' && *(s + 1) == 'x' ? hex_(s + 2) :
-    *s == '0' && *(s + 1) == 'B' ? binary_(s + 2) :
-    *s == '0' && *(s + 1) == 'b' ? binary_(s + 2) :
-    *s == '0' ? octal_(s + 1) :
-    *s == '+' ? +decimal_(s + 1) :
-    *s == '-' ? -decimal_(s + 1) :
-    decimal_(s)
-  );
-}
-
 inline double real(const char* s) {
   return atof(s);
 }

nall/string.hpp

@@ -28,6 +28,7 @@
 #define NALL_STRING_INTERNAL_HPP
 #include <nall/string/base.hpp>
 #include <nall/string/ref.hpp>
+#include <nall/string/atoi.hpp>
 #include <nall/string/cast.hpp>
 #include <nall/string/compare.hpp>
 #include <nall/string/convert.hpp>

nall/string/atoi.hpp

@@ -0,0 +1,21 @@
+#ifdef NALL_STRING_INTERNAL_HPP
+
+namespace nall {
+
+auto string::integer() const -> intmax_t {
+  if(beginsWith("0b") || beginsWith("0B")) return nall::binary(data());
+  if(beginsWith("0o") || beginsWith("0O")) return nall::octal(data());
+  if(beginsWith("0x") || beginsWith("0X")) return nall::hex(data());
+  return nall::integer(data());
+}
+
+auto string::decimal() const -> uintmax_t {
+  if(beginsWith("0b") || beginsWith("0B")) return nall::binary(data());
+  if(beginsWith("0o") || beginsWith("0O")) return nall::octal(data());
+  if(beginsWith("0x") || beginsWith("0X")) return nall::hex(data());
+  return nall::decimal(data());
+}
+
+}
+
+#endif

nall/string/base.hpp

@@ -219,11 +219,9 @@ public:
   auto begin() const -> const char* { return &data()[0]; }
   auto end() const -> const char* { return &data()[size()]; }
 
-  //nall/atoi.hpp
-  inline auto integer() const -> intmax_t { return nall::integer(*this); }
-  inline auto decimal() const -> uintmax_t { return nall::decimal(*this); }
-  inline auto hex() const -> uintmax_t { return nall::hex(*this); }
-  inline auto numeral() const -> intmax_t { return nall::numeral(*this); }
+  //atoi.hpp
+  inline auto integer() const -> intmax_t;
+  inline auto decimal() const -> uintmax_t;
 
   //core.hpp
   inline auto operator[](signed) const -> const char&;

nall/string/markup/find.hpp

@@ -41,10 +41,10 @@ auto ManagedNode::_evaluate(string query) const -> bool {
     switch(comparator) {
     case Comparator::EQ: if(data.match(side(1)) ==  true)      continue; break;
     case Comparator::NE: if(data.match(side(1)) == false)      continue; break;
-    case Comparator::LT: if(numeral(data)  < numeral(side(1))) continue; break;
-    case Comparator::LE: if(numeral(data) <= numeral(side(1))) continue; break;
-    case Comparator::GT: if(numeral(data)  > numeral(side(1))) continue; break;
-    case Comparator::GE: if(numeral(data) >= numeral(side(1))) continue; break;
+    case Comparator::LT: if(data.decimal()  < side(1).decimal()) continue; break;
+    case Comparator::LE: if(data.decimal() <= side(1).decimal()) continue; break;
+    case Comparator::GT: if(data.decimal()  > side(1).decimal()) continue; break;
+    case Comparator::GE: if(data.decimal() >= side(1).decimal()) continue; break;
     }
 
     return false;
@@ -65,10 +65,10 @@ auto ManagedNode::_find(const string& query) const -> vector<Node> {
     name = p(0);
     if(p(1).find("-")) {
       p = p(1).split<1>("-");
-      lo = p(0).empty() ?  0u : numeral(p(0));
-      hi = p(1).empty() ? ~0u : numeral(p(1));
+      lo = p(0).empty() ?  0u : p(0).decimal();
+      hi = p(1).empty() ? ~0u : p(1).decimal();
     } else {
-      lo = hi = numeral(p(1));
+      lo = hi = p(1).decimal();
     }
   }
 

nall/string/markup/node.hpp

@@ -47,8 +47,8 @@ struct Node {
 
   auto text() const -> string { return value().strip(); }
   auto boolean() const -> bool { return text() == "true"; }
-  auto integer() const -> intmax_t { return text().numeral(); }
-  auto decimal() const -> uintmax_t { return text().numeral(); }
+  auto integer() const -> intmax_t { return text().integer(); }
+  auto decimal() const -> uintmax_t { return text().decimal(); }
 
   auto setName(const string& name = "") -> void { shared->_name = name; }
   auto setValue(const string& value = "") -> void { shared->_value = value; }