From 34437a72a34f102ef57bd828307b1e8625c6e603 Mon Sep 17 00:00:00 2001 From: PocketMiner82 Date: Wed, 24 Apr 2024 12:17:47 +0200 Subject: [PATCH] chore: fix naming conventions --- pseudocodeIde/interpreter/OutputForm.cs | 12 +-- pseudocodeIde/interpreter/parser/Parser.cs | 120 ++++++++++----------- pseudocodeIdeUpdater/Program.cs | 3 - 3 files changed, 66 insertions(+), 69 deletions(-) diff --git a/pseudocodeIde/interpreter/OutputForm.cs b/pseudocodeIde/interpreter/OutputForm.cs index a817048..7b9da76 100644 --- a/pseudocodeIde/interpreter/OutputForm.cs +++ b/pseudocodeIde/interpreter/OutputForm.cs @@ -47,13 +47,13 @@ public string OutputText } } - private readonly Interpreter INTERPRETER; + private readonly Interpreter _interpreter; public OutputForm(PseudocodeIDEForm mainForm) { Owner = mainForm; - INTERPRETER = new Interpreter(this); + _interpreter = new Interpreter(this); Logger.OutputForm = this; InitializeComponent(); @@ -80,7 +80,7 @@ private void OutputForm_FormClosing(object sender, FormClosingEventArgs e) } else { - INTERPRETER.Stop(); + _interpreter.Stop(); } } @@ -104,7 +104,7 @@ private void StartMenuItem_Click(object sender, EventArgs e) stopMenuItem.Enabled = true; OutputText = ""; - INTERPRETER.Run(); + _interpreter.Run(); } public void StopMenuItem_Click(object sender, EventArgs e) @@ -115,7 +115,7 @@ public void StopMenuItem_Click(object sender, EventArgs e) stopMenuItem.Enabled = false; })); - INTERPRETER.Stop(); + _interpreter.Stop(); Logger.Print(""); Logger.Info(LogMessage.STOPPED_PROGRAM); @@ -123,7 +123,7 @@ public void StopMenuItem_Click(object sender, EventArgs e) private void CopyCSharpCodeMenuItem_Click(object sender, EventArgs e) { - new SetClipboardHelper(DataFormats.UnicodeText, INTERPRETER.CodeManager.CodeText).Go(); + new SetClipboardHelper(DataFormats.UnicodeText, _interpreter.CodeManager.CodeText).Go(); MessageBox.Show("C# Code in Zwischenablage gespeichert.", "Zwischenablage"); } diff --git a/pseudocodeIde/interpreter/parser/Parser.cs b/pseudocodeIde/interpreter/parser/Parser.cs index ec938d3..a695cf3 100644 --- a/pseudocodeIde/interpreter/parser/Parser.cs +++ b/pseudocodeIde/interpreter/parser/Parser.cs @@ -24,19 +24,19 @@ public class Parser private const string FUNCTION_HEADER_TEMPLATE = "%visibility% %type% %identifier%(%insideParens%) {"; // Mapping of pseudocode tokens to C# code - private static readonly Dictionary TOKEN_TO_C_SHARP = new Dictionary(); + private static readonly Dictionary _tokenToCSharp = new Dictionary(); // Mapping of visibility tokens to C# visibility modifiers - private static readonly Dictionary VISIBILITY = new Dictionary(); + private static readonly Dictionary _visibility = new Dictionary(); // Characters that do not require a semicolon after them - private static readonly List NO_SEMICOLON_AFTER = new List(); + private static readonly List _noSemicolonAfter = new List(); // Linked list of tokens to be parsed - private readonly LinkedList TOKENS; + private readonly LinkedList _tokens; // Manager for generated C# code - private readonly CSharpCodeManager C_SHARP_CODE = new CSharpCodeManager(); + private readonly CSharpCodeManager _cSharpCode = new CSharpCodeManager(); // Current token being processed LinkedListNode _currentToken; @@ -55,53 +55,53 @@ public class Parser /// static Parser() { - TOKEN_TO_C_SHARP.Add(TYPE_BOOL, "bool?"); - TOKEN_TO_C_SHARP.Add(TYPE_INT, "int?"); - TOKEN_TO_C_SHARP.Add(TYPE_DOUBLE, "double?"); - TOKEN_TO_C_SHARP.Add(TYPE_CHAR, "char?"); - TOKEN_TO_C_SHARP.Add(TYPE_STRING, "string"); - TOKEN_TO_C_SHARP.Add(TYPE_VOID, "void"); + _tokenToCSharp.Add(TYPE_BOOL, "bool?"); + _tokenToCSharp.Add(TYPE_INT, "int?"); + _tokenToCSharp.Add(TYPE_DOUBLE, "double?"); + _tokenToCSharp.Add(TYPE_CHAR, "char?"); + _tokenToCSharp.Add(TYPE_STRING, "string"); + _tokenToCSharp.Add(TYPE_VOID, "void"); - TOKEN_TO_C_SHARP.Add(END_IF, "}"); - TOKEN_TO_C_SHARP.Add(END_FOR, "}"); - TOKEN_TO_C_SHARP.Add(END_WHILE, "}"); - TOKEN_TO_C_SHARP.Add(END_SWITCH, "}"); + _tokenToCSharp.Add(END_IF, "}"); + _tokenToCSharp.Add(END_FOR, "}"); + _tokenToCSharp.Add(END_WHILE, "}"); + _tokenToCSharp.Add(END_SWITCH, "}"); - TOKEN_TO_C_SHARP.Add(IF, "if"); - TOKEN_TO_C_SHARP.Add(ELSE, "} else {"); + _tokenToCSharp.Add(IF, "if"); + _tokenToCSharp.Add(ELSE, "} else {"); - TOKEN_TO_C_SHARP.Add(WHILE, "while"); + _tokenToCSharp.Add(WHILE, "while"); - TOKEN_TO_C_SHARP.Add(AND, "&&"); - TOKEN_TO_C_SHARP.Add(OR, "||"); + _tokenToCSharp.Add(AND, "&&"); + _tokenToCSharp.Add(OR, "||"); - TOKEN_TO_C_SHARP.Add(TRUE, "true"); - TOKEN_TO_C_SHARP.Add(FALSE, "false"); + _tokenToCSharp.Add(TRUE, "true"); + _tokenToCSharp.Add(FALSE, "false"); - TOKEN_TO_C_SHARP.Add(BREAK, "break"); + _tokenToCSharp.Add(BREAK, "break"); - TOKEN_TO_C_SHARP.Add(RETURN, "return "); + _tokenToCSharp.Add(RETURN, "return "); - TOKEN_TO_C_SHARP.Add(VAR_ASSIGN, "="); + _tokenToCSharp.Add(VAR_ASSIGN, "="); - TOKEN_TO_C_SHARP.Add(EQUAL, "=="); + _tokenToCSharp.Add(EQUAL, "=="); - TOKEN_TO_C_SHARP.Add(TYPE_LIST, "Liste"); - TOKEN_TO_C_SHARP.Add(NEW, "new "); - TOKEN_TO_C_SHARP.Add(NULL, "null"); + _tokenToCSharp.Add(TYPE_LIST, "Liste"); + _tokenToCSharp.Add(NEW, "new "); + _tokenToCSharp.Add(NULL, "null"); - VISIBILITY.Add(PLUS, "public"); - VISIBILITY.Add(MINUS, "private"); - VISIBILITY.Add(HASH, "protected"); + _visibility.Add(PLUS, "public"); + _visibility.Add(MINUS, "private"); + _visibility.Add(HASH, "protected"); - NO_SEMICOLON_AFTER.Add('}'); - NO_SEMICOLON_AFTER.Add('{'); - NO_SEMICOLON_AFTER.Add('\n'); - NO_SEMICOLON_AFTER.Add('\r'); - NO_SEMICOLON_AFTER.Add(';'); - NO_SEMICOLON_AFTER.Add(default); + _noSemicolonAfter.Add('}'); + _noSemicolonAfter.Add('{'); + _noSemicolonAfter.Add('\n'); + _noSemicolonAfter.Add('\r'); + _noSemicolonAfter.Add(';'); + _noSemicolonAfter.Add(default); } /// @@ -110,11 +110,11 @@ static Parser() /// The tokens to parse. public Parser(LinkedList tokens) { - TOKENS = tokens; + _tokens = tokens; for (int i = 0; i < 3; i++) { - TOKENS.AddLast(Token.CreateEofToken(TOKENS.Last.Value.LINE)); + _tokens.AddLast(Token.CreateEofToken(_tokens.Last.Value.LINE)); } } @@ -130,19 +130,19 @@ public CSharpCodeManager ParseTokens() Advance(); AddCode(ParseToken(_isInConstructor - ? C_SHARP_CODE.Constructor.LastOrDefault() - : C_SHARP_CODE.Methods.LastOrDefault())); + ? _cSharpCode.Constructor.LastOrDefault() + : _cSharpCode.Methods.LastOrDefault())); } - C_SHARP_CODE.Constructor += (NO_SEMICOLON_AFTER.Contains(C_SHARP_CODE.Constructor.LastOrDefault()) ? "" : ";"); + _cSharpCode.Constructor += (_noSemicolonAfter.Contains(_cSharpCode.Constructor.LastOrDefault()) ? "" : ";"); if (!_isInConstructor) { // function end - AddCode((NO_SEMICOLON_AFTER.Contains(C_SHARP_CODE.Methods.LastOrDefault()) ? "" : ";") + "\n}\n"); + AddCode((_noSemicolonAfter.Contains(_cSharpCode.Methods.LastOrDefault()) ? "" : ";") + "\n}\n"); } - return C_SHARP_CODE; + return _cSharpCode; } /// @@ -180,10 +180,10 @@ private string ParseToken(char prevChar, bool ignoreSpecialCases = false, bool i return TryHandleVarDef(ignoreSpecialCases, isInForLoopVarDef); case NEW_LINE: - return (NO_SEMICOLON_AFTER.Contains(prevChar) ? "" : ";") + "\n"; + return (_noSemicolonAfter.Contains(prevChar) ? "" : ";") + "\n"; case VAR_ASSIGN: - string output = TOKEN_TO_C_SHARP[token.TYPE]; + string output = _tokenToCSharp[token.TYPE]; Token possibleLeftBracket = Peek(); if (possibleLeftBracket.TYPE == LEFT_BRACKET) { @@ -199,8 +199,8 @@ private string ParseToken(char prevChar, bool ignoreSpecialCases = false, bool i return output; default: - return TOKEN_TO_C_SHARP.ContainsKey(token.TYPE) - ? TOKEN_TO_C_SHARP[token.TYPE] + return _tokenToCSharp.ContainsKey(token.TYPE) + ? _tokenToCSharp[token.TYPE] : token.LEXEME; } } @@ -351,7 +351,7 @@ private string HandleSimpleHeader() string output = ""; Token currentToken = _currentToken.Value; - string keyword = TOKEN_TO_C_SHARP[currentToken.TYPE]; + string keyword = _tokenToCSharp[currentToken.TYPE]; do { @@ -518,7 +518,7 @@ private string TryHandleVarDef(bool insideFunctionParens, bool isInForLoopVarDef if (IsVarType(possibleVarType.TYPE)) { - string type = TOKEN_TO_C_SHARP[possibleVarType.TYPE]; + string type = _tokenToCSharp[possibleVarType.TYPE]; if (possibleVarAssign.TYPE == LESS) { Advance(); @@ -528,7 +528,7 @@ private string TryHandleVarDef(bool insideFunctionParens, bool isInForLoopVarDef if (_isInConstructor && !insideFunctionParens) { - C_SHARP_CODE.Fields += $"private {type} _{identifier.LEXEME};\n"; + _cSharpCode.Fields += $"private {type} _{identifier.LEXEME};\n"; if (possibleVarAssign.TYPE == VAR_ASSIGN) { @@ -577,7 +577,7 @@ private string TryHandleTypedVarType() if (IsVarType(possibleVarType.TYPE)) { - string type = TOKEN_TO_C_SHARP[possibleVarType.TYPE]; + string type = _tokenToCSharp[possibleVarType.TYPE]; if (possibleLessSign.TYPE == LESS) { output += type + "<"; @@ -645,9 +645,9 @@ private string HandleFunction() Token possibleVisibility = Advance(); Token possibleIdentifier = possibleVisibility; - if (Parser.VISIBILITY.ContainsKey(possibleVisibility.TYPE)) + if (Parser._visibility.ContainsKey(possibleVisibility.TYPE)) { - visibility = Parser.VISIBILITY[possibleIdentifier.TYPE]; + visibility = Parser._visibility[possibleIdentifier.TYPE]; possibleIdentifier = Advance(); } @@ -699,14 +699,14 @@ private string HandleFunction() if (!_isInConstructor) { - output += (NO_SEMICOLON_AFTER.Contains(output.LastOrDefault()) ? "" : ";") + "}\n\n"; + output += (_noSemicolonAfter.Contains(output.LastOrDefault()) ? "" : ";") + "}\n\n"; } _isInConstructor = false; return output + FUNCTION_HEADER_TEMPLATE .Replace("%visibility%", visibility) - .Replace("%type%", TOKEN_TO_C_SHARP[type]) + .Replace("%type%", _tokenToCSharp[type]) .Replace("%identifier%", "_" + possibleIdentifier.LEXEME) .Replace("%insideParens%", insideParens); } @@ -754,7 +754,7 @@ private Token Peek() private LinkedListNode PeekLinkedList() { return _currentToken == null - ? TOKENS.First + ? _tokens.First : _currentToken.NextOrLast(); } @@ -775,11 +775,11 @@ private void AddCode(string code) { if (_isInConstructor) { - C_SHARP_CODE.Constructor += code; + _cSharpCode.Constructor += code; } else { - C_SHARP_CODE.Methods += code; + _cSharpCode.Methods += code; } } } diff --git a/pseudocodeIdeUpdater/Program.cs b/pseudocodeIdeUpdater/Program.cs index 4b00be5..f063288 100644 --- a/pseudocodeIdeUpdater/Program.cs +++ b/pseudocodeIdeUpdater/Program.cs @@ -19,9 +19,6 @@ namespace pseudocodeIdeUpdater { internal static class Program { - /// - /// Der Haupteinstiegspunkt für die Anwendung. - /// [STAThread] static void Main(string[] args) {