Minor cleanup

sasq64 · Jun 9, 2020 · f73a670 · f73a670
1 parent 380aaef
commit f73a670
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/assembler.cpp b/src/assembler.cpp
@@ -551,7 +551,6 @@ void Assembler::setupRules()
 
                 auto it = macros.find(i->opcode);
                 if (it != macros.end()) {
-                    LOGI("Found macro %s", it->second.name);
                     Call c{i->opcode};
                     if (i->mode > sixfive::ACC) {
                         c.args.emplace_back(any_num(i->val));
@@ -692,9 +691,9 @@ void Assembler::setupRules()
         return sv[0];
     };
 
-    parser["Index"] = [&](SV& sv) {
+    parser["Index"] = [&](SV& sv) -> std::any {
         trace(sv);
-        auto index = any_cast<Number>(sv[1]);
+        auto index = number<size_t>(sv[1]);
         std::any vec = sv[0];
         if (any_cast<Number>(&vec) != nullptr) {
             return any_num(0);

diff --git a/src/wrap.cpp b/src/wrap.cpp
@@ -140,7 +140,7 @@ void ParserWrapper::action(
             throw peg::parse_error(e.what());
         } catch (assert_error& e) {
             throw peg::parse_error(e.what());
-        } catch (std::bad_any_cast& e) {
+        } catch (std::bad_any_cast&) {
             throw peg::parse_error("Data type error");
         }
     };