X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=wrappergen%2Fwrite_jna.c;h=d681f4768936d50854c2a747738f017d5d473129;hb=2fb66fd8bd2a5956ab2cad26978ccfb7e105d45f;hp=09ef6aa85f2c6a250771bd7ebfe21b7defd41f2a;hpb=911636db3ac676ff861f72277f68e0e2e0d2c3d6;p=cparser

diff --git a/wrappergen/write_jna.c b/wrappergen/write_jna.c
index 09ef6aa..d681f47 100644
--- a/wrappergen/write_jna.c
+++ b/wrappergen/write_jna.c
@@ -308,13 +308,10 @@ 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);
@@ -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