Let git ignore more visual studio files.

[cparser] / wrappergen / write_jna.c

diff --git a/wrappergen/write_jna.c b/wrappergen/write_jna.c
index 26bfd4e..2285206 100644 (file)
--- a/wrappergen/write_jna.c
+++ b/wrappergen/write_jna.c
@@ -40,7 +40,11 @@ static void write_type(type_t *type);
 
 static bool is_system_header(const char *fname)
 {
-       return strncmp(fname, "/usr/include", 12) == 0;
+       if (strncmp(fname, "/usr/include", 12) == 0)
+               return true;
+       if (fname == builtin_source_position.input_name)
+               return true;
+       return false;
 }
 
 static const char *fix_builtin_names(const char *name)
@@ -99,7 +103,7 @@ static void write_pointer_type(const pointer_type_t *type)
        }
        if (is_type_pointer(points_to)) {
                /* hack... */
-               fputs("Pointer[]", out);
+               fputs("java.nio.Buffer", out);
                return;
        }
        fputs("Pointer", out);
@@ -301,8 +305,12 @@ 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: {
                /* UHOH... hacking */
                entity_t *entity = expression->reference.entity;
@@ -393,7 +401,7 @@ static void write_function(const entity_t *entity)
        const function_type_t *function_type
                = (const function_type_t*) entity->declaration.type;
 
-       fputc('\t', out);
+       fprintf(out, "\tpublic static native ");
        type_t *return_type = skip_typeref(function_type->return_type);
        write_type(return_type);
        fprintf(out, " %s(", entity->base.symbol->string);
@@ -436,24 +444,28 @@ void write_jna_decls(FILE *output, const translation_unit_t *unit)
 
        print_to_file(out);
        fprintf(out, "/* WARNING: Automatically generated file */\n");
-       fputs("import com.sun.jna.Library;\n", out);
+       fputs("import com.sun.jna.Native;\n", out);
        fputs("import com.sun.jna.Pointer;\n", out);
        fputs("\n\n", out);
 
        /* TODO: where to get the name from? */
-       fputs("public interface binding extends Library {\n", out);
+       fputs("public class binding {\n", out);
+       fputs("\tstatic { Native.register(\"firm\"); }\n", out);
 
        /* read the avoid list */
        FILE *avoid = fopen("avoid.config", "r");
        if (avoid != NULL) {
                while (!feof(avoid)) {
                        char buf[1024];
-                       fgets(buf, sizeof(buf), avoid);
+                       char *res = fgets(buf, sizeof(buf), avoid);
+                       if (res == NULL)
+                               break;
+                       if (buf[0] == 0)
+                               continue;
+
                        size_t len = strlen(buf);
                        if (buf[len-1] == '\n')
                                buf[len-1] = 0;
-                       if (buf[0] == 0)
-                               continue;
 
                        char *str = malloc(len+1);
                        memcpy(str, buf, len+1);