Skip to content

Commit da39756

Browse files
maurodecmaurodec
committed
Various fixes, mostly style.
1 parent 070f724 commit da39756

File tree

1 file changed

+51
-56
lines changed

1 file changed

+51
-56
lines changed

‎VerbalExpressions.java renamed to ‎VerbalExpression.java

Lines changed: 51 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,126 +1,121 @@
11
import java.util.regex.Pattern;
22

3-
class VerbalExpressions {
3+
class VerbalExpression {
44
private String prefixes, source, suffixes, pattern = "";
5-
int modifiers = Pattern.MULTILINE;
6-
Pattern p;
7-
8-
public VerbalExpressions() {
9-
10-
}
5+
private int modifiers = Pattern.MULTILINE;
116

127
private String sanitize(String value) {
138
if(value == null)
149
return value;
1510
return Pattern.quote(value);
1611
}
1712

18-
public VerbalExpressions add(String value) {
13+
public VerbalExpression add(String value) {
1914
this.source = this.source != null ? this.source + value : value;
2015
if (this.source != null) {
21-
this.p = Pattern.compile(this.prefixes + this.source + this.suffixes, this.modifiers);
22-
this.pattern = this.p.pattern();
16+
Pattern p = Pattern.compile(this.prefixes + this.source + this.suffixes, this.modifiers);
17+
this.pattern = p.pattern();
2318
}
2419
return this;
2520
}
2621

27-
public VerbalExpressions startOfLine(boolean enable) {
22+
public VerbalExpression startOfLine(boolean enable) {
2823
this.prefixes = enable ? "^" : "";
29-
this.add( "" );
24+
this.add("");
3025
return this;
3126
}
3227

33-
public VerbalExpressions startOfLine() {
28+
public VerbalExpression startOfLine() {
3429
return startOfLine(true);
3530
}
3631

37-
public VerbalExpressions endOfLine(boolean enable) {
32+
public VerbalExpression endOfLine(boolean enable) {
3833
this.suffixes = enable ? "$" : "";
39-
this.add( "" );
34+
this.add("");
4035
return this;
4136
}
4237

43-
public VerbalExpressions endOfLine() {
38+
public VerbalExpression endOfLine() {
4439
return endOfLine(true);
4540
}
4641

47-
public VerbalExpressions then(String value) {
42+
public VerbalExpression then(String value) {
4843
value = sanitize(value);
49-
this.add( "(" + value + ")" );
44+
this.add("(" + value + ")");
5045
return this;
5146
}
5247

53-
public VerbalExpressions find(String value) {
48+
public VerbalExpression find(String value) {
5449
this.then(value);
5550
return this;
5651
}
5752

58-
public VerbalExpressions maybe(String value) {
53+
public VerbalExpression maybe(String value) {
5954
value = sanitize(value);
60-
this.add( "(" + value + ")?" );
55+
this.add("(" + value + ")?");
6156
return this;
6257
}
6358

64-
public VerbalExpressions anything() {
65-
this.add( "(.*)" );
59+
public VerbalExpression anything() {
60+
this.add("(.*)");
6661
return this;
6762
}
6863

69-
public VerbalExpressions anythingBut(String value) {
64+
public VerbalExpression anythingBut(String value) {
7065
value = sanitize(value);
71-
this.add( "([^" + value + "]*)" );
66+
this.add("([^" + value + "]*)");
7267
return this;
7368
}
7469

75-
public VerbalExpressions something() {
76-
this.add( "(.+)" );
70+
public VerbalExpression something() {
71+
this.add("(.+)");
7772
return this;
7873
}
7974

80-
public VerbalExpressions somethingBut(String value) {
75+
public VerbalExpression somethingBut(String value) {
8176
value = sanitize(value);
82-
this.add( "([^" + value + "]+)" );
77+
this.add("([^" + value + "]+)");
8378
return this;
8479
}
8580

86-
public VerbalExpressions replace(String source, String value) {
87-
this.add( "" );
81+
public VerbalExpression replace(String source, String value) {
82+
this.add("");
8883
this.source.replaceAll(pattern,value);
8984
return this;
9085
}
9186

92-
public VerbalExpressions lineBreak() {
93-
this.add( "(\\n|(\\r\\n))" );
87+
public VerbalExpression lineBreak() {
88+
this.add("(\\n|(\\r\\n))");
9489
return this;
9590
}
9691

97-
public VerbalExpressions br() {
92+
public VerbalExpression br() {
9893
this.lineBreak();
9994
return this;
10095
}
10196

102-
public VerbalExpressions tab() {
103-
this.add( "\\t" );
97+
public VerbalExpression tab() {
98+
this.add("\\t");
10499
return this;
105100
}
106101

107-
public VerbalExpressions word() {
108-
this.add( "\\w+" );
102+
public VerbalExpression word() {
103+
this.add("\\w+");
109104
return this;
110105
}
111106

112-
public VerbalExpressions anyOf(String value) {
107+
public VerbalExpression anyOf(String value) {
113108
value = sanitize(value);
114-
this.add( "[" + value + "]" );
109+
this.add("[" + value + "]");
115110
return this;
116111
}
117112

118-
public VerbalExpressions any(String value) {
113+
public VerbalExpression any(String value) {
119114
this.anyOf(value);
120115
return this;
121116
}
122117

123-
public VerbalExpressions range(Object[] args) {
118+
public VerbalExpression range(Object[] args) {
124119
String value = "[";
125120
for(int _from = 0; _from < args.length; _from += 2) {
126121
int _to = _from+1;
@@ -137,7 +132,7 @@ public VerbalExpressions range(Object[] args) {
137132
return this;
138133
}
139134

140-
public VerbalExpressions addModifier(char modifier) {
135+
public VerbalExpression addModifier(char modifier) {
141136
switch (modifier) {
142137
case 'd':
143138
modifiers |= Pattern.UNIX_LINES;
@@ -164,11 +159,11 @@ public VerbalExpressions addModifier(char modifier) {
164159
break;
165160
}
166161

167-
this.add( "" );
162+
this.add("");
168163
return this;
169164
}
170165

171-
public VerbalExpressions removeModifier(char modifier) {
166+
public VerbalExpression removeModifier(char modifier) {
172167
switch (modifier) {
173168
case 'd':
174169
modifiers ^= Pattern.UNIX_LINES;
@@ -195,29 +190,29 @@ public VerbalExpressions removeModifier(char modifier) {
195190
break;
196191
}
197192

198-
this.add( "" );
193+
this.add("");
199194
return this;
200195
}
201196

202-
public VerbalExpressions withAnyCase(boolean enable) {
197+
public VerbalExpression withAnyCase(boolean enable) {
203198
if (enable) this.addModifier( 'i' );
204199
else this.removeModifier( 'i' );
205-
this.add( "" );
200+
this.add("");
206201
return this;
207202
}
208203

209-
public VerbalExpressions withAnyCase() {
204+
public VerbalExpression withAnyCase() {
210205
return withAnyCase(true);
211206
}
212207

213-
public VerbalExpressions searchOneLine(boolean enable) {
208+
public VerbalExpression searchOneLine(boolean enable) {
214209
if (enable) this.removeModifier( 'm' );
215210
else this.addModifier( 'm' );
216-
this.add( "" );
211+
this.add("");
217212
return this;
218213
}
219214

220-
public VerbalExpressions multiple(String value) {
215+
public VerbalExpression multiple(String value) {
221216
value = this.sanitize(value);
222217
switch (value.charAt(0)) {
223218
case '*':
@@ -230,22 +225,22 @@ public VerbalExpressions multiple(String value) {
230225
return this;
231226
}
232227

233-
public VerbalExpressions or(String value) {
228+
public VerbalExpression or(String value) {
234229
if (this.prefixes.indexOf("(") == -1) this.prefixes += "(";
235230
if (this.suffixes.indexOf(")") == -1) this.suffixes = ")" + this.suffixes;
236231

237-
this.add( ")|(" );
232+
this.add(")|(");
238233
if (value != null) this.then(value);
239234
return this;
240235
}
241236

242237
public boolean test(String toTest) {
243-
this.add( "" );
238+
this.add("");
244239
return Pattern.matches(this.pattern, toTest);
245240
}
246241

247242
public String toString() {
248-
this.add( "" );
243+
this.add("");
249244
return this.pattern.toString();
250245
}
251246
}

0 commit comments

Comments
 (0)