Merge branch 'feature/logging'

Author: mbdevpl

logging.properties

@@ -0,0 +1,11 @@
+handlers = java.util.logging.ConsoleHandler, java.util.logging.FileHandler
+.level = FINEST
+
+java.util.logging.ConsoleHandler.level = FINE
+
+java.util.logging.FileHandler.level = FINER
+java.util.logging.FileHandler.level = formatter
+java.util.logging.FileHandler.limit = 524288
+java.util.logging.FileHandler.count = 100
+java.util.logging.FileHandler.pattern = test/results/logs/parser_%g.log
+java.util.logging.FileHandler.append = true

src/fortran/ofp/XMLPrinter.java

@@ -2,6 +2,8 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import org.antlr.runtime.Token;
 import org.w3c.dom.Attr;
@@ -17,6 +19,8 @@
  */
 public class XMLPrinter extends XMLPrinterBase {
 
+	private static final Logger LOG = Logger.getLogger(XMLPrinter.class.getName());
+
 	public XMLPrinter(String[] args, IFortranParser parser, String filename) {
 		super(args, parser, filename);
 	}
@@ -93,8 +97,10 @@ public void specification_part(int numUseStmts, int numImportStmts, int numImplS
 			contextClose("header");
 			contextOpen("body");
 		}
-		if (context.getTagName().equals("declaration"))
+		if (context.getTagName().equals("declaration")) {
+			LOG.log(Level.FINER, "closing unclosed declaration at specification_part");
 			contextClose("declaration");
+		}
 		if (!context.getTagName().equals("specification"))
 			contextOpen("specification");
 		contextCloseAllInner("specification");
@@ -2263,8 +2269,10 @@ public void module_subprogram(boolean hasPrefix) {
 
 	public void use_stmt(Token label, Token useKeyword, Token id, Token onlyKeyword, Token eos, boolean hasModuleNature,
 			boolean hasRenameList, boolean hasOnly) {
-		if (context.getTagName().equals("declaration"))
+		if (context.getTagName().equals("declaration")) {
+			LOG.log(Level.FINE, "closing unclosed declaration at use_stmt id={0}", id.getText());
 			contextClose("declaration");
+		}
 		if (!context.getTagName().equals("use"))
 			contextOpen("use");
 		setAttribute("name", id);
@@ -2274,8 +2282,10 @@ public void use_stmt(Token label, Token useKeyword, Token id, Token onlyKeyword,
 	}
 
 	public void rename_list__begin() {
-		if (context.getTagName().equals("declaration"))
+		if (context.getTagName().equals("declaration")) {
+			LOG.log(Level.FINE, "closing unclosed declaration at rename_list__begin");
 			contextClose("declaration");
+		}
 		contextOpen("use");
 		contextOpen("rename");
 		if (verbosity >= 100)
@@ -2288,8 +2298,10 @@ public void rename_list(int count) {
 	}
 
 	public void only_list__begin() {
-		if (context.getTagName().equals("declaration"))
+		if (context.getTagName().equals("declaration")) {
+			LOG.log(Level.FINE, "closing unclosed declaration at only_list__begin");
 			contextClose("declaration");
+		}
 		contextOpen("use");
 		contextOpen("only");
 		if (verbosity >= 100)
@@ -2630,8 +2642,10 @@ public void end_mp_subprogram_stmt(Token label, Token keyword1, Token keyword2,
 
 	public void start_of_file(String filename, String path) {
 		if (contextTryFind("file") != null) {
-			if (context.getTagName().equals("declaration"))
+			if (context.getTagName().equals("declaration")) {
+				LOG.log(Level.FINER, "closing unclosed declaration at start_of_file");
 				contextClose("declaration");
+			}
 			contextOpen("declaration");
 			setAttribute("type", "include");
 		}

test/__init__.py

@@ -6,11 +6,15 @@
 from open_fortran_parser.config import JAVA as java_config
 
 
+if java_config['options'] is None:
+    java_config['options'] = []
+java_config['options'].append('-Djava.util.logging.config.file=logging.properties')
+
+os.makedirs(str(pathlib.Path('test', 'results', 'logs')), exist_ok=True)
+
 if os.environ.get('TEST_COVERAGE'):
     JACOCO_PATH = pathlib.Path('lib', 'org.jacoco.agent-0.8.1-runtime.jar').resolve()
     JACOCO_EXCLUDES = ('fortran.ofp.parser.java.FortranParserExtras_FortranParser08',)
     if JACOCO_PATH.is_file():
-        if java_config['options'] is None:
-            java_config['options'] = []
         java_config['options'].append(
             '-javaagent:{}=excludes={}'.format(str(JACOCO_PATH), ':'.join(JACOCO_EXCLUDES)))