Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/haifengl/smile
Browse files Browse the repository at this point in the history
  • Loading branch information
haifengl committed Sep 28, 2017
2 parents 4f73d23 + 9d4b1bd commit 1285e56
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion shell/src/main/scala/smile/shell/AmmoniteREPL.scala
Expand Up @@ -23,7 +23,7 @@ import ammonite.runtime.Storage
*
* @author Haifeng Li
*/
object AmmoniteShell {
object AmmoniteREPL {
val home = Path(System.getProperty("user.home")) / ".smile"
val prompt = "smile> "
val welcome =
Expand Down
6 changes: 3 additions & 3 deletions shell/src/main/scala/smile/shell/Main.scala
Expand Up @@ -42,10 +42,10 @@ object Main extends App {
} else {
(cliConfig.code, leftoverArgs) match {
case (Some(code), Nil) =>
AmmoniteShell.runCode(code)
AmmoniteREPL.runCode(code)

case (None, Nil) =>
AmmoniteShell.run()
AmmoniteREPL.run()
true

case (None, head :: rest) if head.startsWith("-") =>
Expand All @@ -54,7 +54,7 @@ object Main extends App {
false

case (None, head :: rest) =>
val success = AmmoniteShell.runScript(Path(head, pwd)) // ignore script args for now
val success = AmmoniteREPL.runScript(Path(head, pwd)) // ignore script args for now
success
}
}
Expand Down

0 comments on commit 1285e56

Please sign in to comment.