scala binary can execute scripts

Author: anatoliykmetyuk

dist/bin/scala

@@ -38,8 +38,10 @@ addDotcOptions () {
 source "$PROG_HOME/bin/common"
 
 declare -a residual_args
+declare -a script_args
 execute_repl=false
 execute_run=false
+execute_script=false
 with_compiler=false
 class_path_count=0
 CLASS_PATH=""
@@ -79,13 +81,28 @@ while [[ $# -gt 0 ]]; do
       addDotcOptions "${1}"
       shift ;;
     *)
-      residual_args+=("$1")
+      if [ $execute_script == false ]; then
+        if [[ "$1" == *.scala ]]; then
+          execute_script=true
+          target_script="$1"
+        else
+          residual_args+=("$1")
+        fi
+      else
+        script_args+=("$1")
+      fi
       shift
       ;;
 
   esac
 done
-if [ $execute_repl == true ] || ([ $execute_run == false ] && [ $options_indicator == 0 ]); then
+
+if [ $execute_script == true ]; then
+  if [ "$CLASS_PATH" ]; then
+    cp_arg="-classpath \"$CLASS_PATH\""
+  fi
+  eval "\"$PROG_HOME/bin/scalac\" $cp_arg ${java_options[@]} ${residual_args[@]} -script $target_script ${script_args[@]}"
+elif [ $execute_repl == true ] || ([ $execute_run == false ] && [ $options_indicator == 0 ]); then
   if [ "$CLASS_PATH" ]; then
     cp_arg="-classpath \"$CLASS_PATH\""
   fi

dist/bin/scalac

@@ -33,6 +33,7 @@ withCompiler=true
 CompilerMain=dotty.tools.dotc.Main
 DecompilerMain=dotty.tools.dotc.decompiler.Main
 ReplMain=dotty.tools.repl.Main
+ScriptingMain=dotty.tools.scripting.Main
 
 PROG_NAME=$CompilerMain
 
@@ -45,6 +46,9 @@ addScala () {
 addResidual () {
   residual_args+=("'$1'")
 }
+addScripting () {
+  scripting_args+=("'$1'")
+}
 
 classpathArgs () {
   # echo "dotty-compiler: $DOTTY_COMP"
@@ -74,6 +78,7 @@ classpathArgs () {
   jvm_cp_args="-classpath \"$toolchain\""
 }
 
+in_scripting_args=false
 while [[ $# -gt 0 ]]; do
 case "$1" in
            --) shift; for arg; do addResidual "$arg"; done; set -- ;;
@@ -85,6 +90,7 @@ case "$1" in
     # Optimize for short-running applications, see https://github.com/lampepfl/dotty/issues/222
     -Oshort) addJava "-XX:+TieredCompilation -XX:TieredStopAtLevel=1" && shift ;;
         -repl) PROG_NAME="$ReplMain" && shift ;;
+      -script) PROG_NAME="$ScriptingMain" && target_script="$2" && in_scripting_args=true && shift && shift ;;
      -compile) PROG_NAME="$CompilerMain" && shift ;;
    -decompile) PROG_NAME="$DecompilerMain" && shift ;;
  -print-tasty) PROG_NAME="$DecompilerMain" && addScala "-print-tasty" && shift ;;
@@ -98,12 +104,22 @@ case "$1" in
           # will be available as system properties.
           -D*) addJava "$1" && shift ;;
           -J*) addJava "${1:2}" && shift ;;
-            *) addResidual "$1" && shift ;;
+            *) if [ $in_scripting_args == false ]; then
+                addResidual "$1"
+               else
+                addScripting "$1"
+               fi
+               shift
+               ;;
   esac
 done
 
 classpathArgs
 
+if [ "$PROG_NAME" == "$ScriptingMain" ]; then
+  scripting_string="-script $target_script ${scripting_args[@]}"
+fi
+
 eval exec "\"$JAVACMD\"" \
      ${JAVA_OPTS:-$default_java_opts} \
      "$DEBUG" \
@@ -112,5 +128,6 @@ eval exec "\"$JAVACMD\"" \
      -Dscala.usejavacp=true \
      "$PROG_NAME"  \
      "${scala_args[@]}" \
-     "${residual_args[@]}"
+     "${residual_args[@]}" \
+     "$scripting_string"
 exit $?