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

View file

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