From a50c7c24b898e50a4ea6cf8d90389f2ef837110f Mon Sep 17 00:00:00 2001
From: "kr.angelov" <kr.angelov@gmail.com>
Date: Mon, 12 Nov 2012 12:51:27 +0000
Subject: [PATCH] use size_t consistently as the type for constituent indices
 in the C runtime

---
 src/runtime/c/pgf/literals.c |  8 ++++----
 src/runtime/c/pgf/parser.c   | 12 ++++++------
 src/runtime/c/pgf/parser.h   |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/runtime/c/pgf/literals.c b/src/runtime/c/pgf/literals.c
index ea082e28a..e6c9a9ed3 100644
--- a/src/runtime/c/pgf/literals.c
+++ b/src/runtime/c/pgf/literals.c
@@ -16,7 +16,7 @@ pgf_match_string_lit(PgfConcr* concr, PgfItem* item, PgfToken tok,
 {
 	GuPool* tmp_pool = gu_new_pool();
 
-	int lin_idx;
+	size_t lin_idx;
 	PgfSequence seq;
 	pgf_item_sequence(item, &lin_idx, &seq, tmp_pool);
 	gu_assert(lin_idx == 0);
@@ -64,7 +64,7 @@ pgf_match_int_lit(PgfConcr* concr, PgfItem* item, PgfToken tok,
 {
 	GuPool* tmp_pool = gu_new_pool();
 
-	int lin_idx;
+	size_t lin_idx;
 	PgfSequence seq;
 	pgf_item_sequence(item, &lin_idx, &seq, tmp_pool);
 	gu_assert(lin_idx == 0);
@@ -121,7 +121,7 @@ pgf_match_float_lit(PgfConcr* concr, PgfItem* item, PgfToken tok,
 {
 	GuPool* tmp_pool = gu_new_pool();
 
-	int lin_idx;
+	size_t lin_idx;
 	PgfSequence seq;
 	pgf_item_sequence(item, &lin_idx, &seq, tmp_pool);
 	gu_assert(lin_idx == 0);
@@ -176,7 +176,7 @@ static bool
 pgf_match_name_lit(PgfConcr* concr, PgfItem* item, PgfToken tok,
                    PgfExprProb** out_ep, GuPool *pool)
 {
-	int lin_idx;
+	size_t lin_idx;
 	PgfSequence seq;
 	pgf_item_sequence(item, &lin_idx, &seq, pool);
 
diff --git a/src/runtime/c/pgf/parser.c b/src/runtime/c/pgf/parser.c
index c9a0234a6..abcdbc69a 100644
--- a/src/runtime/c/pgf/parser.c
+++ b/src/runtime/c/pgf/parser.c
@@ -22,7 +22,7 @@ static GU_DEFINE_TYPE(PgfItemBuf, abstract, _);
 
 struct PgfItemConts {
 	PgfCCat* ccat;
-	unsigned short lin_idx;
+	size_t lin_idx;
 #ifdef PGF_PARSER_DEBUG
 	unsigned short offset;
 #endif
@@ -63,12 +63,12 @@ typedef struct {
 
 typedef struct {
 	int fid;
-	int lin_idx;
+	size_t lin_idx;
 } PgfCFCat;
 
 static GU_DEFINE_TYPE(PgfCFCat, struct,
 	       GU_MEMBER(PgfCFCat, fid, int),
-           GU_MEMBER(PgfCFCat, lin_idx, int));
+           GU_MEMBER(PgfCFCat, lin_idx, size_t));
 
 extern GuHasher pgf_cfcat_hasher;
 
@@ -166,7 +166,7 @@ pgf_prev_extern_sym(PgfSymbol sym)
 	}
 }
 
-int
+size_t
 pgf_item_lin_idx(PgfItem* item) {
 	return item->conts->lin_idx;
 }
@@ -243,7 +243,7 @@ pgf_extern_seq_get(PgfItem* item, GuPool* pool)
 
 void
 pgf_item_sequence(PgfItem* item, 
-                  int* lin_idx, PgfSequence* seq,
+                  size_t* lin_idx, PgfSequence* seq,
                   GuPool* pool) {
 	*lin_idx = item->conts->lin_idx;
 
@@ -360,7 +360,7 @@ static void
 pgf_print_item_seq(PgfItem *item,
                    GuWriter* wtr, GuExn* err, GuPool* pool)
 {
-	int lin_idx;
+	size_t lin_idx;
 	PgfSequence seq;
 	pgf_item_sequence(item, &lin_idx, &seq, pool);
 
diff --git a/src/runtime/c/pgf/parser.h b/src/runtime/c/pgf/parser.h
index b1dc3f32b..65997f601 100644
--- a/src/runtime/c/pgf/parser.h
+++ b/src/runtime/c/pgf/parser.h
@@ -106,12 +106,12 @@ PgfExpr
 pgf_parse_best_result(PgfParseState* state, GuPool* pool);
 
 
-int
+size_t
 pgf_item_lin_idx(PgfItem* item);
 
 void
 pgf_item_sequence(PgfItem* item, 
-                  int* lin_idx, PgfSequence* seq,
+                  size_t* lin_idx, PgfSequence* seq,
                   GuPool* pool);
 
 int