oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

count lines correctly.

Browse Source 
(error_message): print filename in messages


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@8152 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
2000-04-09 09:20:22 +00:00
parent 8df215173d
commit 149c240f4f
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/asn1/lex.l
View File

@@ -46,8 +46,13 @@
#endif #endif
#include "symbol.h" #include "symbol.h"
#include "parse.h" #include "parse.h"
#include "gen_locl.h"
void error_message(char *, ...); void error_message(const char *, ...)
#ifdef HAVE___ATTRIBUTE__
__attribute__ ((format (printf, 1, 2)))
#endif
;
static unsigned lineno = 1; static unsigned lineno = 1;
@@ -74,11 +79,11 @@ EXTERNAL { return EXTERNAL; }
"[" { return *yytext; } "[" { return *yytext; }
"]" { return *yytext; } "]" { return *yytext; }
::= { return EEQUAL; } ::= { return EEQUAL; }
--[^\n]*\n { ; } --[^\n]*\n { ++lineno; }
-?[0-9]+ { yylval.constant = atoi(yytext); return CONSTANT; } -?[0-9]+ { yylval.constant = atoi(yytext); return CONSTANT; }
[A-Za-z][-A-Za-z0-9_]* { yylval.name = strdup (yytext); return IDENTIFIER; } [A-Za-z][-A-Za-z0-9_]* { yylval.name = strdup (yytext); return IDENTIFIER; }
[ \t] ; [ \t] ;
\n { lineno++; } \n { ++lineno; }
\.\. { return DOTDOT; } \.\. { return DOTDOT; }
. { error_message("Ignoring char(%c)\n", *yytext); } . { error_message("Ignoring char(%c)\n", *yytext); }
%% %%
@@ -92,12 +97,12 @@ yywrap ()
#endif #endif
void void
error_message (char *format, ...) error_message (const char *format, ...)
{ {
va_list args; va_list args;
va_start (args, format); va_start (args, format);
fprintf (stderr, ":%d: ", lineno); fprintf (stderr, "%s:%d: ", filename(), lineno);
vfprintf (stderr, format, args); vfprintf (stderr, format, args);
va_end (args); va_end (args);
} }