Changeset 3893 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/parser/MapCSSParser.jj

Timestamp:

2011-02-12T20:30:01+01:00 (13 years ago)

Author:

bastiK

Message:

mapcss: some rework of Error Handling, (Multi)Cascade and icon loading

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/parser/MapCSSParser.jj (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/parser/MapCSSParser.jj

@@ -290 +290 @@
 {
     boolean not = false;
+    boolean yes = false;
     String key;
 }
@@ -295 +296 @@
     ( <EXCLAMATION> { not = true; } )?
     key=string_or_ident()
-    { return new Condition.KeyCondition(key, not); }
+    ( <QUESTION> { yes = true; } )?
+    { return new Condition.KeyCondition(key, not, yes); }
 }
 
@@ -504 +506 @@
 JAVACODE
 void error_skipto(int kind) {
+    if (token.kind == EOF)
+        throw new ParseException("Reached end of file while parsing");
     ParseException e = generateParseException();
     System.err.println("Skipping to the next rule, because of an error:");
     System.err.println(e);
     if (sheet != null) {
-        sheet.logError(e);
+        sheet.logError(new ParseException(e.getMessage()));
     }
     Token t;
@@ -527 +531 @@
     while (true) {
         t = getNextToken();
+        if ((t.kind == S || t.kind == STRING || t.kind == UNEXPECTED_CHAR) &&
+                t.image.contains("\n")) {
+            ParseException e = new ParseException(String.format("Warning: end of line while reading an unquoted string at line %s column %s.", t.beginLine, t.beginColumn));
+            System.err.println(e);
+            if (sheet != null) {
+                sheet.logError(e);
+            }
+        }
         if (t.kind == SEMICOLON || t.kind == EOF)
             break;