You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2008/05/10 17:09:50 UTC

svn commit: r655098 - in /jakarta/jmeter/trunk: docs/usermanual/regular_expressions.html xdocs/usermanual/regular_expressions.xml

Author: sebb
Date: Sat May 10 08:09:50 2008
New Revision: 655098

URL: http://svn.apache.org/viewvc?rev=655098&view=rev
Log:
More info on modifiers

Modified:
    jakarta/jmeter/trunk/docs/usermanual/regular_expressions.html
    jakarta/jmeter/trunk/xdocs/usermanual/regular_expressions.xml

Modified: jakarta/jmeter/trunk/docs/usermanual/regular_expressions.html
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/usermanual/regular_expressions.html?rev=655098&r1=655097&r2=655098&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/usermanual/regular_expressions.html (original)
+++ jakarta/jmeter/trunk/docs/usermanual/regular_expressions.html Sat May 10 08:09:50 2008
@@ -405,47 +405,40 @@
 		<tr><td>
 		  <blockquote>
 		  									 				<p	>
-								The pattern matching behave in various slightly different ways, 
+								The pattern matching behaves in various slightly different ways, 
 depending on the setting of the multi-line and single-line modifiers.
+Note that the single-line and multi-line operators have nothing to do with each other;
+they can be specified independently.
 
 						</p>
+							  									 				<h3	>
+								Single-line mode
+						</h3>
 							  									 				<p	>
-								There are the four possible combinations:
-						</p>
-							  									 				<ul	>
 								
+Single-line mode only affects how the '.' meta-character is interpreted.
 
-												<li	>
-								
-Default behavior. '.' matches any character except "\n". ^ matches only at the beginning of the string and $ matches only at the end or before a newline at the end. 
-
-						</li>
-									
-
-												<li	>
+						</p>
+							  									 				<p	>
 								
-Single-line modifier (?s): Treat string as a single long line. '.' matches any character, even "\n". ^ matches only at the beginning of the string and $ matches only at the end or before a newline at the end. 
-
-						</li>
-									
+Default behaviour is that '.' matches any character except newline. 
+In single-line mode, '.' also matches newline.
 
-												<li	>
+						</p>
+							  									 				<h3	>
+								Multi-line mode
+						</h3>
+							  									 				<p	>
 								
-
-Multi-line modifier (?m): Treat string as a set of multiple lines. '.' matches any character except "\n". ^ and $ are able to match at the start or end of any line within the string. 
+Multi-line mode only affects how the meta-characters '^' and '$' are interpreted.
 
-						</li>
-									
-
-												<li	>
+						</p>
+							  									 				<p	>
 								
-
-Both modifiers (?sm): Treat string as a single long line, but detect multiple lines. '.' matches any character, even "\n". ^ and $, however, are able to match at the start or end of any line within the string. 
-
-						</li>
-									
-
-						</ul>
+Default behaviour is that '^' and '$' only match at the very beginning and end of the string. 
+When Multi-line mode is used, the '^' metacharacter matches at the beginning of every line,
+and the '$' metacharacter matches at the end of every line.
+						</p>
 							  		  </blockquote>
 		</td></tr>
 		<tr><td><br></td></tr>
@@ -517,6 +510,41 @@
 		</td></tr>
 		<tr><td><br></td></tr>
 	 </table>
+							  									 			 	 <table border="0" cellspacing="0" cellpadding="2" width="100%">
+		<tr><td bgcolor="#828DA6">
+		  <font color="#ffffff" face="arial,helvetica,sanserif">
+			 <a name="placement"><strong>20.5 Placement of modifiers</strong></a>
+		  </font>
+		</td></tr>
+		<tr><td>
+		  <blockquote>
+		  									 				<p	>
+								
+Modifiers can be placed anywhere in the regex, and apply from that point onwards.
+
+						</p>
+							  									 				<p	>
+								
+The single-line (?s) and multi-line (?m) modifiers are normally placed at the start of the regex.
+
+						</p>
+							  									 				<p	>
+								
+The ignore-case modifier (?i) may be usefully applied to just part of a regex,
+for example:
+
+												<pre	>
+								
+Match ExAct case or (?i)ArBiTrARY(?-i) case
+
+						</pre>
+									
+
+						</p>
+							  		  </blockquote>
+		</td></tr>
+		<tr><td><br></td></tr>
+	 </table>
 							  		  </blockquote>
 		  </p>
 		</td></tr>

Modified: jakarta/jmeter/trunk/xdocs/usermanual/regular_expressions.xml
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/usermanual/regular_expressions.xml?rev=655098&r1=655097&r2=655098&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/usermanual/regular_expressions.xml (original)
+++ jakarta/jmeter/trunk/xdocs/usermanual/regular_expressions.xml Sat May 10 08:09:50 2008
@@ -126,28 +126,31 @@
 </p>
 </subsection>
 <subsection name="&sect-num;.3 Line mode" anchor="line_mode">
-<p>The pattern matching behave in various slightly different ways, 
+<p>The pattern matching behaves in various slightly different ways, 
 depending on the setting of the multi-line and single-line modifiers.
+Note that the single-line and multi-line operators have nothing to do with each other;
+they can be specified independently.
+</p>
+<h3>Single-line mode</h3>
+<p>
+Single-line mode only affects how the '.' meta-character is interpreted.
+</p>
+<p>
+Default behaviour is that '.' matches any character except newline. 
+In single-line mode, '.' also matches newline.
 </p>
-<p>There are the four possible combinations:</p>
-
-<ul>
-<li>
-Default behavior. '.' matches any character except "\n". ^ matches only at the beginning of the string and $ matches only at the end or before a newline at the end. 
-</li>
-<li>
-Single-line modifier (?s): Treat string as a single long line. '.' matches any character, even "\n". ^ matches only at the beginning of the string and $ matches only at the end or before a newline at the end. 
-</li>
-<li>
 
-Multi-line modifier (?m): Treat string as a set of multiple lines. '.' matches any character except "\n". ^ and $ are able to match at the start or end of any line within the string. 
-</li>
-<li>
+<h3>Multi-line mode</h3>
+<p>
+Multi-line mode only affects how the meta-characters '^' and '$' are interpreted.
+</p>
+<p>
+Default behaviour is that '^' and '$' only match at the very beginning and end of the string. 
+When Multi-line mode is used, the '^' metacharacter matches at the beginning of every line,
+and the '$' metacharacter matches at the end of every line.</p>
 
-Both modifiers (?sm): Treat string as a single long line, but detect multiple lines. '.' matches any character, even "\n". ^ and $, however, are able to match at the start or end of any line within the string. 
-</li>
-</ul>
 </subsection>
+
 <subsection name="&sect-num;.4 Meta characters" anchor="meta_chars">
 <p>
 Regular expressions use certain characters as meta characters - these characters have a special meaning to the RE engine.
@@ -167,6 +170,22 @@
 <p>Please note that ORO does not support the \Q and \E meta-characters.
 [In other RE engines, these can be used to quote a portion of an RE so that the meta-characters stand for themselves.]</p>
 </subsection>
+
+<subsection name="&sect-num;.5 Placement of modifiers" anchor="placement">
+<p>
+Modifiers can be placed anywhere in the regex, and apply from that point onwards.
+</p>
+<p>
+The single-line (?s) and multi-line (?m) modifiers are normally placed at the start of the regex.
+</p>
+<p>
+The ignore-case modifier (?i) may be usefully applied to just part of a regex,
+for example:
+<pre>
+Match ExAct case or (?i)ArBiTrARY(?-i) case
+</pre>
+</p>
+</subsection>
 </section>
 
 </body>



---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org