} else {
String n = env.path(c[1]);
- Request.Response ret = env.send(new Request.Key(n));
- if (!(ret instanceof Request.Key.Res)) {
+ Request.Response ret = env.send(new Request.IsKey(n));
+ if (!(ret instanceof Request.IsKey.Res)) {
w.write("error: ");
w.write(ret.error().getMessage());
w.write("\n");
} else {
- List l = ((Request.Key.Res)ret).keys();
- if (l.size() == 0) {
+ if (((Request.IsKey.Res)ret).exists()) {
w.write("error: ");
w.write(c[1]);
w.write(": no such path\n");
/** Returns the keys in <tt>js</tt> that match <tt>matcher</tt>. */
protected List matches(JS js) throws JSExn {
- Pattern pat = Pattern.compile(matcher);
+ String m = matcher;
+
+ Pattern pat = Pattern.compile(m);
List keys = new ArrayList();
Iterator i = js.keys().iterator(); while(i.hasNext()) {
public Response process(JSScope root) throws JSExn {
JS js = keyed(path(root));
+
+ // if matcher is exact and a keyed object, return its keys
+ JS o = keyed(js.get(matcher));
+ if (o != null) { js = o; matcher = ".*"; }
+
return js == null ? new Res() : new Res(matches(js));
}
}
}
+ public static class IsKey extends Key {
+ public IsKey() {}
+ public IsKey(String c) { super(c); }
+ public Response process(JSScope root) throws JSExn {
+ JS js = keyed(path(root));
+ return js == null ? new Res(false) : new Res(js.get(matcher) != null);
+ }
+
+ public static class Res extends Response {
+ private boolean exists;
+ public Res() {}
+ public Res(boolean e) { exists = e; }
+ public boolean exists() { return exists; }
+ }
+ }
+
public static class RemoveKey extends Key {
public RemoveKey(String c) { super(c); }
public RemoveKey(String p, String m) { super(p, m); }