Misc. cleanup

Author: amomchilov

ast/desugar/Desugar.cc

@@ -54,7 +54,7 @@ core::NameRef blockParam2Name(DesugarContext dctx, const BlockParam &blockParam)
 int numparamNum(DesugarContext dctx, parser::Node *decl) {
     if (auto *lvar = parser::cast_node<parser::LVar>(decl)) {
         auto name_str = lvar->name.show(dctx.ctx);
-        return name_str[1] - 48;
+        return name_str[1] - '0';
     }
     return -1;
 }

parser/Builder.cc

@@ -229,7 +229,7 @@ class Builder::Impl {
                 auto intro = make_unique<LVar>(node->loc, id->name);
                 auto decls = driver_->alloc.node_list();
                 decls->emplace_back(toForeign(std::move(intro)));
-                driver_->numparam_stack.regis(name_str[1] - 48, std::move(decls));
+                driver_->numparam_stack.regis(name_str[1] - '0', std::move(decls));
             }
 
             auto last_char = name_str.back();
@@ -1913,7 +1913,7 @@ class Builder::Impl {
     }
 
     bool isNumberedParameterName(std::string_view name) {
-        return name.length() == 2 && name[0] == '_' && name[1] >= '1' && name[1] <= '9';
+        return name.length() == 2 && name[0] == '_' && isdigit(name[1]);
     }
 };
 

parser/parser/include/ruby_parser/driver.hh

@@ -224,12 +224,12 @@ public:
 
     // Have we encountered an ordinary param before? (top < 0)
     bool seen_ordinary_params() {
-        return stack.empty() ? false : top()->max < 0;
+        return !stack.empty() && top()->max < 0;
     }
 
     // Have we encountered a num param before? (top > 0)
     bool seen_numparams() {
-        return stack.empty() ? false : top()->max > 0;
+        return !stack.empty() && top()->max > 0;
     }
 
     // Register a numparam in the current scope

parser/prism/Translator.cc

@@ -1231,6 +1231,9 @@ unique_ptr<parser::Node> Translator::translate(pm_node_t *node, bool preserveCon
 
                                 auto paramCount = numberedParamsNode->maximum;
 
+                                ENFORCE(1 <= paramCount,
+                                        "A numbered parameters node should have at least one parameter");
+
                                 NodeVec params;
                                 params.reserve(paramCount);