Ticket #304: ticket-304.patch

Source/CobraParser.cobra

@@ -114 +114 @@
 
     var _spaceAgnosticIndentLevel as int
     var _spaceAgnosticExprLevel as int
-    var _isContractOnSameLine as bool
 
     var _isTraceOn as bool
 
@@ -1925 +1924 @@
             <any statement 2>
             <any statement N>
         Example source
+            require <cond 1> |
             require
                 <cond 1>
                 <cond N>
+            ensure <cond 1>  |  
             ensure
                 <cond 1>
                 <cond N>
-            test
+            [test
                 <any statement 1>
                 <any statement 2>
-                <any statement N>
+                <any statement N>]
             [body
                 <any statement 1>
                 <any statement 2>
@@ -1956 +1957 @@
             while .peek.which == 'EOL', .grab
             if .peek.which.isOneOf('BODY.TEST.REQUIRE.ENSURE.OR.AND.')
                 # sectional
-                # not flexible. sequence is signature, contract, test, implementation
-                _isContractOnSameLine = false
+                # not flexible. sequence is signature, contracts, tests, implementation body
+                haveCode = false
                 if .peek.which.isOneOf('REQUIRE.OR.')
+                    haveCode = true
                     .requireSection(codePart)
                 if .peek.which.isOneOf('ENSURE.AND.')
+                    haveCode = true
                     .ensureSection(codePart)
                 while .peek.which == 'TEST'
+                    haveCode = true
                     .testSection(codePartContainingTest to !)
                 if .peek.which=='BODY'
                     .grab
                     .indent
                     _statementsFor(codePart)
+                    .dedent # back to level of body
                 else
-                    if _isContractOnSameLine
+                    if haveCode # already have contract or test subclause so must also have body statements
                         _statementsFor(codePart)
                     else
                         pass
                         # There is no body for abstract or interface members. Error checking is done elsewhere.
                         # .throwError('Expecting `body` section.')
-                if not _isContractOnSameLine
-                    .dedent
             else
                 # non-sectional
                 _statementsFor(codePart)
@@ -2463 +2466 @@
             # one expression, on the same line
             exprs = [.expression]
             .endOfLine
-            _isContractOnSameLine = true
         return theClass(connectToken, mainToken, codeMember, exprs) to ContractPart
 
     def throwStmt as Stmt

Tests/340-contracts/090-parse-test.cobra

@@ +1 @@
+# test the main the variants of contract layout - looking for parsing errors
+class ContractParsing
+    # this was the failure case
+    def dedentError(x as int) as char
+        require x < 3
+        test
+            assert true
+        body
+            return c'z'
+    # to here
+        
+    def dedent1(x as int) as char
+        require 
+            x < 3
+        test
+            assert true
+        body
+            return c'z'
+
+            
+    def dedent2(x as int) as char
+        require x < 3
+        #test
+        #   assert true
+        body
+            return c'z'
+            
+    def dedent2a(x as int) as char
+        require 
+            x < 3
+        #test
+        #   assert true
+        body
+            return c'z'
+            
+    def dedent3(x as int) as char
+        require x < 3
+        #test
+        #   assert true
+        #body
+        return c'z'
+
+    def dedent3a(x as int) as char
+        require 
+            x < 3
+        #test
+        #   assert true
+        #body
+        return c'z'
+        
+    def dedent4(x as int) as char
+        require x < 3
+        test
+            assert true
+        #body
+        return c'z'
+        
+    def dedent4a(x as int) as char
+        require 
+            x < 3
+        test
+            assert true
+        #body
+        return c'z'
+    
+    def dedent5(x as int) as char
+        #require x < 3
+        test
+            assert true
+        #body
+        return c'z'
+        
+    def dedent5a(x as int) as char
+        #require x < 3
+        test
+            assert true
+        body
+            return c'z'
+        
+            
+    def main is shared
+        c = ContractParsing()
+        assert c.dedentError(1) == c'z'
+        assert c.dedent1(1) == c'z'
+        assert c.dedent2(1) == c'z'
+        assert c.dedent2a(2) == c'z'
+        assert c.dedent3(1) == c'z'
+        assert c.dedent3a(2) == c'z'
+        assert c.dedent4(1) == c'z'
+        assert c.dedent4a(2) == c'z'
+        assert c.dedent5(1) == c'z'
+        assert c.dedent5a(1) == c'z'