/*
** LCLint - annotation-assisted static program checker
-** Copyright (C) 1994-2000 University of Virginia,
+** Copyright (C) 1994-2001 University of Virginia,
** Massachusetts Institute of Technology
**
** This program is free software; you can redistribute it and/or modify it
/* evs - sounds bogus to me! */
-static unsigned int colNumber;
-static unsigned int startCol;
+static int colNumber;
+static int startCol;
static char *currentLine;
static char currentChar;
static ltokenCode tokenCode;
}
ltoken_setCol (newToken, startCol);
- ltoken_setLine (newToken, tsource_thisLineNumber (LCLScanSource ()));
- ltoken_setFileName (newToken, tsource_fileName (LCLScanSource ()));
+ ltoken_setLine (newToken, inputStream_thisLineNumber (LCLScanSource ()));
+ ltoken_setFileName (newToken, inputStream_fileName (LCLScanSource ()));
if (ltoken_getCode (newToken) == commentSym)
{
}
ltoken_setCol (t, colNumber);
- ltoken_setLine (t, tsource_thisLineNumber (LCLScanSource ()));
- ltoken_setFileName (t, tsource_fileName (LCLScanSource ()));
+ ltoken_setLine (t, inputStream_thisLineNumber (LCLScanSource ()));
+ ltoken_setFileName (t, inputStream_fileName (LCLScanSource ()));
return t;
}
static void
LocalUserError (char *msg)
{
- tsource *s = LCLScanSource ();
- llfatalerror (message ("%s:%u,%u: %s",
- cstring_fromChars (tsource_fileName (s)),
- tsource_thisLineNumber (s),
+ inputStream s = LCLScanSource ();
+ llfatalerror (message ("%s:%d,%d: %s",
+ inputStream_fileName (s),
+ inputStream_thisLineNumber (s),
colNumber,
cstring_fromChars (msg)));
}