Merge branch 'dev'

pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>com.geodesk</groupId>
   <artifactId>geodesk</artifactId>
-  <version>0.1.1-SNAPSHOT</version>
+  <version>0.1.2</version>
   <packaging>jar</packaging>
 
   <name>GeoDesk</name>

src/main/java/com/geodesk/feature/match/MatcherParser.java

@@ -42,7 +42,8 @@ public class MatcherParser extends Parser
 	private static final String RBRACKET = "]";
 
 	private final static Pattern KEY_IDENTIFIER_PATTERN =
-		Pattern.compile("[a-zA-Z_][\\w:]*");
+		// Pattern.compile("[a-zA-Z_][\\w:]*");
+		Pattern.compile("\\p{L}[[\\p{L}\\p{N}]:_]*");
 	// TODO: make pattern stricter?
 	//  No, should make more lenient:
 	//    "[a-zA-Z_\u00C0-\u1FFF\u2C00-\uD7FF][\\w:\u00C0-\u1FFF\u2C00-\uD7FF]*"

src/main/java/com/geodesk/feature/match/MatcherSet.java

@@ -9,6 +9,11 @@
 
 import static com.geodesk.feature.match.TypeBits.*;
 
+// TODO: Could we consolidate Matcher and MatcherSet?
+//  (For polyform selectors, we would need to create additional classes)
+//  For uniform matchers, we would eliminate one object allocation,
+//  but we would still have the reference indirection
+
 public class MatcherSet
 {
     private final int types;

src/main/java/com/geodesk/feature/match/TypeBits.java

@@ -110,6 +110,7 @@ public static String toString(int flags)
         return s.toString();
     }
 
+    // TODO: remove
     public static void main(String[] args)
     {
         Log.debug("%d", 1 << -1);

src/test/resources/feature/queries.fab

@@ -3,6 +3,9 @@
 //  RegEx
 //
 
+query:  w[highway][name="Löwengrube"]
+    highway3: false
+
 query: w[name~".*str.*", ".*house$"]
     highway_residential: false
     highway3: true
@@ -968,3 +971,4 @@ query:  *[jarbour]
 
 query:  *[!jarbour]
     jarbour: false
+