Fix inline comment regexp for v2.0.3

aichaos · Aug 26, 2016 · a9b3961 · a9b3961
1 parent c245219
commit a9b3961
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 5 deletions.
diff --git a/Changes b/Changes
@@ -1,5 +1,9 @@
 Revision history for Perl extension RiveScript.
 
+  2.0.3  Aug 26 2016
+  - Fix inline comment regexp that was making URLs impossible to represent
+    in replies.
+
   2.0.2  Jan 11 2016
   - Fix typo in changelog.
 

diff --git a/README.md b/README.md
@@ -431,6 +431,10 @@ defines the standards of RiveScript.
 
 # CHANGES
 
+    2.0.3  Aug 26 2016
+    - Fix inline comment regexp that was making URLs impossible to represent
+      in replies.
+
     2.0.0  Dec 28 2015
     - Switch from old-style floating point version number notation to dotted
       decimal notation. This bumps the version number to `2.0.0` because the next

diff --git a/docs/RiveScript.html b/docs/RiveScript.html
@@ -5,7 +5,7 @@
 <title></title>
 <link rel="stylesheet" href="rivescript.css" type="text/css" />
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<link rev="made" href="mailto:nlo@osx004.apple.com" />
+<link rev="made" href="mailto:root@localhost" />
 </head>
 
 <body>

diff --git a/lib/RiveScript.pm b/lib/RiveScript.pm
@@ -5,7 +5,7 @@ use warnings;
 
 # Version of the Perl RiveScript interpreter. This must be on a single line!
 # See `perldoc version`
-use version; our $VERSION = version->declare('v2.0.2');
+use version; our $VERSION = version->declare('v2.0.3');
 
 our $SUPPORT = '2.0';  # Which RS standard we support.
 our $basedir = (__FILE__ =~ /^(.+?)\.pm$/i ? $1 : '.');
@@ -471,10 +471,10 @@ sub parse {
 
 		# Ignore inline comments if there's a space before and after
 		# the // or # symbols.
-		my $inline_comment_regexp = "(\\s+\\#\\s+|\\/\\/)";
+		my $inline_comment_regexp = qr/(\s+#\s+|\s+\/\/)/;
 		$line =~ s/\\\/\//\\\/\\\//g; # Turn \// into \/\/
 		if ($cmd eq '+') {
-			$inline_comment_regexp = "(\\s\\s\\#|\\/\\/)";
+			$inline_comment_regexp = qr/(\s\s#|\s+\/\/)/;
 			if ($line =~ /\s\s#\s/) {
 				# Deprecated.
 				$self->issue ("Using the # symbol for comments is deprecated at $fname line $lineno (near: $line).");
@@ -3381,6 +3381,10 @@ L<http://www.rivescript.com/> - The official homepage of RiveScript.
 
 =head1 CHANGES
 
+  2.0.3  Aug 26 2016
+  - Fix inline comment regexp that was making URLs impossible to represent
+    in replies.
+
   2.0.2  Jan 11 2016
   - Fix typo in changelog.
 

diff --git a/lib/RiveScript/WD.pm b/lib/RiveScript/WD.pm
@@ -5,7 +5,7 @@ use warnings;
 
 # Version of the Perl RiveScript interpreter. This must be on a single line!
 # See `perldoc version`
-use version; our $VERSION = version->declare('v2.0.2');
+use version; our $VERSION = version->declare('v2.0.3');
 
 # This is not a real module; it's only a current copy of the RiveScript
 # Working Draft. See the latest version at