From 83503c4f883e1ea9790509d7e477ea87b74a64ed Mon Sep 17 00:00:00 2001 From: Marcin Kosiba Date: Tue, 17 Jun 2014 10:04:59 +0100 Subject: Add support for using the dollar sign in rules. Change-Id: I613c1527657d67680b044ef9ca79e74ada4da905 --- src/main/com/tonicsystems/jarjar/Wildcard.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/com/tonicsystems/jarjar/Wildcard.java b/src/main/com/tonicsystems/jarjar/Wildcard.java index 723c6f5..5cc486f 100644 --- a/src/main/com/tonicsystems/jarjar/Wildcard.java +++ b/src/main/com/tonicsystems/jarjar/Wildcard.java @@ -26,6 +26,7 @@ class Wildcard private static Pattern dstar = Pattern.compile("\\*\\*"); private static Pattern star = Pattern.compile("\\*"); private static Pattern estar = Pattern.compile("\\+\\??\\)\\Z"); + private static Pattern dollar = Pattern.compile("\\$"); private final Pattern pattern; private final int count; @@ -45,6 +46,7 @@ class Wildcard regex = replaceAllLiteral(dstar, regex, "(.+?)"); regex = replaceAllLiteral(star, regex, "([^/]+)"); regex = replaceAllLiteral(estar, regex, "*)"); + regex = replaceAllLiteral(dollar, regex, "\\$"); this.pattern = Pattern.compile("\\A" + regex + "\\Z"); this.count = this.pattern.matcher("foo").groupCount(); -- cgit v1.2.3