X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fbackends%2Fjvm%2Fgenerator-jvm-basic.c;h=88de2e2292119fbe5c8a4b090caee7c1051bc526;hb=86c0ca1aafd465a3e0d4a9d6b1af661eba483ae1;hp=2b9b5483efa3b7b76050a4c105d3cb4b20dc655c;hpb=e6a70a3b694efa5600cfcd0d8110f8d9e8866342;p=dsw-obn.git

diff --git a/src/backends/jvm/generator-jvm-basic.c b/src/backends/jvm/generator-jvm-basic.c
index 2b9b548..88de2e2 100644
--- a/src/backends/jvm/generator-jvm-basic.c
+++ b/src/backends/jvm/generator-jvm-basic.c
@@ -90,6 +90,26 @@ jvm_get_descriptor(oberon_type_t * type)
 					break;
 			}
 			break;
+		case OBERON_TYPE_CHAR:
+			switch(type -> size)
+			{
+				case 1:
+					return new_string("B");
+					break;
+				case 2:
+					return new_string("C");
+					break;
+				case 4:
+					return new_string("I");
+					break;
+				case 8:
+					return new_string("J");
+					break;
+				default:
+					gen_error("jvm_get_descriptor: unsupported char size %i", type -> size);
+					break;
+			}
+			break;
 		case OBERON_TYPE_BOOLEAN:
 			return new_string("Z");
 			break;
@@ -113,6 +133,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)
 {
@@ -121,6 +164,7 @@ jvm_get_prefix(oberon_type_t * type)
 	{
 		case OBERON_TYPE_BOOLEAN:
 		case OBERON_TYPE_INTEGER:
+		case OBERON_TYPE_CHAR:
 			return (size <= 4) ? ('i') : ('l');
 			break;
 		case OBERON_TYPE_PROCEDURE:
@@ -132,10 +176,11 @@ jvm_get_prefix(oberon_type_t * type)
 		case OBERON_TYPE_REAL:
 			return (size <= 4) ? ('f') : ('d');
 			break;
+		default:
+			gen_error("jvm_get_prefix: wat");
+			return '!';
+			break;
 	}
-
-	gen_error("jvm_get_prefix: wat");
-	return '!';
 }
 
 char
@@ -167,6 +212,26 @@ jvm_get_postfix(oberon_type_t * type)
 					break;
 			}
 			break;
+		case OBERON_TYPE_CHAR:
+			switch(size)
+			{
+				case 1:
+					return 'b';
+					break;
+				case 2:
+					return 'c';
+					break;
+				case 4:
+					return 'i';
+					break;
+				case 8:
+					return 'l';
+					break;
+				default:
+					gen_error("jvm_get_postfix: char wat");
+					break;
+			}
+			break;
 		case OBERON_TYPE_PROCEDURE:
 		case OBERON_TYPE_ARRAY:
 		case OBERON_TYPE_RECORD:
@@ -241,14 +306,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;
 			}