Merge pull request #15 from PetrPytelka/consumeEndOfLine_to_consumeEndOfStatement

Rename consumeEndOfLine to consumeEndOfStatement and allow to use colon as a statement separator

Author: verhas

src/main/java/com/scriptbasic/interfaces/LexicalElement.java

@@ -79,5 +79,12 @@ public interface LexicalElement extends SourceLocationBound {
      */
     Boolean isSymbol(String lexeme);
 
+    /**
+     * Return true if the lexical element is colon 
+     * 
+     * @return true if the lexical element is colon
+     */
+    Boolean isStatementSeparator();
+
     Boolean isLineTerminator();
 }

src/main/java/com/scriptbasic/lexer/BasicLexicalElement.java

@@ -179,4 +179,10 @@ public Boolean isLineTerminator() {
                 && CharUtils.isNewLine(getLexeme().codePointAt(0));
     }
 
+    @Override
+    public Boolean isStatementSeparator() {
+        return getType() == TYPE_SYMBOL && getLexeme().length() == 1
+                && getLexeme().codePointAt(0) == ':';
+    }
+
 }

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

@@ -93,17 +93,16 @@ protected boolean isKeyWord(final String keyword) throws AnalysisException {
     }
 
     /**
-     * Checks that there are no extra characters on a program line when the line
-     * analyzer thinks that it has finished analyzing the line. If there are
+     * Checks that there are no extra characters when the line analyzer 
+     * expects it has finished analyzing the statement. If there are
      * some extra characters on the line then throws syntax error exception.
-     * Otherwise it simply steps the lexical analyzer iterator over the EOL
-     * symbol.
+     * Otherwise it simply steps the lexical analyzer iterator over the symbol.
      *
      * @throws AnalysisException when there are extra character on the actual line
      */
-    protected void consumeEndOfLine() throws AnalysisException {
+    protected void consumeEndOfStatement() throws AnalysisException {
         final var le = ctx.lexicalAnalyzer.get();
-        if (le != null && !le.isLineTerminator()) {
+        if (le != null && !(le.isLineTerminator() || le.isStatementSeparator())) {
             SyntaxExceptionUtility.throwSyntaxException(
                     "There are extra characters following the expression after the '"
                             + getName() + "' keyword", le);

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

@@ -27,7 +27,7 @@ public Command analyze() throws AnalysisException {
         final var node = newNode();
         final var list = analyzeSimpleLeftValueList();
         node.setLeftValueList(list);
-        consumeEndOfLine();
+        consumeEndOfStatement();
         return node;
     }
 

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

@@ -31,7 +31,7 @@ public Command analyze() throws AnalysisException {
     protected Expression analizeLine() throws AnalysisException {
         final var condition = analyzeExpression();
         assertKeyWord(ScriptBasicKeyWords.KEYWORD_THEN);
-        consumeEndOfLine();
+        consumeEndOfStatement();
         return condition;
     }
 

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

@@ -26,7 +26,7 @@ public Command analyze() throws AnalysisException {
             ctx.lexicalAnalyzer.resetLine();
             final var commandLet = new CommandLet();
             commandLet.setExpression(ctx.expressionAnalyzer.analyze());
-            consumeEndOfLine();
+            consumeEndOfStatement();
             return commandLet;
         } else {
             final var functionName = lv.getIdentifier();
@@ -47,7 +47,7 @@ public Command analyze() throws AnalysisException {
             if (needClosingParenthesis) {
                 consumeClosingParenthesis(ctx.lexicalAnalyzer);
             }
-            consumeEndOfLine();
+            consumeEndOfStatement();
             return new CommandCall(functionCall);
         }
     }

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

@@ -27,7 +27,7 @@ public Command analyze() throws AnalysisException {
         } else {
             analyzeCaseConditions(node);
         }
-        consumeEndOfLine();
+        consumeEndOfStatement();
 
         var lastSelectPart = ctx.nestedStructureHouseKeeper.pop(AbstractCommandSelectPart.class);
         CommandSelect commandSelect = null;

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

@@ -86,7 +86,7 @@ private void defineDSLRule() throws AnalysisException {
         if (!functionNameLexicalElement.isIdentifier()) {
             throw new BasicSyntaxException("there should be a function name after the keyword 'call' defining a sentenceó");
         }
-        consumeEndOfLine();
+        consumeEndOfStatement();
         final String[] syntaxElements = sentence.split("\\s+");
         if (syntaxElements.length == 0) {
             throw new BasicSyntaxException("sentence can not be empty");

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

@@ -14,7 +14,7 @@ public CommandAnalyzerElse(final Context ctx) {
     @Override
     public Command analyze() throws AnalysisException {
         final var node = new CommandElse();
-        consumeEndOfLine();
+        consumeEndOfStatement();
         registerAndSwapNode(node);
         return node;
     }

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

@@ -25,7 +25,7 @@ public Command analyze() throws AnalysisException {
             throw new BasicSyntaxException(
                     "Select has to be terminated with End Select statement");        	
         }
-        consumeEndOfLine();
+        consumeEndOfStatement();
 
         var lastSelectPart = ctx.nestedStructureHouseKeeper.pop(AbstractCommandSelectPart.class);