Repository: stfc/fparser

Issue:
Remove staticmethod for tostr() in Stmt_Function_Stmt class
A spurious staticmethod decorator has been added to the tostr() method in the Stmt_Function_Stmt class in Fortran2003.py.

Discussion:

Patch:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4c3f28e..558dbde 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,9 @@ Modifications by (in alphabetical order):
 * P. Vitt, University of Siegen, Germany
 * A. Voysey, UK Met Office
 
+12/09/2022 PR #374 for #373. Removes @staticmethod decorator added to
+           Stmt_Function_Stmt.tostr() in error.
+
 05/09/2022 PR #372 fix for whitespace being lost when Format_Item_List is
            contained within parentheses.
 
diff --git a/src/fparser/two/Fortran2003.py b/src/fparser/two/Fortran2003.py
index 4621729..8b5b726 100644
--- a/src/fparser/two/Fortran2003.py
+++ b/src/fparser/two/Fortran2003.py
@@ -12060,7 +12060,6 @@ class Stmt_Function_Stmt(StmtBase):  # R1238
             return Function_Name(name), Dummy_Arg_Name_List(args), Scalar_Expr(expr)
         return Function_Name(name), None, Scalar_Expr(expr)
 
-    @staticmethod
     def tostr(self):
         if self.items[1] is None:
             return "%s () = %s" % (self.items[0], self.items[2])


Test patch:
diff --git a/src/fparser/two/tests/fortran2003/test_stmt_function_stmt_r1238.py b/src/fparser/two/tests/fortran2003/test_stmt_function_stmt_r1238.py
new file mode 100644
index 0000000..cb19346
--- /dev/null
+++ b/src/fparser/two/tests/fortran2003/test_stmt_function_stmt_r1238.py
@@ -0,0 +1,77 @@
+# Copyright (c) 2022 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 : This file tests support for the
+Stmt_Function_Stmt class.
+
+"""
+import pytest
+
+from fparser.two.Fortran2003 import Stmt_Function_Stmt
+from fparser.two.utils import NoMatchError
+
+
+def test_stmt_function_stmt():
+    """Test that the stmt_function_stmt class can be created, raises the
+    expected exception and outputs the expected string
+    representation.
+
+    """
+    tcls = Stmt_Function_Stmt
+
+    # no args
+    obj = tcls("a()=b")
+    assert isinstance(obj, tcls), repr(obj)
+    assert str(obj) == "a () = b"
+    assert obj.tostr() == "a () = b"
+
+    # args
+    obj = tcls("a(x)=b")
+    assert obj.tostr() == "a (x) = b"
+
+    with pytest.raises(NoMatchError) as info:
+        obj = tcls("hello")
+    assert "Stmt_Function_Stmt: 'hello'" in str(info.value)
+    with pytest.raises(NoMatchError) as info:
+        obj = tcls("a()=")
+    assert "Stmt_Function_Stmt: 'a()='" in str(info.value)
+    with pytest.raises(NoMatchError) as info:
+        obj = tcls("=a")
+    assert "Stmt_Function_Stmt: '=a'" in str(info.value)
+    with pytest.raises(NoMatchError) as info:
+        obj = tcls("a)=b")
+    assert "Stmt_Function_Stmt: 'a)=b'" in str(info.value)
+    with pytest.raises(NoMatchError) as info:
+        obj = tcls("()=b")
+    assert "Stmt_Function_Stmt: '()=b'" in str(info.value)