add +, - and # before function name (and after OPERATION keyword) to …

…allow making functions public, private and protected
PocketMiner82 · Mar 25, 2024 · 24c7b6b · 24c7b6b
1 parent 0b9c92d
commit 24c7b6b
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 8 deletions.
diff --git a/pseudocodeIde/interpreter/parser/Parser.cs b/pseudocodeIde/interpreter/parser/Parser.cs
@@ -8,9 +8,11 @@ namespace pseudocodeIde.interpreter
 {
     public class Parser
     {
-        private const string FUNCTION_HEADER_TEMPLATE = "private %type% %identifier%(%insideParens%) {";
+        private const string FUNCTION_HEADER_TEMPLATE = "%visibility% %type% %identifier%(%insideParens%) {";
 
-        private static readonly Dictionary<TokenType, string> TOKEN_TO_CSHARP = new Dictionary<TokenType, string>();
+        private static readonly Dictionary<TokenType, string> TOKEN_TO_CSHARP = new Dictionary<TokenType, string>(); 
+
+        private static readonly Dictionary<TokenType, string> VISIBILITY = new Dictionary<TokenType, string>();
 
         private static readonly List<char> NO_SEMICOLON_AFTER = new List<char>();
 
@@ -64,6 +66,11 @@ static Parser()
             TOKEN_TO_CSHARP.Add(NULL,           "null");
 
 
+            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');
@@ -559,11 +566,19 @@ private string handleFunction()
         {
             string output = "";
             string insideParens = "";
+            string visibility = "";
             TokenType type = TYPE_VOID;
 
-            Token operationKeyword = this.currentToken.Value;
+            Token functionKeyword = this.currentToken.Value;
+
+            Token possibleVisibility = this.advance();
+            Token possibleIdentifier = possibleVisibility;
+            if (VISIBILITY.ContainsKey(possibleVisibility.type))
+            {
+                visibility = VISIBILITY[possibleIdentifier.type];
+                possibleIdentifier = this.advance();
+            }
 
-            Token possibleIdentifier = this.advance();
             Token possibleLeftParen = this.advance();
 
             Token possibleRightParen = this.advance();
@@ -572,7 +587,7 @@ private string handleFunction()
 
             if (possibleIdentifier.type != IDENTIFIER || possibleLeftParen.type != LEFT_PAREN)
             {
-                Logger.error(operationKeyword.line, "Unerwartete Zeichen nach dem OPERATION-Keyword.");
+                Logger.error(functionKeyword.line, "Unerwartete Zeichen nach dem OPERATION-Keyword.");
                 return "";
             }
 
@@ -581,7 +596,7 @@ private string handleFunction()
             {
                 if (possibleRightParen.type == NEW_LINE)
                 {
-                    Logger.error(operationKeyword.line, "Neue Zeile vor dem Ende der OPERATION-Definition.");
+                    Logger.error(functionKeyword.line, "Neue Zeile vor dem Ende der OPERATION-Definition.");
                     return "\n";
                 }
                 else if (possibleRightParen.type == RIGHT_PAREN
@@ -605,7 +620,7 @@ private string handleFunction()
                 }
                 else
                 {
-                    Logger.error(operationKeyword.line, "Unerwartete Zeichen.");
+                    Logger.error(functionKeyword.line, "Unerwartete Zeichen.");
                     return "";
                 }
             }
@@ -618,6 +633,7 @@ private string handleFunction()
             this.isInConstructor = false;
 
             return output + FUNCTION_HEADER_TEMPLATE
+                .Replace("%visibility%", visibility)
                 .Replace("%type%", TOKEN_TO_CSHARP[type])
                 .Replace("%identifier%", "_" + possibleIdentifier.lexeme)
                 .Replace("%insideParens%", insideParens);

diff --git a/pseudocodeIde/interpreter/scanner/Scanner.cs b/pseudocodeIde/interpreter/scanner/Scanner.cs
@@ -121,6 +121,7 @@ private void scanToken()
                 case '←': this.addToken(VAR_ASSIGN); break;
                 case '&': this.addToken(SINGLE_AND); break;
                 case '|': this.addToken(SINGLE_OR); break;
+                case '#': this.addToken(HASH); break;
 
                 // single or two char lexems
                 case '!':

diff --git a/pseudocodeIde/interpreter/scanner/TokenType.cs b/pseudocodeIde/interpreter/scanner/TokenType.cs
@@ -3,7 +3,7 @@
     public enum TokenType
     {
         // Single-character tokens.
-        LEFT_PAREN, RIGHT_PAREN, LEFT_BRACKET, RIGHT_BRACKET,
+        LEFT_PAREN, RIGHT_PAREN, LEFT_BRACKET, RIGHT_BRACKET, HASH,
         SINGLE_AND, SINGLE_OR, COLON, COMMA, DOT, MINUS, PLUS, SEMICOLON, SLASH, STAR, NEW_LINE,
 
         // One or two character tokens.