/*
** Splint - annotation-assisted static program checker
-** Copyright (C) 1994-2002 University of Virginia,
+** Copyright (C) 1994-2003 University of Virginia,
** Massachusetts Institute of Technology
**
** This program is free software; you can redistribute it and/or modify it
# include <string.h>
# include "splintMacros.nf"
-# include "llbasic.h"
+# include "basic.h"
# include "cpplib.h"
# include "cpphash.h"
# include "cppexp.h"
static struct operation cppexp_lex (cppReader *);
static void integer_overflow (cppReader *);
-static long left_shift (cppReader *, long, bool p_unsignedp, size_t);
+static long left_shift (cppReader *, long, bool p_unsignedp, unsigned long);
static long right_shift (long, bool p_unsignedp, unsigned long);
/*@constant short CPPREADER_ERRORTOK@*/
for (i = 0; i < len; i++)
{
- /*drl bee: is*/ if (p[i] == '.') {
+ if (p[i] == '.') {
/* It's a float since it contains a point. */
cppReader_errorLit
(pfile,
}
else if (*p == '0')
{
- /*@i3434*/
- /* drl: see if there is a reason that we shouldn't do
- p++;
- len--; */
-
base = 8;
}
else
/*@innerbreak@*/ break;
}
- /*drl bee: ltc*/ c = *p++;
+ c = *p++;
}
/* Don't look for any more digits after the suffixes. */
break;
if (overflow)
{
- /*@i23 add flags for all these...*/
cppReader_pedwarnLit
(pfile,
cstring_makeLiteralTemp ("Integer constant out of range"));
}
++ptr;
- /*drl bee: hda*/ while (ptr < tok_end && ((c = *ptr++) != '\''))
+ while (ptr < tok_end && ((c = *ptr++) != '\''))
{
if (c == '\\')
{
}
}
- /*drl bee: dad*/ token_buffer[num_chars] = 0;
+ token_buffer[num_chars] = 0;
if (c != '\'')
cppReader_errorLit (pfile,
{
for (toktab = tokentab2; toktab->operator != NULL; toktab++)
{
- /*drl bee: hda*/ if (tok_start[0] == /*drl bee: hda*/ toktab->operator[0]
- && /*drl bee: hda*/ tok_start[1] == /*drl bee: hda*/ toktab->operator[1])
+ if (tok_start[0] == toktab->operator[0] &&
+ tok_start[1] == toktab->operator[1])
{
/*@loopbreak@*/ break;
}
int
cppReader_parseEscape (cppReader *pfile, char **string_ptr)
{
- /*drl bee: pbr*/ char c = *(*string_ptr)++;
+ char c = *(*string_ptr)++;
switch (c)
{
else
{
- /*drl bee: pbr*/ (*string_ptr)--;
+ (*string_ptr)--;
/*@loopbreak@*/ break;
}
}
}
static long
-left_shift (cppReader *pfile, long a, bool unsignedp, size_t b)
+left_shift (cppReader *pfile, long a, bool unsignedp, unsigned long b)
{
if (b >= HOST_BITS_PER_LONG)
{
while (top->rprio > lprio)
{
/*@-usedef@*/
- long v1 = top[-1].value, v2 = top[0].value;
+ HOST_WIDE_INT v1 = top[-1].value;
+ HOST_WIDE_INT v2 = top[0].value;
bool unsigned1 = top[-1].unsignedp;
bool unsigned2 = top[0].unsignedp;
if (top == limit)
{
struct operation *new_stack;
- int old_size = (char *) limit - (char *) stack;
- size_t new_size = size_fromInt (2 * old_size);
+ size_t old_size = size_fromInt ((char *) limit - (char *) stack);
+ size_t new_size = (size_t) (2 * old_size);
if (stack != init_stack)
{