diff options
author | David Gibson <david@gibson.dropbear.id.au> | 2009-12-08 14:24:42 +1100 |
---|---|---|
committer | Jon Loeliger <jdl@jdl.com> | 2010-01-14 07:53:00 -0600 |
commit | c6225f86fd7fe2c46ba30203e0582900e2260f9c (patch) | |
tree | 1f04d566b624a6dab149928cfdbc3d174ca5fe2e /srcpos.c | |
parent | e1fee329e2a74141fc6872a5c4307d078c4ba553 (diff) | |
download | dtc-c6225f86fd7fe2c46ba30203e0582900e2260f9c.zip dtc-c6225f86fd7fe2c46ba30203e0582900e2260f9c.tar.gz dtc-c6225f86fd7fe2c46ba30203e0582900e2260f9c.tar.bz2 |
dtc: Cleanup YYLTYPE and YYLLOC_DEFAULT declarations
This patch makes some small cleanups to the declaration of YYLTYPE,
YYLLOC_DEFAULT and related things.
- We used to use undocumented magic #defines for bison,
YYLTYPE_IS_DECLARED and YYLTYPE_IS_TRIVIAL. This may not be
portable across bison versions. Instead define YYLTYPE as a
macro in terms of struct srcpos, as the info pages suggest.
- Our kernel-derived coding style discourages typedefed
structures. So use 'struct srcpos' instead of 'srcpos'
throughout'.
- Indent the YYLLOC_DEFAULT macro according to our coding
style (it was in GNU indent style, since it was taken from
the example in the bison info).
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'srcpos.c')
-rw-r--r-- | srcpos.c | 22 |
1 files changed, 11 insertions, 11 deletions
@@ -119,7 +119,7 @@ int srcfile_pop(void) * The empty source position. */ -srcpos srcpos_empty = { +struct srcpos srcpos_empty = { .first_line = 0, .first_column = 0, .last_line = 0, @@ -129,7 +129,7 @@ srcpos srcpos_empty = { #define TAB_SIZE 8 -void srcpos_update(srcpos *pos, const char *text, int len) +void srcpos_update(struct srcpos *pos, const char *text, int len) { int i; @@ -153,13 +153,13 @@ void srcpos_update(srcpos *pos, const char *text, int len) pos->last_column = current_srcfile->colno; } -srcpos * -srcpos_copy(srcpos *pos) +struct srcpos * +srcpos_copy(struct srcpos *pos) { - srcpos *pos_new; + struct srcpos *pos_new; - pos_new = xmalloc(sizeof(srcpos)); - memcpy(pos_new, pos, sizeof(srcpos)); + pos_new = xmalloc(sizeof(struct srcpos)); + memcpy(pos_new, pos, sizeof(struct srcpos)); return pos_new; } @@ -167,7 +167,7 @@ srcpos_copy(srcpos *pos) void -srcpos_dump(srcpos *pos) +srcpos_dump(struct srcpos *pos) { printf("file : \"%s\"\n", pos->file ? (char *) pos->file : "<no file>"); @@ -180,7 +180,7 @@ srcpos_dump(srcpos *pos) char * -srcpos_string(srcpos *pos) +srcpos_string(struct srcpos *pos) { const char *fname = "<no-file>"; char *pos_str; @@ -210,7 +210,7 @@ srcpos_string(srcpos *pos) void -srcpos_error(srcpos *pos, char const *fmt, ...) +srcpos_error(struct srcpos *pos, char const *fmt, ...) { const char *srcstr; va_list va; @@ -227,7 +227,7 @@ srcpos_error(srcpos *pos, char const *fmt, ...) void -srcpos_warn(srcpos *pos, char const *fmt, ...) +srcpos_warn(struct srcpos *pos, char const *fmt, ...) { const char *srcstr; va_list va; |