emileclarkb/hammer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

comma-separate properly in h_pprint_stringset

Browse source
This commit is contained in:
Sven M. Hallberg 2013-05-22 20:49:05 +02:00
parent f5d5c36756
commit 475d0ea9f3
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/cfgrammar.c
View file

@ -741,21 +741,20 @@ void h_pprint_symbolset(FILE *file, const HCFGrammar *g, const HHashSet *set, in
#define BUFSIZE 512 #define BUFSIZE 512
void pprint_stringset_elems(FILE *file, char *prefix, size_t n, const HCFStringMap *set) void pprint_stringset_elems(FILE *file, bool first, char *prefix, size_t n, const HCFStringMap *set)
{ {
assert(n < BUFSIZE-4); assert(n < BUFSIZE-4);
if(set->epsilon_branch) { if(set->epsilon_branch) {
if(n==0) { if(!first) fputc(',', file); first=false;
if(n==0)
fputs("''", file); fputs("''", file);
} else { else
fputc(',', file);
fwrite(prefix, 1, n, file); fwrite(prefix, 1, n, file);
} }
}
if(set->end_branch) { if(set->end_branch) {
fputc(',', file); if(!first) fputc(',', file); first=false;
fwrite(prefix, 1, n, file); fwrite(prefix, 1, n, file);
fputc('$', file); fputc('$', file);
} }
@ -787,7 +786,7 @@ void pprint_stringset_elems(FILE *file, char *prefix, size_t n, const HCFStringM
n_ += sprintf(prefix+n_, "\\x%.2X", c); n_ += sprintf(prefix+n_, "\\x%.2X", c);
} }
pprint_stringset_elems(file, prefix, n_, ends); pprint_stringset_elems(file, first, prefix, n_, ends);
} }
} }
} }
@ -799,6 +798,6 @@ void h_pprint_stringset(FILE *file, const HCFGrammar *g, const HCFStringMap *set
char buf[BUFSIZE]; char buf[BUFSIZE];
fputc('{', file); fputc('{', file);
pprint_stringset_elems(file, buf, 0, set); pprint_stringset_elems(file, true, buf, 0, set);
fputs("}\n", file); fputs("}\n", file);
} }