ports #191 fix

eed3si9n · Nov 8, 2014 · 51ce24a · 51ce24a
1 parent 0207702
commit 51ce24a
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/cli/src/main/scala/scalaxb/compiler/xsd2/namer.scala b/cli/src/main/scala/scalaxb/compiler/xsd2/namer.scala
@@ -205,9 +205,19 @@ trait Namer extends ScalaNames { self: Lookup with Splitter  =>
       case _ => false
     }
 
-  private def identifier(value: String) =
-    """\W""".r.replaceAllIn(value, "")
-
+  def identifier(value: String) = {
+    val nonspace = 
+      if (value.trim != "") """\s""".r.replaceAllIn(value, "")
+      else value    
+    if ("""\W""".r.findFirstIn(nonspace).isDefined) {
+      (nonspace.toSeq map { c =>
+        if ("""\W""".r.findFirstIn(c.toString).isDefined) "u" + c.toInt.toString
+        else c.toString
+      }).mkString
+    }
+    else nonspace
+  }
+
   def quote(value: Option[String]): String = value map {
     "Some(\"" + _ + "\")"
   } getOrElse { "None" }