Commit db92f120 authored by johnvg@science.ru.nl's avatar johnvg@science.ru.nl
Browse files

remove variabels CurrentPhase and CurrentExt

parent af2d0391
...@@ -3287,9 +3287,7 @@ BEInit (int argc) ...@@ -3287,9 +3287,7 @@ BEInit (int argc)
ExitEnv_valid=0; ExitEnv_valid=0;
CurrentPhase = "Back End";
CurrentModule = "<unknown module>"; CurrentModule = "<unknown module>";
CurrentExt = "";
InitStorage (); InitStorage ();
......
...@@ -1132,8 +1132,6 @@ void CodeGeneration (ImpMod imod, char *fname) ...@@ -1132,8 +1132,6 @@ void CodeGeneration (ImpMod imod, char *fname)
int DoStrictnessAnalysis_and_init_ok; int DoStrictnessAnalysis_and_init_ok;
ImpRuleP new_rules; ImpRuleP new_rules;
CurrentPhase = NULL;
#if 0 #if 0
PrintRules (imod->im_rules); PrintRules (imod->im_rules);
#endif #endif
......
...@@ -37,7 +37,7 @@ extern int VERSION; ...@@ -37,7 +37,7 @@ extern int VERSION;
/* 'CurrentModule' contains the name of the module that is currently under examination. */ /* 'CurrentModule' contains the name of the module that is currently under examination. */
char *CurrentPhase, *CurrentModule, *CurrentExt; char *CurrentModule;
unsigned CurrentLine; unsigned CurrentLine;
Symbol CurrentSymbol; Symbol CurrentSymbol;
Bool CompilerError; Bool CompilerError;
...@@ -309,18 +309,13 @@ void StaticMessage (Bool error, char *symbol_format, char *message_format, ...) ...@@ -309,18 +309,13 @@ void StaticMessage (Bool error, char *symbol_format, char *message_format, ...)
FPutS ("### ",StdError); FPutS ("### ",StdError);
#endif #endif
if (CurrentPhase){ FPutS (error ? "Error [" : "Warning [", StdError);
FPutS (CurrentPhase, StdError);
FPutS (error ? " error [" : " warning [", StdError);
} else
FPutS (error ? "Error [" : "Warning [", StdError);
#ifdef MAKE_MPW_TOOL #ifdef MAKE_MPW_TOOL
FPutS ("File ",StdError); FPutS ("File ",StdError);
#endif #endif
FPutS (CurrentModule, StdError); FPutS (CurrentModule, StdError);
FPutS (CurrentExt, StdError);
if (CurrentLine > 0){ if (CurrentLine > 0){
#ifdef MAKE_MPW_TOOL #ifdef MAKE_MPW_TOOL
...@@ -450,7 +445,6 @@ void InitCompiler (void) ...@@ -450,7 +445,6 @@ void InitCompiler (void)
/* Call all the initialization functions */ /* Call all the initialization functions */
/* InitStorage has to be called first */ /* InitStorage has to be called first */
CurrentModule = Init; CurrentModule = Init;
CurrentExt = "";
InitStorage (); InitStorage ();
InitParser (); InitParser ();
......
...@@ -19,7 +19,7 @@ struct symbol; ...@@ -19,7 +19,7 @@ struct symbol;
extern void PrintSymbol (struct symbol *symbol,File file); extern void PrintSymbol (struct symbol *symbol,File file);
extern Bool CompilerError; extern Bool CompilerError;
extern char *CurrentModule, *CurrentExt, *CurrentPhase, *CompilerVersion; extern char *CurrentModule, *CompilerVersion;
extern struct symbol *CurrentSymbol; extern struct symbol *CurrentSymbol;
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
File FOpen (char *fname,char *mode) File FOpen (char *fname,char *mode)
{ {
return fopen (fname,mode); return fopen (fname,mode);
} }
int FClose (File f) int FClose (File f)
{ {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment