From ddda5856e49c82fb6d5a4a94dae46a93ceade138 Mon Sep 17 00:00:00 2001
From: johnvg
Date: Thu, 18 Oct 2001 11:33:45 +0000
Subject: store macros and local functions in macros in separate {#{#FunDef}},
 remove conversion table, except for macros

git-svn-id: https://svn.cs.ru.nl/repos/clean-compiler/trunk@863 1f8540f1-abd5-4d5b-9d24-4c5ce8603e2d
---
 frontend/transform.dcl | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'frontend/transform.dcl')

diff --git a/frontend/transform.dcl b/frontend/transform.dcl
index 77ff19d..0ef43f2 100644
--- a/frontend/transform.dcl
+++ b/frontend/transform.dcl
@@ -8,15 +8,16 @@ import syntax, checksupport
 
 :: PredefSymbolsForTransform = { predef_alias_dummy :: !PredefinedSymbol, predef_and :: !PredefinedSymbol, predef_or :: !PredefinedSymbol };
 
-partitionateAndLiftFunctions :: ![IndexRange] !Index !PredefSymbolsForTransform !*{# FunDef} !*{# DclModule} !*VarHeap !*ExpressionHeap !*SymbolTable !*ErrorAdmin
-	-> (!*{! Group}, !*{# FunDef}, !.{# DclModule}, !*VarHeap, !*ExpressionHeap,  !*SymbolTable, !*ErrorAdmin )
+partitionateDclMacros :: !IndexRange !Index !PredefSymbolsForTransform !*{#FunDef} !*{#*{#FunDef}} !*{#DclModule} !*VarHeap !*ExpressionHeap !*SymbolTable !*ErrorAdmin
+																   -> (!*{#FunDef},!*{#*{#FunDef}},!.{#DclModule},!*VarHeap,!*ExpressionHeap,!*SymbolTable,!*ErrorAdmin )
 
-partitionateMacros :: !IndexRange !Index !PredefSymbolsForTransform !*{# FunDef} !*{# DclModule} !*VarHeap !*ExpressionHeap !*SymbolTable !*ErrorAdmin
-	-> (!*{# FunDef}, !.{# DclModule}, !*VarHeap, !*ExpressionHeap, !*SymbolTable, !*ErrorAdmin )
+partitionateIclMacros :: !IndexRange !Index !PredefSymbolsForTransform !*{#FunDef} !*{#*{#FunDef}} !*{#DclModule} !*VarHeap !*ExpressionHeap !*SymbolTable !*ErrorAdmin
+																   -> (!*{#FunDef},!*{#*{#FunDef}},!.{#DclModule},!*VarHeap,!*ExpressionHeap,!*SymbolTable,!*ErrorAdmin )
 
-::	CopiedLocalFunctions
+partitionateAndLiftFunctions :: ![IndexRange] !Index !PredefSymbolsForTransform !*{#FunDef} !*{#*{#FunDef}} !*{#DclModule} !*VarHeap !*ExpressionHeap !*SymbolTable !*ErrorAdmin
+																-> (!*{!Group}, !*{#FunDef},!*{#*{#FunDef}},!.{#DclModule},!*VarHeap,!*ExpressionHeap,!*SymbolTable,!*ErrorAdmin )
 
-// AA..
+::	CopiedLocalFunctions
 
 ::	CollectState =
 	{	cos_var_heap	:: !.VarHeap
@@ -28,8 +29,6 @@ partitionateMacros :: !IndexRange !Index !PredefSymbolsForTransform !*{# FunDef}
 
 determineVariablesAndRefCounts :: ![FreeVar] !Expression !*CollectState -> (!Expression , ![FreeVar], ![FreeVar], !*CollectState)
 
-// ..AA
-
 ::	UnfoldState =
 	{	us_var_heap				:: !.VarHeap
 	,	us_symbol_heap			:: !.ExpressionHeap
@@ -41,7 +40,7 @@ determineVariablesAndRefCounts :: ![FreeVar] !Expression !*CollectState -> (!Exp
 ::	UnfoldInfo =
 	{	ui_handle_aci_free_vars	:: !AciFreeVarHandleMode,
 		ui_convert_module_n :: !Int, // -1 if no conversion
-		ui_conversion_table :: !Optional ConversionTable
+		ui_conversion_table :: !Optional {#Int}
 	}
 
 :: AciFreeVarHandleMode = LeaveThem | RemoveThem | SubstituteThem
-- 
cgit v1.2.3