diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/food.c | 2 | ||||
| -rw-r--r-- | src/parser.c | 15 |
2 files changed, 12 insertions, 5 deletions
@@ -180,7 +180,7 @@ main(int argc, char * argv[]) for (int i = 0; i < n; i++) { recipe * r = parse(lib[i], NULL); if (!r) { - fprintf(stderr, "Recipe %s not found\n", lib[i]); + fprintf(stderr, "Couldn't parse recipe: %s\n", lib[i]); continue; } diff --git a/src/parser.c b/src/parser.c index e4bffb4..9206f42 100644 --- a/src/parser.c +++ b/src/parser.c @@ -87,7 +87,10 @@ parse_item(const char * s, recipe * r, pt * type, char * error) char buf[LINE_SIZE] = ""; for (int i = 0; i < l; i++) { if (val) { - if (s[i] == ',' || s[i] == '=') { + if (s[i] == ',' || s[i] == '=' || i == l - 1) { + if (i == l - 1) { + buf[c++] = s[i]; + } buf[c++] = '\0'; if (!strlen(buf)) { sprintf(error, "malformed ingredient: %s", s); @@ -118,8 +121,9 @@ parse_item(const char * s, recipe * r, pt * type, char * error) } if (!strlen(buf)) { - sprintf(error, "empty ingredient quantity: %s", s); - return 1; + // sprintf(error, "empty ingredient quantity: %s", s); + // return 1; + strcpy(buf, "*"); } for (int i = 0; i < itemc; i++) { @@ -230,7 +234,10 @@ parse(char * path, const char * prev) strcpy(tmp, path); } f = fopen(tmp, "r"); - if (!f) return NULL; + if (!f) { + fprintf(stderr, "Can't open %s\n", path); + return NULL; + } } recipe * r = new_recipe(); |