eed3si9n · December 13, 2015 23:29 · Feb 20, 2013 · Feb 20, 2013 · Feb 20, 2013
diff --git a/Macros.scala b/Macros.scala
@@ -1,17 +1,16 @@
 import scala.reflect.macros.Context
 import scala.util.matching.Regex
 import java.util.regex.PatternSyntaxException
-
-object Macros{
-
-  implicit class RegexContext(val c: StringContext) {
-    def r(): Regex = macro regexImpl
+
+object Macros {
+  implicit class RegexContext(val c: String) {
+    def regex(): Regex = macro regexImpl
   }
-
+ 
   def regexImpl(c: Context)(): c.Expr[Regex] = {
     import c.universe._
     c.prefix.tree match {
-      case Apply(_,List(Apply(_,List(Literal(Constant(str: String)))))) =>
+      case Apply(Select(_, _), List(Literal(Constant(str: String)))) =>
         try{
           str.r
         }catch{
@@ -21,5 +20,4 @@ object Macros{
         c.Expr[Regex](Apply.apply(fun, c.literal(str).tree :: Nil))
     }
   }
-
 }
diff --git a/Main.scala b/Main.scala
@@ -1,7 +1,7 @@
 import Macros._
 
 object Main extends App{
-  println(r"foo|bar") // compile success !
-  println(r"[foo") // compile error !
-  println(r"foo$") // error: invalid string interpolation: `$$', `$'ident or `$'BlockExpr expected 
-}
+  println("foo|bar".regex) // compile success !
+  println("[foo".regex) // compile error !
+  println("foo$".regex)
+}
diff --git a/README.md b/README.md
@@ -1,2 +1 @@
 - inspired by [macrocosm](https://github.com/retronym/macrocosm/blob/521dfc0bcd1/src/main/scala/com/github/retronym/macrocosm/Macrocosm.scala#L102-L128) and [inkytonik's blog post](http://hootenannylas.blogspot.com.au/2013/02/syntax-checking-in-scala-string.html)
-- Can not use if `$` character contains. Does anyone have a solution? :(
diff --git a/README.md b/README.md
@@ -1,2 +1,2 @@
-- inspired [macrocosm](https://github.com/retronym/macrocosm/blob/521dfc0bcd1/src/main/scala/com/github/retronym/macrocosm/Macrocosm.scala#L102-L128) and [inkytonik's blog post](http://hootenannylas.blogspot.com.au/2013/02/syntax-checking-in-scala-string.html)
+- inspired by [macrocosm](https://github.com/retronym/macrocosm/blob/521dfc0bcd1/src/main/scala/com/github/retronym/macrocosm/Macrocosm.scala#L102-L128) and [inkytonik's blog post](http://hootenannylas.blogspot.com.au/2013/02/syntax-checking-in-scala-string.html)
 - Can not use if `$` character contains. Does anyone have a solution? :(
diff --git a/Macros.scala b/Macros.scala
@@ -0,0 +1,25 @@
+import scala.reflect.macros.Context
+import scala.util.matching.Regex
+import java.util.regex.PatternSyntaxException
+
+object Macros{
+
+  implicit class RegexContext(val c: StringContext) {
+    def r(): Regex = macro regexImpl
+  }
+
+  def regexImpl(c: Context)(): c.Expr[Regex] = {
+    import c.universe._
+    c.prefix.tree match {
+      case Apply(_,List(Apply(_,List(Literal(Constant(str: String)))))) =>
+        try{
+          str.r
+        }catch{
+          case e: PatternSyntaxException => c.abort(c.enclosingPosition, e.toString)
+        }
+        val Apply(fun, _) = reify(new Regex("")).tree
+        c.Expr[Regex](Apply.apply(fun, c.literal(str).tree :: Nil))
+    }
+  }
+
+}
diff --git a/Main.scala b/Main.scala
@@ -0,0 +1,7 @@
+import Macros._
+
+object Main extends App{
+  println(r"foo|bar") // compile success !
+  println(r"[foo") // compile error !
+  println(r"foo$") // error: invalid string interpolation: `$$', `$'ident or `$'BlockExpr expected 
+}
diff --git a/README.md b/README.md
@@ -0,0 +1,2 @@
+- inspired [macrocosm](https://github.com/retronym/macrocosm/blob/521dfc0bcd1/src/main/scala/com/github/retronym/macrocosm/Macrocosm.scala#L102-L128) and [inkytonik's blog post](http://hootenannylas.blogspot.com.au/2013/02/syntax-checking-in-scala-string.html)
+- Can not use if `$` character contains. Does anyone have a solution? :(
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		- inspired by [macrocosm](https://github.com/retronym/macrocosm/blob/521dfc0bcd1/src/main/scala/com/github/retronym/macrocosm/Macrocosm.scala#L102-L128) and [inkytonik's blog post](http://hootenannylas.blogspot.com.au/2013/02/syntax-checking-in-scala-string.html)
		- Can not use if `$` character contains. Does anyone have a solution? :(
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		- inspired [macrocosm](https://github.com/retronym/macrocosm/blob/521dfc0bcd1/src/main/scala/com/github/retronym/macrocosm/Macrocosm.scala#L102-L128) and [inkytonik's blog post](http://hootenannylas.blogspot.com.au/2013/02/syntax-checking-in-scala-string.html)
		- Can not use if `$` character contains. Does anyone have a solution? :(