Ticket #116: multiline-if-indent.patch

Source/CobraParser.cobra

@@ -2124 +2124 @@
         else
             # for x in stuff
             return ForEnumerableStmt(token, varr, what, .block)
-
+            
     def ifStmt as Stmt
         token = .expect('IF')
-        cond = .expression
+        cond = _expressionMultiLinePreBlock     # was .expression
         trueStmts = .block
         falseStmts as BlockStmt?
         if .peek.which=='ELSE'
@@ -2165 +2165 @@
     def postWhileStmt as Stmt
         token = .expect('POST')
         .expect('WHILE')
-        return PostWhileStmt(token, .expression, .block)
+        return PostWhileStmt(token, _expressionMultiLinePreBlock, .block)
 
     def traceStmt as TraceStmt?
         """
@@ -2363 +2363 @@
         return UsingStmt(token, varr, initExpr, block)
 
     def whileStmt as Stmt
-        return WhileStmt(.expect('WHILE'), .expression, .block)
+        return WhileStmt(.expect('WHILE'), _expressionMultiLinePreBlock, .block)
 
     def yieldStmt as Stmt
         token = .expect('YIELD')
@@ -2566 +2566 @@
 
     var _inExpression as int
     
+    def _expressionMultiLinePreBlock as Expr
+        cond = .expression
+        if  cond.token.lineNum <> .last.lineNum  and _spaceAgnosticIndentLevel <> 0
+            # expression broken across multiple lines and changed indentation
+            # unwind indentation and correct indentation tokens for the expected following block
+            _spaceAgnostic
+            _spaceAgnosticIndentLevel=0
+            if .peek.which <> 'COMMA'
+                .undo
+                .replace(.peek.copy('INDENT'))
+                .undo
+                .replace(.peek.copy('EOL'))
+        return cond
+        
     def expression as Expr
         test
             assert 0 not in _binaryOpPrec.values

Tests/110-basics-two/160-lines-and-comments/420-multiline-in-if.cobra

@@ +1 @@
+# Test multiline expressions in if-statements with non matching indentation
+class IfSpaceAgnostic
+    def main is shared
+        a=99
+        b=99
+
+        if  (a > 98 and
+        b == 99 )    # matching indent - otherwise OK
+            assert true, 'OK - 0'
+        else, assert false, 'fail'
+        
+        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 )
+            assert true, 'OK - 4 indents'
+        else
+            assert false, 'fail'
+
+            
+        if  (a > 98 and b == 99 ), assert true, 'OK - 2'  #.no-warnings.
+        else, assert false, 'fail'
+
+/#      # TODO: fix this
+        if  (a > 98 and
+            b == 99 ),  assert true, 'OK - 2'
+        else, assert true, 'fail'
+#/
+        # pathological back indentation
+        if  (a > 98 and
+    b == 99 )
+            assert true, 'OK - 1 DEDENT)'
+        else
+            assert false, 'fail'
+        
+        if b==99 or a==99
+            assert true, 'normal'   
+            
+        if b==99 or a==99, assert true, 'normal'    

Developer/IntermediateReleaseNotes.text

@@ -247 +247 @@
 * Fixed: Cobra does not read "non-nilable" from DLL parameter types.
 
 * Fixed: Cobra does not give a sensible error message when the `X` in `print to X, ...` is not a valid destination. ticket:63
+
+* Fixed: multiline expression in if with different indentation. ticket:116