@@ -63,6 +63,7 @@ window.VerbalExpression = (function(){
63
63
// Sanitation function for adding
64
64
// anything safely to the expression
65
65
sanitize : function ( value ) {
66
+ if ( value . source ) return value . source ;
66
67
return value . replace ( / [ ^ \w ] / g, function ( character ) { return "\\" + character ; } ) ;
67
68
} ,
68
69
@@ -97,7 +98,7 @@ window.VerbalExpression = (function(){
97
98
// behaviour to split the "scentences"
98
99
// naturally.
99
100
then : function ( value ) {
100
- value = this . sanitize ( value ) ;
101
+ value = this . sanitize ( value ) ;
101
102
this . add ( "(" + value + ")" ) ;
102
103
return ( this ) ;
103
104
} ,
@@ -125,7 +126,7 @@ window.VerbalExpression = (function(){
125
126
126
127
// Anything but these characters
127
128
anythingBut : function ( value ) {
128
- value = this . sanitize ( value ) ;
129
+ value = this . sanitize ( value ) ;
129
130
this . add ( "([^" + value + "]*)" ) ;
130
131
return ( this ) ;
131
132
} ,
@@ -178,7 +179,7 @@ window.VerbalExpression = (function(){
178
179
return ( this . anyOf ( value ) ) ;
179
180
} ,
180
181
181
- // Usage: .range( from, to [, from, to ...] )
182
+ // Usage: .range( from, to [, from, to ... ] )
182
183
range : function ( ) {
183
184
184
185
var value = "[" ;
@@ -242,7 +243,7 @@ window.VerbalExpression = (function(){
242
243
} ,
243
244
244
245
// Multiline, also reversed
245
- searhOneLine : function ( enable ) {
246
+ searchOneLine : function ( enable ) {
246
247
247
248
if ( enable != false ) this . removeModifier ( "m" ) ;
248
249
else this . addModifier ( "m" ) ;
@@ -267,6 +268,18 @@ window.VerbalExpression = (function(){
267
268
value += "+" ;
268
269
}
269
270
this . add ( value ) ;
271
+ return ( this ) ;
272
+ } ,
273
+
274
+ // Adds alternative expressions
275
+ or : function ( value ) {
276
+
277
+ if ( this . _prefixes . indexOf ( "(" ) == - 1 ) this . _prefixes += "(" ;
278
+ if ( this . _suffixes . indexOf ( ")" ) == - 1 ) this . _suffixes = ")" + this . _suffixes ;
279
+
280
+ this . add ( ")|(" ) ;
281
+ if ( value ) this . then ( value ) ;
282
+
270
283
return ( this ) ;
271
284
}
272
285
0 commit comments