Enable i18n in Bison.

[cdecl99.git] / src / parse-decl.c

diff --git a/src/parse-decl.c b/src/parse-decl.c
index 47b60a346824301635eec8fa207fa2562946bdbb..dc187c00b00c440eb5b059781b376f4e3ffdf712 100644 (file)
--- a/src/parse-decl.c
+++ b/src/parse-decl.c
@@ -23,6 +23,7 @@
 #include "typemap.h"
 #include "parse.h"
 #include "scan.h"
+#include "i18n.h"
 
 /*
  * Determine if a declarator declares an identifier (other than a function
@@ -51,8 +52,7 @@ static bool valid_declspecs(struct cdecl *decl, bool top)
 
        typemap = cdecl__build_typemap(specs);
        if (typemap == -1)
-               return -1;
-
+               return false;
 
        for (struct cdecl_declspec *c = specs; c; c = c->next) {
                switch (cdecl_spec_kind(c)) {
@@ -392,14 +392,16 @@ struct cdecl *cdecl_parse_decl(const char *declstr)
        struct cdecl *decl;
        int rc;
 
-       rc = yylex_init(&scanner);
+       cdecl__init_i18n();
+
+       rc = cdecl__yylex_init(&scanner);
        if (rc != 0)
                return NULL;
 
-       state = yy_scan_string(declstr, scanner);
-       rc = yyparse(scanner, &decl);
-       yy_delete_buffer(state, scanner);
-       yylex_destroy(scanner);
+       state = cdecl__yy_scan_string(declstr, scanner);
+       rc = cdecl__yyparse(scanner, &decl);
+       cdecl__yy_delete_buffer(state, scanner);
+       cdecl__yylex_destroy(scanner);
 
        if (rc != 0)
                return NULL;
@@ -430,3 +432,42 @@ err:
        cdecl_free(decl);
        return NULL;
 }
+
+struct cdecl *cdecl_parse_english(const char *english)
+{
+       YY_BUFFER_STATE state;
+       yyscan_t scanner;
+       struct cdecl *decl;
+       int rc;
+
+       cdecl__init_i18n();
+
+       rc = cdecl__yylex_init_extra(true, &scanner);
+       if (rc != 0)
+               return NULL;
+
+       state = cdecl__yy_scan_string(english, scanner);
+       rc = cdecl__yyparse(scanner, &decl);
+       cdecl__yy_delete_buffer(state, scanner);
+       cdecl__yylex_destroy(scanner);
+
+       if (rc != 0)
+               return NULL;
+
+       for (struct cdecl *i = decl; i; i = i->next) {
+               if (!forall_declarators(i, check_parameters))
+                       goto err;
+               if (!forall_declarators(i, check_rettypes))
+                       goto err;
+               if (!forall_declarators(i, check_arrays))
+                       goto err;
+
+               if (!valid_declspecs(i, true))
+                       goto err;
+       }
+
+       return decl;
+err:
+       cdecl_free(decl);
+       return NULL;
+}