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

diff --git a/src/backends/jvm/generator-jvm-basic.c b/src/backends/jvm/generator-jvm-basic.c
index bcd82a2..27f1c56 100644
--- a/src/backends/jvm/generator-jvm-basic.c
+++ b/src/backends/jvm/generator-jvm-basic.c
@@ -53,7 +53,7 @@ jvm_get_descriptor(oberon_type_t * type)
 
 	switch(type -> class)
 	{
-		case OBERON_TYPE_VOID:
+		case OBERON_TYPE_NOTYPE:
 			return new_string("V");
 			break;
 		case OBERON_TYPE_INTEGER:
@@ -126,6 +126,26 @@ jvm_get_descriptor(oberon_type_t * type)
 			desc = jvm_get_descriptor(type -> base);
 			return new_string("[%s", desc);
 			break;
+		case OBERON_TYPE_STRING:
+			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 string size %i", type -> size);
+					break;
+			}
+			break;
 		default:
 			gen_error("jvm_get_descriptor: unsupported type class %i", type -> class);
 			break;
@@ -173,13 +193,15 @@ jvm_get_prefix(oberon_type_t * type)
 		case OBERON_TYPE_ARRAY:
 		case OBERON_TYPE_RECORD:
 		case OBERON_TYPE_POINTER:
+		case OBERON_TYPE_STRING:
+		case OBERON_TYPE_NIL:
 			return 'a';
 			break;
 		case OBERON_TYPE_REAL:
 			return (size <= 4) ? ('f') : ('d');
 			break;
 		default:
-			gen_error("jvm_get_prefix: wat");
+			gen_error("jvm_get_prefix: wat %i", type -> class);
 			return '!';
 			break;
 	}
@@ -239,6 +261,8 @@ jvm_get_postfix(oberon_type_t * type)
 		case OBERON_TYPE_ARRAY:
 		case OBERON_TYPE_RECORD:
 		case OBERON_TYPE_POINTER:
+		case OBERON_TYPE_STRING:
+		case OBERON_TYPE_NIL:
 			return 'a';
 			break;
 		case OBERON_TYPE_REAL:
@@ -252,17 +276,45 @@ jvm_get_postfix(oberon_type_t * type)
 	return '!';
 }
 
+char *
+jvm_get_name(oberon_object_t * x)
+{
+	switch(x -> class)
+	{
+		case OBERON_CLASS_VAR:
+		case OBERON_CLASS_VAR_PARAM:
+		case OBERON_CLASS_PARAM:
+		case OBERON_CLASS_FIELD:
+			return new_string(x -> name);
+		case OBERON_CLASS_PROC:
+			if(x -> parent)
+			{
+				return new_string("%s$%s", jvm_get_name(x -> parent), x -> name);
+			}
+			else
+			{
+				return new_string(x -> name);
+			}
+		default:
+			gen_error("jvm_get_name: wat");
+	}
+
+	return NULL;
+}
+
 char *
 jvm_get_field_full_name(oberon_object_t * x)
 {
+	char * parent;
 	switch(x -> class)
 	{
 		case OBERON_CLASS_VAR:
+			return new_string("%s/%s", x -> module -> name, jvm_get_name(x));
 		case OBERON_CLASS_PROC:
-			return new_string("%s/%s", x -> module -> name, x -> name);
-		case OBERON_CLASS_FIELD:;
-			char * rec_name = jvm_get_class_full_name(x -> parent_type);
-			return new_string("%s/%s", rec_name, x -> name);
+			return new_string("%s/%s", x -> module -> name, jvm_get_name(x));
+		case OBERON_CLASS_FIELD:
+			parent = jvm_get_class_full_name(x -> parent_type);
+			return new_string("%s/%s", parent, jvm_get_name(x));
 		case OBERON_CLASS_MODULE:
 			return new_string(x -> module -> name);
 		default:
@@ -314,6 +366,7 @@ jvm_get_class_full_name(oberon_type_t * type)
 
 			int num = type -> num_decl;
 			oberon_object_t * arg = type -> decl;
+
 			for(int i = 0; i < num; i++)
 			{
 				desc = jvm_get_descriptor_safe(arg -> type);
@@ -334,29 +387,6 @@ jvm_get_class_full_name(oberon_type_t * type)
 	return name;
 }
 
-char *
-jvm_get_procedure_signature(oberon_type_t * proc)
-{
-	char * signature;
-	char * desc;
-
-	signature = new_string("(");
-
-	int num = proc -> num_decl;
-	oberon_object_t * arg = proc -> decl;
-	for(int i = 0; i < num; i++)
-	{
-		desc = jvm_get_descriptor(arg -> type);
-		signature = new_string("%s%s", signature, desc);
-		arg = arg -> next;
-	}
-
-	desc = jvm_get_descriptor(proc -> base);
-	signature = new_string("%s)%s", signature, desc);
-
-	return signature;
-}
-
 int
 jvm_cell_size_for_type(oberon_type_t * type)
 {
@@ -370,7 +400,7 @@ jvm_cell_size_for_type(oberon_type_t * type)
 			return 2;
 		}
 	}
-	else if(type -> class == OBERON_TYPE_VOID)
+	else if(type -> class == OBERON_TYPE_NOTYPE)
 	{
 		return 0;
 	}