Ticket #210: line-cont-plus-spaces.patch

Source/CobraParser.cobra

@@ -3047 +3047 @@
                         else
                             throw
 
-    var _implicitContinuationOps = [
-        'ASSIGN', 'AND', 'OR', 'STAR', 'SLASH', 'PLUS', 'MINUS',
-        'EQ', 'NE', 'LT', 'GT', 'LE', 'GE', 'IN', 'NOTIN',  
-        'PLUS_EQUALS', 'MINUS_EQUALS', 'STAR_EQUALS', 'SLASH_EQUALS', 'PERCENT_EQUALS', 
-        'SLASHSLASH', 'PERCENT', 'AMPERSAND', 'VERTICAL_BAR',   'CARET', 'DOUBLE_LT',   
-        'DOUBLE_GT', 'AMPERSAND_EQUALS', 'VERTICAL_BAR_EQUALS', 'CARET_EQUALS', 
-        'DOUBLE_LT_EQUALS', 'DOUBLE_GT_EQUALS', 'STARSTAR', 'STARSTAR_EQUALS' 
-    ]
+    shared 
+        var implicitContinuationOps = [
+            'ASSIGN', 'AND', 'OR', 'STAR', 'SLASH', 'PLUS', 'MINUS',
+            'EQ', 'NE', 'LT', 'GT', 'LE', 'GE', 'IN', 'NOTIN',  
+            'PLUS_EQUALS', 'MINUS_EQUALS', 'STAR_EQUALS', 'SLASH_EQUALS', 'PERCENT_EQUALS', 
+            'SLASHSLASH', 'PERCENT', 'AMPERSAND', 'VERTICAL_BAR',   'CARET', 'DOUBLE_LT',   
+            'DOUBLE_GT', 'AMPERSAND_EQUALS', 'VERTICAL_BAR_EQUALS', 'CARET_EQUALS', 
+            'DOUBLE_LT_EQUALS', 'DOUBLE_GT_EQUALS', 'STARSTAR', 'STARSTAR_EQUALS' 
+        ]
             
     def _continuedExpression(prec as int, opToken as IToken) as Expr
         """
@@ -3062 +3063 @@
         Relies on _expressionMultilinePreBlock (on if, postwhile and while stmts)
         and end of statement _finishSpaceAgnostic to handle subsequent indent/dedent cleanup
         """
-        if .peek.which == 'EOL' and opToken.which in _implicitContinuationOps 
+        if .peek.which == 'EOL' and opToken.which in CobraParser.implicitContinuationOps 
             _spaceAgnostic  # eat the following EOL and remove any now hanging indents
         right = .expression(prec)
         return right

Source/CobraTokenizer.cobra

@@ -450 +450 @@
         return t
 
     def _processNumIndentLevels(numTabs as int) as IToken?
-        if .justDidLineContinuation
+        if .justDidLineContinuation and not _implicitLineContinuation
             if numTabs < _indentCount
                 .recordError('Must indent same amount or more on a continued line.')
             return nil
@@ -477 +477 @@
         return firstTok
 
     var _didLineContinuation as bool  # only meaningful after an EOL
-
+    var _implicitLineContinuation as bool # only meaningful after an EOL
+    
     get justDidLineContinuation as bool
-        return .lastToken and .lastToken.which == 'EOL' and _didLineContinuation
-
+        return .lastToken and .lastToken.which == 'EOL' and (_didLineContinuation or _implicitLineContinuation)
+        
+    shared 
+        var implicitContinuationOps = [
+            'COMMA', 'ASSIGN', 'AND', 'OR', 'STAR', 'SLASH', 'PLUS', 'MINUS',
+            'EQ', 'NE', 'LT', 'LE', 'GE', 'IN', 'NOTIN', # 'GT' confuses Generic dcls   
+            'PLUS_EQUALS', 'MINUS_EQUALS', 'STAR_EQUALS', 'SLASH_EQUALS', 'PERCENT_EQUALS', 
+            'SLASHSLASH', 'PERCENT', 'AMPERSAND', 'VERTICAL_BAR',   'CARET', 'DOUBLE_LT',   
+            'AMPERSAND_EQUALS', 'VERTICAL_BAR_EQUALS', 'CARET_EQUALS',  # ditto 'DOUBLE_GT'
+            'DOUBLE_LT_EQUALS', 'DOUBLE_GT_EQUALS', 'STARSTAR', 'STARSTAR_EQUALS' 
+        ]
+            
     def onEOL(tok as IToken) as IToken?
         _didLineContinuation = .lastToken and .lastToken.text == '_' and .lastToken.which == 'ID'
