/*
** 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"
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;
}
}
}
else
{
- long l = int_toNonNegative (a) << b;
+ /*@-shiftimplementation@*/
+ long l = a << b; /* int_toNonNegative removed (allow shifts of negative values) */
# ifdef WIN32
# pragma warning( disable : 4018 )
# endif
- if (int_toNonNegative (l) >> b != a)
+ if (l >> b != a) /* int_toNonNegative removed (allow shifts of negative values) */
{
integer_overflow (pfile);
}
else if (unsignedp)
return (unsigned long) a >> b;
else
- return int_toNonNegative (a) >> b;
+ return a >> b; /* int_toNonNegative removed (allow shifts of negative values) */
+ /*@=shiftimplementation@*/
}
/* These priorities are all even, so we can handle associatively. */