X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/0b82602331f058f1dea9fee1ecc37c503576855b..ad973d63e038f293f2b158f19b04c1582e616af0:/src/parse.y

diff --git a/src/parse.y b/src/parse.y
index 9c644da..bf2a596 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -1,7 +1,7 @@
 %code top {
 /*
  *  Parser for C declarations.
- *  Copyright © 2011 Nick Bowler
+ *  Copyright © 2011-2012, 2021 Nick Bowler
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -32,8 +32,8 @@
 #include <stdbool.h>
 
 #include "scan.h"
-#include "error.h"
 #include "cdecl.h"
+#include "cdecl-internal.h"
 
 #define FAIL(msg) do { \
 	yyerror(&yylloc, NULL, NULL, msg); \
@@ -42,8 +42,10 @@
 
 #define ALLOC(ptr, size) do { \
 	(ptr) = malloc(size); \
-	if (!(ptr)) \
-		FAIL("failed to allocate memory"); \
+	if (!(ptr)) { \
+		cdecl__err(CDECL_ENOMEM); \
+		YYERROR; \
+	} \
 } while (0)
 
 #define ALLOC_STRUCT(ptr, type, ...) do { \
@@ -58,12 +60,12 @@
 
 %code provides {
 void cdecl__free(struct cdecl *);
-void cdecl__yyerror(YYLTYPE *, void *, struct cdecl **, const char *);
 int cdecl__yyparse(void *scanner, struct cdecl **out);
 }
 
 %union {
 	uintmax_t uintval;
+	unsigned spectype;
 	_Bool boolval;
 	char *strval;
 	struct cdecl_declspec *declspec;
@@ -137,6 +139,15 @@ void cdecl__free(struct cdecl *decl)
 {
 	free_decl(decl);
 }
+
+static void
+yyerror(YYLTYPE *loc, yyscan_t scanner, struct cdecl **out, const char *err)
+{
+	if (strstr(err, "T_LEX_ERROR"))
+		return;
+
+	cdecl__err(CDECL_ENOPARSE, "%s", err);
+}
 %}
 
 %destructor { free($$); }            <strval>
@@ -205,7 +216,7 @@ void cdecl__free(struct cdecl *decl)
 
 %type <strval>     vla_ident
 %type <boolval>    varargs
-%type <uintval>    declspec_simple typespec_simple qualifier_simple
+%type <spectype>   declspec_simple typespec_simple qualifier_simple
 %type <declspec>   declspec_notype declspec_noid typespec_noid typespec
 %type <declspec>   qualifier qualifiers
 %type <declspec>   declspecs declspecs_noid
@@ -335,7 +346,7 @@ vla_ident: T_IDENT | T_ASTERISK {
 
 array: T_LBRACKET T_UINT T_RBRACKET {
 	if ($2 == 0)
-		FAIL("array length must be positive");
+		FAIL(_("array length must be positive"));
 
 	ALLOC_STRUCT($$, struct cdecl_declarator,
 		.type = CDECL_DECL_ARRAY,
@@ -562,7 +573,7 @@ english_array: T_VLA T_ARRAY english_vla T_OF {
 		.u.array.vla = $3);
 } | T_ARRAY T_UINT T_OF {
 	if ($2 == 0)
-		FAIL("array length must be positive");
+		FAIL(_("array length must be positive"));
 
 	ALLOC_STRUCT($$, struct cdecl_declarator,
 		.type = CDECL_DECL_ARRAY,
@@ -577,16 +588,3 @@ english_vla: T_IDENT | {
 	ALLOC($$, sizeof "");
 	strcpy($$, "");
 }
-
-%%
-void
-yyerror(YYLTYPE *loc, yyscan_t scanner, struct cdecl **out, const char *err)
-{
-	if (strstr(err, "T_LEX_ERROR"))
-		return;
-
-	cdecl__set_error(&(const struct cdecl_error){
-		.code = CDECL_ENOPARSE,
-		.str  = err,
-	});
-}