F2PY: Cont implementing Fortran 2003 parser. Clean up.

1 files changed, 18 insertions, 1 deletions

diff --git a/numpy/f2py/lib/parser/readfortran.py b/numpy/f2py/lib/parser/readfortran.py
index 508829063..dfe64b4f1 100644
--- a/numpy/f2py/lib/parser/readfortran.py
+++ b/numpy/f2py/lib/parser/readfortran.py
@@ -268,7 +268,7 @@ class FortranReaderBase:
             pass
         return
 
-    def put_item(self):
+    def put_item(self, item):
         self.fifo_item.insert(0, item)
         return
     # Iterator methods:
@@ -389,6 +389,7 @@ class FortranReaderBase:
     def show_message(self, message, stream = sys.stdout):
         stream.write(message+'\n')
         stream.flush()
+        return
 
     def format_message(self, kind, message, startlineno, endlineno,
                        startcolno=0, endcolno=-1):
@@ -424,6 +425,22 @@ class FortranReaderBase:
         return self.format_message('WARNING',message, startlineno,
                                    endlineno, startcolno, endcolno)
 
+    def error(self, message, item=None):
+        if item is None:
+            m = self.format_error_message(message, len(self.source_lines)-2, len(self.source_lines))
+        else:
+            m = self.format_error_message(message, item.span[0], item.span[1])
+        self.show_message(m)
+        return
+
+    def warning(self, message, item=None):
+        if item is None:
+            m = self.format_warning_message(message, len(self.source_lines)-2, len(self.source_lines))
+        else:
+            m = self.format_warning_message(message, item.span[0], item.span[1])
+        self.show_message(m)
+        return
+
     # Auxiliary methods for processing raw source lines:
 
     def handle_cf2py_start(self, line):