webruby 0.2.5 → 0.2.7

data/modules/mruby/mrbgems/mruby-string-utf8/test/string.rb

@@ -0,0 +1,27 @@
+##
+# String(utf8) Test
+
+assert('String#[]') do
+  assert_equal "ち", "こんにちわ世界"[3]
+  assert_equal nil, "こんにちわ世界"[20]
+  assert_equal "世", "こんにちわ世界"[-2]
+  assert_equal "世界", "こんにちわ世界"[-2..-1]
+  assert_equal "んに", "こんにちわ世界"[1,2]
+  assert_equal "世", "こんにちわ世界"["世"]
+end
+
+assert('String#reverse', '15.2.10.5.29') do
+  a = 'こんにちわ世界!'
+  a.reverse
+    
+  assert_equal 'こんにちわ世界!', a
+  assert_equal '!界世わちにんこ', 'こんにちわ世界!'.reverse
+end
+
+assert('String#reverse!', '15.2.10.5.30') do
+  a = 'こんにちわ世界!'
+  a.reverse!
+    
+  assert_equal '!界世わちにんこ', a
+  assert_equal '!界世わちにんこ', 'こんにちわ世界!'.reverse!
+end

data/modules/mruby/mrbgems/mruby-struct/src/struct.c

@@ -10,7 +10,6 @@
 #include "mruby/array.h"
 #include "mruby/string.h"
 #include "mruby/class.h"
-#include "mruby/data.h"
 #include "mruby/variable.h"
 
 #define RSTRUCT_ARY(st) mrb_ary_ptr(st)

data/modules/mruby/mrblib/init_mrblib.c

@@ -1,8 +1,5 @@
 #include "mruby.h"
 #include "mruby/irep.h"
-#include "mruby/dump.h"
-#include "mruby/string.h"
-#include "mruby/proc.h"
 
 extern const uint8_t mrblib_irep[];
 

data/modules/mruby/src/array.c

@@ -4,12 +4,6 @@
 ** See Copyright Notice in mruby.h
 */
 
-#ifndef SIZE_MAX
- /* Some versions of VC++
-  * has SIZE_MAX in stdint.h
-  */
-# include <limits.h>
-#endif
 #include "mruby.h"
 #include "mruby/array.h"
 #include "mruby/class.h"
@@ -318,7 +312,7 @@ mrb_ary_cmp(mrb_state *mrb, mrb_value ary1)
     for (i=0; i<len; i++) {
       mrb_value v = ary_elt(ary2, i);
       r = mrb_funcall_argv(mrb, ary_elt(ary1, i), cmp, 1, &v);
-      if (mrb_type(r) != MRB_TT_FIXNUM || mrb_fixnum(r) != 0) return r;
+      if (!mrb_fixnum_p(r) || mrb_fixnum(r) != 0) return r;
     }
   }
   len = a1->len - a2->len;
@@ -697,7 +691,7 @@ mrb_ary_aget(mrb_state *mrb, mrb_value self)
     return mrb_ary_ref(mrb, self, index);
 
   case 1:
-    if (mrb_type(argv[0]) != MRB_TT_FIXNUM) {
+    if (!mrb_fixnum_p(argv[0])) {
       mrb_raise(mrb, E_TYPE_ERROR, "expected Fixnum");
     }
     if (index < 0) index += a->len;
@@ -854,6 +848,9 @@ mrb_ary_splat(mrb_state *mrb, mrb_value v)
   if (mrb_array_p(v)) {
     return v;
   }
+  if (mrb_respond_to(mrb, v, mrb_intern_lit(mrb, "to_a"))) {
+    return mrb_funcall(mrb, v, "to_a", 0);
+  }
   else {
     return mrb_ary_new_from_values(mrb, 1, &v);
   }
@@ -1113,6 +1110,22 @@ mrb_ary_eql(mrb_state *mrb, mrb_value ary1)
   return mrb_true_value();
 }
 
