issue #171. Hack to remove statement function matching.

stfc · Mar 28, 2019 · 145d85a · 145d85a
1 parent 75b8829
commit 145d85a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/src/fparser/scripts/fparser2.py b/src/fparser/scripts/fparser2.py
@@ -98,6 +98,7 @@ def runner(_, options, args):
             f2003_parser = ParserFactory().create()
             program = f2003_parser(reader)
             print (program)
+            print (repr(program))
         except FortranSyntaxError as msg:
             print ("Syntax error: {0}".format(str(msg)))
             try:

diff --git a/src/fparser/sergi_example.f90 b/src/fparser/sergi_example.f90
@@ -0,0 +1,4 @@
+   subroutine field_copy_code()
+     output(ji,jj) = input(ji,jj)
+   end subroutine field_copy_code
+
diff --git a/src/fparser/two/Fortran2003.py b/src/fparser/two/Fortran2003.py
@@ -425,10 +425,14 @@ class Declaration_Construct(Base):  # R207
                               | <type-declaration-stmt>
                               | <stmt-function-stmt>
     """
+    #subclass_names = ['Comment', 'Derived_Type_Def', 'Entry_Stmt', 'Enum_Def',
+    #                  'Format_Stmt', 'Interface_Block', 'Parameter_Stmt',
+    #                  'Procedure_Declaration_Stmt', 'Specification_Stmt',
+    #                  'Type_Declaration_Stmt', 'Stmt_Function_Stmt']
     subclass_names = ['Comment', 'Derived_Type_Def', 'Entry_Stmt', 'Enum_Def',
                       'Format_Stmt', 'Interface_Block', 'Parameter_Stmt',
                       'Procedure_Declaration_Stmt', 'Specification_Stmt',
-                      'Type_Declaration_Stmt', 'Stmt_Function_Stmt']
+                      'Type_Declaration_Stmt']
 
 
 class Execution_Part(BlockBase):  # R208

diff --git a/src/fparser/two/Fortran2008.py b/src/fparser/two/Fortran2008.py
@@ -192,7 +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')
-    subclass_names.remove('Stmt_Function_Stmt')
+    #subclass_names.remove('Stmt_Function_Stmt')
 
 
 class Submodule(BlockBase):  # R1116 [C1112,C1114]