+        _implicitLineContinuation = .lastToken and .lastToken.which in CobraTokenizer.implicitContinuationOps
         return tok
 
     def onSINGLE_LINE_COMMENT_BLOCK(tok as IToken) as IToken?

Tests/110-basics-two/150-line-continuation/130-implicit-line-cont-plus-wspc.cobra

@@ +1 @@
+# these implicitly continued lines have Tabs AND spaces
+class X
+
+    def foo(i as int, j as int) as int
+        return i + j
+
+    def main
+        assert .foo(1, 2) ==3
+        assert .foo(1,
+                2) == 3  # tabs only
+        assert .foo(1,
+                   2) == 3 # tabs and spaces
+                   
+        .stmtExpr
+        .cond
+               
+    
+    def stmtExpr
+        assert (1 +     # braces ok
+             2) == 3
+        assert (1 +     # braces ok
+             2) 
+        assert 1 *      # implicit trailing '*', 0 indent + space
+         2  == 2
+        
+        assert 1 +      # implicit trailing '+', 1 indent + spaces
+              2 == 3
+        
+        assert (1 +     # braces, double indent plus spaces
+                  12) == 13
+        assert 1 +      # trailing '+', double indent after plus spaces
+                   2 == 3
+        assert 3 -      # trailing '-', double indent after
+                 2 == 1
+                
+        assert 3 *      # ((3*1) + 4) -(8/2)  # multiple lines
+             1 +
+             4 -
+             8 /
+             2 == 3
+            
+        a = 1
+        b = 2
+        assert (a == 1 and  
+             b == 2)
+        assert a == 1 and   #implicit on 'and'
+               b == 2
+        assert a == 1 or    # implicit on or
+               b == 2
+
+    def cond
+        a=99
+        b=99
+        
+        
+        # 2nd perhaps subsequent lines indented 1 or 2 indents (plus spaces)
+        if  a > 98 and
+                b == 99 
+            assert true, 'OK - 1 indent'
+        else
+            assert false, 'fail'
+
+        if  a > 98 and
+              b == 99 
+            assert true, 'OK - 2 indents'
+        else
+            assert false, 'fail'
+
+        if  a > 98 and
+              b == 99 or
+              a == b
+            assert true, 'OK - 1 indent'
+        else
+            assert false, 'fail'

Tests/110-basics-two/150-line-continuation/120-implicit-line-cont-ops.cobra

@@ -18 +18 @@
         
         assert 1 +      # implicit trailing '+', 1 indent
             2 == 3
-        #assert (1 +        # Ticket 210: Cannot mix tabs and spaces in indentation.
-        #      2)
-        #assert 1 +     # Both tickets.
-        #     2 == 3
+        assert (1 +     # Ticket 210: Cannot mix tabs and spaces in indentation.
+               2)
+        assert 1 +      # Both tickets.
+              2 == 3
         
         assert (1 +     # braces, double indent
                 12) == 13
@@ -45 +45 @@
         assert a == 1 or    # implicit on or
             b == 2
 
-        #assert a == 1 and  # implicit on and and tabs+spaces
-        #      b == 2
+        assert a == 1 and   # implicit on and and tabs+spaces
+               b == 2
 
 
     def cond
@@ -99 +99 @@
         if  a > 98 and  b == 99, assert true, 'OK - 2' 
         else, assert false, 'fail'
 
-        /# TODO Fix this case
+        /# TODO Fix this case (when disallow back indent)
         if  a > 98 and
             b == 99, assert true, 'OK - 2'
         else, assert true, 'fail'