caching of dcl modules

git-svn-id: https://svn.cs.ru.nl/repos/clean-compiler/trunk@233 1f8540f1-abd5-4d5b-9d24-4c5ce8603e2d

1 files changed, 93 insertions, 29 deletions

diff --git a/main/compile.icl b/main/compile.icl
index c468e2e..b17a90e 100644
--- a/main/compile.icl
+++ b/main/compile.icl
@@ -10,8 +10,8 @@ import RWSDebug
 	{
 		moduleName
 			:: {#Char}
-	,	pathName
-			:: {#Char}
+	,	pathName ::
+			{#Char}
 	,	errorPath
 			:: {#Char}
 	,	errorMode
@@ -34,7 +34,7 @@ InitialCoclOptions =
 	,	errorMode
 			=	FWriteText
 	,	outPath
-			=	"messages"
+			=	"out"
 	,	outMode
 			=	FWriteText
 	,	searchPaths
@@ -43,10 +43,16 @@ InitialCoclOptions =
 
 compile :: [{#Char}] *Files -> (!Bool, !*Files)
 compile args files
-	=	compileModule (parseCommandLine args InitialCoclOptions) args files
+	# (args_without_modules,modules,cocl_options) = parseCommandLine args InitialCoclOptions
+	# heaps = { hp_var_heap = newHeap, hp_expression_heap = newHeap, hp_type_heaps = { th_vars = newHeap, th_attrs = newHeap }}
+	# (predef_symbols, hash_table) = buildPredefinedSymbols newHashTable
+	= compile_modules modules 0 cocl_options args_without_modules {} {} predef_symbols hash_table heaps files;
 
-parseCommandLine :: [{#Char}] CoclOptions -> CoclOptions
+parseCommandLine :: [{#Char}] CoclOptions -> ([{#Char}],[{#Char}],CoclOptions)
 parseCommandLine [] options
+	=	([],[],options)
+/*
+	// JVG: removed hack because the searchPaths list becomes too large when >1 file is compiled
 	=	prependModulePath options
 	where
 		// RWS +++ hack, both module name and file path should be passed to frontEndInterface
@@ -55,21 +61,30 @@ parseCommandLine [] options
 				&	moduleName = baseName pathName
 				,	searchPaths = {searchPaths & sp_paths = [directoryName pathName : searchPaths.sp_paths]}
 				}
-parseCommandLine ["-P", searchPathsString : args] options=:{searchPaths}
-	=	parseCommandLine args {options & searchPaths = {searchPaths & sp_paths = splitPaths searchPathsString}}
-parseCommandLine ["-RO", outPath : args] options
-	=	parseCommandLine args {options & outPath = stripQuotes outPath, outMode = FWriteText}
-parseCommandLine ["-RAO", outPath : args] options
-	=	parseCommandLine args {options & outPath = stripQuotes outPath, outMode = FAppendText}
-parseCommandLine ["-RE", errorPath : args] options
-	=	parseCommandLine args {options & errorPath = stripQuotes errorPath, errorMode = FWriteText}
-parseCommandLine ["-RAE", errorPath : args] options
-	=	parseCommandLine args {options & errorPath = stripQuotes errorPath, errorMode = FAppendText}
+*/
+parseCommandLine [arg1=:"-P", searchPathsString : args] options=:{searchPaths}
+// RWS, voor Maarten +++	=	parseCommandLine args {options & searchPaths = {searchPaths & sp_paths = splitPaths searchPathsString}}
+	# (args,modules,options) =	parseCommandLine args {options & searchPaths.sp_paths = splitPaths searchPathsString}
+	= ([arg1,searchPathsString:args],modules,options)
+parseCommandLine [arg1=:"-RO", outPath : args] options
+	# (args,modules,options)=	parseCommandLine args {options & outPath = stripQuotes outPath, outMode = FWriteText}
+	= ([arg1,outPath:args],modules,options)
+parseCommandLine [arg1=:"-RAO", outPath : args] options
+	# (args,modules,options)=	parseCommandLine args {options & outPath = stripQuotes outPath, outMode = FAppendText}
+	= ([arg1,outPath:args],modules,options)
+parseCommandLine [arg1=:"-RE", errorPath : args] options
+	# (args,modules,options)=	parseCommandLine args {options & errorPath = stripQuotes errorPath, errorMode = FWriteText}
+	= ([arg1,errorPath:args],modules,options)
+parseCommandLine [arg1=:"-RAE", errorPath : args] options
+	# (args,modules,options)=	parseCommandLine args {options & errorPath = stripQuotes errorPath, errorMode = FAppendText}
+	= ([arg1,errorPath:args],modules,options)
 parseCommandLine [arg : args] options
 	| arg.[0] == '-'
-		=	parseCommandLine args options
+		# (args,modules,options)=	parseCommandLine args options
+		= ([arg:args],modules,options)
 	// otherwise
-		=	parseCommandLine args {options & pathName = stripExtension ".icl" (stripQuotes arg)}
+		# (args,modules,options) = parseCommandLine args options
+		= (args,[arg : modules],options);
 
 stripExtension :: {#Char} {#Char} -> {#Char}
 stripExtension extension string
@@ -119,8 +134,49 @@ directoryName :: {#Char} -> {#Char}
 directoryName path
 	=	foldr (\p ps -> p +++ {DirectorySeparator} +++ ps) "" (init (splitBy DirectorySeparator path))
 
-compileModule :: CoclOptions [{#Char}] *Files -> (!Bool, !*Files)
-compileModule options commandLineArgs files
+compile_modules [module_:modules] n_compiles cocl_options args_without_modules dcl_modules functions_and_macros predef_symbols hash_table heaps files
+	# cocl_options = prependModulePath {cocl_options & pathName=stripExtension ".icl" (stripQuotes module_)}
+		with
+		// RWS +++ hack, both module name and file path should be passed to frontEndInterface
+		prependModulePath options=:{pathName, searchPaths}
+			=	{	options
+				&	moduleName = baseName pathName
+					// RWS, voor Maarten +++				,	searchPaths = {searchPaths & sp_paths = [directoryName pathName : searchPaths.sp_paths]}
+//				,	searchPaths = [directoryName pathName : searchPaths]
+				}
+	# (ok,dcl_modules,functions_and_macros,n_functions_and_macros_in_dcl_modules,predef_symbols,hash_table,heaps,files)
+		= compileModule cocl_options (args_without_modules++[module_]) dcl_modules functions_and_macros predef_symbols hash_table heaps files;
+	| ok
+//		# hash_table=remove_module_idents_from_symbol_table 0 dcl_modules hash_table;
+/*		# hash_table=remove_module_ident_from_symbol_table dcl_modules.[0] hash_table;
+			with
+			remove_module_idents_from_symbol_table module_n dcl_modules hash_table
+				| module_n==size dcl_modules
+					= hash_table;
+					# hash_table = remove_module_ident_from_symbol_table dcl_modules.[module_n] hash_table
+					= remove_module_idents_from_symbol_table (module_n+1) dcl_modules hash_table
+
+			remove_module_ident_from_symbol_table dcl_module hash_table
+					# module_symbol_pointer = dcl_module.dcl_name.id_info;
+					# symbol_heap=hash_table.hte_symbol_heap;
+					# (hte_entry,symbol_heap) = readPtr module_symbol_pointer symbol_heap
+					# symbol_heap=writePtr module_symbol_pointer {hte_entry & ste_kind=STE_Empty} symbol_heap
+					= {hash_table & hte_symbol_heap=symbol_heap}
+		# dcl_modules = {dcl_modules.[module_n] \\ module_n <-[1..size dcl_modules-1]}
+*/
+/*
+		# heaps = { hp_var_heap = newHeap, hp_expression_heap = newHeap, hp_type_heaps = { th_vars = newHeap, th_attrs = newHeap }}
+		# (predef_symbols, hash_table) = buildPredefinedSymbols newHashTable
+		= compile_modules modules 0 cocl_options args_without_modules {} {} predef_symbols hash_table heaps files;
+*/
+		= compile_modules modules (n_compiles+1) cocl_options args_without_modules dcl_modules functions_and_macros predef_symbols hash_table heaps files;
+
+		= (ok,files);
+compile_modules [] n_compiles cocl_options args_without_modules dcl_modules functions_and_macros predef_symbols hash_table heaps files
+	= (True,files);
+
+compileModule :: CoclOptions [{#Char}] {#DclModule} {#FunDef} *PredefinedSymbols !*HashTable *Heaps *Files -> (!Bool,!{#DclModule},!{#FunDef},!Int,!*PredefinedSymbols,!*HashTable,!*Heaps, !*Files)
+compileModule options commandLineArgs dcl_modules functions_and_macros predef_symbols hash_table heaps files
 	# (opened, error, files)
 		=	fopen options.errorPath options.errorMode files
 	| not opened
@@ -131,12 +187,12 @@ compileModule options commandLineArgs files
 		=	abort ("couldn't open out file \"" +++ options.outPath +++ "\"\n")
 	# (io, files)
 		=	stdio files
-	# (predefSymbols, hashTable) = buildPredefinedSymbols newHashTable
-	  (moduleIdent, hashTable) = putIdentInHashTable options.moduleName IC_Module hashTable
-	  list_inferred_types = if (isMember "-lt" commandLineArgs) (Yes (not (isMember "-lattr" commandLineArgs))) No
-	# (predefs, _, files, error, io, out, optionalSyntaxTree)
-		=	frontEndInterface FrontEndPhaseAll moduleIdent options.searchPaths list_inferred_types
-								predefSymbols hashTable files error io out
+//	  (moduleIdent, hash_table) = putIdentInHashTable options.moduleName IC_Module hash_table
+	# ({boxed_ident=moduleIdent}, hash_table) = putIdentInHashTable options.moduleName IC_Module hash_table
+	#  list_inferred_types = if (isMember "-lt" commandLineArgs) (Yes (not (isMember "-lattr" commandLineArgs))) No
+	# (optionalSyntaxTree,cached_functions_and_macros,n_functions_and_macros_in_dcl_modules,main_dcl_module_n,predef_symbols, hash_table, files, error, io, out,heaps)
+		=	frontEndInterface FrontEndPhaseAll moduleIdent options.searchPaths dcl_modules functions_and_macros No predef_symbols hash_table files error io out heaps
+	# unique_copy_of_predef_symbols={predef_symbol\\predef_symbol<-:predef_symbols}
 	# (closed, files)
 		=	fclose io files
 	| not closed
@@ -145,10 +201,14 @@ compileModule options commandLineArgs files
 		=	fclose out files
 	| not closed
 		=	abort ("couldn't close out file \"" +++ options.outPath +++ "\"\n")
-	# (success, error, files)
+	# var_heap=heaps.hp_var_heap
+	# (success,dcl_modules,functions_and_macros,n_functions_and_macros_in_dcl_modules,var_heap,error, files)
 		=	case optionalSyntaxTree of
 				Yes syntaxTree
-					->	backEndInterface outputPath (map appendRedirection commandLineArgs) predefs syntaxTree error files
+					# dcl_modules=syntaxTree.fe_dcls
+					# functions_and_macros = syntaxTree.fe_icl.icl_functions
+					# (success,var_heap,error, files) = backEndInterface outputPath (map appendRedirection commandLineArgs) predef_symbols syntaxTree main_dcl_module_n var_heap error files
+					-> (success,dcl_modules,functions_and_macros,n_functions_and_macros_in_dcl_modules,var_heap,error, files)
 					with
 						appendRedirection arg
 							= case arg of
@@ -159,13 +219,17 @@ compileModule options commandLineArgs files
 								arg
 									->	arg
 				No
-					-> (False, error, files)
+					-> (False,{},{},0,var_heap,error, files)
 		with
 			outputPath
 	//				=	/* directoryName options.pathName +++ "Clean System Files" +++ {DirectorySeparator} +++ */ baseName options.pathName
 				=	baseName options.pathName
+	# heaps = {heaps & hp_var_heap=var_heap}
 	# (closed, files)
 		=	fclose error files
 	| not closed
 		=	abort ("couldn't close error file \"" +++ options.errorPath +++ "\"\n")
-	=	(success, files)
\ No newline at end of file
+	| success
+		# dcl_modules={{dcl_module \\ dcl_module<-:dcl_modules} & [main_dcl_module_n].dcl_conversions=No}
+		=	(success,dcl_modules,cached_functions_and_macros,n_functions_and_macros_in_dcl_modules,unique_copy_of_predef_symbols,hash_table,heaps,files)
+		=	(success,dcl_modules,cached_functions_and_macros,n_functions_and_macros_in_dcl_modules,unique_copy_of_predef_symbols,hash_table,heaps,files)