Change yyerror to use stdarg so we can give more descriptive errors.
PATCH 1/1 Change yyerror to use stdarg so we can give more descriptive errors.
The subject pretty much says it all. The patch is to allow dtc to give more descriptive errors by having yyerror take a variable number of parameters printf style.
- John
---
dtc-parser.y | 15 ++++++++++----- srcpos.c | 21 +++++++++++++-------- srcpos.h | 2 ++ 3 files changed, 25 insertions(+), 13 deletions(-)
dtc-parser.y +10 -5
@@ -27,7 +27,7 @@ YYLTYPE yylloc; extern int yylex(void); -extern void yyerror(char const *s); +extern void yyerror(char const *fmt, ...); extern struct boot_info *the_boot_info; extern int treesource_error;
@@ -136,8 +136,8 @@ devicetree: if (target) merge_nodes(target, $3); else - yyerror("label does not exist in " - " node redefinition"); + yyerror("label, '%s' does not exist in" + " node extension", $2); $$ = $1; } ;
@@ -314,9 +314,14 @@ subnode: %% -void yyerror(char const *s) +void yyerror(char const *fmt, ...) { - srcpos_error(&yylloc, "%s", s); + va_list va; + + va_start(va, fmt); + srcpos_verror(&yylloc, fmt, va); + va_end(va); + treesource_error = 1; }
srcpos.c +13 -8
@@ -208,20 +208,25 @@ srcpos_string(struct srcpos *pos)return pos_str; } +void +srcpos_verror (struct srcpos *pos,char const *fmt,va_list va) +{ +const char *srcstr; + + srcstr =srcpos_string (pos); + +fprintf (stdout,"Error: %s " , srcstr); +vfprintf (stdout, fmt, va); +fprintf (stdout,"\n" ); +}void srcpos_error (struct srcpos *pos,char const *fmt, ...) { -const char *srcstr;va_list va; -va_start (va, fmt); - - srcstr =srcpos_string (pos); - -fprintf (stderr,"Error: %s " , srcstr); -vfprintf (stderr, fmt, va); -fprintf (stderr,"\n" ); +va_start (va, fmt); +srcpos_verror (pos, fmt, va);va_end (va); }
srcpos.h +2 -0
@@ -76,6 +76,8 @@ extern struct srcpos *srcpos_copy(struct srcpos *pos);extern char *srcpos_string (struct srcpos *pos);extern void srcpos_dump (struct srcpos *pos); +extern void srcpos_verror (struct srcpos *pos,char const *,va_list va) + __attribute__((format (printf,2 ,0 )));extern void srcpos_error (struct srcpos *pos,char const *, ...) __attribute__((format (printf,2 ,3 )));extern void srcpos_warn (struct srcpos *pos,char const *, ...)
Quoted 5 lines · John Bonesio
The subject pretty much says it all. The patch is to allow dtc to give more descriptive errors by having yyerror take a variable number of parameters printf style.
- John
Missing your Signed-off-by line.
One trivial comment below, but otherwise looks right to me.
Quoted 21 lines
---
dtc-parser.y | 15 ++++++++++----- srcpos.c | 21 +++++++++++++-------- srcpos.h | 2 ++ 3 files changed, 25 insertions(+), 13 deletions(-)dtc-parser.y +1
-1@@ -27,7 +27,7 @@ YYLTYPE yylloc; extern int yylex(void); -extern void yyerror(char const *s); +extern void yyerror(char const *fmt, ...); extern struct boot_info *the_boot_info; extern int treesource_error;
dtc-parser.y devicetree: · line 140
Quoted 7 lines
dtc-parser.y +2
-2@@ -136,8 +136,8 @@ devicetree: if (target) merge_nodes(target, $3); else - yyerror("label does not exist in " - " node redefinition"); + yyerror("label, '%s' does not exist in" + " node extension", $2);
Actually, the neither the original nor the new message is very accurate. How about simply:
"label '%s' does not exist"
or perhaps
"reference to non-existent label '%s'".
Quoted 76 lines
dtc-parser.y +7
-2$$ = $1; } ;@@ -314,9 +314,14 @@ subnode: %% -void yyerror(char const *s) +void yyerror(char const *fmt, ...) { - srcpos_error(&yylloc, "%s", s); + va_list va; + + va_start(va, fmt); + srcpos_verror(&yylloc, fmt, va); + va_end(va); + treesource_error = 1; }srcpos.c +13
-8@@ -208,20 +208,25 @@ srcpos_string(struct srcpos *pos)return pos_str; } +void +srcpos_verror (struct srcpos *pos,char const *fmt,va_list va) +{ +const char *srcstr; + + srcstr =srcpos_string (pos); + +fprintf (stdout,"Error: %s " , srcstr); +vfprintf (stdout, fmt, va); +fprintf (stdout,"\n" ); +}void srcpos_error (struct srcpos *pos,char const *fmt, ...) { -const char *srcstr;va_list va; -va_start (va, fmt); - - srcstr =srcpos_string (pos); - -fprintf (stderr,"Error: %s " , srcstr); -vfprintf (stderr, fmt, va); -fprintf (stderr,"\n" ); +va_start (va, fmt); +srcpos_verror (pos, fmt, va);va_end (va); }srcpos.h +2
-0@@ -76,6 +76,8 @@ extern struct srcpos *srcpos_copy(struct srcpos *pos);extern char *srcpos_string (struct srcpos *pos);extern void srcpos_dump (struct srcpos *pos); +extern void srcpos_verror (struct srcpos *pos,char const *,va_list va) + __attribute__((format (printf,2 ,0 )));extern void srcpos_error (struct srcpos *pos,char const *, ...) __attribute__((format (printf,2 ,3 )));extern void srcpos_warn (struct srcpos *pos,char const *, ...)_______________________________________________
devicetree-discuss mailing list devicetree-discuss-uLR06cmDAlY/[email protected]
https://lists.ozlabs.org/listinfo/devicetree-discuss
Quoted 3 lines · John Bonesio
The subject pretty much says it all. The patch is to allow dtc to give more descriptive errors by having yyerror take a variable number of parameters printf style.
Sorry, nack. yyerror() is provided for bison's convenience and is defined by that interface to be void yyerror(const char *s). We just use it explicitly because it happens to be there.
Yes, I know it's unlikely that bison would supply a string with format specifiers which would mess things up but I'm still not comfortable changing the signature when there's no need. If you want a varargs error printing function, define and use one (well, if srcpos_error() isn't close enough) instead of yyerror().
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson