removed leading/trailing tabs/blanks in nsc/mod...

removed leading/trailing tabs/blanks in nsc/models/*.scala

1 files changed, 13 insertions, 1 deletions

diff --git a/test/scalatest b/test/scalatest
index 74f934a920..ffbeb482b9 100755
--- a/test/scalatest
+++ b/test/scalatest
@@ -144,6 +144,7 @@ test_print_help() {
     test_print_usage;
     echo "";
     echo "--auto          use filenames to select the test to run";
+    echo "--dis           next files test the class file disassembler";
     echo "--run           next files test the interpreter and all backends";
     echo "--jvm           next files test the JVM backend";
     echo "--pos           next files test a compilation success";
@@ -382,6 +383,8 @@ test_check_kind() {
 # Checks everything.
 test_check_all() {
     [ $# = 0 ] || abort "internal error";
+    test_check_kind "Testing disassembler" \
+        "dis" $FILES_DIS;
     test_check_kind "Testing JVM backend" \
         "jvm" $FILES_RUN $FILES_JVM;
     test_check_kind "Testing compiler (on files whose compilation should succeed)" \
@@ -411,6 +414,7 @@ test_add_file() {
     TEST_ALL="false";
     case "$TEST_TYPE" in
         auto   ) ;;
+        dis    ) FILES_DIS="$FILES_DIS $1"; return;;
         run    ) FILES_RUN="$FILES_RUN $1"; return;;
         jvm    ) FILES_JVM="$FILES_JVM $1"; return;;
         pos    ) FILES_POS="$FILES_POS $1"; return;;
@@ -420,6 +424,7 @@ test_add_file() {
         *      ) abort "unknown test type \`$TEST_TYPE'";;
     esac;
     case "$1" in
+        dis  | */dis  | */dis/*  | dis/*  ) FILES_DIS="$FILES_DIS $1";;
         run  | */run  | */run/*  | run/*  ) FILES_RUN="$FILES_RUN $1";;
         jvm5 | */jvm5 | */jvm5*  | jvm5/* )
             if [ "$JAVA5" = "true" ]; then
@@ -501,6 +506,7 @@ FILES_POS="";
 FILES_NEG="";
 FILES_MSIL="";
 FILES_SCRIPT="";
+FILES_DIS="";
 
 QUICK="$PREFIX/build/quick/bin"
 if [ -d "$PREFIX/dists" ]; then
@@ -531,6 +537,7 @@ esac;
 while [ $# -gt 0 ]; do
     case "$1" in
         --auto       ) TEST_TYPE="auto"; shift 1;;
+        --dis        ) TEST_TYPE="dis"; shift 1;;
         --run        ) TEST_TYPE="run"; shift 1;;
         --jvm        ) TEST_TYPE="jvm"; shift 1;;
         --pos        ) TEST_TYPE="pos"; shift 1;;
@@ -573,6 +580,9 @@ printf_initialization "${COLOR:-many}";
 
 if [ "$TEST_ALL" = "true" ]; then
     case "$TEST_TYPE" in
+        dis ) FILES_DIS="$FILES_DIS $SRCDIR/dis";;
+    esac;
+    case "$TEST_TYPE" in
         run ) FILES_RUN="$FILES_RUN $SRCDIR/run";;
     esac;
     case "$TEST_TYPE" in
@@ -598,7 +608,7 @@ fi;
 
 SCALA="${BIN_DIR}scala";
 SCALAC="${BIN_DIR}scalac -encoding iso-8859-1";
-SCALAP="${BIN_DIR}scalap";
+SCALAP="scalap";
 
 if [ -n "$OBJDIR" ]; then
     if [ -d "$OBJDIR" ] || mkdir -p "$OBJDIR"; then
@@ -615,6 +625,8 @@ if [ -z "$bin_dir" ]; then
     bin_dir=`test_get_location $scalac`;
 fi;
 printf_outline "Scala binaries in   : $bin_dir\\n";
+scala_version=`${BIN_DIR}scalac -version 2>&1`
+printf_outline "Scala version is    : $scala_version\\n";
 jvm_version=`${JAVACMD:=java} -version 2>&1 | head -3 | tail -1`
 printf_outline "Java runtime is     : $jvm_version\\n\\n";