remove macros_2.c, checktypedefs_2.c, macros.h and checktypedefs.h

backendC/CleanCompilerSources/checker_2.c

@@ -29,11 +29,9 @@
 #include "typechecker.h"
 #include "transform.h"
 #include "checksupport.h"
-#include "checktypedefs.h"
 #include "overloading.h"
 #include "settings.h"
 #include "checker.h"
-#include "macros.h"
 #ifdef MOVE_FUNCTIONS_IN_LAMBDAS
 # include "optimise_lambda.h"
 #endif
@@ -169,8 +167,8 @@ static Ident SystemFunctionsId,StdArrayAbortId;
 void InitChecker (void)
 {
 	FreeDefs=NIL;
-	free_ldefs=NULL;
 #ifndef CLEAN2
+	free_ldefs=NULL;
 	free_depend_macros=NULL;
 #endif
 	AnnotatedId	= PutStringInHashTable ("_annotated", SymbolIdTable);
@@ -226,6 +224,7 @@ void InitChecker (void)
 	ArrayFunctionIds[_UnqArraySelectLastFun]= PutStringInHashTable ("_uselectl", SymbolIdTable);
 	ArrayFunctionIds[_ArrayUpdateFun]= PutStringInHashTable ("_updatei", SymbolIdTable);
 
+#ifndef CLEAN2
 	FunTypeClass.tac_uniprop = ALLBITSCLEAR;
 	FunTypeClass.tac_possign = BIT(1);
 	FunTypeClass.tac_negsign = BIT(0);
@@ -233,6 +232,7 @@ void InitChecker (void)
 	GeneralTypeClass.tac_uniprop = ALLBITSSET;
 	GeneralTypeClass.tac_possign = ALLBITSSET;
 	GeneralTypeClass.tac_negsign = ALLBITSCLEAR;
+#endif
 
 	OpenDefinitionModules	= NIL;
 }

backendC/CleanCompilerSources/checktypedefs.h

-/*
-
-	Version 1.0 10/06/1994
-
-	Author:  Sjaak Smetsers
-
-*/
-
-/*
-	global type defintions
-*/
-
-/* LAST
-typedef enum
-{
-	AlgebraicType, SynonymType, FunctionType, ClassType
-
-} TypeDefKind;
-
-typedef struct instance_list
-{
-	SymbDef					il_symbol;
-	unsigned long			il_basic_instances;
-	struct instance_list *	il_next;
-	
-} * InstanceList;
-*/
-
-typedef enum
-{	AlgebraicType, SynonymType, FunctionType, ClassType
-} TypeDefKind;
-
-
-/*
-	global variables
-*/
-
-extern TypeArgClass FunTypeClass, GeneralTypeClass;
-
-/*
-	global functions
-*/
-
-extern void CheckInstances (Instance instances);
-
-extern void AdjustFixitiesAndPrioritiesOfInstances (ClassInstance instances);
-
-extern void CheckTypesImpOfRules (ImpRules imp_rules);
-extern void CheckTypesOfDefRules (RuleTypes def_rules);
-
-extern void CheckAbsTypes (AbsTypes abstr);
-extern void CheckSynonymTypes (SynTypes syn_type);
-extern void CheckTypes (Types types);
-extern void CheckTypeVars (TypeVarList lhs_vars);
-extern void CheckTypeClasses (ClassDefinition classes, Bool check_icl_file);
-
-extern Symbol MarkTypeClasses (ClassDefinition classes, Symbol all_symbols);
-extern Symbol MarkTypeClassInstances (ClassInstance instances, Symbol all_symbols, char * def_mod_name);
-
-extern void CollectInstancesOfTypeClasses (ClassInstance instances);
-extern void CheckInstancesInIclFile (ClassInstance instances);
-
-extern Symbol CheckInstancesInDclFile (ClassInstance instances, Symbol all_symbols, Bool is_def_mod);
-
-extern void CheckOverloadedRules (Overloaded overrules);
-
-extern void ExpandSymbolTypes (Symbol imp_symbols);
-
-extern void VerifyTypeDefinitions (SymbDef type1,SymbDef type2);
-extern void VerifyRuleTypes (TypeAlts type1,TypeAlts type2, Bool check_exported_instances);
-extern Bool VerifySymbDefs (SymbDef dcl_sdef, SymbDef icl_sdef);
-extern Bool VerifyTypeGraphs (TypeNode root1,TypeNode root2);
-extern Bool VerifyLhsOfTypes (FlatType lhs1, FlatType lhs2);
-
-extern void CheckExportedInstances (DefMod def);
-extern void CollectBasicClassInstances (Symbol symbs, Bool is_icl_file);
-extern void CollectBasicClassInstancesOfEmptyClasses (Symbol all_symbols);
-
-extern void VerifyTypeClasses (SymbDef dcl_symb, SymbDef icl_symb);
-extern void VerifyInstances (ClassInstance dcl_instance, SymbDef icl_sdef);
-
-extern void InitCheckTypeDefs (void);
-extern void ExitCheckTypeDefs (void);

backendC/CleanCompilerSources/checktypedefs_2.c

-/*
-	Version 1.0 26/08/1994
-
-	Author:  Sjaak Smetsers
-*/
-
-#pragma segment checktypedefs
-
-#define COMPLEX_ABSTYPES
-
-#include "compiledefines.h"
-#include "types.t"
-#include "syntaxtr.t"
-#include "comsupport.h"
-#include "scanner.h"
-#include "comparser.h"
-#include "buildtree.h"
-#include "statesgen.h"
-#include "settings.h"
-#include "sizes.h"
-
-#include "checker.h"
-#include "checksupport.h"
-#include "checktypedefs.h"
-#include "overloading.h"
-#include "typechecker.h"
-
-TypeArgClass GeneralTypeClass,FunTypeClass;

backendC/CleanCompilerSources/macros.h

-
-extern Node substitute_macro_in_rhs (Macro *macro_p,Node appl,int local_scope,NodeDefs **node_def_p,ImpRuleS ***imp_rule_p);
-extern Node substitute_macro_in_lhs (RuleAltS *alt,Node appl,int local_scope,NodeDefs **node_def_p);
-extern void CheckEqualMacros (RuleAltS *alt1,RuleAltS *alt2);
-
-extern struct local_def *AllocateLocalDef (void);
-
-extern struct local_def *free_ldefs;

backendC/CleanCompilerSources/macros_2.c

-/*
-	File: macros.c
-	Author: John van Groningen
-*/
-
-#include "compiledefines.h"
-#include "types.t"
-#include "types.t"
-#include "system.h"
-#include "syntaxtr.t"
-#include "comsupport.h"
-#include "sizes.h"
-#include "buildtree.h"
-#include "checksupport.h"
-#include "macros.h"
-#include "checktypedefs.h"
-
-struct local_def *free_ldefs;