X-Git-Url: https://deadsoftware.ru/gitweb?p=dsw-obn.git;a=blobdiff_plain;f=src%2Fbackends%2Fjvm%2Fgenerator-jvm.c;h=2456aa79cd9bafd5a6b4e71f26c5715ea250e9e8;hp=5b45cc166bca184d32d0640a24f9f90a016617ef;hb=8c59e1e41700802575cefb289600028909c5ffc2;hpb=2985d77f3ee4af98761b28b4ce1e57582d8c8619

diff --git a/src/backends/jvm/generator-jvm.c b/src/backends/jvm/generator-jvm.c
index 5b45cc1..2456aa7 100644
--- a/src/backends/jvm/generator-jvm.c
+++ b/src/backends/jvm/generator-jvm.c
@@ -319,6 +319,7 @@ oberon_generator_init_context(oberon_context_t * ctx)
 	memset(gen_context, 0, sizeof *gen_context);
 
 	ctx -> gen_context = gen_context;
+	gen_context -> dir = ".";
 }
 
 void
@@ -327,7 +328,7 @@ oberon_generator_destroy_context(oberon_context_t * ctx)
 }
 
 static void
-oberon_generate_procedure_class(oberon_type_t * proc)
+oberon_generate_procedure_class(const char * dir, oberon_type_t * proc)
 {
 	FILE * fp;
 	char * cname;
@@ -335,7 +336,7 @@ oberon_generate_procedure_class(oberon_type_t * proc)
 	struct gen_class * class; 
 
 	cname = jvm_get_class_full_name(proc);
-	class = jvm_create_class(cname);
+	class = jvm_create_class(dir, cname);
 	fp = class -> fp;
 
 	fprintf(fp, ".source SYSTEM\n");
@@ -357,7 +358,7 @@ oberon_generate_procedure_class(oberon_type_t * proc)
 }
 
 static void
-oberon_generate_procedure_pointer_class(oberon_object_t * proc)
+oberon_generate_procedure_pointer_class(const char * dir, oberon_object_t * proc)
 {
 	FILE * fp;
 	char * cname;
@@ -367,7 +368,7 @@ oberon_generate_procedure_pointer_class(oberon_object_t * proc)
 	struct gen_class * class;
 
 	cname = jvm_get_field_full_name_safe(proc);
-	class = jvm_create_class(cname);
+	class = jvm_create_class(dir, cname);
 	abscname = jvm_get_class_full_name(proc -> type);
 	absdesc = jvm_get_descriptor(proc -> type);
 	fp = class -> fp;
@@ -440,7 +441,7 @@ oberon_generate_procedure_pointer_class(oberon_object_t * proc)
 }
 
 static void
-oberon_generate_record_class(gen_module_t * m, oberon_type_t * rec)
+oberon_generate_record_class(const char * dir, gen_module_t * m, oberon_type_t * rec)
 {
 	char * cname;
 	struct gen_class * class;
@@ -450,7 +451,7 @@ oberon_generate_record_class(gen_module_t * m, oberon_type_t * rec)
 	m -> rec_id += 1;
 
 	cname = jvm_get_class_full_name(rec);
-	class = jvm_create_class(cname);
+	class = jvm_create_class(dir, cname);
 
 	fprintf(class -> fp, ".source %s\n", rec -> module -> name);
 	fprintf(class -> fp, ".class  public %s\n", cname);
@@ -475,6 +476,9 @@ oberon_generator_init_type(oberon_context_t * ctx, oberon_type_t * type)
 	memset(t, 0, sizeof *t);
 	type -> gen_type = t;
 
+	gen_context_t * c;
+	c = ctx -> gen_context;
+
 	gen_module_t * m;
 	switch(type -> class)
 	{
@@ -491,10 +495,10 @@ oberon_generator_init_type(oberon_context_t * ctx, oberon_type_t * type)
 			break;
 		case OBERON_TYPE_RECORD:
 			m = type -> module -> gen_mod;
-			oberon_generate_record_class(m, type);
+			oberon_generate_record_class(c -> dir, m, type);
 			break;
 		case OBERON_TYPE_PROCEDURE:
-			oberon_generate_procedure_class(type);
+			oberon_generate_procedure_class(c -> dir, type);
 			break;
 		default:
 			gen_error("oberon_generator_init_type: unk calss %i", type -> class);
@@ -693,8 +697,11 @@ oberon_generator_init_module(oberon_context_t * ctx, oberon_module_t * mod)
 	memset(m, 0, sizeof *m);
 	mod -> gen_mod = m;
 
+	gen_context_t * c;
+	c = ctx -> gen_context;
+
 	struct gen_class * class;
-	class = jvm_create_class(mod -> name);
+	class = jvm_create_class(c -> dir, mod -> name);
 
 	fprintf(class -> fp, ".source %s\n", mod -> name);
 	fprintf(class -> fp, ".class %s\n", mod -> name);
@@ -702,7 +709,7 @@ oberon_generator_init_module(oberon_context_t * ctx, oberon_module_t * mod)
 
 	m -> class = class;
 
-	ctx -> gen_context -> current_m = m;
+	c -> current_m = m;
 }
 
 void
@@ -893,7 +900,7 @@ oberon_generate_begin_proc(oberon_context_t * ctx, oberon_object_t * proc)
 	}
 	else
 	{
-		oberon_generate_procedure_pointer_class(proc);
+		oberon_generate_procedure_pointer_class(p -> class -> dir, proc);
 		signature = jvm_get_procedure_signature(proc -> type);
 	}
 
@@ -1795,3 +1802,12 @@ oberon_generate_halt(oberon_context_t * ctx, int64_t n)
 	jvm_generate(p, 2, 0, "invokestatic SYSTEM/HALT(J)V");
 }
 
+void
+oberon_set_out_directory(oberon_context_t * ctx, const char * path)
+{
+	gen_context_t * c;
+
+	c = ctx -> gen_context;
+
+	c -> dir = new_string(path);
+}