Ticket #334: comma-sep-intrnl-error.patch

Source/CobraParser.cobra

@@ -3210 +3210 @@
         while true
             if isSpaceAgnostic
                 _spaceAgnostic
-            if .peek is nil
-                literal = {'RPAREN': ')', 'RBRACKET': ']'}
-                what = (for t in terminators.split(c'.') where t.trim<>'' get '"[if(literal.containsKey(t), literal[t], t)]"').join(' or ')
-                .throwError('Expecting "," or [what].')
-            if .peek.which.isOneOf(terminators)
+            if _peekCommaSep(terminators)
                 .grab
                 break
             if expectSep
                 .expect(sep)
-            if .peek.which.isOneOf(terminators)
+            if _peekCommaSep(terminators)
                 .grab
                 break
             if isSpaceAgnostic
                 _spaceAgnostic
-            if .peek.which.isOneOf(terminators)
+            if _peekCommaSep(terminators)
                 .grab
                 break
             .newOpStack
@@ -3237 +3233 @@
                 .delOpStack
             expectSep = true
         return exprs
-    
+
+    def _peekCommaSep(terminators as String) as bool
+        p = .peek
+        if p is nil
+            literal = {'RPAREN': ')', 'RBRACKET': ']'}
+            what = (for t in terminators.split(c'.') where t.trim<>'' get '"[if(literal.containsKey(t), literal[t], t)]"').join(' or ')
+            .throwError('Unexpected end of comma separated expressions - Expecting "," or [what].')
+        return p.which.isOneOf(terminators)
+        
     def doExpr as AnonymousExpr
         """
         Example:

Tests/820-errors/200-expressions/710-unexpected-end.cobra

@@ +1 @@
+# .error. end of comma separated expressions
+class Program
+
+    def main
+        variable as int
+        streamReader = StreamReader("Something.txt")
+        streamReader.getType(variable,