[incubator-amaterasu] 03/03: added checking for multiline comments in scala

[ya...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

yaniv pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-amaterasu.git

commit 74a1b9c6b95f838f31140e0bc552e85da34c5e77
Author: Yaniv Rodenski <ro...@gmail.com>
AuthorDate: Sat Jun 9 14:23:57 2018 +1000

    added checking for multiline comments in scala
---
 .../apache/spark/repl/amaterasu/runners/spark/SparkScalaRunner.scala   | 3 ++-
 .../test/scala/org/apache/amaterasu/spark/SparkScalaRunnerTests.scala  | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/executor/src/main/scala/org/apache/spark/repl/amaterasu/runners/spark/SparkScalaRunner.scala b/executor/src/main/scala/org/apache/spark/repl/amaterasu/runners/spark/SparkScalaRunner.scala
index a45b8c0..56a04cf 100755
--- a/executor/src/main/scala/org/apache/spark/repl/amaterasu/runners/spark/SparkScalaRunner.scala
+++ b/executor/src/main/scala/org/apache/spark/repl/amaterasu/runners/spark/SparkScalaRunner.scala
@@ -61,7 +61,8 @@ class SparkScalaRunner(var env: Environment,
 
     for (line <- source.getLines()) {
 
-      if (!line.isEmpty) {
+      // ignoring empty or commented lines
+      if (!line.isEmpty && !line.trim.startsWith("*") && !line.startsWith("/")) {
 
         outStream.reset()
         log.debug(line)
diff --git a/executor/src/test/scala/org/apache/amaterasu/spark/SparkScalaRunnerTests.scala b/executor/src/test/scala/org/apache/amaterasu/spark/SparkScalaRunnerTests.scala
index 9575205..1d79fc9 100755
--- a/executor/src/test/scala/org/apache/amaterasu/spark/SparkScalaRunnerTests.scala
+++ b/executor/src/test/scala/org/apache/amaterasu/spark/SparkScalaRunnerTests.scala
@@ -33,7 +33,6 @@ class SparkScalaRunnerTests extends FlatSpec with Matchers with BeforeAndAfterAl
 
   "SparkScalaRunner" should "execute the simple-spark.scala" in {
 
-
     val sparkRunner =factory.getRunner("spark", "scala").get.asInstanceOf[SparkScalaRunner]
     val script = getClass.getResource("/simple-spark.scala").getPath
     val sourceCode = Source.fromFile(script).getLines().mkString("\n")

-- 
To stop receiving notification emails like this one, please contact
yaniv@apache.org.