Skip to content

Commit

Permalink
Merge pull request #3714 from masatake/suppress-warning
Browse files Browse the repository at this point in the history 
Suppress warnings reported from msvc
  • Loading branch information
@masatake
masatake committed May 12, 2023
2 parents cc36e4f + ceda2dc commit e1abef6
Show file tree
Hide file tree
Showing 15 changed files with 130 additions and 99 deletions.
9 changes: 4 additions & 5 deletions dsl/es.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -822,7 +822,6 @@ es_symbol_print(const EsObject* object, MIO* fp)
unsigned char cc;
unsigned char mask;
int needs_bar;
int i;

string = es_symbol_get(object);
if (!string)
Expand All @@ -840,7 +839,7 @@ es_symbol_print(const EsObject* object, MIO* fp)
{
/* 0 => 1? */
mask = 0x2;
for (i = 0; i< len; i++)
for (size_t i = 0; i< len; i++)
{
c = string[i];
cc = get_char_class(c);
Expand All @@ -854,7 +853,7 @@ es_symbol_print(const EsObject* object, MIO* fp)
if (needs_bar)
mio_printf(fp, "|");

for (i = 0; i < len; i++)
for (size_t i = 0; i < len; i++)
{
c = string[i];
if (c == '\\' || c == '|')
Expand Down Expand Up @@ -1028,7 +1027,7 @@ es_string_print(const EsObject* object, MIO* fp)
const char* string;
char c;
size_t len;
int i;
size_t i;


string = es_string_get(object);
Expand Down Expand Up @@ -2167,7 +2166,7 @@ static void
dump_token (MIO* stream, const char* prefix, Token* seed)
{
const char* buf;
int i;
size_t i;
char c;


Expand Down
89 changes: 47 additions & 42 deletions dsl/optscript.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2437,13 +2437,16 @@ GEN_PRINTER(op__print, vm_print_full (vm, elt, true, 0))
static EsObject*
op__make_array (OptVM *vm, EsObject *name)
{
int n = vm_ostack_counttomark (vm);
if (n < 0)
int n0 = vm_ostack_counttomark (vm);
if (n0 < 0)
return OPT_ERR_UNMATCHEDMARK;
unsigned int n = (unsigned int)n0;

unsigned int count = vm_ostack_count (vm);
Assert(count > n);

EsObject *a = array_new (ATTR_READABLE | ATTR_WRITABLE);
for (int i = (int)(count - n); i < count; i++)
for (unsigned int i = count - n; i < count; i++)
{
EsObject *elt = ptrArrayItem (vm->ostack, i);
array_op_add (a, elt);
Expand Down Expand Up @@ -2713,18 +2716,19 @@ op_copy (OptVM *vm, EsObject *name)
if (!es_integer_p (nobj))
return op__copy_compound (vm, name, c, nobj);

int n = es_integer_get (nobj);
if (n < 0)
int n0 = es_integer_get (nobj);
if (n0 < 0)
return OPT_ERR_RANGECHECK;
unsigned int n = (unsigned int)n0;

c--;

if (((int)c) - n < 0)
if (c < n)
return OPT_ERR_UNDERFLOW;

ptrArrayDeleteLast(vm->ostack);

for (int i = c - n; i < c; i++)
for (unsigned int i = c - n; i < c; i++)
{
EsObject * elt = ptrArrayItem (vm->ostack, i);
vm_ostack_push (vm, elt);
Expand Down Expand Up @@ -4211,11 +4215,9 @@ op__forall_array (OptVM *vm, EsObject *name,
{
ptrArray *a = es_pointer_get (obj);
unsigned int c = ptrArrayCount (a);
if (((int)c) < 0)
return OPT_ERR_INTERNALERROR; /* TODO: integer overflow */

EsObject *e = es_false;
for (int i = 0; i < c; i++)
for (unsigned int i = 0; i < c; i++)
{
EsObject *o = ptrArrayItem (a, i);
es_object_ref (o);
Expand Down Expand Up @@ -4287,11 +4289,9 @@ op__forall_string (OptVM *vm, EsObject *name,
{
vString *s = es_pointer_get (obj);
unsigned int c = vStringLength (s);
if (((int)c) < 0)
return OPT_ERR_INTERNALERROR; /* TODO: integer overflow */

EsObject *e = es_false;
for (int i = 0; i < c; i++)
for (unsigned int i = 0; i < c; i++)
{
unsigned char chr = vStringChar (s, i);
EsObject *o = es_integer_new (chr);
Expand Down Expand Up @@ -4343,23 +4343,24 @@ op_forall (OptVM *vm, EsObject *name)

static EsObject*
op__putinterval_array (OptVM *vm, EsObject *name,
ptrArray *srca, int index, ptrArray *dsta)
ptrArray *srca, unsigned int index, ptrArray *dsta)
{
unsigned int dlen = ptrArrayCount (dsta);
unsigned int slen = ptrArrayCount (srca);
if (dlen > index)
{
if ((dlen - index) <= slen)
unsigned d = dlen - index;
if (d <= slen)
{
ptrArrayDeleteLastInBatch (dsta, dlen - index);
ptrArrayDeleteLastInBatch (dsta, d);
for (unsigned int i = 0; i < slen; i++)
ptrArrayAdd (dsta, es_object_ref (ptrArrayItem (srca, i)));
return es_false;
}
else
{
for (size_t i = 0; i < slen; i++)
ptrArrayUpdate (dsta, ((size_t)index) + i,
for (unsigned int i = 0; i < slen; i++)
ptrArrayUpdate (dsta, index + i,
es_object_ref (ptrArrayItem (srca, i)),
es_nil);
return es_false;
Expand All @@ -4377,21 +4378,22 @@ op__putinterval_array (OptVM *vm, EsObject *name,

static EsObject*
op__putinterval_string (OptVM *vm, EsObject *name,
vString *srcv, int index, vString *dstv)
vString *srcv, unsigned int index, vString *dstv)
{
size_t dlen = vStringLength (dstv);
unsigned int dlen = vStringLength (dstv);
if (dlen > index)
{
size_t slen = vStringLength (srcv);
if ((dlen - index) <= slen)
unsigned int d = dlen - index;
unsigned int slen = vStringLength (srcv);
if (d <= slen)
{
vStringTruncate (dstv, (size_t)index);
vStringTruncate (dstv, index);
vStringCat (dstv, srcv);
return es_false;
}
else
{
for (size_t i = 0; i < slen; i++)
for (unsigned int i = 0; i < slen; i++)
vStringChar (dstv, index + i) = vStringChar (srcv, i);
return es_false;
}
Expand Down Expand Up @@ -4423,9 +4425,10 @@ op_putinterval (OptVM *vm, EsObject *name)
else
return OPT_ERR_TYPECHECK;

int index = es_integer_get (indexobj);
if (index < 0)
int index0 = es_integer_get (indexobj);
if (index0 < 0)
return OPT_ERR_RANGECHECK;
unsigned int index = (size_t)index0;

EsObject *r;
if (t == OPT_TYPE_ARRAY)
Expand All @@ -4448,39 +4451,39 @@ op_putinterval (OptVM *vm, EsObject *name)
static EsObject*
op__copyinterval_array (OptVM *vm, EsObject *name,
ptrArray *dsta,
int count,
int index,
unsigned int count,
unsigned int index,
ptrArray *srca)
{
unsigned long srcl = ptrArrayCount (srca);
unsigned int srcl = ptrArrayCount (srca);

if ((unsigned long)index > srcl)
if (index > srcl)
return OPT_ERR_RANGECHECK;

if ((unsigned long)(index + count) > srcl)
if ((index + count) > srcl)
return OPT_ERR_RANGECHECK;

for (unsigned int i = (unsigned int)index; i < index + count; i++)
for (unsigned int i = index; i < index + count; i++)
ptrArrayAdd (dsta, es_object_ref (ptrArrayItem (srca, i)));
return es_false;
}

static EsObject*
op__copyinterval_string (OptVM *vm, EsObject *name,
vString *dsts,
int count,
int index,
unsigned int count,
unsigned int index,
vString *srcs)
{
size_t srcl = vStringLength (srcs);
unsigned int srcl = vStringLength (srcs);

if ((size_t)index > srcl)
if (index > srcl)
return OPT_ERR_RANGECHECK;

if ((size_t)(index + count) > srcl)
if ((index + count) > srcl)
return OPT_ERR_RANGECHECK;

vStringNCatSUnsafe (dsts, vStringValue (srcs) + index, (size_t)count);
vStringNCatSUnsafe (dsts, vStringValue (srcs) + index, count);
return es_false;
}

Expand All @@ -4503,13 +4506,15 @@ op__copyinterval (OptVM *vm, EsObject *name)
if (!es_integer_p (indexobj))
return OPT_ERR_TYPECHECK;

int count = es_integer_get (countobj);
if (count < 0)
int count0 = es_integer_get (countobj);
if (count0 < 0)
return OPT_ERR_RANGECHECK;
unsigned int count = (unsigned int)count0;

int index = es_integer_get (indexobj);
if (index < 0)
int index0 = es_integer_get (indexobj);
if (index0 < 0)
return OPT_ERR_RANGECHECK;
unsigned int index = (size_t)index0;

EsObject* r;
if (t == OPT_TYPE_ARRAY)
Expand Down
3 changes: 3 additions & 0 deletions dsl/sorter.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,10 @@ int s_compare (const tagEntry * a, const tagEntry * b, SCode *code)
dsl_cache_reset (DSL_SORTER);

if (exit_code)
{
i = 0; /* For suppress the warning. */
exit (exit_code);
}

return i;
}
Expand Down
10 changes: 5 additions & 5 deletions main/entry.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1022,9 +1022,9 @@ extern const tagField* getParserFieldForIndex (const tagEntryInfo * tag, int ind

extern const char* getParserFieldValueForType (const tagEntryInfo *const tag, fieldType ftype)
{
for (int i = 0; i < tag->usedParserFields; i++)
for (unsigned int i = 0; i < tag->usedParserFields; i++)
{
const tagField *f = getParserFieldForIndex (tag, i);
const tagField *f = getParserFieldForIndex (tag, (int)i);
if (f && f->ftype == ftype)
return f->value;
}
Expand Down Expand Up @@ -1111,7 +1111,7 @@ static tagEntryInfoX *copyTagEntry (const tagEntryInfo *const tag,

if (slot->extraDynamic)
{
int n = countXtags () - XTAG_COUNT;
unsigned int n = countXtags () - XTAG_COUNT;
slot->extraDynamic = xCalloc ((n / 8) + 1, uint8_t);
memcpy (slot->extraDynamic, tag->extraDynamic, (n / 8) + 1);
}
Expand Down Expand Up @@ -2017,8 +2017,8 @@ static void markTagExtraBitFull (tagEntryInfo *const tag, xtagType extra, bool m
else
{
Assert (extra < countXtags ());

int n = countXtags () - XTAG_COUNT;
Assert (XTAG_COUNT <= countXtags ());
unsigned int n = countXtags () - XTAG_COUNT;
tag->extraDynamic = xCalloc ((n / 8) + 1, uint8_t);
if (!tag->inCorkQueue)
PARSER_TRASH_BOX(tag->extraDynamic, eFree);
Expand Down
Loading

0 comments on commit e1abef6

Please sign in to comment.