From 725c46abd1f6cda9612afbb28f1b3e8f952632d4 Mon Sep 17 00:00:00 2001
From: johnvg
Date: Thu, 5 Jan 2006 13:57:06 +0000
Subject: use the same file for list all types and list exported types as for
 list inferred types, list all types and list exported types didn't work on
 solaris, this should be fixed now

git-svn-id: https://svn.cs.ru.nl/repos/clean-compiler/trunk@1587 1f8540f1-abd5-4d5b-9d24-4c5ce8603e2d
---
 main/compile.icl | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'main')

diff --git a/main/compile.icl b/main/compile.icl
index 372880d..cb4d71e 100644
--- a/main/compile.icl
+++ b/main/compile.icl
@@ -284,21 +284,16 @@ compileModule options backendArgs cache=:{dcl_modules,functions_and_macros,prede
 		=	fclose io files
 	| not closed
 		=	abort ("couldn't close stdio")
-	# (closed, files)
-		=	fclose out files
-	| not closed
-		=	abort ("couldn't close out file \"" +++ options.outPath +++ "\"\n")
 	# var_heap=heaps.hp_var_heap
 	  hp_type_heaps=heaps.hp_type_heaps
 	  attrHeap=hp_type_heaps.th_attrs
-	# (success,functions_and_macros,var_heap,attrHeap,error, files)
+	# (success,functions_and_macros,var_heap,attrHeap,error, out)
 		= case optionalSyntaxTree of
 			Yes syntaxTree
 				# functions_and_macros = syntaxTree.fe_icl.icl_functions
-				# (success, var_heap, attrHeap, error, files)
-				 	 = backEndInterface outputPath (map appendRedirection backendArgs) options.listTypes options.outPath predef_symbols syntaxTree main_dcl_module_n var_heap attrHeap error files
-				-> (success,functions_and_macros,var_heap,attrHeap, error, files)
-				// -> (True,functions_and_macros,var_heap,attrHeap, error, files)
+				# (success, var_heap, attrHeap, error, out)
+				 	 = backEndInterface outputPath (map appendRedirection backendArgs) options.listTypes options.outPath predef_symbols syntaxTree main_dcl_module_n var_heap attrHeap error out
+				-> (success,functions_and_macros,var_heap,attrHeap, error, out)
 				with
 					appendRedirection arg
 						= case arg of
@@ -309,7 +304,7 @@ compileModule options backendArgs cache=:{dcl_modules,functions_and_macros,prede
 							arg
 								->	arg
 			No
-				-> (False,{},var_heap,attrHeap,error, files)
+				-> (False,{},var_heap,attrHeap,error, out)
 		with
 /*
 			outputPath
@@ -321,6 +316,9 @@ compileModule options backendArgs cache=:{dcl_modules,functions_and_macros,prede
 	//				=	/* directoryName options.pathName +++ "Clean System Files" +++ {DirectorySeparator} +++ */ baseName options.pathName
 				=	baseName options.pathName
 	# heaps = {heaps & hp_var_heap=var_heap, hp_type_heaps = {hp_type_heaps  & th_attrs = attrHeap}}
+	# (closed, files) = fclose out files
+	| not closed
+		=	abort ("couldn't close out file \"" +++ options.outPath +++ "\"\n")
 	# (closed, files)
 		=	fclose error files
 	| not closed
-- 
cgit v1.2.3