+static mrb_value
+mrb_ary_ceqq(mrb_state *mrb, mrb_value ary)
+{
+  mrb_value v;
+  mrb_int i, len;
+  mrb_sym eqq = mrb_intern_lit(mrb, "===");
+
+  mrb_get_args(mrb, "o", &v);
+  len = RARRAY_LEN(ary);
+  for (i=0; i<len; i++) {
+    mrb_value c = mrb_funcall_argv(mrb, ary_elt(ary, i), eqq, 1, &v);
+    if (mrb_test(c)) return mrb_true_value();
+  }
+  return mrb_false_value();
+}
+
 void
 mrb_init_array(mrb_state *mrb)
 {
@@ -1155,4 +1168,5 @@ mrb_init_array(mrb_state *mrb)
   mrb_define_method(mrb, a, "==",              mrb_ary_equal,        MRB_ARGS_REQ(1)); /* 15.2.12.5.33 (x) */
   mrb_define_method(mrb, a, "eql?",            mrb_ary_eql,          MRB_ARGS_REQ(1)); /* 15.2.12.5.34 (x) */
   mrb_define_method(mrb, a, "<=>",             mrb_ary_cmp,          MRB_ARGS_REQ(1)); /* 15.2.12.5.36 (x) */
+  mrb_define_method(mrb, a, "__case_eqq",      mrb_ary_ceqq,         MRB_ARGS_REQ(1)); /* internal */
 }

data/modules/mruby/src/backtrace.c

@@ -4,6 +4,7 @@
 ** See Copyright Notice in mruby.h
 */
 
+#include <stdarg.h>
 #include "mruby.h"
 #include "mruby/variable.h"
 #include "mruby/proc.h"
@@ -11,7 +12,6 @@
 #include "mruby/string.h"
 #include "mruby/class.h"
 #include "mruby/debug.h"
-#include <stdarg.h>
 
 typedef void (*output_stream_func)(mrb_state*, void*, int, const char*, ...);
 
