[Devmon-devel] SF.net SVN: devmon:[237] trunk/modules/dm_templates.pm

[<buc...@us...>]

Revision: 237
          http://devmon.svn.sourceforge.net/devmon/?rev=237&view=rev
Author:   buchanmilne
Date:     2012-12-21 06:45:18 +0000 (Fri, 21 Dec 2012)
Log Message:
-----------
Fix regex for operator matching in MATH transform, which had broken some templates using x as multiplication

Modified Paths:
--------------
    trunk/modules/dm_templates.pm

Modified: trunk/modules/dm_templates.pm
===================================================================
--- trunk/modules/dm_templates.pm	2012-08-03 10:36:23 UTC (rev 236)
+++ trunk/modules/dm_templates.pm	2012-12-21 06:45:18 UTC (rev 237)
@@ -544,9 +544,10 @@
 
         $func_type eq 'math' and do {
           $temp =~ s/:\s*\d+\s*$//;
-          $temp =~ s/\{\s*\S+?\s*\}|\s\.\s|\sx\s|\*|\+|\/|-|\^|%|\||&|\d+(\.\d*)?|\(|\)\s*//g;
+          $temp =~ s/\{\s*\S+?\s*\}|\s\.\s|\s+x\s+|\*|\+|\/|-|\^|%|\||&|\d+(\.\d*)?|\(|\)//g;
+          $temp =~ s/\s*//;
           do_log("MATH transform uses only math/numeric symbols and an " .
-                 "optional precision number at $trans_file, line $l_num", 0)
+                 "optional precision number, $temp did not pass, at $trans_file, line $l_num", 0)
             and next LINE if $temp !~ /^\s*$/;
           last CASE;
         };

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.