diff --git a/src/Regex.java b/src/Regex.java index 70a6797..156279d 100644 --- a/src/Regex.java +++ b/src/Regex.java @@ -58,9 +58,9 @@ public abstract class Regex { */ public static final Pattern ARG_SPLIT_REGEX = Pattern.compile(" *(\\w+) *: *(\\w+)"); - public static final Pattern FIELD_FIND_REGEX_NO_ENCAPSULATION = Pattern.compile(" *(?[+\\-~#])* *(?\\w+) *: *(?[\\w<>]+)"); + public static final Pattern FIELD_FIND_REGEX_NO_ENCAPSULATION = Pattern.compile(" *(?[+\\-~#])? *(?\\w+) *: *(?[\\w<>]+)"); - public static final Pattern METHOD_FIND_REGEX_NO_ENCAPSULATION = Pattern.compile(" *(?[+\\-~#])* *(?\\w+) *\\( *(?(?: *\\w+ *: *[\\w<>]+ *,? *)*) *\\) *(?:: *(?[\\w<>]+))?"); + public static final Pattern METHOD_FIND_REGEX_NO_ENCAPSULATION = Pattern.compile(" *(?[+\\-~#])? *(?\\w+) *\\( *(?(?: *\\w+ *: *[\\w<>]+ *,? *)*) *\\) *(?:: *(?[\\w<>]+))?"); public static String getMethodPattern(boolean encapsulation){