- Project file updated to directory structure with 'Tools' and 'Libraries'...

- Project file updated to directory structure with 'Tools' and 'Libraries' instead of 'Tools Sparkle' and 'Libraries Sparkle';
- Removed temporary debugging code from ChangeDefinition.icl

Sparkle/Tools/Core/ChangeDefinition.icl

@@ -243,31 +243,9 @@ bindDefinition mb_conversions all_names all_ptrs (IclDefinitionPtr icl_name icl_
 	| not ok							= (pushError (X_Internal ("Rule 'bindDefinition' does not match. (unknown iclmodule " +++ icl_name +++ ")")) OK, DummyValue, heaps)
 	= (OK, conversions.ccSelectorPtrs.[def_index], heaps)
 
-// -------------------------------------------------------------------------------------------------------------------------------------------------   
-bindDefinition2 :: !(Maybe CompilerConversion) ![ModuleName] ![ModulePtr] !IndexedPtr !*CHeaps -> (!Error, !HeapPtr, !*CHeaps)
-// -------------------------------------------------------------------------------------------------------------------------------------------------   
-bindDefinition2 mb_conversions all_names all_ptrs ptr1 heaps
-	# (error, ptr2, heaps)				= bindDefinition mb_conversions all_names all_ptrs ptr1 heaps
-	| isError error						= (error, ptr2, heaps)
-	# kind_1							= get_kind ptr1
-	# kind_2							= ptrKind ptr2
-	= check kind_1 kind_2 error ptr1 ptr2 heaps
-	where
-		get_kind :: !IndexedPtr -> CompilerDefinitionKind
-		get_kind (IclDefinitionPtr _ _ _ kind _)
-			= kind
-		get_kind (DclDefinitionPtr _ _ kind _)
-			= kind
-		
-		check :: !CompilerDefinitionKind !DefinitionKind !Error !IndexedPtr !HeapPtr !*CHeaps -> (!Error, !HeapPtr, !*CHeaps)
-		check CheckedTypeDef CRecordType error ptr1 ptr2 heaps
-			= (error, ptr2, heaps)
-		check kind1 CRecordType error ptr1 ptr2 heaps
-//			#! heaps					= heaps --->> ptr1
-			= (error, ptr2, heaps)
-		check _ _ error ptr1 ptr2 heaps
-			= (error, ptr2, heaps)
-	
+
+
+
 
 
 
@@ -673,7 +651,7 @@ bindModule all_names all_ptrs mod_ptr heaps prj
 		
 		bindFuns :: ![HeapPtr] ![CFunDefI] !*CHeaps !*CProject -> (!Error, !*CHeaps, !*CProject)
 		bindFuns [ptr:ptrs] [def:defs] heaps prj
-			# (error, def, heaps)		= changeDefinition (bindDefinition2 Nothing all_names all_ptrs) def heaps
+			# (error, def, heaps)		= changeDefinition (bindDefinition Nothing all_names all_ptrs) def heaps
 			| isError error				= (error, heaps, prj)
 			# (error, prj)				= putFunDef ptr def prj
 			| isError error				= (error, heaps, prj)