@@ -62,9 +62,8 @@ mrb_output_backtrace(mrb_state *mrb, struct RObject *exc, output_stream_func fun
   mrb_callinfo *ci;
   mrb_int ciidx;
   const char *filename, *method, *sep;
-  int i, line;
+  int i, lineno, tracehead = 1;
 
-  func(mrb, stream, 1, "trace:\n");
   ciidx = mrb_fixnum(mrb_obj_iv_get(mrb, exc, mrb_intern_lit(mrb, "ciidx")));
   if (ciidx >= mrb->c->ciend - mrb->c->cibase)
     ciidx = 10; /* ciidx is broken... */
@@ -72,7 +71,7 @@ mrb_output_backtrace(mrb_state *mrb, struct RObject *exc, output_stream_func fun
   for (i = ciidx; i >= 0; i--) {
     ci = &mrb->c->cibase[i];
     filename = NULL;
-    line = -1;
+    lineno = -1;
 
     if (MRB_PROC_CFUNC_P(ci->proc)) {
       continue;
@@ -91,9 +90,9 @@ mrb_output_backtrace(mrb_state *mrb, struct RObject *exc, output_stream_func fun
         pc = (mrb_code*)mrb_cptr(mrb_obj_iv_get(mrb, exc, mrb_intern_lit(mrb, "lastpc")));
       }
       filename = mrb_debug_get_filename(irep, pc - irep->iseq);
-      line = mrb_debug_get_line(irep, pc - irep->iseq);
+      lineno = mrb_debug_get_line(irep, pc - irep->iseq);
     }
-    if (line == -1) continue;
+    if (lineno == -1) continue;
     if (ci->target_class == ci->proc->target_class)
       sep = ".";
     else
@@ -103,24 +102,28 @@ mrb_output_backtrace(mrb_state *mrb, struct RObject *exc, output_stream_func fun
       filename = "(unknown)";
     }
 
+    if (tracehead) {
+      func(mrb, stream, 1, "trace:\n");
+      tracehead = 0;
+    }
     method = mrb_sym2name(mrb, ci->mid);
     if (method) {
       const char *cn = mrb_class_name(mrb, ci->proc->target_class);
 
       if (cn) {
         func(mrb, stream, 1, "\t[%d] ", i);
-        func(mrb, stream, 0, "%s:%d:in %s%s%s", filename, line, cn, sep, method);
+        func(mrb, stream, 0, "%s:%d:in %s%s%s", filename, lineno, cn, sep, method);
         func(mrb, stream, 1, "\n");
       }
       else {
         func(mrb, stream, 1, "\t[%d] ", i);
-        func(mrb, stream, 0, "%s:%d:in %s", filename, line, method);
+        func(mrb, stream, 0, "%s:%d:in %s", filename, lineno, method);
         func(mrb, stream, 1, "\n");
       }
     }
     else {
         func(mrb, stream, 1, "\t[%d] ", i);
-        func(mrb, stream, 0, "%s:%d", filename, line);
+        func(mrb, stream, 0, "%s:%d", filename, lineno);
         func(mrb, stream, 1, "\n");
     }
   }

data/modules/mruby/src/class.c

@@ -4,9 +4,9 @@
 ** See Copyright Notice in mruby.h
 */
 
-#include "mruby.h"
-#include <stdarg.h>
 #include <ctype.h>
+#include <stdarg.h>
+#include "mruby.h"
 #include "mruby/array.h"
 #include "mruby/class.h"
 #include "mruby/numeric.h"
@@ -522,7 +522,7 @@ mrb_get_args(mrb_state *mrb, const char *format, ...)
           s = mrb_str_ptr(ss);
           len = (mrb_int)strlen(s->ptr);
           if (len < s->len) {
-            mrb_raise(mrb, E_ARGUMENT_ERROR, "String contains NUL");
+            mrb_raise(mrb, E_ARGUMENT_ERROR, "string contains null byte");
           }
           else if (len > s->len) {
             mrb_str_modify(mrb, s);

data/modules/mruby/src/codegen.c

@@ -421,7 +421,7 @@ new_lit(codegen_scope *s, mrb_value val)
   case MRB_TT_FIXNUM:
     for (i=0; i<s->irep->plen; i++) {
       pv = &s->irep->pool[i];
-      if (mrb_type(*pv) != MRB_TT_FIXNUM) continue;
+      if (!mrb_fixnum_p(*pv)) continue;
       if (mrb_fixnum(*pv) == mrb_fixnum(val)) return i;
     }
     break;
@@ -661,7 +661,7 @@ scope_body(codegen_scope *s, node *tree, int val)
 {
   codegen_scope *scope = scope_new(s->mrb, s, tree->car);
 
-  codegen(scope, tree->cdr, val);
+  codegen(scope, tree->cdr, VAL);
   if (!s->iseq) {
     genop(scope, MKOP_A(OP_STOP, 0));
   }
@@ -1386,7 +1386,12 @@ codegen(codegen_scope *s, node *tree, int val)
           if (head) {
             genop(s, MKOP_AB(OP_MOVE, cursp(), head));
             pop();
-            genop(s, MKOP_ABC(OP_SEND, cursp(), new_msym(s, mrb_intern_lit(s->mrb, "===")), 1));
+            if ((intptr_t)n->car->car == NODE_SPLAT) {
+              genop(s, MKOP_ABC(OP_SEND, cursp(), new_msym(s, mrb_intern_lit(s->mrb, "__case_eqq")), 1));
+            }
+            else {
+              genop(s, MKOP_ABC(OP_SEND, cursp(), new_msym(s, mrb_intern_lit(s->mrb, "===")), 1));
+            }
           }
           else {
             pop();
@@ -1510,7 +1515,14 @@ codegen(codegen_scope *s, node *tree, int val)
     break;
 
   case NODE_SPLAT:
-    codegen(s, tree, VAL);
+    {
+      int idx = new_msym(s, mrb_intern_lit(s->mrb, "to_a"));
+
+      codegen(s, tree, VAL);
+      pop();
+      genop(s, MKOP_ABC(OP_SEND, cursp(), idx, 0));
+      push();
+    }
     break;
 
   case NODE_ASGN:
@@ -2895,7 +2907,7 @@ codedump_recur(mrb_state *mrb, mrb_irep *irep)
 void
 codedump_all(mrb_state *mrb, struct RProc *proc)
 {
-  return codedump_recur(mrb, proc->body.irep);
+  codedump_recur(mrb, proc->body.irep);
 }
 
 struct RProc*

data/modules/mruby/src/dump.c

@@ -4,10 +4,9 @@
 ** See Copyright Notice in mruby.h
 */
 
+#include <ctype.h>
 #include <string.h>
 #include "mruby/dump.h"
-#include <ctype.h>
-
 #include "mruby/string.h"
 #include "mruby/irep.h"
 #include "mruby/numeric.h"
@@ -595,6 +594,9 @@ write_filename_table(mrb_state *mrb, mrb_irep *irep, uint8_t **cp, mrb_sym **fp,
 
     size += sizeof(uint16_t) + fn_len;
   }
+  for (file_i=0; file_i<irep->rlen; file_i++) {
+    size += write_filename_table(mrb, irep->reps[file_i], &cur, fp, lp);
+  }
   *cp = cur;
   return size;
 }
@@ -606,7 +608,7 @@ write_section_debug(mrb_state *mrb, mrb_irep *irep, uint8_t *cur)
   const uint8_t *bin = cur;
   struct rite_section_debug_header *header;
   mrb_sym *filenames;
-  size_t filenames_len = 0, i;
+  size_t filenames_len = 0;
   uint8_t *filenames_len_out;
   uint32_t dlen;
 
@@ -624,9 +626,6 @@ write_section_debug(mrb_state *mrb, mrb_irep *irep, uint8_t *cur)
   cur += sizeof(uint16_t);
   section_size += sizeof(uint16_t);
   section_size += write_filename_table(mrb, irep, &cur, &filenames, &filenames_len);
-  for (i=0; i<irep->rlen; i++) {
-    section_size += write_filename_table(mrb, irep->reps[i], &cur, &filenames, &filenames_len);
-  }
   uint16_to_bin(filenames_len, filenames_len_out);
 
   // debug records

data/modules/mruby/src/error.c

@@ -7,10 +7,8 @@
 #include <errno.h>
 #include <stdarg.h>
 #include <stdlib.h>
-#include <string.h>
 #include "mruby.h"
 #include "mruby/array.h"
-#include "mruby/class.h"
 #include "mruby/irep.h"
 #include "mruby/proc.h"
 #include "mruby/string.h"

data/modules/mruby/src/etc.c

@@ -6,8 +6,6 @@
 
 #include "mruby.h"
 #include "mruby/string.h"
-#include "error.h"
-#include "mruby/numeric.h"
 #include "mruby/data.h"
 #include "mruby/class.h"
 

data/modules/mruby/src/gc.c

@@ -4,12 +4,6 @@
 ** See Copyright Notice in mruby.h
 */
 
-#ifndef SIZE_MAX
- /* Some versions of VC++
-  * has SIZE_MAX in stdint.h
-  */
-# include <limits.h>
-#endif
 #include <string.h>
 #include <stdlib.h>
 #include "mruby.h"
@@ -370,17 +364,19 @@ mrb_free_heap(mrb_state *mrb)
 static void
 gc_protect(mrb_state *mrb, struct RBasic *p)
 {
-  if (mrb->arena_idx >= MRB_GC_ARENA_SIZE) {
 #ifdef MRB_GC_FIXED_ARENA
+  if (mrb->arena_idx >= MRB_GC_ARENA_SIZE) {
     /* arena overflow error */
     mrb->arena_idx = MRB_GC_ARENA_SIZE - 4; /* force room in arena */
     mrb_raise(mrb, E_RUNTIME_ERROR, "arena overflow error");
+  }
 #else
+  if (mrb->arena_idx >= mrb->arena_capa) {
     /* extend arena */
     mrb->arena_capa *= 1.5;
     mrb->arena = (struct RBasic**)mrb_realloc(mrb, mrb->arena, sizeof(struct RBasic*)*mrb->arena_capa);
-#endif
   }
+#endif
   mrb->arena[mrb->arena_idx++] = p;
 }
 

data/modules/mruby/src/load.c

@@ -4,12 +4,7 @@
 ** See Copyright Notice in mruby.h
 */
 
-#ifndef SIZE_MAX
- /* Some versions of VC++
-  * has SIZE_MAX in stdint.h
-  */
-# include <limits.h>
-#endif
+#include <limits.h>
 #include <stdlib.h>
 #include <string.h>
 #include "mruby/dump.h"

data/modules/mruby/src/numeric.c

@@ -5,12 +5,6 @@
 */
 
 #include <float.h>
-#if defined(__FreeBSD__) && __FreeBSD__ < 4
-# include <floatingpoint.h>
-#endif
-#ifdef HAVE_IEEEFP_H
-# include <ieeefp.h>
-#endif
 #include <limits.h>
 #include <math.h>
 #include <stdlib.h>

data/modules/mruby/src/object.c

@@ -5,11 +5,9 @@
 */
 
 #include "mruby.h"
-#include "mruby/array.h"
 #include "mruby/class.h"
 #include "mruby/numeric.h"
 #include "mruby/string.h"
-#include "error.h"
 
 mrb_bool
 mrb_obj_eq(mrb_state *mrb, mrb_value v1, mrb_value v2)
@@ -326,9 +324,9 @@ mrb_check_to_integer(mrb_state *mrb, mrb_value val, const char *method)
 {
   mrb_value v;
 
-  if (mrb_type(val) == MRB_TT_FIXNUM) return val;
+  if (mrb_fixnum_p(val)) return val;
   v = convert_type(mrb, val, "Integer", method, FALSE);
-  if (mrb_nil_p(v) || mrb_type(v) != MRB_TT_FIXNUM) {
+  if (mrb_nil_p(v) || !mrb_fixnum_p(v)) {
     return mrb_nil_value();
   }
   return v;
@@ -404,7 +402,7 @@ mrb_check_type(mrb_state *mrb, mrb_value x, enum mrb_vtype t)
         if (mrb_nil_p(x)) {
           etype = "nil";
         }
-        else if (mrb_type(x) == MRB_TT_FIXNUM) {
+        else if (mrb_fixnum_p(x)) {
           etype = "Fixnum";
         }
         else if (mrb_type(x) == MRB_TT_SYMBOL) {

data/modules/mruby/src/parse.y

@@ -3335,13 +3335,9 @@ nextc(parser_state *p)
  eof:
   if (!p->cxt) return -1;
   else {
-    mrbc_context *cxt = p->cxt;
-
-    if (cxt->partial_hook(p) < 0) return -1;
-    c = '\n';
-    p->lineno = 1;
-    p->cxt = cxt;
-    return c;
+    if (p->cxt->partial_hook(p) < 0)
+      return -1;
+    return -2;
   }
 }
 
@@ -3560,7 +3556,7 @@ read_escape(parser_state *p)
       buf[0] = c;
       for (i=1; i<3; i++) {
 	buf[i] = nextc(p);
-	if (buf[i] == -1) goto eof;
+	if (buf[i] < 0) goto eof;
 	if (buf[i] < '0' || '7' < buf[i]) {
 	  pushback(p, buf[i]);
 	  break;
@@ -3577,7 +3573,7 @@ read_escape(parser_state *p)
 
       for (i=0; i<2; i++) {
 	buf[i] = nextc(p);
-	if (buf[i] == -1) goto eof;
+	if (buf[i] < 0) goto eof;
 	if (!ISXDIGIT(buf[i])) {
 	  pushback(p, buf[i]);
 	  break;
@@ -3606,7 +3602,7 @@ read_escape(parser_state *p)
     if ((c = nextc(p)) == '\\') {
       return read_escape(p) | 0x80;
     }
-    else if (c == -1) goto eof;
+    else if (c < 0) goto eof;
     else {
       return ((c & 0xff) | 0x80);
     }
@@ -3623,11 +3619,12 @@ read_escape(parser_state *p)
     }
     else if (c == '?')
       return 0177;
-    else if (c == -1) goto eof;
+    else if (c < 0) goto eof;
     return c & 0x9f;
 
   eof:
   case -1:
+  case -2:
     yyerror(p, "Invalid escape character syntax");
     return '\0';
 
@@ -3649,7 +3646,7 @@ parse_string(parser_state *p)
 
   newtok(p);
   while ((c = nextc(p)) != end || nest_level != 0) {
-    if (hinf && (c == '\n' || c == -1)) {
+    if (hinf && (c == '\n' || c < 0)) {
       int line_head;
       tokadd(p, '\n');
       tokfix(p);
@@ -3671,7 +3668,7 @@ parse_string(parser_state *p)
 	  return tHEREDOC_END;
 	}
       }
-      if (c == -1) {
+      if (c < 0) {
 	char buf[256];
 	snprintf(buf, sizeof(buf), "can't find heredoc delimiter \"%s\" anywhere before EOF", hinf->term);
 	yyerror(p, buf);
@@ -3680,7 +3677,7 @@ parse_string(parser_state *p)
       yylval.nd = new_str(p, tok(p), toklen(p));
       return tHD_STRING_MID;
     }
-    if (c == -1) {
+    if (c < 0) {
       yyerror(p, "unterminated string meets end of file");
       return 0;
     }
@@ -3706,7 +3703,7 @@ parse_string(parser_state *p)
 	else {
 	  if (type & STR_FUNC_REGEXP) {
 	    tokadd(p, '\\');
-	    if (c != -1)
+	    if (c >= 0)
 	      tokadd(p, c);
 	  } else {
 	    pushback(p, c);
@@ -3796,7 +3793,7 @@ parse_string(parser_state *p)
     char *dup;
 
     newtok(p);
-    while (c = nextc(p), c != -1 && ISALPHA(c)) {
+    while (c = nextc(p), c >= 0 && ISALPHA(c)) {
       switch (c) {
       case 'i': f |= 1; break;
       case 'x': f |= 2; break;
@@ -3855,19 +3852,19 @@ heredoc_identifier(parser_state *p)
     if (c == '\'')
       quote = TRUE;
     newtok(p);
-    while ((c = nextc(p)) != -1 && c != term) {
+    while ((c = nextc(p)) >= 0 && c != term) {
       if (c == '\n') {
 	c = -1;
 	break;
       }
       tokadd(p, c);
     }
-    if (c == -1) {
+    if (c < 0) {
       yyerror(p, "unterminated here document identifier");
       return 0;
     }
   } else {
-    if (c == -1) {
+    if (c < 0) {
       return 0;                 /* missing here document identifier */
     }
     if (! identchar(c)) {
@@ -3878,7 +3875,7 @@ heredoc_identifier(parser_state *p)
     newtok(p);
     do {
       tokadd(p, c);
-    } while ((c = nextc(p)) != -1 && identchar(c));
+    } while ((c = nextc(p)) >= 0 && identchar(c));
     pushback(p, c);
   }
   tokfix(p);
@@ -3948,6 +3945,7 @@ parser_yylex(parser_state *p)
   case '#':     /* it's a comment */
     skip(p, '\n');
   /* fall through */
+  case -2:      /* end of partial script. */
   case '\n':
   maybe_heredoc:
     heredoc_treat_nextline(p);
@@ -3982,6 +3980,7 @@ parser_yylex(parser_state *p)
 	  goto retry;
 	}
       case -1:			/* EOF */
+      case -2:			/* end of partial script */
 	goto normal_newline;
       default:
 	pushback(p, c);
@@ -4165,7 +4164,7 @@ parser_yylex(parser_state *p)
       return '?';
     }
     c = nextc(p);
-    if (c == -1) {
+    if (c < 0) {
       yyerror(p, "incomplete character syntax");
       return 0;
     }
@@ -4313,7 +4312,7 @@ parser_yylex(parser_state *p)
     if (IS_BEG() || (IS_SPCARG(c) && arg_ambiguous(p))) {
       p->lstate = EXPR_BEG;
       pushback(p, c);
-      if (c != -1 && ISDIGIT(c)) {
+      if (c >= 0 && ISDIGIT(c)) {
 	c = '+';
 	goto start_num;
       }
@@ -4345,7 +4344,7 @@ parser_yylex(parser_state *p)
     if (IS_BEG() || (IS_SPCARG(c) && arg_ambiguous(p))) {
       p->lstate = EXPR_BEG;
       pushback(p, c);
-      if (c != -1 && ISDIGIT(c)) {
+      if (c >= 0 && ISDIGIT(c)) {
 	return tUMINUS_NUM;
       }
       return tUMINUS;
@@ -4364,7 +4363,7 @@ parser_yylex(parser_state *p)
       return tDOT2;
     }
     pushback(p, c);
-    if (c != -1 && ISDIGIT(c)) {
+    if (c >= 0 && ISDIGIT(c)) {
       yyerror(p, "no .<digit> floating literal anymore; put 0 before dot");
     }
     p->lstate = EXPR_DOT;
@@ -4390,7 +4389,7 @@ parser_yylex(parser_state *p)
 	if (c == 'x' || c == 'X') {
 	  /* hexadecimal */
 	  c = nextc(p);
-	  if (c != -1 && ISXDIGIT(c)) {
+	  if (c >= 0 && ISXDIGIT(c)) {
 	    do {
 	      if (c == '_') {
 		if (nondigit) break;
@@ -4400,7 +4399,7 @@ parser_yylex(parser_state *p)
 	      if (!ISXDIGIT(c)) break;
 	      nondigit = 0;
 	      tokadd(p, tolower(c));
-	    } while ((c = nextc(p)) != -1);
+	    } while ((c = nextc(p)) >= 0);
 	  }
 	  pushback(p, c);
 	  tokfix(p);
@@ -4424,7 +4423,7 @@ parser_yylex(parser_state *p)
 	      if (c != '0' && c != '1') break;
 	      nondigit = 0;
 	      tokadd(p, c);
-	    } while ((c = nextc(p)) != -1);
+	    } while ((c = nextc(p)) >= 0);
 	  }
 	  pushback(p, c);
 	  tokfix(p);
@@ -4438,7 +4437,7 @@ parser_yylex(parser_state *p)
 	if (c == 'd' || c == 'D') {
 	  /* decimal */
 	  c = nextc(p);
-	  if (c != -1 && ISDIGIT(c)) {
+	  if (c >= 0 && ISDIGIT(c)) {
 	    do {
 	      if (c == '_') {
 		if (nondigit) break;
@@ -4448,7 +4447,7 @@ parser_yylex(parser_state *p)
 	      if (!ISDIGIT(c)) break;
 	      nondigit = 0;
 	      tokadd(p, c);
-	    } while ((c = nextc(p)) != -1);
+	    } while ((c = nextc(p)) >= 0);
 	  }
 	  pushback(p, c);
 	  tokfix(p);
@@ -4466,7 +4465,7 @@ parser_yylex(parser_state *p)
 	if (c == 'o' || c == 'O') {
 	  /* prefixed octal */
 	  c = nextc(p);
-	  if (c == -1 || c == '_' || !ISDIGIT(c)) {
+	  if (c < 0 || c == '_' || !ISDIGIT(c)) {
 	    no_digits();
 	  }
 	}
@@ -4483,7 +4482,7 @@ parser_yylex(parser_state *p)
 	    if (c > '7') goto invalid_octal;
 	    nondigit = 0;
 	    tokadd(p, c);
-	  } while ((c = nextc(p)) != -1);
+	  } while ((c = nextc(p)) >= 0);
 
 	  if (toklen(p) > start) {
 	    pushback(p, c);
@@ -4526,7 +4525,7 @@ parser_yylex(parser_state *p)
 	  }
 	  else {
 	    int c0 = nextc(p);
-	    if (c0 == -1 || !ISDIGIT(c0)) {
+	    if (c0 < 0 || !ISDIGIT(c0)) {
 	      pushback(p, c0);
 	      goto decode_num;
 	    }
@@ -4760,7 +4759,7 @@ parser_yylex(parser_state *p)
 
       c = nextc(p);
     quotation:
-      if (c == -1 || !ISALNUM(c)) {
+      if (c < 0 || !ISALNUM(c)) {
 	term = c;
 	c = 'Q';
       }
@@ -4771,7 +4770,7 @@ parser_yylex(parser_state *p)
 	  return 0;
 	}
       }
-      if (c == -1 || term == -1) {
+      if (c < 0 || term < 0) {
 	yyerror(p, "unterminated quoted string meets end of file");
 	return 0;
       }
@@ -4844,14 +4843,14 @@ parser_yylex(parser_state *p)
     p->lstate = EXPR_END;
     token_column = newtok(p);
     c = nextc(p);
-    if (c == -1) {
+    if (c < 0) {
       yyerror(p, "incomplete global variable syntax");
       return 0;
     }
     switch (c) {
     case '_':     /* $_: last read line string */
       c = nextc(p);
-      if (c != -1 && identchar(c)) { /* if there is more after _ it is a variable */
+      if (c >= 0 && identchar(c)) { /* if there is more after _ it is a variable */
 	tokadd(p, '$');
 	tokadd(p, c);
 	break;
@@ -4909,7 +4908,7 @@ parser_yylex(parser_state *p)
       do {
 	tokadd(p, c);
 	c = nextc(p);
-      } while (c != -1 && isdigit(c));
+      } while (c >= 0 && isdigit(c));
       pushback(p, c);
       if (last_state == EXPR_FNAME) goto gvar;
       tokfix(p);
@@ -4934,7 +4933,7 @@ parser_yylex(parser_state *p)
       tokadd(p, '@');
       c = nextc(p);
     }
-    if (c == -1) {
+    if (c < 0) {
       if (p->bidx == 1) {
 	yyerror(p, "incomplete instance variable syntax");
       }