1 files changed, 20 insertions, 16 deletions

diff --git a/src/parse.y b/src/parse.y
index 62393a0bb..fe1bd805f 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -882,7 +882,7 @@ heredoc_start_sym(parser_state *p, node *beg, mrb_sym sym, enum heredoc_type typ
 {
   char *bs = (char*)beg->cdr->car;
   int allow_indent = (bs[2] == '-');
-  int len;
+  size_t len;
   const char *s = mrb_sym2name_len(p->mrb, sym, &len);
   return heredoc_start_sb(p, s, len, type, allow_indent);
 }
@@ -3393,34 +3393,38 @@ toklen(parser_state *p)
 #define IS_LABEL_POSSIBLE() ((p->lstate == EXPR_BEG && !cmd_state) || IS_ARG())
 #define IS_LABEL_SUFFIX(n) (peek_n(p, ':',(n)) && !peek_n(p, ':', (n)+1))
 
-static unsigned long
+static int
 scan_oct(const int *start, int len, int *retlen)
 {
   const int *s = start;
-  unsigned long retval = 0;
+  int retval = 0;
 
+  /* assert(len <= 3) */
   while (len-- && *s >= '0' && *s <= '7') {
     retval <<= 3;
     retval |= *s++ - '0';
   }
   *retlen = s - start;
+
   return retval;
 }
 
-static unsigned long
+static int
 scan_hex(const int *start, int len, int *retlen)
 {
   static const char hexdigit[] = "0123456789abcdef0123456789ABCDEF";
   register const int *s = start;
-  register unsigned long retval = 0;
+  register int retval = 0;
   char *tmp;
 
-  while (len-- && *s && (tmp = (char *)strchr(hexdigit, *s))) {
+  /* assert(len <= 2) */
+  while (len-- && *s && (tmp = strchr(hexdigit, *s))) {
     retval <<= 4;
     retval |= (tmp - hexdigit) & 15;
     s++;
   }
   *retlen = s - start;
+
   return retval;
 }
 
@@ -3457,19 +3461,19 @@ read_escape(parser_state *p)
   case '0': case '1': case '2': case '3': /* octal constant */
   case '4': case '5': case '6': case '7':
     {
-       int buf[3];
-       int i;
+      int buf[3];
+      int i;
 
-       buf[0] = c;
-       for (i=1; i<3; i++) {
+      buf[0] = c;
+      for (i=1; i<3; i++) {
         buf[i] = nextc(p);
         if (buf[i] == -1) goto eof;
-          if (buf[i] < '0' || '7' < buf[i]) {
-            pushback(p, buf[i]);
-            break;
-          }
-       }
-       c = scan_oct(buf, i, &i);
+        if (buf[i] < '0' || '7' < buf[i]) {
+          pushback(p, buf[i]);
+          break;
+        }
+      }
+      c = scan_oct(buf, i, &i);
     }
     return c;