BrychanD/159.341_Assignment_1
1
0
Fork 0
Code Issues 2 Pull Requests 1 Projects Releases Wiki Activity

Moved Symbols to the Parser class, made it non-static, therefore instancing it instead of being a static global
All checks were successful
continuous-integration/appveyor/branch AppVeyor build succeeded
Details

Browse Source
This commit is contained in:
Brychan Dempsey 2021-03-19 12:20:01 +13:00
parent 9e68ca1fcd
commit 1bd6b1b040
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Assignment 1/Program.cs
View File

@ -23,14 +23,6 @@ namespace Assignment_1
Static = 4, Static = 4,
Undef = 8 Undef = 8
} }
static Dictionary<string, Tuple<string, VariableFlags>> Symbols = new()
{
{ "SPACE", new Tuple<string, VariableFlags>(" ", VariableFlags.Reserved | VariableFlags.NoPrint) },
{ "TAB", new Tuple<string, VariableFlags>("\t", VariableFlags.Reserved | VariableFlags.NoPrint) },
{ "NEWLINE", new Tuple<string, VariableFlags>("\n", VariableFlags.Reserved | VariableFlags.NoPrint) },
{ "CARRIAGE_RETURN", new Tuple<string, VariableFlags>("\r", VariableFlags.Reserved | VariableFlags.NoPrint) }
};
/// <summary> /// <summary>
/// Characters that cannot appear in a normal string /// Characters that cannot appear in a normal string
/// </summary> /// </summary>
@ -80,6 +72,14 @@ namespace Assignment_1
} }
public class Parser public class Parser
{ {
Dictionary<string, Tuple<string, VariableFlags>> Symbols = new()
{
{ "SPACE", new Tuple<string, VariableFlags>(" ", VariableFlags.Reserved | VariableFlags.NoPrint) },
{ "TAB", new Tuple<string, VariableFlags>("\t", VariableFlags.Reserved | VariableFlags.NoPrint) },
{ "NEWLINE", new Tuple<string, VariableFlags>("\n", VariableFlags.Reserved | VariableFlags.NoPrint) },
{ "CARRIAGE_RETURN", new Tuple<string, VariableFlags>("\r", VariableFlags.Reserved | VariableFlags.NoPrint) }
};
public enum statements public enum statements
{ {
exit, exit,
@ -225,7 +225,6 @@ namespace Assignment_1
{ {
throw new ParserException("expected a semi-colon", 0, source.Position); throw new ParserException("expected a semi-colon", 0, source.Position);
} }
} }
else else
{ {
@ -256,9 +255,7 @@ namespace Assignment_1
Environment.Exit(-1); Environment.Exit(-1);
} }
} }
} }
} }
else else
{ {
@ -267,7 +264,14 @@ namespace Assignment_1
} }
#region Function Handling #region Function Handling
/// <summary>
/// Checks if the next expression in the source meets the requirements of being a key,
/// and optionally verify that key exists.
/// Also contracts the key is not reserved or constant
/// </summary>
/// <param name="source"></param>
/// <param name="checkExist"></param>
/// <returns></returns>
private string ValidateKey(Stream source, bool checkExist) private string ValidateKey(Stream source, bool checkExist)
{ {
long keyEndPos = FindIdentifier(source, out string key); long keyEndPos = FindIdentifier(source, out string key);
@ -290,6 +294,11 @@ namespace Assignment_1
return key; return key;
} }
/// <summary>
/// Checks if the next expression meets the requirements of being a value
/// </summary>
/// <param name="source"></param>
/// <returns></returns>
private string ValidateValue(Stream source) private string ValidateValue(Stream source)
{ {
long valuePos = FindExpression(source, out string value); long valuePos = FindExpression(source, out string value);
@ -303,6 +312,7 @@ namespace Assignment_1
} }
return value; return value;
} }
/// <summary> /// <summary>
/// Handles the 'append x y [ + z];' case & /// Handles the 'append x y [ + z];' case &
/// And the 'set x y [ + z];' case /// And the 'set x y [ + z];' case
@ -337,8 +347,8 @@ namespace Assignment_1
{ {
int keyWidth = 21; int keyWidth = 21;
int valueWidth = 50; int valueWidth = 50;
int flagWidth = 9; // 80 char total int flagWidth = 9;
StringBuilder consoleOutput = new StringBuilder(); StringBuilder consoleOutput = new();
consoleOutput.Append(string.Format("┌" + new string('─', keyWidth) + "┬" + new string('─', valueWidth) + "┬" + new string('─', flagWidth) + "┐\n")); consoleOutput.Append(string.Format("┌" + new string('─', keyWidth) + "┬" + new string('─', valueWidth) + "┬" + new string('─', flagWidth) + "┐\n"));
consoleOutput.Append(string.Format("│{0}│{1}│{2}│\n", CenterString("Symbol", keyWidth), CenterString("Value", valueWidth), CenterString("Flags", flagWidth))); consoleOutput.Append(string.Format("│{0}│{1}│{2}│\n", CenterString("Symbol", keyWidth), CenterString("Value", valueWidth), CenterString("Flags", flagWidth)));
// Figure out how many symbols are eligible for printing // Figure out how many symbols are eligible for printing