a few refactor and typos

Author: verhas

src/main/java/com/scriptbasic/syntax/commands/CommandAnalyzerMethod.java

@@ -4,6 +4,7 @@
 import com.scriptbasic.executors.commands.CommandMethod;
 import com.scriptbasic.interfaces.AnalysisException;
 import com.scriptbasic.interfaces.Expression;
+import com.scriptbasic.interfaces.ExpressionList;
 import com.scriptbasic.interfaces.ScriptBasicKeyWords;
 import com.scriptbasic.spi.Command;
 import com.scriptbasic.utility.ExpressionUtility;
@@ -29,42 +30,68 @@ public CommandAnalyzerMethod(final Context ctx) {
      */
     @Override
     public Command analyze() throws AnalysisException {
-        final var methodName = ExpressionUtility
-                .convertToString(analyzeExpression());
+        final String methodName = getMethodName();
+
         LexUtility.checkLexeme(ctx.lexicalAnalyzer, ScriptBasicKeyWords.KEYWORD_FROM,
                 "Keyword 'FROM' is missing in command 'METHOD'");
-        final var className = ExpressionUtility
-                .convertToString(analyzeExpression());
+
+        final String className = getClassName();
 
         LexUtility.checkLexeme(ctx.lexicalAnalyzer, ScriptBasicKeyWords.KEYWORD_IS,
                 "Keyword 'IS' is missing in command 'METHOD'");
         LexUtility.checkLexeme(ctx.lexicalAnalyzer, "(",
                 "'(' is missing in command 'METHOD' after the keyword 'IS'");
 
-        final var argExpressions = ctx.expressionListAnalyzer.analyze();
+        final var argClasses = getArgClasses();
+
         LexUtility.checkLexeme(ctx.lexicalAnalyzer, ")",
                 "')' is missing in command 'METHOD'");
+
+        final String alias = getAlias(methodName);
+
+        final var node = new CommandMethod();
+        node.setArgumentTypes(argClasses.toArray(new Class<?>[0]));
+        node.setKlass(KlassUtility.forNameEx(className));
+        node.setMethodName(methodName);
+        node.setAlias(alias);
+        consumeEndOfStatement();
+
+        return node;
+    }
+
+    private String getAlias(String methodName) throws AnalysisException {
         final String alias;
         if (LexUtility.isLexeme(ctx.lexicalAnalyzer, ScriptBasicKeyWords.KEYWORD_USE)) {
             LexUtility.checkLexeme(ctx.lexicalAnalyzer, ScriptBasicKeyWords.KEYWORD_AS,
                     "Keyword 'AS' is missung after 'USE in command 'METHOD'");
-            alias = ExpressionUtility.convertToString(analyzeExpression());
+            alias = getString();
         } else {
             alias = methodName;
         }
+        return alias;
+    }
+
+    private String getClassName() throws AnalysisException {
+        return getString();
+    }
+
+    private String getString() throws AnalysisException {
+        return ExpressionUtility
+                    .convertToString(analyzeExpression());
+    }
+
+    private String getMethodName() throws AnalysisException {
+        return getString();
+    }
+
+    private ArrayList<Class<?>> getArgClasses() throws AnalysisException {
+        final var argExpressions = ctx.expressionListAnalyzer.analyze();
         final ArrayList<Class<?>> argClasses = new ArrayList<>();
         for (final Expression expression : argExpressions) {
             final var argClassName = ExpressionUtility.convertToString(expression);
             argClasses.add(KlassUtility.forNameEx(argClassName));
         }
-        final var node = new CommandMethod();
-        node.setArgumentTypes(argClasses.toArray(new Class<?>[0]));
-        node.setKlass(KlassUtility.forNameEx(className));
-        node.setMethodName(methodName);
-        node.setAlias(alias);
-        consumeEndOfStatement();
-
-        return node;
+        return argClasses;
     }
 
 }

src/main/java/com/scriptbasic/utility/ExpressionUtility.java

@@ -154,6 +154,6 @@ public static String convertToString(final Expression expression)
             return ((BasicStringValue) expression).getValue();
         }
         throw new BasicSyntaxException(
-                "class, package or symbol name are not vaid in command USE");
+                "class, package or symbol name are not valid in command USE or METHOD");
     }
 }