#include <stdarg.h>
#include "global.h"
-#include "io.h"
+#include "input.h"
#include "scanner.h"
#include "stmt.h"
#include "error.h"
"`\"' or `<' expected",
"Missing terminator or name too long",
"Include file `%s' not found",
- "Open failure on include file `%s'",
+ "Cannot open include file `%s': %s",
"Invalid #error directive",
"#error: %s",
"Unexpected `#endif'",
va_list ap;
if (!NoWarn) {
- fprintf (stderr, "%s(%u): Warning #%u: ", fin, curpos, WarnNum);
+ fprintf (stderr, "%s(%u): Warning #%u: ",
+ GetCurrentFile(), curpos, WarnNum);
va_start (ap, WarnNum);
vfprintf (stderr, WarnMsg [WarnNum-1], ap);
va_list ap;
if (!NoWarn) {
- fprintf (stderr, "%s(%u): Warning #%u: ", fin, ln, WarnNum);
+ fprintf (stderr, "%s(%u): Warning #%u: ",
+ GetCurrentFile(), GetCurrentLine(), WarnNum);
va_start (ap, WarnNum);
vfprintf (stderr, WarnMsg [WarnNum-1], ap);
{
va_list ap;
- fprintf (stderr, "%s(%u): Error #%u: ", fin, curpos, ErrNum);
+ fprintf (stderr, "%s(%u): Error #%u: ",
+ GetCurrentFile(), curpos, ErrNum);
va_start (ap, ErrNum);
vfprintf (stderr, ErrMsg [ErrNum-1], ap);
{
va_list ap;
- fprintf (stderr, "%s(%u): Error #%u: ", fin, ln, ErrNum);
+ fprintf (stderr, "%s(%u): Error #%u: ",
+ GetCurrentFile(), GetCurrentLine(), ErrNum);
va_start (ap, ErrNum);
vfprintf (stderr, ErrMsg [ErrNum-1], ap);
{
va_list ap;
- fprintf (stderr, "%s(%u): Fatal #%u: ", fin, curpos, FatNum);
+ fprintf (stderr, "%s(%u): Fatal #%u: ",
+ GetCurrentFile(), curpos, FatNum);
va_start (ap, FatNum);
vfprintf (stderr, FatMsg [FatNum-1], ap);
{
va_list ap;
- fprintf (stderr, "%s(%u): Internal compiler error:\n", fin, curpos);
+ fprintf (stderr, "%s(%u): Internal compiler error:\n",
+ GetCurrentFile(), curpos);
va_start (ap, Format);
vfprintf (stderr, Format, ap);
+