Merge branch 'ofp_v0.8.5'

Author: mbdevpl

README.rst

@@ -432,17 +432,17 @@ dependencies
 
 *   Java 1.7 or later
 
-*   Open Fortran Parser 0.8.4-4
+*   Open Fortran Parser 0.8.5-1
 
     https://github.com/mbdevpl/open-fortran-parser/releases
 
     This is a patched version of OFP. The list of changes is available at the above link.
 
-*   ANTRL 3.3 (dependency of Open Fortran Parser)
+*   ANTRL 3.5.2 (dependency of Open Fortran Parser)
 
     http://www.antlr3.org/download/
 
-*   Apache Commons CLI 1.4 (or later)
+*   Apache Commons CLI 1.4 or later
 
     https://commons.apache.org/proper/commons-cli/download_cli.cgi
 

open_fortran_parser/config.py

@@ -9,14 +9,14 @@
 DEV_DEPENDENCIES_PATH = pathlib.Path(os.getcwd(), 'lib')
 
 DEV_DEPENDENCIES = {
-    'ANTLR 3.3': (
+    'ANTLR 3.5.2': (
         urllib.parse.urlparse(
-            'https://github.com/mbdevpl/open-fortran-parser/releases/download/v0.8.4-1/'),
-        pathlib.Path('antlr-3.3-complete.jar')),
-    'Open Fortran Parser 0.8.4-4': (
+            'https://github.com/mbdevpl/open-fortran-parser/releases/download/v0.8.5-1/'),
+        pathlib.Path('antlr-3.5.2-complete.jar')),
+    'Open Fortran Parser 0.8.5-1': (
         urllib.parse.urlparse(
-            'https://github.com/mbdevpl/open-fortran-parser/releases/download/v0.8.4-4/'),
-        pathlib.Path('OpenFortranParser-0.8.4-4.jar')),
+            'https://github.com/mbdevpl/open-fortran-parser/releases/download/v0.8.5-1/'),
+        pathlib.Path('OpenFortranParser-0.8.5-1.jar')),
     'Apache Commons CLI 1.4': (
         urllib.parse.urlparse(
             'https://github.com/mbdevpl/open-fortran-parser-xml/releases/download/v0.1.0/'),
@@ -36,7 +36,9 @@
 OUTDATED_DEPENDENCIES = {
     'Open Fortran Parser 0.8.4-1': pathlib.Path('OpenFortranParser-0.8.4-1.jar'),
     'Open Fortran Parser 0.8.4-2': pathlib.Path('OpenFortranParser-0.8.4-2.jar'),
-    'Open Fortran Parser 0.8.4-3': pathlib.Path('OpenFortranParser-0.8.4-3.jar')}
+    'Open Fortran Parser 0.8.4-3': pathlib.Path('OpenFortranParser-0.8.4-3.jar'),
+    'ANTLR 3.3': pathlib.Path('antlr-3.3-complete.jar'),
+    'Open Fortran Parser 0.8.4-4': pathlib.Path('OpenFortranParser-0.8.4-4.jar')}
 
 JAVA = {
     'executable': pathlib.Path('java'),

src/fortran/ofp/XMLPrinterBase.java

@@ -696,9 +696,9 @@ protected void printTokens(Token... tokens) {
 	 */
 	protected void insertTokens(Element context, int tokenType, String tokenContextName, String tokenTextAttributeName)
 			throws IOException {
-		// System.err.println("all tokens: " + new TokensList(new File(filename)));
+		// LOG.log(Level.INFO, "all tokens: {0}", new TokensList(new File(filename)));
 		TokensList tokens = new TokensList(new File(filename), tokenType);
-		// System.err.println("found tokens: " + tokens);
+		// LOG.log(Level.INFO, "found tokens of type={0}: {1}", new Object[]{tokenType, tokens});
 		insertTokens(context, tokens, tokenContextName, tokenTextAttributeName);
 	}