rename field cos_symbol_heap to cos_expression_heap

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

3 files changed, 35 insertions, 39 deletions

diff --git a/frontend/partition.icl b/frontend/partition.icl
index 233563e..25f2ef3 100644
--- a/frontend/partition.icl
+++ b/frontend/partition.icl
@@ -97,11 +97,11 @@ stripStrictLets fun_defs predef_symbols var_heap sym_heap error_admin
 	# collect_state =
 		{ cos_predef_symbols_for_transform	= cs_predef
 		, cos_var_heap						= var_heap
-		, cos_symbol_heap					= sym_heap
+		, cos_expression_heap				= sym_heap
 		, cos_error							= error_admin
 		}
 	# (fun_defs,collect_state) = aMapSt determine_ref_counts fun_defs collect_state
-	= (fun_defs,predef_symbols,collect_state.cos_var_heap, collect_state.cos_symbol_heap, collect_state.cos_error)
+	= (fun_defs,predef_symbols,collect_state.cos_var_heap, collect_state.cos_expression_heap, collect_state.cos_error)
 where
 	aMapSt f a s
 		# (l,s)	= mapSt f [e \\ e <-: a] s
@@ -114,7 +114,7 @@ partitionateFunctions` fun_defs ranges main_dcl_module_n def_min def_max predef_
 	# collect_state =
 		{ cos_predef_symbols_for_transform	= cs_predef
 		, cos_var_heap						= var_heap
-		, cos_symbol_heap					= sym_heap
+		, cos_expression_heap				= sym_heap
 		, cos_error							= error_admin
 		}
 	# partitioning_info =
@@ -128,7 +128,7 @@ partitionateFunctions` fun_defs ranges main_dcl_module_n def_min def_max predef_
 	  (fun_defs, {pi_groups`,pi_next_group`,pi_collect`}) = 
 	  		foldSt (partitionate_functions max_fun_nr) ranges (fun_defs, partitioning_info)
 	  groups = { {component_members = group} \\ group <- reverse pi_groups` }
-	= (groups, fun_defs, predef_symbols, pi_collect`.cos_var_heap, pi_collect`.cos_symbol_heap, pi_collect`.cos_error)
+	= (groups, fun_defs, predef_symbols, pi_collect`.cos_var_heap, pi_collect`.cos_expression_heap, pi_collect`.cos_error)
 where
 	partitionate_functions :: !Index !IndexRange !(!*{# FunDef}, !*PartitioningInfo`) -> (!*{# FunDef}, !*PartitioningInfo`)
 	partitionate_functions max_fun_nr ir=:{ir_from,ir_to} (fun_defs, pi=:{pi_marks`})
@@ -241,7 +241,7 @@ partitionateFunctions`` max_fun_nr next_group fun_defs functions main_dcl_module
 	# collect_state =
 		{ cos_predef_symbols_for_transform	= cs_predef
 		, cos_var_heap						= var_heap
-		, cos_symbol_heap					= sym_heap
+		, cos_expression_heap				= sym_heap
 		, cos_error							= error_admin
 		}
 	# partitioning_info =
@@ -255,7 +255,7 @@ partitionateFunctions`` max_fun_nr next_group fun_defs functions main_dcl_module
 	  (fun_defs, fun_heap, {pi_groups``,pi_next_group``,pi_collect``})
 	  	= partitionate_component functions max_fun_nr (fun_defs, fun_heap, partitioning_info)
 	  groups = [ {component_members = group} \\ group <- reverse pi_groups`` ]
-	= (pi_next_group``,groups, fun_defs, fun_heap, predef_symbols, pi_collect``.cos_var_heap, pi_collect``.cos_symbol_heap, pi_collect``.cos_error)
+	= (pi_next_group``,groups, fun_defs, fun_heap, predef_symbols, pi_collect``.cos_var_heap, pi_collect``.cos_expression_heap, pi_collect``.cos_error)
 where
 	partitionate_component :: !ComponentMembers !Index !(!*{# FunDef}, !*FunctionHeap, !*PartitioningInfo``) -> (!*{# FunDef}, !*FunctionHeap, !*PartitioningInfo``)
 	partitionate_component (ComponentMember member members) max_fun_nr (fun_defs, fun_heap, pi=:{pi_marks``})
diff --git a/frontend/transform.dcl b/frontend/transform.dcl
index 2ed9647..4a5e120 100644
--- a/frontend/transform.dcl
+++ b/frontend/transform.dcl
@@ -16,9 +16,9 @@ partitionateAndLiftFunctions :: ![IndexRange] !Index !PredefSymbolsForTransform
 ::	CopiedLocalFunctions
 
 ::	CollectState =
-	{	cos_var_heap	:: !.VarHeap
-	,	cos_symbol_heap :: !.ExpressionHeap
-	,	cos_error		:: !.ErrorAdmin
+	{	cos_var_heap		:: !.VarHeap
+	,	cos_expression_heap :: !.ExpressionHeap
+	,	cos_error			:: !.ErrorAdmin
 	,	cos_predef_symbols_for_transform :: !PredefSymbolsForTransform
 	}
 
diff --git a/frontend/transform.icl b/frontend/transform.icl
index 4d63f35..817529a 100644
--- a/frontend/transform.icl
+++ b/frontend/transform.icl
@@ -1387,7 +1387,6 @@ where
 			_
 				-> (fun_defs, symbol_table)
 
-
 expandMacrosInBody :: [.FunCall] CheckedBody ![ExprInfoPtr] PredefSymbolsForTransform *ExpandState -> ([FreeVar],Expression,[FreeVar],[FunCall],![ExprInfoPtr],.ExpandState);
 expandMacrosInBody fi_calls {cb_args,cb_rhs} fi_dynamics predef_symbols_for_transform es=:{es_symbol_table,es_symbol_heap,es_fun_defs,es_macro_defs}
 	# (prev_calls, fun_defs, macro_defs,es_symbol_table)
@@ -1398,20 +1397,17 @@ expandMacrosInBody fi_calls {cb_args,cb_rhs} fi_dynamics predef_symbols_for_tran
 	  		= removeFunctionCallsFromSymbolTable all_calls es.es_fun_defs es.es_symbol_table
 	  ((merged_rhs, _), es_var_heap, es_symbol_heap, es_error)
 	  		= mergeCases rhs rhss es.es_var_heap es.es_symbol_heap es.es_error
-	  (new_rhs, new_args, local_vars, fi_dynamics, {cos_error, cos_var_heap, cos_symbol_heap})
+	  (new_rhs, new_args, local_vars, fi_dynamics, {cos_error, cos_var_heap, cos_expression_heap})
 	  		= determineVariablesAndRefCounts cb_args merged_rhs
-	  				{ cos_error = es_error, cos_var_heap = es_var_heap, cos_symbol_heap = es_symbol_heap,
+	  				{ cos_error = es_error, cos_var_heap = es_var_heap, cos_expression_heap = es_symbol_heap,
 	  					cos_predef_symbols_for_transform = predef_symbols_for_transform }
 	= (new_args, new_rhs, local_vars, all_calls, fi_dynamics,
-		{ es & es_error = cos_error, es_var_heap = cos_var_heap, es_symbol_heap = cos_symbol_heap, es_fun_defs=fun_defs, es_symbol_table = symbol_table })
-//		---> ("expandMacrosInBody", (cb_args, ca_rhs, '\n'), ("merged_rhs", merged_rhs, '\n'), ("new_rhs", new_args, local_vars, (new_rhs, '\n')))
-
+		{ es & es_error = cos_error, es_var_heap = cos_var_heap, es_symbol_heap = cos_expression_heap, es_fun_defs=fun_defs, es_symbol_table = symbol_table })
 
 expandCheckedAlternative {ca_rhs, ca_position} ei
 	# (ca_rhs, ei) = expand ca_rhs ei
 	= ((ca_rhs, ca_position), ei)
 
-
 ::	ExpandInfo :== (![FunCall], !.ExpandState)
 
 add_new_fun_defs new_functions new_function_index last_function_index es=:{es_fun_defs,es_new_fun_def_numbers}
@@ -1653,9 +1649,9 @@ where
 		= (no, ei)
 
 ::	CollectState =
-	{	cos_var_heap	:: !.VarHeap
-	,	cos_symbol_heap :: !.ExpressionHeap
-	,	cos_error		:: !.ErrorAdmin
+	{	cos_var_heap		:: !.VarHeap
+	,	cos_expression_heap :: !.ExpressionHeap
+	,	cos_error			:: !.ErrorAdmin
 	,	cos_predef_symbols_for_transform :: !PredefSymbolsForTransform
 	}
 
@@ -1736,17 +1732,17 @@ where
 		where
 			if_expression :: !Expression !Expression !Expression !*CollectState -> (!Expression,!.CollectState);
 			if_expression e1 e2 e3 cos
-//				# (new_info_ptr,symbol_heap) = newPtr EI_Empty cos.cos_symbol_heap
+//				# (new_info_ptr,symbol_heap) = newPtr EI_Empty cos.cos_expression_heap
 				# case_type =
 					{	ct_pattern_type	= MakeAttributedType (TB BT_Bool)
 					,	ct_result_type	= MakeAttributedType (TB BT_Bool)
 					,	ct_cons_types 	= [[MakeAttributedType (TB BT_Bool)]]
 					}
-				# (new_info_ptr,symbol_heap) = newPtr (EI_CaseType case_type) cos.cos_symbol_heap
+				# (new_info_ptr,symbol_heap) = newPtr (EI_CaseType case_type) cos.cos_expression_heap
 				# kase = Case {	case_expr=e1, case_guards=BasicPatterns BT_Bool [{bp_value=BVB True,bp_expr=e2,bp_position=NoPos}],
 								case_default=Yes e3, case_ident=No, case_info_ptr=new_info_ptr, case_default_pos = NoPos,
 								case_explicit = False }
-				= (kase,{cos & cos_symbol_heap=symbol_heap});
+				= (kase,{cos & cos_expression_heap=symbol_heap});
 			
 			two_args [_,_]
 				= True;
@@ -1759,11 +1755,11 @@ where
 		# ((expr, exprs), free_vars, dynamics, cos) = collectVariables (expr, exprs) free_vars dynamics cos
 		= (expr @ exprs, free_vars, dynamics, cos)
 	collectVariables (Let lad=:{let_strict_binds, let_lazy_binds, let_expr, let_info_ptr}) free_vars dynamics cos=:{cos_var_heap}
-		# (let_info,cos_symbol_heap)	= readPtr let_info_ptr cos.cos_symbol_heap
+		# (let_info,cos_expression_heap) = readPtr let_info_ptr cos.cos_expression_heap
 		  let_types = case let_info of
 		  				EI_LetType let_types	-> let_types
 		  				_						-> repeat undef
-		  cos = {cos & cos_symbol_heap = cos_symbol_heap}
+		  cos = {cos & cos_expression_heap = cos_expression_heap}
 		  cos_var_heap = cos.cos_var_heap
 
 		# cos_var_heap = determine_aliases let_strict_binds cos_var_heap
@@ -1789,8 +1785,8 @@ where
 				_				-> let_info
 			  let_strict_binds = map snd let_strict_binds
 			  let_lazy_binds = map snd let_lazy_binds
-			  cos_symbol_heap = writePtr let_info_ptr let_info cos.cos_symbol_heap
-			  cos = {cos & cos_symbol_heap = cos_symbol_heap}
+			  cos_expression_heap = writePtr let_info_ptr let_info cos.cos_expression_heap
+			  cos = {cos & cos_expression_heap = cos_expression_heap}
 			= (Let {lad & let_strict_binds = let_strict_binds, let_lazy_binds = let_lazy_binds }, free_vars, dynamics,
 					{ cos & cos_error = checkError "" "cyclic let definition" cos.cos_error})
 //		| otherwise
@@ -1839,8 +1835,8 @@ where
 				# let_info = case let_info of
 					EI_LetType _	-> EI_LetType (let_strict_bind_types ++ let_lazy_bind_types)
 					_				-> let_info
-				  cos_symbol_heap = writePtr let_info_ptr let_info cos.cos_symbol_heap
-				  cos = {cos & cos_symbol_heap = cos_symbol_heap}
+				  cos_expression_heap = writePtr let_info_ptr let_info cos.cos_expression_heap
+				  cos = {cos & cos_expression_heap = cos_expression_heap}
 				= (Let {lad & let_expr = let_expr, let_strict_binds = let_strict_binds, let_lazy_binds = let_lazy_binds}, free_vars, dynamics, cos)
 		where
 		/*	Set the 'var_info_field' of each  bound variable to either 'VI_Alias var' (if
@@ -1894,13 +1890,13 @@ where
 								-> False
 				
 				add_dummy_id_for_strict_alias :: !.Expression !*CollectState -> (!.Expression,!.CollectState)
-				add_dummy_id_for_strict_alias bind_src cos=:{cos_symbol_heap, cos_predef_symbols_for_transform}
-					# (new_app_info_ptr, cos_symbol_heap) = newPtr EI_Empty cos_symbol_heap
+				add_dummy_id_for_strict_alias bind_src cos=:{cos_expression_heap, cos_predef_symbols_for_transform}
+					# (new_app_info_ptr, cos_expression_heap) = newPtr EI_Empty cos_expression_heap
 					  {pds_module, pds_def} = cos_predef_symbols_for_transform.predef_alias_dummy
 					  pds_ident = predefined_idents.[PD_DummyForStrictAliasFun]
 			  		  app_symb = { symb_ident = pds_ident, symb_kind = SK_Function {glob_module = pds_module, glob_object = pds_def} }
 					= (App { app_symb = app_symb, app_args = [bind_src], app_info_ptr = new_app_info_ptr },
-						{ cos & cos_symbol_heap = cos_symbol_heap } )
+						{ cos & cos_expression_heap = cos_expression_heap } )
 								
 		/*	Apply 'collectVariables' to the bound expressions (the 'bind_src' field of 'let'-bind) if
 		    the corresponding bound variable (the 'bind_dst' field) has been used. This can be determined
@@ -2075,22 +2071,22 @@ where
 
 instance collectVariables DynamicPattern
 where
-	collectVariables pattern=:{dp_var,dp_rhs,dp_type} free_vars dynamics cos=:{cos_var_heap,cos_symbol_heap}
+	collectVariables pattern=:{dp_var,dp_rhs,dp_type} free_vars dynamics cos=:{cos_var_heap,cos_expression_heap}
 		# cos_var_heap = clearCount dp_var cIsALocalVar cos_var_heap
-		  (EI_DynamicTypeWithVars vars type _, cos_symbol_heap) = readPtr dp_type cos_symbol_heap
-		  cos = { cos & cos_var_heap = cos_var_heap, cos_symbol_heap = cos_symbol_heap }
+		  (EI_DynamicTypeWithVars vars type _, cos_expression_heap) = readPtr dp_type cos_expression_heap
+		  cos = { cos & cos_var_heap = cos_var_heap, cos_expression_heap = cos_expression_heap }
 		  (dp_rhs, free_vars, local_dynamics, cos) = collectVariables dp_rhs free_vars [] cos
-		  cos_symbol_heap = cos.cos_symbol_heap <:= (dp_type, EI_DynamicTypeWithVars vars type local_dynamics)
+		  cos_expression_heap = cos.cos_expression_heap <:= (dp_type, EI_DynamicTypeWithVars vars type local_dynamics)
 		  (dp_var, cos_var_heap) = retrieveRefCount dp_var cos.cos_var_heap
-		  cos = { cos & cos_var_heap = cos_var_heap, cos_symbol_heap = cos_symbol_heap }
+		  cos = { cos & cos_var_heap = cos_var_heap, cos_expression_heap = cos_expression_heap }
 		= ({ pattern & dp_rhs = dp_rhs, dp_var = dp_var }, free_vars, [dp_type:dynamics], cos)
 
 instance collectVariables DynamicExpr
 where
 	collectVariables dynamic_expr=:{dyn_expr, dyn_info_ptr} free_vars dynamics cos
-		# (dyn_expr, free_vars, local_dynamics, cos=:{cos_symbol_heap}) = collectVariables dyn_expr free_vars [] cos
-		  cos_symbol_heap = mark_used_dynamic dyn_info_ptr local_dynamics (readPtr dyn_info_ptr cos_symbol_heap)
-		= ({dynamic_expr & dyn_expr = dyn_expr}, free_vars, [dyn_info_ptr:dynamics], { cos & cos_symbol_heap = cos_symbol_heap });
+		# (dyn_expr, free_vars, local_dynamics, cos=:{cos_expression_heap}) = collectVariables dyn_expr free_vars [] cos
+		  cos_expression_heap = mark_used_dynamic dyn_info_ptr local_dynamics (readPtr dyn_info_ptr cos_expression_heap)
+		= ({dynamic_expr & dyn_expr = dyn_expr}, free_vars, [dyn_info_ptr:dynamics], { cos & cos_expression_heap = cos_expression_heap });
 	where
 		mark_used_dynamic dyn_info_ptr local_dynamics (EI_UnmarkedDynamic opt_type _, symbol_heap) 
 			= symbol_heap <:= (dyn_info_ptr, EI_Dynamic opt_type local_dynamics)