treat _ followed by id text as an id rather than as an _ operator
authorTony Cook <tony@develop-help.com>
Fri, 8 May 2015 05:56:40 +0000 (15:56 +1000)
committerTony Cook <tony@develop-help.com>
Sun, 17 May 2015 12:30:13 +0000 (22:30 +1000)
site/cgi-bin/modules/Squirrel/Template/Expr.pm

index e66d92ed0b579b8dd6504175d1e00beee19dedcc..4de0ca0d37a781c542c8e03e280b90448448e519 100644 (file)
@@ -1,7 +1,7 @@
 package Squirrel::Template::Expr;
 use strict;
 
-our $VERSION = "1.015";
+our $VERSION = "1.016";
 
 package Squirrel::Template::Expr::Eval;
 use Scalar::Util ();
@@ -776,7 +776,7 @@ sub get {
         $self->[TEXT] =~ s!\A(\s*/((?:[^/\\]|\\.)+)/([ismx]*\s)?\s*)!!) {
     push @$queue, [ re => $1, $2, $3 || "" ];
   }
-  elsif ($self->[TEXT] =~ s/\A(\s*(not\b|eq\b|ne\b|le\b|lt\b|ge\b|gt\b|cmp\b|<=>|<=|>=|[!=]\=|\=\~|!~|[_\?:,\[\]\(\)<>=!.*\/+\{\};\$-])\s*)//) {
+  elsif ($self->[TEXT] =~ s/\A(\s*(not\b|eq\b|ne\b|le\b|lt\b|ge\b|gt\b|cmp\b|<=>|<=|>=|[!=]\=|\=\~|!~|[\?:,\[\]\(\)<>=!.*\/+\{\};\$-]|_(?![A-Za-z0-9_]))\s*)//) {
     push @$queue, [ "op$2" => $1 ];
   }
   elsif ($self->[TEXT] =~ s/\A(\s*([A-Za-z_][a-zA-Z_0-9]*)\s*)//) {