Merge branch 'feature/nature'

Author: mbdevpl

src/fortran/ofp/XMLPrinter.java

@@ -2281,12 +2281,27 @@ public void use_stmt(Token label, Token useKeyword, Token id, Token onlyKeyword,
 		contextOpen("declaration");
 	}
 
+	public void module_nature(Token nature) {
+		if (context.getTagName().equals("declaration")) {
+			LOG.log(Level.FINE, "closing unclosed declaration at module_nature nature={0}", nature.getText());
+			contextClose("declaration");
+		}
+		if (!context.getTagName().equals("use"))
+			contextOpen("use");
+		contextOpen("nature");
+		setAttribute("name", nature);
+		if (verbosity >= 80)
+			super.module_nature(nature);
+		contextClose("nature");
+	}
+
 	public void rename_list__begin() {
 		if (context.getTagName().equals("declaration")) {
 			LOG.log(Level.FINE, "closing unclosed declaration at rename_list__begin");
 			contextClose("declaration");
 		}
-		contextOpen("use");
+		if (!context.getTagName().equals("use"))
+			contextOpen("use");
 		contextOpen("rename");
 		if (verbosity >= 100)
 			super.rename_list__begin();
@@ -2302,7 +2317,8 @@ public void only_list__begin() {
 			LOG.log(Level.FINE, "closing unclosed declaration at only_list__begin");
 			contextClose("declaration");
 		}
-		contextOpen("use");
+		if (!context.getTagName().equals("use"))
+			contextOpen("use");
 		contextOpen("only");
 		if (verbosity >= 100)
 			super.only_list__begin();

test/test_compatibility.py

@@ -333,6 +333,16 @@ def test_ofp_interface(self):
             'rule-tests/R1207.f90']]
         self.check_cases(input_paths)
 
+    def test_module_nature(self):
+        input_paths = [pathlib.Path(_) for _ in [
+            'annex_c/c_10_2_1.f03',
+            'annex_c/c_10_2_2.f03',
+            'annex_c/c_10_2_3.f03',
+            'annex_c/c_10_2_4.f03',
+            'rule-f08-tests/R1109.f90',
+            'rule-f08-tests/R1228.f90']]
+        self.check_cases(input_paths)
+
     @unittest.skipUnless(os.environ.get('TEST_LONG'), 'skipping long test')
     def test_ofp_all_cases(self):
         tests_absolute_path = _OFP_TESTS_DIR.resolve()