Changeset 33812

Timestamp:

2019-12-18T21:36:07+13:00 (4 years ago)

Author:

ak19

Message:

Better handling of multi-line comment symbols, so I can now include proper multi-line spanning comments in my .json files

Location:

other-projects/maori-lang-detection

Files:

• conf/countrycodes.json (modified) (1 diff)
• src/org/greenstone/atea/CountryCodeCountsMapData.java (modified) (2 diffs)

other-projects/maori-lang-detection/conf/countrycodes.json

@@ -1 +1 @@
 /* CountryCodes with geolocation from https://developers.google.com/public-data/docs/canonical/countries_csv */
-/* BEWARE OF ADDING OR MODIFYING COMMENTS IN THIS FILE INTO MULTILINE COMMENTS, AS JAVA CODE CAN'T DEAL WITH THAT */
 
 /* 1 */

other-projects/maori-lang-detection/src/org/greenstone/atea/CountryCodeCountsMapData.java

@@ -81 +81 @@
  * TO RUN:
  *    maori-lang-detection/src$
- *       java -cp ".:../conf:../lib/*" org/greenstone/atea/CountryCodeCountsMapData ../mongodb-data/countrycodes.json ../mongodb-data/counts.json
+ *       java -cp ".:../conf:../lib/*" org/greenstone/atea/CountryCodeCountsMapData ../mongodb-data/counts.json
  *###################
  *
@@ -215 +215 @@
         new StringBuilder("[");
         String line;
+
+        boolean multi_line_comment = false;
+        
         while((line = reader.readLine()) != null) {
-        line = line.replaceAll("/\\* [^\\/]* \\*/", ""); // get rid of any multiline comments symbols on a single line
+        line = line.trim();
+
+        // ignore any single line comments nested in multi-line symbols
+        if(line.startsWith("/*") && line.endsWith("*/")) {
+            continue; // skip line
+        }
+
+        // skip multi-line comments spread over multiple lines
+        // assumes this ends on a line containing */ without further content on the line.
+        if(line.startsWith("/*") && !line.endsWith("*/")) {
+            multi_line_comment = true;
+            continue; // skip line
+        }
+        if(multi_line_comment) {
+            if(line.contains("*/")) {
+            multi_line_comment = false;
+            }
+
+            continue; // we're in a comment or at end of comment, skip line
+        }
+
         str.append(line);
         if(line.endsWith("}")) {