X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fbackends%2Fjvm%2Fgenerator-jvm-basic.c;h=bcd82a25476803cbcd4aca6e8aa0ecf9f4c24934;hb=9bcd389a97869b2ab6b1c6fdc35c0f09beab66c5;hp=aad9747f25cbf4d091e86db1f0ea9a3d098753dc;hpb=36c1947b3e98abab25f16a0f1c2679125651fe95;p=dsw-obn.git

diff --git a/src/backends/jvm/generator-jvm-basic.c b/src/backends/jvm/generator-jvm-basic.c
index aad9747..bcd82a2 100644
--- a/src/backends/jvm/generator-jvm-basic.c
+++ b/src/backends/jvm/generator-jvm-basic.c
@@ -57,6 +57,7 @@ jvm_get_descriptor(oberon_type_t * type)
 			return new_string("V");
 			break;
 		case OBERON_TYPE_INTEGER:
+		case OBERON_TYPE_SET:
 			switch(type -> size)
 			{
 				case 1:
@@ -133,6 +134,29 @@ jvm_get_descriptor(oberon_type_t * type)
 	return NULL;
 }
 
+char *
+jvm_get_descriptor_safe(oberon_type_t * type)
+{
+	switch(type -> class)
+	{
+		case OBERON_TYPE_POINTER:
+			return new_string("PTR%s", jvm_get_descriptor_safe(type -> base));
+			break;
+		case OBERON_TYPE_PROCEDURE:
+		case OBERON_TYPE_RECORD:
+			return jvm_get_class_full_name(type);
+			break;
+		case OBERON_TYPE_ARRAY:
+			return new_string("A%s", jvm_get_descriptor_safe(type -> base));
+			break;
+		default:
+			return jvm_get_descriptor(type);
+			break;
+	}
+
+	return NULL;
+}
+
 char
 jvm_get_prefix(oberon_type_t * type)
 {
@@ -142,6 +166,7 @@ jvm_get_prefix(oberon_type_t * type)
 		case OBERON_TYPE_BOOLEAN:
 		case OBERON_TYPE_INTEGER:
 		case OBERON_TYPE_CHAR:
+		case OBERON_TYPE_SET:
 			return (size <= 4) ? ('i') : ('l');
 			break;
 		case OBERON_TYPE_PROCEDURE:
@@ -170,6 +195,7 @@ jvm_get_postfix(oberon_type_t * type)
 			return 'b';
 			break;
 		case OBERON_TYPE_INTEGER:
+		case OBERON_TYPE_SET:
 			switch(size)
 			{
 				case 1:
@@ -283,14 +309,14 @@ jvm_get_class_full_name(oberon_type_t * type)
 			name = new_string("SYSTEM$PROCEDURE");
 
 			char * desc;
-			desc = jvm_get_descriptor(type -> base);
+			desc = jvm_get_descriptor_safe(type -> base);
 			name = new_string("%s$%s", name, desc);
 
 			int num = type -> num_decl;
 			oberon_object_t * arg = type -> decl;
 			for(int i = 0; i < num; i++)
 			{
-				desc = jvm_get_descriptor(arg -> type);
+				desc = jvm_get_descriptor_safe(arg -> type);
 				name = new_string("%s%s", name, desc);
 				arg = arg -> next;
 			}
@@ -335,13 +361,19 @@ int
 jvm_cell_size_for_type(oberon_type_t * type)
 {
 	if(type -> class == OBERON_TYPE_INTEGER
-		|| type -> class == OBERON_TYPE_REAL)
+		|| type -> class == OBERON_TYPE_REAL
+		|| type -> class == OBERON_TYPE_CHAR
+		|| type -> class == OBERON_TYPE_SET)
 	{
 		if(type -> size > 4)
 		{
 			return 2;
 		}
 	}
+	else if(type -> class == OBERON_TYPE_VOID)
+	{
+		return 0;
+	}
 
 	return 1;
 }