diff --git a/backendC/CleanCompilerSources/backend.c b/backendC/CleanCompilerSources/backend.c index 5876869a87210d28dcb47c487ba1c2cdcbb1f28d..fa94c3d474b67e350af436d05dae19406b0808f5 100644 --- a/backendC/CleanCompilerSources/backend.c +++ b/backendC/CleanCompilerSources/backend.c @@ -2539,8 +2539,6 @@ DeclareFunctionC (char *name, int arity, int functionIndex, unsigned int ancesto newSymbDef->sdef_dcl_icl = NULL; newSymbDef->sdef_isused = 0; - newSymbDef->sdef_line = 0; /* used in PrintType */ - *icl->beicl_depsP = newSymbDef; icl->beicl_depsP = &newSymbDef->sdef_next_scc; newSymbDef->sdef_arfun = NoArrayFun; @@ -2660,7 +2658,6 @@ BEDeclareRuleType (int functionIndex, int moduleIndex, CleanString name) newSymbDef->sdef_ident = newIdent; newSymbDef->sdef_mark = 0; newSymbDef->sdef_isused = 0; - newSymbDef->sdef_line = 0; /* used in PrintSymbolOfIdent */ functions [functionIndex].symb_kind = definition; functions [functionIndex].symb_def = newSymbDef; diff --git a/backendC/CleanCompilerSources/checker_2.c b/backendC/CleanCompilerSources/checker_2.c index 2474c3157e54f3586877ab84820a36b7d38b7919..5b0ae62636611a02eff31d0a20ba9f0ed59d3266 100644 --- a/backendC/CleanCompilerSources/checker_2.c +++ b/backendC/CleanCompilerSources/checker_2.c @@ -126,7 +126,6 @@ SymbDef MakeNewSymbolDefinition (char * module, Ident name, int arity, SDefKind def->sdef_ident = name; def->sdef_arity = arity; def->sdef_kind = kind; - def->sdef_line = 0; def->sdef_mark=0; diff --git a/backendC/CleanCompilerSources/checksupport.c b/backendC/CleanCompilerSources/checksupport.c index b5f411b872fb963ccab71fe6c97bb3c2867c0aec..f60e08ad78fb9e58e6449d0843b7b9070c323d09 100644 --- a/backendC/CleanCompilerSources/checksupport.c +++ b/backendC/CleanCompilerSources/checksupport.c @@ -10,22 +10,6 @@ #include "checker.h" #include -char - *Earity = "used with wrong arity", - *Ecyclicsyn = "cyclic dependencies between synonym types", - *EwrongdefS = "differs from the symbol of the first rule alternative", - *Einfix_imp_def = "infix specification in the impl module conflicts with the def module", - *EImplandDef1 = "definition in the impl module conflicts with the def module", - *EImplandDef5 = "should have a type specification in the implementation rule", - *Enodeid2 = "multiply defined", - *Enodeid3 = "not defined"; - -static char - *Etuple = "tuples without type checking not allowed"; - -unsigned RuleCount,TypeSymbolCount; -SymbDef StackTop; - char *ConvertSymbolKindToString (SymbKind skind) { switch (skind) @@ -256,11 +240,3 @@ void CheckSymbolWarningOrError (Bool error,struct symbol *symbol,char *msg) { StaticMessage (error,"%S","%S %s",CurrentSymbol,symbol,msg); } - -extern Ident TupleId; - -void TupleError (void) -{ - CheckError (TupleId->ident_name,Etuple); -} - diff --git a/backendC/CleanCompilerSources/checksupport.h b/backendC/CleanCompilerSources/checksupport.h index 0aa4ca7aa7e10a4330ba19a7dbf7d6e6cd7fe4aa..af4f6adc4384f2fcbf805cdae665bc63a3c0b557 100644 --- a/backendC/CleanCompilerSources/checksupport.h +++ b/backendC/CleanCompilerSources/checksupport.h @@ -12,24 +12,6 @@ extern void CheckSymbolWarning (struct symbol *symbol,char *msg); extern void CheckWarningOrError (Bool error,char *msg1,char *msg2); extern void CheckWarningOrError2 (Bool error,char *msg1,char *msg2,char *msg3); extern void CheckSymbolWarningOrError (Bool error,struct symbol *symbol,char *msg); -extern void TupleError (void); - -extern char *Earity,*Enodeid3,*Ecyclicsyn,*Enodeid2,*EwrongdefS,*Einfix_imp_def, - *EImplandDef1,*EImplandDef5; - -extern unsigned RuleCount,TypeSymbolCount; -extern SymbDef StackTop; - -#define PushOnDepStack(sdef) \ - sdef->sdef_parent=StackTop; \ - StackTop=sdef - -#define PopFromDepStack(sdef) \ - sdef=StackTop; \ - StackTop=sdef->sdef_parent; \ - sdef->sdef_parent=NULL - -#define IsOnDepStack(sdef) ((sdef)->sdef_parent!=NULL) #define NameOfSymbol(symb) ((symb)->symb_def ->sdef_ident->ident_name) diff --git a/backendC/CleanCompilerSources/codegen.c b/backendC/CleanCompilerSources/codegen.c index c899f3a563f67425c1ffeb0d9455c42da8e0d756..478d2c8ad1498307dc356239aad0673ce2a8e488 100644 --- a/backendC/CleanCompilerSources/codegen.c +++ b/backendC/CleanCompilerSources/codegen.c @@ -673,7 +673,7 @@ static void CodeRule (ImpRuleP rule) GenFunctionDescriptorAndExportNodeAndDescriptor (rule_sdef); if (DoTimeProfiling) - GenPB_ident (rule_sdef->sdef_ident,rule_sdef->sdef_line); + GenPB_ident (rule_sdef->sdef_ident,0 /*rule_sdef->sdef_line*/); if (rule_sdef->sdef_exported && rule_sdef->sdef_calledwithrootnode && ExpectsResultNode (resultstate)) MakeSymbolLabel (&ea_lab,CurrentModule,ea_pref,rule_sdef,0); diff --git a/backendC/CleanCompilerSources/codegen3.c b/backendC/CleanCompilerSources/codegen3.c index ce75755c13e608e7bf10ce48020d67f4b957bf70..5ccd0185c556ea2e5e15345c1ab2376da59c96ed 100644 --- a/backendC/CleanCompilerSources/codegen3.c +++ b/backendC/CleanCompilerSources/codegen3.c @@ -943,7 +943,6 @@ static void CodeNormalRootNode (Node root,NodeId rootid,int asp,int bsp,CodeGenN Assume (case_ident_s.ident_name != NULL, "codegen3", "CodeNormalRootNode (fail_symb)"); case_def_s.sdef_ident = &case_ident_s; - case_def_s.sdef_line = 0; StaticMessage (FunctionMayFailIsError, "%D", "case may fail", &case_def_s); diff --git a/backendC/CleanCompilerSources/comsupport.c b/backendC/CleanCompilerSources/comsupport.c index 2de894283403b621cdc3f38191433c7dd6694f1d..5fe27ee7a34592f86cd957980607bb0a73c68f23 100644 --- a/backendC/CleanCompilerSources/comsupport.c +++ b/backendC/CleanCompilerSources/comsupport.c @@ -355,7 +355,7 @@ void PrintSymbol (Symbol symbol, File file) break; case definition: symb_id = symbol -> symb_def -> sdef_ident; - line_nr = symbol -> symb_def -> sdef_line; + line_nr = 0; break; case int_denot: FPutS (symbol->symb_int, file); @@ -499,7 +499,7 @@ void StaticMessage (Bool error, char *symbol_format, char *message_format, ...) case 'D': { SymbDef def = va_arg (ap, SymbDef); - PrintSymbolOfIdent (def->sdef_ident, def->sdef_line, StdError); + PrintSymbolOfIdent (def->sdef_ident, 0, StdError); break; } case 'S': diff --git a/backendC/CleanCompilerSources/instructions.c b/backendC/CleanCompilerSources/instructions.c index f9a7a5b4d6f82210ce070e19d4062c7a5c84e052..3f11416e78f32e2fb8a852b294822a78c19c208d 100644 --- a/backendC/CleanCompilerSources/instructions.c +++ b/backendC/CleanCompilerSources/instructions.c @@ -3883,7 +3883,7 @@ void GenNoMatchError (SymbDef sdef,int asp,int bsp,int string_already_generated) if (!desc_needed && !string_already_generated){ put_directive_ (Dstring); FPrintF (OutFile, "x_%u \"",sdef->sdef_number); - PrintSymbolOfIdent (sdef->sdef_ident, sdef->sdef_line,OutFile); + PrintSymbolOfIdent (sdef->sdef_ident,0,OutFile); FPutS ("\"", OutFile); } } @@ -3907,7 +3907,7 @@ void GenCaseNoMatchError (SymbDefP case_def,int asp,int bsp) put_directive_ (Dstring); FPrintF (OutFile, "case_fail%u \"",CaseFailNumber); - PrintSymbolOfIdent (case_def->sdef_ident,case_def->sdef_line,OutFile); + PrintSymbolOfIdent (case_def->sdef_ident,0,OutFile); FPrintF (OutFile, "\""); CaseFailNumber++; diff --git a/backendC/CleanCompilerSources/syntaxtr.t b/backendC/CleanCompilerSources/syntaxtr.t index 38450458da3f6cd0adfebaf70402af44138e99cc..dc3588240365dea2a7336b11696766689672a882 100644 --- a/backendC/CleanCompilerSources/syntaxtr.t +++ b/backendC/CleanCompilerSources/syntaxtr.t @@ -517,7 +517,6 @@ STRUCT (rule_alt,RuleAlt){ RuleAlts alt_next; unsigned alt_line; unsigned alt_kind:3; /* RhsKind */ - Bool alt_may_fail:1; }; #define alt_rhs_root alt_rhs.rhs_root @@ -565,7 +564,6 @@ STRUCT (imp_rule,ImpRule){ #endif unsigned rule_line; unsigned rule_mark; - unsigned rule_ref_count; }; #define RULE_CAF_MASK 2 @@ -620,11 +618,9 @@ STRUCT (symbol_def,SymbDef){ struct symbol_def * sdef_next_scc; union { - struct symbol_def * sdef_u2_parent; struct symbol_def * sdef_u2_next_version; /* for IMPRULES */ } sdef_u2; - unsigned sdef_line; int sdef_mark; unsigned sdef_kind:SDefKindSize; @@ -660,9 +656,6 @@ STRUCT (symbol_def,SymbDef){ /* some macros to reuse bit fields */ #define sdef_group_number sdef_ancestor -#define sdef_has_instance_info sdef_used_as_instance - -#define sdef_parent sdef_u2.sdef_u2_parent #define sdef_next_version sdef_u2.sdef_u2_next_version @@ -698,7 +691,6 @@ typedef struct { Types im_types; ImpRules im_rules; struct symbol_def * im_start; - Bool im_main; DefMod im_def_module; #if IMPORT_OBJ_AND_LIB struct string_list * im_imported_objs;