From acad9567c16317a86d7e246d6093a43d3a58c758 Mon Sep 17 00:00:00 2001
From: KOBAYASHI Shuji <shuujii@gmail.com>
Date: Mon, 15 Jul 2019 23:03:41 +0900
Subject: Unify type of line number to `uint16_t`

---
 include/mruby/compile.h             | 6 +++---
 mrbgems/mruby-compiler/core/parse.y | 2 +-
 mrbgems/mruby-eval/src/eval.c       | 2 +-
 src/backtrace.c                     | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/mruby/compile.h b/include/mruby/compile.h
index 8f8f2ebd7..3b25ff526 100644
--- a/include/mruby/compile.h
+++ b/include/mruby/compile.h
@@ -24,7 +24,7 @@ typedef struct mrbc_context {
   mrb_sym *syms;
   int slen;
   char *filename;
-  short lineno;
+  uint16_t lineno;
   int (*partial_hook)(struct mrb_parser_state*);
   void *partial_data;
   struct RClass *target_class;
@@ -67,7 +67,7 @@ enum mrb_lex_state_enum {
 
 /* saved error message */
 struct mrb_parser_message {
-  int lineno;
+  uint16_t lineno;
   int column;
   char* message;
 };
@@ -119,7 +119,7 @@ struct mrb_parser_state {
 #endif
   mrbc_context *cxt;
   mrb_sym filename_sym;
-  int lineno;
+  uint16_t lineno;
   int column;
 
   enum mrb_lex_state_enum lstate;
diff --git a/mrbgems/mruby-compiler/core/parse.y b/mrbgems/mruby-compiler/core/parse.y
index 96a9453b6..ac59a8b0b 100644
--- a/mrbgems/mruby-compiler/core/parse.y
+++ b/mrbgems/mruby-compiler/core/parse.y
@@ -233,7 +233,7 @@ parser_strdup(parser_state *p, const char *s)
 #define strdup(s) parser_strdup(p, s)
 
 static void
-dump_int(short i, char *s)
+dump_int(uint16_t i, char *s)
 {
   char *p = s;
   char *t = s;
diff --git a/mrbgems/mruby-eval/src/eval.c b/mrbgems/mruby-eval/src/eval.c
index a3b211ba2..30534aaec 100644
--- a/mrbgems/mruby-eval/src/eval.c
+++ b/mrbgems/mruby-eval/src/eval.c
@@ -235,7 +235,7 @@ create_proc_from_string(mrb_state *mrb, char *s, mrb_int len, mrb_value binding,
   }
 
   cxt = mrbc_context_new(mrb);
-  cxt->lineno = (short)line;
+  cxt->lineno = (uint16_t)line;
 
   mrbc_filename(mrb, cxt, file ? file : "(eval)");
   cxt->capture_errors = TRUE;
diff --git a/src/backtrace.c b/src/backtrace.c
index e4f5a3064..991a67d00 100644
--- a/src/backtrace.c
+++ b/src/backtrace.c
@@ -16,7 +16,7 @@
 #include <mruby/data.h>
 
 struct backtrace_location {
-  int lineno;
+  int32_t lineno;
   mrb_sym method_id;
   const char *filename;
 };
-- 
cgit v1.2.3