Based on a patch by Garrett Wollman.

Compile regexes in ColorTest. git-svn-id: http://codeswarm.googlecode.com/svn/trunk@148 eda9c206-d64f-0410-a2f2-67f3fa0499ed
rictic · Jul 11, 2008 · f93ca26 · f93ca26
1 parent 5efe07a
commit f93ca26
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/ColorAssigner.java b/src/ColorAssigner.java
@@ -35,7 +35,7 @@ public ColorAssigner()
 	public void addRule( String label, String expr, int c1, int c2 )
 	{
 		ColorTest t = new ColorTest();
-		t.expr = expr;
+		t.expr = java.util.regex.Pattern.compile( expr );
 		t.label = label;
 		t.c1 = c1;
 		t.c2 = c2;

diff --git a/src/ColorTest.java b/src/ColorTest.java
@@ -18,18 +18,20 @@
  */
 
 import java.awt.Color;
+import java.util.regex.*;
 import processing.core.PApplet;
 import processing.core.PConstants;
 
 class ColorTest
 {
-	String expr;
+	Pattern expr;
 	String label;
 	int c1, c2;
 
 	public boolean passes( String s )
 	{
-		return s.matches( expr );
+		Matcher m = expr.matcher(s);
+		return m.matches();
 	}
 
 	public int assign()
@@ -48,9 +50,9 @@ public void loadProperty( String value )
 		tokens = firstpart.split( "\"" );
         label = tokens[0];
 		if (tokens.length == 3) {
-          expr = tokens[2];
+          expr = Pattern.compile( tokens[2] );
 		} else {
-          expr = tokens[0];
+          expr = Pattern.compile( tokens[0] );
 		}
 		// then the comma delimited colors
 		String rest = value.substring( lastQ + 1 );
@@ -75,7 +77,7 @@ public static void main( String [] args )
 		ColorTest ct = new ColorTest();
 		System.out.println( "input=" + args[0] );
 		ct.loadProperty( args[0] );
-		System.out.println( "regex=" + ct.expr );
+		//System.out.println( "regex=" + ct.expr );
 		System.out.println( "color1=" + Integer.toHexString(ct.c1) );
 		System.out.println( "color2=" + Integer.toHexString(ct.c2) );
 	}