Hand-code the normalized specifier ordering.

[cdecl99.git] / src / cdecl.h

diff --git a/src/cdecl.h b/src/cdecl.h
index ffc01e36002194b72139d13147e922f54ff79ac7..11e0099ee28f5c47c3905a9413043b95e50116f3 100644 (file)
--- a/src/cdecl.h
+++ b/src/cdecl.h
@@ -23,10 +23,10 @@
 
 /* Declaration specifier kinds. */
 enum {
-       CDECL_SPEC_TYPE = 0,
-       CDECL_SPEC_STOR = 256,
-       CDECL_SPEC_QUAL = 512,
-       CDECL_SPEC_FUNC = 1024,
+       CDECL_SPEC_TYPE = 256,
+       CDECL_SPEC_STOR = 512,
+       CDECL_SPEC_QUAL = 1024,
+       CDECL_SPEC_FUNC = 2048,
 };
 
 enum {
@@ -41,6 +41,7 @@ enum {
        CDECL_TYPE_UNSIGNED,
        CDECL_TYPE_BOOL,
        CDECL_TYPE_COMPLEX,
+       CDECL_TYPE_IMAGINARY,
        CDECL_TYPE_STRUCT,
        CDECL_TYPE_UNION,
        CDECL_TYPE_ENUM,
@@ -62,6 +63,7 @@ enum {
        CDECL_DECL_IDENT,
        CDECL_DECL_POINTER,
        CDECL_DECL_ARRAY,
+       CDECL_DECL_FUNCTION,
 };
 
 struct cdecl {
@@ -85,18 +87,45 @@ struct cdecl {
                                char *vla;
                                uintmax_t length;
                        } array;
+                       struct cdecl_function {
+                               struct cdecl *parameters;
+                               _Bool variadic;
+                       } function;
                } u;
        } *declarators;
 };
 
 struct cdecl *cdecl_parse_decl(const char *declstr);
+struct cdecl *cdecl_parse_english(const char *english);
 void cdecl_free(struct cdecl *decl);
 
 size_t cdecl_explain(char *buf, size_t n, struct cdecl *decl);
+size_t cdecl_declare(char *buf, size_t n, struct cdecl *decl);
 
-static inline int cdecl_spec_kind(struct cdecl_declspec *spec)
+static inline int cdecl_spec_kind(const struct cdecl_declspec *spec)
 {
-       return spec->type & ~0xffu;
+       return spec->type & ~(CDECL_SPEC_TYPE-1u);
 }
 
+static inline _Bool cdecl_is_abstract(const struct cdecl_declarator *d)
+{
+       while (d->child)
+               d = d->child;
+
+       return d->type != CDECL_DECL_IDENT;
+}
+
+/* Error handling. */
+enum {
+       CDECL_ENOMEM,
+       CDECL_ENOPARSE,
+};
+
+struct cdecl_error {
+       unsigned code;
+       const char *str;
+};
+
+const struct cdecl_error *cdecl_get_error(void);
+
 #endif