[vassalengine-svn-trunk] [vassalengine-svn] SF.net SVN: vassalengine:[9240] VASSAL-src/trunk/src/bsh/Primitive.java

[<uck...@us...>]

Revision: 9240
          http://sourceforge.net/p/vassalengine/svn/9240
Author:   uckelman
Date:     2016-11-07 17:24:58 +0000 (Mon, 07 Nov 2016)
Log Message:
-----------
Merged Brent-3.2-Work@9232.

Fixed Bug 12534: Regular Expression matching not supported in Calulated Property

Modified Paths:
--------------
    VASSAL-src/trunk/src/bsh/Primitive.java

Modified: VASSAL-src/trunk/src/bsh/Primitive.java
===================================================================
--- VASSAL-src/trunk/src/bsh/Primitive.java	2016-11-07 17:23:53 UTC (rev 9239)
+++ VASSAL-src/trunk/src/bsh/Primitive.java	2016-11-07 17:24:58 UTC (rev 9240)
@@ -36,6 +36,7 @@
 
 import java.util.Map;
 import java.util.HashMap;
+import java.util.regex.Pattern;
 
 /**
     Wrapper for primitive types in Bsh.  This is package public because it 
@@ -470,6 +471,9 @@
             case PLUS:
                 return lhs + rhs;
                 
+            case MATCH:
+                return new Boolean(Pattern.matches(rhs, lhs));
+                
             default:
                 throw new InterpreterError(
           "Unimplemented binary String operator");

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


------------------------------------------------------------------------------
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today. http://sdm.link/xeonphi
_______________________________________________
vassalengine-svn mailing list
vas...@li...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn