fix escape

edadma · Jun 19, 2018 · eebde1f · eebde1f
1 parent a148168
commit eebde1f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/src/main/scala/Command.scala b/src/main/scala/Command.scala
@@ -604,7 +604,7 @@ object Command {
     ) map (c => c.name -> c) toMap
 
   def escape( s: String ) =
-    escapeRegex.replaceAllIn( s, { m => s"&${Entity( m group 1 head )};" } )
+    escapeRegex.replaceSomeIn( s, { m => Entity( m group 1 head ) map (e => s"&$e;") } )
 
   def escapeFull( s: String ) =
     escapeRegex.replaceAllIn( s, { m => s"&${Entity.full( m group 1 head )};" } )

diff --git a/src/main/scala/Entity.scala b/src/main/scala/Entity.scala
@@ -5,11 +5,11 @@ object Entity {
 
   def apply( c: Char ) =
     c match {
-      case '&' => "amp"
-      case '<' => "lt"
-      case '>' => "gt"
-      case _ if c > '\u007F' => s"#${c.toInt}"
-      case _ => c.toString
+      case '&' => Some( "amp" )
+      case '<' => Some( "lt" )
+      case '>' => Some( "gt" )
+      case _ if c > '\u007F' => Some( s"#${c.toInt}" )
+      case _ => None
     }
 
   def full( c: Char ) =

diff --git a/src/test/scala/Main.scala b/src/test/scala/Main.scala
@@ -11,9 +11,7 @@ object Main extends App {
     )
   val input =
     """
-      |\def m a b {asdf \a\ zxvc \b}
-      |\set v 123
-      |\m qwer\v
+      |\escape "a < b &&\n b < c"
     """.trim.stripMargin
   val assigns =
     Map(