provide our own hashset implementation

[cparser] / wrappergen / write_jna.c

diff --git a/wrappergen/write_jna.c b/wrappergen/write_jna.c
index 2cdadb9..b209042 100644 (file)
--- a/wrappergen/write_jna.c
+++ b/wrappergen/write_jna.c
@@ -32,7 +32,7 @@
 #include "printer.h"
 #include "adt/error.h"
 #include "adt/xmalloc.h"
-#include <libfirm/adt/pset_new.h>
+#include "adt/pset_new.h"
 
 typedef struct output_limit {
        const char          *filename;
@@ -56,17 +56,17 @@ static bool is_system_header(const char *fname)
 
 static const char *fix_builtin_names(const char *name)
 {
-       if (strcmp(name, "class") == 0) {
+       if (streq(name, "class")) {
                return "_class";
-       } else if(strcmp(name, "this") == 0) {
+       } else if (streq(name, "this")) {
                return "_this";
-       } else if(strcmp(name, "public") == 0) {
+       } else if (streq(name, "public")) {
                return "_public";
-       } else if(strcmp(name, "protected") == 0) {
+       } else if (streq(name, "protected")) {
                return "_protected";
-       } else if(strcmp(name, "private") == 0) {
+       } else if (streq(name, "private")) {
                return "_private";
-       } else if(strcmp(name, "final") == 0) {
+       } else if (streq(name, "final")) {
                return "_final";
        }
        /* TODO put all reserved names here */
@@ -308,23 +308,20 @@ static void write_expression(const expression_t *expression)
        /* TODO */
        switch(expression->kind) {
        case EXPR_LITERAL_INTEGER:
-       case EXPR_LITERAL_INTEGER_OCTAL:
                fprintf(out, "%s", expression->literal.value.begin);
                break;
-       case EXPR_LITERAL_INTEGER_HEXADECIMAL:
-               fprintf(out, "0x%s", expression->literal.value.begin);
-               break;
-       case EXPR_REFERENCE_ENUM_VALUE: {
+
+       case EXPR_ENUM_CONSTANT: {
                /* UHOH... hacking */
                entity_t *entity = expression->reference.entity;
                write_enum_name(& entity->enum_value.enum_type->enumt);
                fprintf(out, ".%s.val", entity->base.symbol->string);
                break;
        }
-       EXPR_UNARY_CASES
+       case EXPR_UNARY_CASES:
                write_unary_expression(&expression->unary);
                break;
-       EXPR_BINARY_CASES
+       case EXPR_BINARY_CASES:
                write_binary_expression(&expression->binary);
                break;
        default:
@@ -520,8 +517,7 @@ void write_jna_decls(FILE *output, const translation_unit_t *unit)
                }
 
 #if 0
-               if(type->kind == TYPE_COMPOUND_STRUCT
-                               || type->kind == TYPE_COMPOUND_UNION) {
+               if (is_type_compound(type)) {
                        write_compound(entity->base.symbol, &type->compound);
                }
 #endif
@@ -541,7 +537,7 @@ void write_jna_decls(FILE *output, const translation_unit_t *unit)
                        bool in_limits = false;
                        for (output_limit *limit = output_limits; limit != NULL;
                             limit = limit->next) {
-                           if (strcmp(limit->filename, input_name) == 0) {
+                           if (streq(limit->filename, input_name)) {
                                        in_limits = true;
                                        break;
                                }