Even more renaming

WILL IT EVER STOP?!
This commit is contained in:
arookas 2016-03-02 02:44:47 -05:00
parent f03fb8ac10
commit a17a6c4b84
2 changed files with 12 additions and 12 deletions

View file

@ -47,8 +47,8 @@ namespace arookas {
if (sSettings.OutputSym) {
WriteSym();
}
if (sSettings.OutputBss) {
WriteBss();
if (sSettings.OutputVars) {
WriteVars();
}
Console.WriteLine("Closing output file...");
}
@ -209,16 +209,16 @@ namespace arookas {
}
sWriter.WriteLine();
}
static void WriteBss() {
Console.WriteLine("Outputting .bss...");
sWriter.WriteLine(".bss");
for (int i = 0; i < sVarCount; ++i) {
static void WriteVars() {
Console.WriteLine("Outputting variables...");
sWriter.WriteLine("# variables:");
var symbol = FetchSymbol(j => j.Type == SymbolType.Variable && j.Data == i);
if (symbol != null) {
sWriter.WriteLine(" .var {0}", FetchSymbolName(symbol));
sWriter.WriteLine("# {0}", FetchSymbolName(symbol));
}
else {
sWriter.WriteLine(" .var");
sWriter.WriteLine("# (NULL)");
}
}
sWriter.WriteLine();
@ -233,7 +233,7 @@ namespace arookas {
}
static string FetchDataValue(int i) {
if (i < 0 || i >= sDataCount) {
return "null";
return "(NULL)";
}
return FetchDataValue(FetchData(i));
}

View file

@ -4,7 +4,7 @@ using System.IO;
namespace arookas {
class CommandLineSettings {
string mInput, mOutput;
bool mOutputHeader, mOutputText, mOutputData, mOutputSym, mOutputBss;
bool mOutputHeader, mOutputText, mOutputData, mOutputSym, mOutputVars;
public string Input { get { return mInput; } }
public string Output { get { return mOutput; } }
@ -12,7 +12,7 @@ namespace arookas {
public bool OutputText { get { return mOutputText; } }
public bool OutputData { get { return mOutputData; } }
public bool OutputSym { get { return mOutputSym; } }
public bool OutputBss { get { return mOutputBss; } }
public bool OutputVars { get { return mOutputVars; } }
public CommandLineSettings(aCommandLine cmd) {
if (cmd == null) {
@ -30,8 +30,8 @@ namespace arookas {
case "-d": mOutputData = false; continue;
case "-S": mOutputSym = true; continue;
case "-s": mOutputSym = false; continue;
case "-B": mOutputBss = true; continue;
case "-b": mOutputBss = false; continue;
case "-V": mOutputVars = true; continue;
case "-v": mOutputVars = false; continue;
}
}
if (mInput == null) {