Statement function fix

src/fparser/two/Fortran2003.py

@@ -431,19 +431,11 @@ class Declaration_Construct(Base):  # R207
                            or specification-stmt
                            or type-declaration-stmt
                            or stmt-function-stmt
-
-    Note, stmt-function-stmt is not currently matched.
-
     '''
-    # Commented out Stmt_Function_Stmt as it can falsely match an
-    # access to an array or function. Reintroducing statement
-    # functions is captured in issue #202.
-
-    #                   'Type_Declaration_Stmt', 'Stmt_Function_Stmt']
     subclass_names = ['Derived_Type_Def', 'Entry_Stmt', 'Enum_Def',
                       'Format_Stmt', 'Interface_Block', 'Parameter_Stmt',
                       'Procedure_Declaration_Stmt', 'Specification_Stmt',
-                      'Type_Declaration_Stmt']
+                      'Type_Declaration_Stmt', 'Stmt_Function_Stmt']
 
 
 class Execution_Part(BlockBase):  # R208

src/fparser/two/Fortran2008.py

@@ -192,10 +192,7 @@ class Declaration_Construct_C1112(Declaration_Construct):  # C1112
     subclass_names = Declaration_Construct.subclass_names[:]
     subclass_names.remove('Format_Stmt')
     subclass_names.remove('Entry_Stmt')
-    # Commented out Stmt_Function_Stmt as it can falsely match an
-    # access to an array or function. Reintroducing statement
-    # functions is captured in issue #202.
-    # subclass_names.remove('Stmt_Function_Stmt')
+    subclass_names.remove('Stmt_Function_Stmt')
 
 
 class Submodule(BlockBase):  # R1116 [C1112,C1114]

src/fparser/two/tests/fortran2003/test_statement_function_r1238.py

@@ -0,0 +1,144 @@
+# Copyright (c) 2018 Science and Technology Facilities Council
+
+# All rights reserved.
+
+# Modifications made as part of the fparser project are distributed
+# under the following license:
+
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+
+# 3. Neither the name of the copyright holder nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+'''Test Fortran 2003 rule R1238 : Tests support for statement functions.
+
+'''
+
+
+import pytest
+from fparser.two.utils import InternalError, NoMatchError
+from fparser.api import get_reader
+from fparser.two.Fortran2003 import Stmt_Function_Stmt, Assignment_Stmt, Program
+
+def test_statement_function_simple(f2003_create):
+    """
+    Test that a simple statement function can be parsed.
+    """
+    code = """
+    MYFUNC(ARG1) = MAX(0.0, ARG1)
+    """
+    reader = get_reader(code)
+    ast = Stmt_Function_Stmt(reader)
+    assert "MYFUNC (ARG1) = MAX(0.0, ARG1)" in str(ast)
+
+
+def test_statement_function_multiline(f2003_create):
+    """
+    Test that a multiline statement function can be parsed.
+    """
+    code = """
+    MYFUNC(X, Y, Z) = &
+      & MAX(X, MIN(Y, Z))
+    """
+    reader = get_reader(code)
+    ast = Stmt_Function_Stmt(reader)
+    assert "MYFUNC (X, Y, Z) = MAX(X, MIN(Y, Z))" in str(ast)
+
+
+def test_statement_function_subroutine(f2003_create):
+    """
+    Test that we can parse a statement function in the declaration
+    section of a subroutine.
+    """
+    code = """
+    subroutine test()
+      integer :: x, y
+      integer :: mymax
+      mymax(x, y) = MAX(x, y)
+    end subroutine
+    """
+    reader = get_reader(code)
+    ast = Program(reader)
+
+    # Ensure we have a Stmt_Function_Stmt type!
+    ast_spec = ast.content[0].content[1]
+    assert type(ast_spec.content[2]) is Stmt_Function_Stmt
+    assert """SUBROUTINE test
+  INTEGER :: x, y
+  INTEGER :: mymax
+  mymax (x, y) = MAX(x, y)
+END SUBROUTINE""" in str(ast)
+
+
+def test_statement_function_array_aliasing(f2003_create):
+    """
+    Test that we can parse a statement function
+    """
+    code = """
+    subroutine test()
+      integer :: x, y
+      integer :: myarray(x, y)
+      integer :: myfunc
+
+      ! Stmt function in declaration space
+      myfunc(x, y) = MAX(x, y)
+
+      ! ----------------------
+
+      ! Array assignment in execution space
+      myarray(x, y) = 1.
+    end subroutine
+    """
+    reader = get_reader(code)
+    ast = Program(reader)
+
+    ast_spec = ast.content[0].content[1]
+    assert type(ast_spec.content[3]) is Stmt_Function_Stmt
+    assert type(ast_spec.content[4]) is Assignment_Stmt
+
+
+def test_statement_function_array_aliasing_fail(f2003_create):
+    """
+    Test that we can parse a statement function
+    """
+    code = """
+    subroutine test()
+      integer :: x, y
+      integer :: myarray(x, y)
+      integer :: myfunc
+
+      ! ----------------------
+
+      ! Array assignment means execution space starts
+      myarray(x, y) = 1.
+
+      ! Stmt function in execution space => FAIL!
+      myfunc(x, y) = MAX(x, y)
+
+    end subroutine
+    """
+    with pytest.raises(NoMatchError) as excinfo:
+        reader = get_reader(code)
+        ast = Program(reader)