diff options
| author | Christopher Vogt <oss.nsp@cvogt.org> | 2016-11-07 02:43:41 -0500 |
|---|---|---|
| committer | Christopher Vogt <oss.nsp@cvogt.org> | 2016-11-07 09:31:13 -0500 |
| commit | 7b2f3bbd3741450992d4152d8c64c45b41734d74 (patch) | |
| tree | 64a401864cf4ebc3c3a24880b7905f9689a25e61 /libraries/eval/Eval.scala | |
| parent | 1da77f2df3d28e2a30e2934be268ef1163520690 (diff) | |
| download | cbt-7b2f3bbd3741450992d4152d8c64c45b41734d74.tar.gz cbt-7b2f3bbd3741450992d4152d8c64c45b41734d74.tar.bz2 cbt-7b2f3bbd3741450992d4152d8c64c45b41734d74.zip | |
Add cbt build for Eval and remove dependency on twitter util-core
Diffstat (limited to 'libraries/eval/Eval.scala')
| -rw-r--r-- | libraries/eval/Eval.scala | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/libraries/eval/Eval.scala b/libraries/eval/Eval.scala index 1ab5762..057fd53 100644 --- a/libraries/eval/Eval.scala +++ b/libraries/eval/Eval.scala @@ -16,8 +16,6 @@ package com.twitter.util -import com.twitter.conversions.string._ -import com.twitter.io.StreamIO import java.io._ import java.math.BigInteger import java.net.URLClassLoader @@ -294,9 +292,9 @@ class Eval(target: Option[File]) { case -1 => fileName case dot => fileName.substring(0, dot) } - baseName.regexSub(Eval.classCleaner) { m => - "$%02x".format(m.group(0).charAt(0).toInt) - } + Eval.classCleaner.replaceAllIn( baseName, { m => + Regex.quoteReplacement( "$%02x".format(m.group(0).charAt(0).toInt) ) + }) } /* @@ -433,7 +431,13 @@ class Eval(target: Option[File]) { if (maxDepth == 0) { throw new IllegalStateException("Exceeded maximum recusion depth") } else { - apply(StreamIO.buffer(r.get(path)).toString, maxDepth - 1) + val inputStream = r.get(path) + val string = new String( + Iterator.continually( + inputStream.read() + ).takeWhile(_ != -1).map(_.toByte).toArray + ) + apply(string, maxDepth - 1) } } case _ => |