simplified regex literal format - no longer need to escape \

patch from Chouser

1 files changed, 16 insertions, 2 deletions

diff --git a/src/jvm/clojure/lang/LispReader.java b/src/jvm/clojure/lang/LispReader.java
index afc95835..e3b01c4b 100644
--- a/src/jvm/clojure/lang/LispReader.java
+++ b/src/jvm/clojure/lang/LispReader.java
@@ -364,8 +364,22 @@ static class RegexReader extends AFn{
 	static StringReader stringrdr = new StringReader();

 

 	public Object invoke(Object reader, Object doublequote) throws Exception{

-		String str = (String) stringrdr.invoke(reader, doublequote);

-		return Pattern.compile(str);

+		StringBuilder sb = new StringBuilder();

+		Reader r = (Reader) reader;

+		for(int ch = r.read(); ch != '"'; ch = r.read())

+			{

+			if(ch == -1)

+				throw new Exception("EOF while reading regex");

+			sb.append( (char) ch );

+			if(ch == '\\')	//escape

+				{

+				ch = r.read();

+				if(ch == -1)

+					throw new Exception("EOF while reading regex");

+				sb.append( (char) ch ) ;

+				}

+			}

+		return Pattern.compile(sb.toString());

 	}

 }