From 6f4ba5480f9aa43baf49de774b64d0b3dbc95a10 Mon Sep 17 00:00:00 2001
From: ilyas <ilyas@epfl.ch>
Date: Wed, 6 May 2009 10:24:51 +0000
Subject: Scala decompiler test suite added

---
 build.xml                                          |  35 +-
 scala-lang.ipr                                     | 921 ++++++++++++++++++++-
 src/partest/scala/tools/partest/PartestTask.scala  |  13 +
 .../scala/tools/partest/nest/CompileManager.scala  |   1 +
 .../scala/tools/partest/nest/TestFile.scala        |   9 +
 src/partest/scala/tools/partest/nest/Worker.scala  |  63 +-
 src/scala-lang.iml                                 |  16 +-
 test/files/scalap/abstractClass/A.scala            |   5 +
 test/files/scalap/abstractClass/result.test        |   4 +
 test/files/scalap/abstractMethod/A.scala           |   4 +
 test/files/scalap/abstractMethod/result.test       |   5 +
 test/files/scalap/caseClass/A.scala                |   3 +
 test/files/scalap/caseClass/result.test            |  11 +
 test/files/scalap/caseObject/A.scala               |   3 +
 test/files/scalap/caseObject/result.test           |   8 +
 test/files/scalap/cbnParam/A.scala                 |   1 +
 test/files/scalap/cbnParam/result.test             |   3 +
 test/files/scalap/classWithExistential/A.scala     |   3 +
 test/files/scalap/classWithExistential/result.test |   4 +
 test/files/scalap/classWithSelfAnnotation/A.scala  |   4 +
 .../scalap/classWithSelfAnnotation/result.test     |   5 +
 test/files/scalap/covariantParam/A.scala           |   3 +
 test/files/scalap/covariantParam/result.test       |   4 +
 test/files/scalap/implicitParam/A.scala            |   3 +
 test/files/scalap/implicitParam/result.test        |   4 +
 test/files/scalap/paramClauses/A.scala             |   3 +
 test/files/scalap/paramClauses/result.test         |   4 +
 test/files/scalap/paramNames/A.scala               |   3 +
 test/files/scalap/paramNames/result.test           |   4 +
 test/files/scalap/sequenceParam/A.scala            |   1 +
 test/files/scalap/sequenceParam/result.test        |   3 +
 test/files/scalap/simpleClass/A.scala              |   3 +
 test/files/scalap/simpleClass/result.test          |   4 +
 test/files/scalap/traitObject/A.scala              |   7 +
 test/files/scalap/traitObject/result.test          |   8 +
 test/files/scalap/valAndVar/A.scala                |   4 +
 test/files/scalap/valAndVar/result.test            |   5 +
 test/files/scalap/wildcardType/A.scala             |   1 +
 test/files/scalap/wildcardType/result.test         |   3 +
 39 files changed, 1153 insertions(+), 35 deletions(-)
 create mode 100644 test/files/scalap/abstractClass/A.scala
 create mode 100644 test/files/scalap/abstractClass/result.test
 create mode 100644 test/files/scalap/abstractMethod/A.scala
 create mode 100644 test/files/scalap/abstractMethod/result.test
 create mode 100644 test/files/scalap/caseClass/A.scala
 create mode 100644 test/files/scalap/caseClass/result.test
 create mode 100644 test/files/scalap/caseObject/A.scala
 create mode 100644 test/files/scalap/caseObject/result.test
 create mode 100644 test/files/scalap/cbnParam/A.scala
 create mode 100644 test/files/scalap/cbnParam/result.test
 create mode 100644 test/files/scalap/classWithExistential/A.scala
 create mode 100644 test/files/scalap/classWithExistential/result.test
 create mode 100644 test/files/scalap/classWithSelfAnnotation/A.scala
 create mode 100644 test/files/scalap/classWithSelfAnnotation/result.test
 create mode 100644 test/files/scalap/covariantParam/A.scala
 create mode 100644 test/files/scalap/covariantParam/result.test
 create mode 100644 test/files/scalap/implicitParam/A.scala
 create mode 100644 test/files/scalap/implicitParam/result.test
 create mode 100644 test/files/scalap/paramClauses/A.scala
 create mode 100644 test/files/scalap/paramClauses/result.test
 create mode 100644 test/files/scalap/paramNames/A.scala
 create mode 100644 test/files/scalap/paramNames/result.test
 create mode 100644 test/files/scalap/sequenceParam/A.scala
 create mode 100644 test/files/scalap/sequenceParam/result.test
 create mode 100644 test/files/scalap/simpleClass/A.scala
 create mode 100644 test/files/scalap/simpleClass/result.test
 create mode 100644 test/files/scalap/traitObject/A.scala
 create mode 100644 test/files/scalap/traitObject/result.test
 create mode 100644 test/files/scalap/valAndVar/A.scala
 create mode 100644 test/files/scalap/valAndVar/result.test
 create mode 100644 test/files/scalap/wildcardType/A.scala
 create mode 100644 test/files/scalap/wildcardType/result.test

diff --git a/build.xml b/build.xml
index c85fa72a7e..873aea0d98 100644
--- a/build.xml
+++ b/build.xml
@@ -476,8 +476,8 @@ QUICK BUILD (QUICK)
     <touch file="${build-quick.dir}/compiler.complete" verbose="no"/>
     <stopwatch name="quick.comp.timer" action="total"/>
   </target>
-  
-  <target name="quick.pre-partest" depends="quick.comp">
+
+  <target name="quick.pre-partest" depends="quick.scalap">
     <uptodate property="quick.partest.available" targetfile="${build-quick.dir}/partest.complete">
       <srcfiles dir="${src.dir}/partest"/>
     </uptodate>
@@ -493,6 +493,7 @@ QUICK BUILD (QUICK)
       <classpath>
         <pathelement location="${build-quick.dir}/classes/library"/>
         <pathelement location="${build-quick.dir}/classes/compiler"/>
+        <pathelement location="${build-quick.dir}/classes/scalap"/>
         <pathelement location="${build-quick.dir}/classes/partest"/>
       </classpath>
       <include name="**/*.java"/>
@@ -509,6 +510,7 @@ QUICK BUILD (QUICK)
       <compilationpath>
         <pathelement location="${build-quick.dir}/classes/library"/>
         <pathelement location="${build-quick.dir}/classes/compiler"/>
+        <pathelement location="${build-quick.dir}/classes/scalap"/>
         <pathelement location="${build-quick.dir}/classes/partest"/>
         <pathelement location="${ant.jar}"/>
       </compilationpath>
@@ -525,13 +527,13 @@ QUICK BUILD (QUICK)
     <touch file="${build-quick.dir}/partest.complete" verbose="no"/>
     <stopwatch name="quick.partest.timer" action="total"/>
   </target>
-  
-  <target name="quick.pre-scalap" depends="quick.partest">
+
+  <target name="quick.pre-scalap" depends="quick.comp">
     <uptodate property="quick.scalap.available" targetfile="${build-quick.dir}/scalap.complete">
       <srcfiles dir="${src.dir}/scalap"/>
     </uptodate>
   </target>
-    
+
   <target name="quick.scalap" depends="quick.pre-scalap" unless="quick.scalap.available">
     <stopwatch name="quick.scalap.timer"/>
     <mkdir dir="${build-quick.dir}/classes/scalap"/>
@@ -554,8 +556,8 @@ QUICK BUILD (QUICK)
     <touch file="${build-quick.dir}/scalap.complete" verbose="no"/>
     <stopwatch name="quick.scalap.timer" action="total"/>
   </target>
-  
-  <target name="quick.pre-bin" depends="quick.scalap">
+
+  <target name="quick.pre-bin" depends="quick.partest">
     <condition property="quick.bin.available">
       <isset property="quick.comp.available"/>
     </condition>
@@ -898,7 +900,7 @@ BOOTSTRAPPING BUILD (STRAP)
     <stopwatch name="strap.comp.timer" action="total"/>
   </target>
   
-  <target name="strap.pre-partest" depends="strap.comp">
+  <target name="strap.pre-partest" depends="strap.scalap">
     <uptodate property="strap.partest.available" targetfile="${build-strap.dir}/partest.complete">
       <srcfiles dir="${src.dir}/partest"/>
     </uptodate>
@@ -914,6 +916,7 @@ BOOTSTRAPPING BUILD (STRAP)
       <classpath>
         <pathelement location="${build-strap.dir}/classes/library"/>
         <pathelement location="${build-strap.dir}/classes/compiler"/>
+        <pathelement location="${build-strap.dir}/classes/scalap"/>
         <pathelement location="${build-strap.dir}/classes/partest"/>
       </classpath>
       <include name="**/*.java"/>
@@ -928,6 +931,7 @@ BOOTSTRAPPING BUILD (STRAP)
       <classpath>
         <pathelement location="${build-strap.dir}/classes/library"/>
         <pathelement location="${build-strap.dir}/classes/compiler"/>
+        <pathelement location="${build-strap.dir}/classes/scalap"/>
         <pathelement location="${build-strap.dir}/classes/partest"/>
         <pathelement location="${ant.jar}"/>
       </classpath>
@@ -940,13 +944,13 @@ BOOTSTRAPPING BUILD (STRAP)
     <touch file="${build-strap.dir}/partest.complete" verbose="no"/>
     <stopwatch name="strap.partest.timer" action="total"/>
   </target>
-  
-  <target name="strap.pre-scalap" depends="strap.partest">
+
+  <target name="strap.pre-scalap" depends="strap.comp">
     <uptodate property="strap.scalap.available" targetfile="${build-strap.dir}/scalap.complete">
       <srcfiles dir="${src.dir}/scalap"/>
     </uptodate>
   </target>
-    
+
   <target name="strap.scalap" depends="strap.pre-scalap" unless="strap.scalap.available">
     <stopwatch name="strap.scalap.timer"/>
     <mkdir dir="${build-strap.dir}/classes/scalap"/>
@@ -968,7 +972,7 @@ BOOTSTRAPPING BUILD (STRAP)
     <stopwatch name="strap.scalap.timer" action="total"/>
   </target>
   
-  <target name="strap.done" depends="strap.scalap"/>
+  <target name="strap.done" depends="strap.partest"/>
 
   <target name="strap.clean">
     <delete dir="${build-strap.dir}" includeemptydirs="yes" quiet="yes" failonerror="no"/>
@@ -1129,7 +1133,7 @@ OPTIMISED COMPILER
     <stopwatch name="optimised.comp.timer" action="total"/>
   </target>
 
-  <target name="optimised.pre-partest" depends="optimised.comp">
+  <target name="optimised.pre-partest" depends="optimised.scalap">
     <uptodate property="optimised.partest.available" targetfile="${build-optimised.dir}/partest.complete">
       <srcfiles dir="${src.dir}/partest"/>
     </uptodate>
@@ -1174,7 +1178,7 @@ OPTIMISED COMPILER
     <stopwatch name="optimised.partest.timer" action="total"/>
   </target>
 
-  <target name="optimised.pre-scalap" depends="optimised.partest">
+  <target name="optimised.pre-scalap" depends="optimised.comp">
     <uptodate property="optimised.scalap.available" targetfile="${build-optimised.dir}/scalap.complete">
       <srcfiles dir="${src.dir}/scalap"/>
     </uptodate>
@@ -1203,7 +1207,7 @@ OPTIMISED COMPILER
     <stopwatch name="optimised.scalap.timer" action="total"/>
   </target>
 
-  <target name="optimised.pre-bin" depends="optimised.scalap">
+  <target name="optimised.pre-bin" depends="optimised.partest">
     <condition property="optimised.bin.available">
       <isset property="optimised.comp.available"/>
     </condition>
@@ -1433,6 +1437,7 @@ BOOTRAPING TEST AND TEST SUITE
       <jvm5tests dir="${test.dir}/files/jvm5" includes="*.scala"/>
       <residenttests dir="${test.dir}/files/res" includes="*.res"/>
       <!-- <scripttests dir="${test.dir}/files/script" includes="*.scala"/> -->
+      <scalaptests dir="${test.dir}/files/scalap" includes="**/*.scala"/>
     </partest>
   </target>
   
diff --git a/scala-lang.ipr b/scala-lang.ipr
index 08313cc822..8acf8dbffe 100644
--- a/scala-lang.ipr
+++ b/scala-lang.ipr
@@ -6,7 +6,7 @@
       <additionalClassPath />
       <antReference projectDefault="true" />
       <customJdkName value="" />
-      <maximumHeapSize value="128" />
+      <maximumHeapSize value="1024" />
       <maximumStackSize value="32" />
       <properties />
     </buildFile>
@@ -15,7 +15,37 @@
     <option name="BUILD_JARS_ON_MAKE" value="false" />
   </component>
   <component name="CodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS" />
+    <option name="PER_PROJECT_SETTINGS">
+      <value>
+        <ADDITIONAL_INDENT_OPTIONS fileType="">
+          <option name="INDENT_SIZE" value="4" />
+          <option name="CONTINUATION_INDENT_SIZE" value="8" />
+          <option name="TAB_SIZE" value="4" />
+          <option name="USE_TAB_CHARACTER" value="false" />
+          <option name="SMART_TABS" value="false" />
+          <option name="LABEL_INDENT_SIZE" value="0" />
+          <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+        </ADDITIONAL_INDENT_OPTIONS>
+        <ADDITIONAL_INDENT_OPTIONS fileType="java">
+          <option name="INDENT_SIZE" value="4" />
+          <option name="CONTINUATION_INDENT_SIZE" value="8" />
+          <option name="TAB_SIZE" value="4" />
+          <option name="USE_TAB_CHARACTER" value="false" />
+          <option name="SMART_TABS" value="false" />
+          <option name="LABEL_INDENT_SIZE" value="0" />
+          <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+        </ADDITIONAL_INDENT_OPTIONS>
+        <ADDITIONAL_INDENT_OPTIONS fileType="xml">
+          <option name="INDENT_SIZE" value="4" />
+          <option name="CONTINUATION_INDENT_SIZE" value="8" />
+          <option name="TAB_SIZE" value="4" />
+          <option name="USE_TAB_CHARACTER" value="false" />
+          <option name="SMART_TABS" value="false" />
+          <option name="LABEL_INDENT_SIZE" value="0" />
+          <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+        </ADDITIONAL_INDENT_OPTIONS>
+      </value>
+    </option>
     <option name="USE_PER_PROJECT_SETTINGS" value="false" />
   </component>
   <component name="CompilerConfiguration">
@@ -52,6 +82,870 @@
     <option name="MAXIMUM_HEAP_SIZE" value="128" />
   </component>
   <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
+  <component name="FacetAutodetectingManager">
+    <autodetection-disabled>
+      <facet-type id="Scala">
+        <modules>
+          <module name="files">
+            <files>
+              <file url="file://$PROJECT_DIR$/test/files/android/HelloAndroid.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/ant/fsc.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/ant/scalac.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/ant/scaladoc.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/cldc/randoms.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/cli/test1/Main.check.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/cli/test1/Main.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/cli/test2/Main.check.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/cli/test2/Main.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/cli/test3/Main.check.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/cli/test3/Main.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/jvm/JavaInteraction.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/jvm/bigints.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/jvm/bug560bis.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/jvm/inner.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/jvm/manifests.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/jvm/methvsfield.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/jvm/natives.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/jvm/nest.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/jvm/protectedacc.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/jvm/serialization.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/jvm/t0632.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/jvm/t1116.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/jvm/t1143-2/t1143-2.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/jvm/t1143.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/jvm/typerep.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/jvm/unittest_io.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/jvm/unittest_xml.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/jvm/xml01.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/jvm/xml02.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/jvm/xml03syntax.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/jvm/xml04embed.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/jvm/xmlattr.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/jvm/xmlmore.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/jvm/xmlpull.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/jvm/xmlstuff.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/jvm5/annotations.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/jvm5/bug676.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/jvm5/bug680.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/jvm5/console.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/jvm5/genericNest.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/jvm5/interpreter.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/jvm5/outerEnum.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/jvm5/stringbuilder.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/jvm5/sync-var.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/jvm5/t0014.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/jvm5/t1461.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/jvm5/t1464/MyTrait.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/jvm5/throws-annot.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/jvm5/typerep.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/abstract.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/accesses.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/annot-nonconst.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/badtok-1.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/badtok-2.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/badtok-3.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug1010.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug1011.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug1017.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug1041.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug1106.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug1112.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug112706A.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug1181.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug1183.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug1224.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug1241.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug1275.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug1392.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug1523.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug1623.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug1838.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug200.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug276.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug278.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug284.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug343.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug391.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug409.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug412.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug414.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug418.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug421.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug452.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug473.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug500.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug501.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug510.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug512.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug515.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug520.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug521.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug545.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug550.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug555.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug556.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug558.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug562.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug563.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug565.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug576.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug585.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug588.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug591.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug593.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug608.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug630.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug631.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug633.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug639.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug649.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug650.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug663.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug664.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug667.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug668.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug677.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug691.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug692.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug693.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug696.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug700.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug708.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug712.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug715.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug729.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug752.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug765.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug766.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug779.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug783.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug798.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug800.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug835.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug836.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug845.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug846.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug856.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug875.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug876.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug877.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug882.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug900.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug908.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug909.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug910.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug935.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug944.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug960.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug961.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug987.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/bug997.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/checksensible.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/constrs.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/cyclics.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/divergent-implicit.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/faculty.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/forward.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/gadts1.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/higherkind_novalue.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/imp2.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/implicits.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/lazy-override.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/lazyvals.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/lubs.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/mixins.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/multi-array.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/nopredefs.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/null-unsoundness.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/overload.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/parstar.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/patmatexhaust.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/patternalts.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/plugin-after-terminal/src/ThePlugin.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/plugin-after-terminal/testsource.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/plugin-before-parser/src/ThePlugin.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/plugin-before-parser/testsource.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/plugin-cyclic-dependency/src/ThePlugin.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/plugin-cyclic-dependency/testsource.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/plugin-multiple-rafter/src/ThePlugin.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/plugin-multiple-rafter/testsource.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/plugin-rafter-before-1/src/ThePlugin.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/plugin-rafter-before-1/testsource.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/plugin-rightafter-terminal/src/ThePlugin.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/plugin-rightafter-terminal/testsource.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/sabin2.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/saito.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/sensitive.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/structural.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/switch.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/t0003.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/t0015.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/t0117.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/t0152.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/t0204.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/t0207.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/t0209.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/t0214.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/t0218.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/t0226.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/t0259.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/t0345.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/t0351.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/t0503.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/t0528neg.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/t0590.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/t0606.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/t0673/Test.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/t0699/A.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/t0699/B.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/t0764.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/t0842.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/t0899.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/t0903.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/t1009.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/t1033.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/t1049.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/t1163.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/t1168.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/t1215.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/t1371.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/t1659.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/tailrec.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/tcpoly_bounds.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/tcpoly_override.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/tcpoly_typealias.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/tcpoly_variance.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/tcpoly_variance_enforce.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/typeerror.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/unreachablechar.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/variances.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/viewtest.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/volatile-intersection.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/volatile.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/wellkinded_app.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/wellkinded_app2.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/wellkinded_bounds.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/wellkinded_wrongarity.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/wellkinded_wrongarity2.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/xmlcorner.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/xmltruncated1.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/xmltruncated2.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/xmltruncated3.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/xmltruncated4.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/xmltruncated5.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/neg/xmltruncated6.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/A.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/List1.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/MailBox.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/NoCyclicReference.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/S1.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/S3.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/S5.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/S8.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/Transactions.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/X.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/Z.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/abstract.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/aliases.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/annot-inner.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/annotations.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/arrays2.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/attributes.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bounds.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug0002.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug0017.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug0020.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug0029.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug0030.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug0031.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug0032.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug0036.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug0039.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug0049.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug0053.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug0054.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug0061.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug0064.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug0066.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug0068.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug0069.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug0076.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug0081.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug0082.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug0085.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug0091.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug0093.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug0123.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug0204.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug0304.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug0325.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug0422.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug0599.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug0646.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug1000.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug1001.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug1006.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug1014.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug1034.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug1049.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug1050.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug1056.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug1070.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug1075.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug1085.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug1087.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug1090.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug1107.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug1119.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug1123.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug112606A.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug1136.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug115.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug116.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug1168.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug1185.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug119.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug1203.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug121.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug1210.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug1210a.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug122.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug1237.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug124.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug1241.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug1279a.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug1292.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug1385.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug151.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug1565.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug159.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug160.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug175.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug177.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug183.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug1858.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug201.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug210.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug211.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug229.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug245.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug247.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug262.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug267.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug284.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug287.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug289.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug295.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug296.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug304.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug318.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug319.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug342.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug344.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug348plus.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug359.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug360.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug361.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug372.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug374.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug389.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug397.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug402.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug404.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug415.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug419.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug422.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug430-feb09.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug430.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug432.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug439.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug443.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug460.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug514.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug516.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug522.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug530.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug531.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug532.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug533.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug566.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug577.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug592.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug595.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug596.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug599.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug602.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug604.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug607.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug611.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug613.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug615.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug616.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug628.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug640.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug651.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug661.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug675.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug684.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug690.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug694.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug697.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug698.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug703.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug704.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug711.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug720.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug756.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug757.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug757a.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug758.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug759.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug762.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug767.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug780.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug788.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug789.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug796.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug802.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug803.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug805.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug807.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug812.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug839.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug851.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug873.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug880.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug892.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug911.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug927.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/bug946.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/builders.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/caseaccs.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/cfcrash.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/channels.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/cls.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/cls1.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/clsrefine.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/code.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/collections.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/comp-rec-test.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/compile.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/compile1.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/compound.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/constfold.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/contrib467.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/contrib701.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/cyclics.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/escapes2.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/eta.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/exceptions.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/functions.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/gadt-gilles.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/gadts2.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/gosh.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/gui.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/homonym.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/imp2.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/imports.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/infer.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/infer2.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/inferbroadtype.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/init.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/itay.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/jesper.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/kinzer.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/ksbug1.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/lambda.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/lambdalift.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/lambdalift1.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/largecasetest.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/listpattern.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/localmodules.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/looping-jsig.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/manifest1.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/matchStarlift.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/matthias1.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/matthias3.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/matthias4.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/matthias5.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/maxim1.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/michel1.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/michel2.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/michel3.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/michel4.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/michel5.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/michel6.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/mixins.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/modules.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/modules1.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/moduletrans.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/needstypeearly.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/nested.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/nested2.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/null.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/nullary.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/nullary_poly.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/override.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/partialfun.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/pat_gilles.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/pat_iuli.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/patterns.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/patterns1.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/patterns1213.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/patterns2.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/patterns3.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/philippe1.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/philippe2.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/philippe3.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/philippe4.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/pmbug.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/proj-rec-test.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/propagate.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/protected-t1010.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/rebind.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/return_thistype.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/scoping1.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/scoping2.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/scoping3.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/seqtest2.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/simplelists.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/stable.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/strings.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/sudoku.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/t0055.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/t0154.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/t0165.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/t0227.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/t0231.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/t0273.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/t0288/Foo.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/t0301.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/t0438.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/t0453.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/t0504.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/t0586.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/t0591.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/t0651.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/t0654.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/t0674.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/t0710.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/t0770.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/t0774/deathname.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/t0774/unrelated.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/t0786.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/t0851.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/t0872.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/t0904.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/t0905.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/t0999.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/t1001.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/t1027.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/t1049.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/t1059.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/t1087.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/t1107/O.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/t1107/T.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/t1131.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/t1146.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/t1147.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/t1159.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/t1164.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/t1280.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/t1380/hallo.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/t1391.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/t1409/ConcreteImpl.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/t1438.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/t1439.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/t1480.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/t1648.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/t1675.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/t1761.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/t1789.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/t1840/S.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/tcpoly_boundedmonad.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/tcpoly_bounds1.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/tcpoly_checkkinds_mix.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/tcpoly_gm.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/tcpoly_higherorder_bound_method.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/tcpoly_late_method_params.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/tcpoly_method.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/tcpoly_overloaded.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/tcpoly_param_scoping.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/tcpoly_poly.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/tcpoly_return_overriding.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/tcpoly_seq.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/tcpoly_seq_typealias.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/tcpoly_subst.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/tcpoly_typeapp.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/tcpoly_typesub.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/tcpoly_variance.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/tcpoly_wildcards.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/ted.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/test1.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/test2.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/test4.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/test4a.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/test4refine.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/test5.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/test5refine.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/testcast.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/thistype.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/thistypes.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/ticket0137.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/tinondefcons.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/traits.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/tryexpr.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/typealias_dubious.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/typealiases.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/typerep-stephane.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/typerep.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/typesafecons.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/unapply.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/unapplyComplex.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/unapplyContexts2.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/unapplyGeneric.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/unapplyNeedsMemberType.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/unapplySeq.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/unapplyVal.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/unicode-decode.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/valdefs.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/variances.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/viewtest1.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos/viewtest2.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos5/chang/Test.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos5/ilya/S.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos5/ilya2/A.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos5/signatures/sig.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos5/t0695/Test.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos5/t1101/S.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos5/t1102/S.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos5/t1150/S.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos5/t1152/S.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos5/t1176/S.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos5/t1196/S.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos5/t1197/S.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos5/t1203/S.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos5/t1230/S.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos5/t1231/S.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos5/t1232/S.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos5/t1263/test.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/pos5/t1711/Seq.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/res/bug597/Main.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/res/bug597/Test.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/res/bug687/QueryA.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/res/bug687/QueryB.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/res/bug722/IfElse.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/res/bug722/Parser.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/res/bug722/ScanBased.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/res/bug735/ScalaExpressions.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/res/bug735/ScalaTyper.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/res/bug743/BracesXXX.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/res/bug743/ParserXXX.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/res/bug785/ScalaNewTyper.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/res/bug785/ScalaTrees.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/res/bug831/NewScalaParserXXX.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/res/bug831/NewScalaTestXXX.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/Course-2002-01.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/Course-2002-02.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/Course-2002-03.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/Course-2002-04.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/Course-2002-05.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/Course-2002-06.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/Course-2002-07.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/Course-2002-08.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/Course-2002-09.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/Course-2002-10.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/Course-2002-13.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/NestedClasses.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/absoverride.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/amp.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/arrays.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/arybufgrow.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/bitsets.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/boolexprs.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/boolord.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/bridges.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/bug0325.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/bug1074.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/bug1192.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/bug1220.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/bug216.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/bug405.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/bug428.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/bug429.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/bug594.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/bug601.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/bug603.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/bug627.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/bug629.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/bug657.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/bug744.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/bug889.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/bug920.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/bug949.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/bug978.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/bugs.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/byname.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/caseclasses.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/checked.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/classof.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/collection-stacks.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/collections.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/colltest.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/complicatedmatch.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/constrained-types.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/constructors.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/contrib674.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/ctor-order.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/deeps.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/docgenerator.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/enums.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/exceptions-2.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/exceptions.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/existentials.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/exoticnames.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/fors.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/forvaleq.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/gadts.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/impconvtimes.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/implicits.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/imports.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/infiniteloop.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/infix.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/intmap.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/iq.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/issue192.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/iterables.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/iterators.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/json.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/jtptest.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/lazy-exprs.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/lazy-locals.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/lazy-override.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/lazy-traits.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/lisp.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/lists.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/literals.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/map_test.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/matcharraytail.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/matchbytes.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/matchemptyarray.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/matchintasany.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/matchonstream.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/misc.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/missingparams.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/mixins.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/multi-array.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/overloads.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/patmatnew.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/promotion.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/randomAccessSeq-apply.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/range.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/retclosure.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/retsynch.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/richs.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/runtime-richChar.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/runtime.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/slices.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/sort.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/streams.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/structural.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/syncchannel.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/t0005.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/t0017.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/t0042.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/t0091.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/t0412.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/t0421.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/t0485.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/t0486.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/t0508.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/t0528.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/t0607.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/t0631.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/t0663.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/t0668.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/t0677.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/t0700.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/t0807.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/t0883.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/t0911.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/t0936.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/t1323.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/t1368.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/t1423.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/t1500.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/t1501.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/t1505.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/t1524.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/t1535.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/t1618.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/t1620.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/t1718.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/t1747.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/t1829.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/tailcalls.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/tcpoly_monads.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/tcpoly_overriding.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/tcpoly_parseridioms.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/try-2.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/try.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/tuples.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/typealias_overriding.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/unapply.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/unapplyArray.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/unboxingBug.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/unittest_collection.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/unittest_io.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/verify-ctor.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/run/withIndex.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/scalacheck/list.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/script/fact.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/script/second.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/script/t1015.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/script/t1017.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/script/utf8.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/shootout/ackermann.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/shootout/ary.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/shootout/binarytrees.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/shootout/binarytrees.scala-2.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/shootout/binarytrees.scala-3.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/shootout/chameneos.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/shootout/except.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/shootout/fannkuch.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/shootout/fannkuch.scala-2.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/shootout/fibo.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/shootout/harmonic.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/shootout/hash.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/shootout/hash2.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/shootout/hello.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/shootout/knucleotide.scala-2.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/shootout/knucleotide.scala-3.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/shootout/lists.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/shootout/message.scala-2.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/shootout/nbody.scala-2.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/shootout/nestedloop.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/shootout/nsieve.scala-2.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/shootout/nsieve.scala-3.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/shootout/nsievebits.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/shootout/nsievebits.scala-2.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/shootout/nsievebits.scala-3.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/shootout/objinst.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/shootout/partialsums.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/shootout/partialsums.scala-2.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/shootout/recursive.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/shootout/regexdna.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/shootout/spectralnorm.scala-2.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/shootout/strcat.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/shootout/sumcol.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/shootout/sumcol.scala-2.scala" />
+              <file url="file://$PROJECT_DIR$/test/files/shootout/takfp.scala" />
+            </files>
+          </module>
+        </modules>
+      </facet-type>
+    </autodetection-disabled>
+  </component>
   <component name="IdProvider" IDEtalkID="522B472C2EA573563CC2BA93160270BE" />
   <component name="InspectionProjectProfileManager">
     <option name="PROJECT_PROFILE" value="Project Default" />
@@ -227,11 +1121,10 @@
   </component>
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/test/files/files.iml" filepath="$PROJECT_DIR$/test/files/files.iml" />
       <module fileurl="file://$PROJECT_DIR$/src/scala-lang.iml" filepath="$PROJECT_DIR$/src/scala-lang.iml" />
     </modules>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" assert-keyword="true" jdk-15="true" project-jdk-name="1.5" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
   <component name="ResourceManagerContainer">
@@ -250,7 +1143,8 @@
   </component>
   <component name="ScalacSettings">
     <option name="MAXIMUM_HEAP_SIZE" value="512" />
-    <option name="NO_GENERICS" value="true" />
+    <option name="DEPRECATION" value="false" />
+    <option name="UNCHECKED" value="false" />
   </component>
   <component name="SvnBranchConfigurationManager">
     <option name="myConfigurationMap">
@@ -297,6 +1191,7 @@
         <root url="jar://$PROJECT_DIR$/lib/ant/vizant.jar!/" />
         <root url="jar://$PROJECT_DIR$/lib/ant/maven-ant-tasks-2.0.9.jar!/" />
         <root url="jar://$PROJECT_DIR$/lib/ant/ant-dotnet-1.0.jar!/" />
+        <root url="jar:///Users/ilya/work/perforce/IDEA/lib/ant/lib/ant.jar!/" />
       </CLASSES>
       <JAVADOC />
       <SOURCES />
@@ -327,6 +1222,22 @@
       <JAVADOC />
       <SOURCES />
     </library>
+    <library name="mylib">
+      <CLASSES>
+        <root url="jar:///Users/ilya/work/scala-2.7.4.final/lib/scala-library.jar!/" />
+        <root url="jar:///Users/ilya/work/scala-2.7.4.final/lib/scala-compiler.jar!/" />
+      </CLASSES>
+      <JAVADOC />
+      <SOURCES />
+    </library>
+    <library name="testlib">
+      <CLASSES>
+        <root url="jar://$PROJECT_DIR$/dists/latest/lib/scalap.jar!/" />
+        <root url="jar://$PROJECT_DIR$/dists/latest/lib/scala-partest.jar!/" />
+      </CLASSES>
+      <JAVADOC />
+      <SOURCES />
+    </library>
   </component>
 </project>
 
diff --git a/src/partest/scala/tools/partest/PartestTask.scala b/src/partest/scala/tools/partest/PartestTask.scala
index bda1f5b679..90073db13d 100644
--- a/src/partest/scala/tools/partest/PartestTask.scala
+++ b/src/partest/scala/tools/partest/PartestTask.scala
@@ -56,6 +56,10 @@ class PartestTask extends Task {
     shootoutFiles = Some(input)
   }
 
+  def addConfiguredScalapTests(input: FileSet) {
+    scalapFiles = Some(input)
+  }
+
   def setClasspath(input: Path) {
     if (classpath.isEmpty)
       classpath = Some(input)
@@ -119,6 +123,7 @@ class PartestTask extends Task {
   private var residentFiles: Option[FileSet] = None
   private var scriptFiles: Option[FileSet] = None
   private var shootoutFiles: Option[FileSet] = None
+  private var scalapFiles: Option[FileSet] = None
   private var errorOnFailed: Boolean = false
   private var scalacOpts: Option[String] = None
   private var timeout: Option[String] = None
@@ -158,6 +163,7 @@ class PartestTask extends Task {
   private def getResidentFiles = getFiles(residentFiles)
   private def getScriptFiles   = getFiles(scriptFiles)
   private def getShootoutFiles = getFiles(shootoutFiles)
+  private def getScalapFiles = getFiles(scalapFiles)
 
   override def execute() {
     if (debug)
@@ -285,6 +291,13 @@ class PartestTask extends Task {
       allFailures += failures
     }
 
+    if (getScalapFiles.size > 0) {
+      log("Running scalap tests")
+      val (successes, failures) = runTestsForFiles(getScalapFiles, "scalap")
+      allSucesses += successes
+      allFailures += failures
+    }
+
     if ((getPosFiles.size + getNegFiles.size + getRunFiles.size + getResidentFiles.size + getScriptFiles.size + getShootoutFiles.size) == 0)
       log("There where no tests to run.")
     else if (allFailures == 0)
diff --git a/src/partest/scala/tools/partest/nest/CompileManager.scala b/src/partest/scala/tools/partest/nest/CompileManager.scala
index fe175b2b7e..0f21efc346 100644
--- a/src/partest/scala/tools/partest/nest/CompileManager.scala
+++ b/src/partest/scala/tools/partest/nest/CompileManager.scala
@@ -105,6 +105,7 @@ class DirectCompiler(val fileManager: FileManager) extends SimpleCompiler {
       case "jvm"      => JvmTestFile(files(0), fileManager, out.isEmpty)
       case "jvm5"     => Jvm5TestFile(files(0), fileManager, out.isEmpty)
       case "shootout" => ShootoutTestFile(files(0), fileManager, out.isEmpty)
+      case "scalap"   => ScalapTestFile(files(0), fileManager, out.isEmpty)
       case "scalacheck" =>
         ScalaCheckTestFile(files(0), fileManager, out.isEmpty)
     }
diff --git a/src/partest/scala/tools/partest/nest/TestFile.scala b/src/partest/scala/tools/partest/nest/TestFile.scala
index 07a96956dd..3d83abe176 100644
--- a/src/partest/scala/tools/partest/nest/TestFile.scala
+++ b/src/partest/scala/tools/partest/nest/TestFile.scala
@@ -106,3 +106,12 @@ case class ShootoutTestFile(override val file: File, override val fileManager: F
     settings.outdir.value = file.getParent
   }
 }
+
+case class ScalapTestFile(override val file: File, override val fileManager: FileManager, createOutDir: Boolean) extends TestFile("scalap", file, fileManager, createOutDir) {
+  override def defineSettings(settings: Settings) {
+    baseSettings(settings)
+    settings.classpath.value = settings.classpath.value+
+      File.pathSeparator+fileManager.CLASSPATH
+    settings.outdir.value = file.getParent
+  }
+}
diff --git a/src/partest/scala/tools/partest/nest/Worker.scala b/src/partest/scala/tools/partest/nest/Worker.scala
index b1e83d6808..3f449b3827 100644
--- a/src/partest/scala/tools/partest/nest/Worker.scala
+++ b/src/partest/scala/tools/partest/nest/Worker.scala
@@ -7,17 +7,15 @@
 
 package scala.tools.partest.nest
 
-import java.io.{File, FileInputStream, FileOutputStream, PrintStream,
-                PrintWriter, StringWriter, FileWriter, InputStreamReader,
-                FileReader, OutputStreamWriter, BufferedReader}
-
-import java.net.URL
+import java.io._
+import java.net.{URLClassLoader, URL}
 import java.util.{Timer, TimerTask}
 
 import scala.tools.nsc.{ObjectRunner, GenericRunnerCommand}
 
 import scala.actors.{Actor, Exit, TIMEOUT}
 import scala.actors.Actor._
+import scalap.scalax.rules.scalasig.{ByteCode, ClassFileParser, ScalaSigAttributeParsers}
 
 case class RunTests(kind: String, files: List[File])
 case class Results(succ: Int, fail: Int, logs: List[LogFile], outdirs: List[File])
@@ -741,6 +739,61 @@ class Worker(val fileManager: FileManager) extends Actor {
             LogContext(logFile, None)
         }
 
+      case "scalap" => {
+
+        def decompileFile(clazz: Class[_]) = {
+          val byteCode = ByteCode.forClass(clazz)
+          val classFile = ClassFileParser.parse(byteCode)
+          val Some(sig) = classFile.attribute("ScalaSig").map(_.byteCode).map(ScalaSigAttributeParsers.parse)
+          import scala.tools.scalap.Main._
+          parseScalaSignature(sig)
+        }
+
+        runInContext(file, kind, (logFile: File, outDir: File) => {
+          val sourceDir = file.getParentFile
+          val sourceDirName = sourceDir.getName
+
+          // 1. Find file with result text
+          val results = sourceDir.listFiles(new FilenameFilter {
+            def accept(dir: File, name: String) = name == "result.test"
+          })
+
+          if (results.length != 1) {
+            NestUI.verbose("Result file not found in directory " + sourceDirName + " \n")
+          } else {
+            val resFile = results(0)
+            // 2. Compile source file
+            if (!compileMgr.shouldCompile(outDir, List(file), kind, logFile)) {
+              succeeded = false
+            } else {
+
+              // 3. Decompile file and compare results
+              val className = sourceDirName.capitalize
+              val url = outDir.toURI.toURL
+              val loader = new URLClassLoader(Array(url), getClass.getClassLoader)
+              val clazz = loader.loadClass(className)
+
+              val result = decompileFile(clazz)
+
+              try {
+                val fstream = new FileWriter(logFile);
+                val out = new BufferedWriter(fstream);
+                out.write(result)
+                out.close();
+              } catch {
+                case e: IOException => NestUI.verbose(e.getMessage()); succeeded = false
+              }
+
+              val diff = fileManager.compareFiles(logFile, resFile)
+              if (!diff.equals("")) {
+                NestUI.verbose("output differs from log file\n")
+                succeeded = false
+              }
+            }
+          }
+        })
+      }
+
       case "script" => {
         val osName = System.getProperty("os.name", "")
           // when option "--failed" is provided
diff --git a/src/scala-lang.iml b/src/scala-lang.iml
index 365c7cd7f7..d74dfe8334 100644
--- a/src/scala-lang.iml
+++ b/src/scala-lang.iml
@@ -7,6 +7,9 @@
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
+    <content url="file://$MODULE_DIR$/../META-INF" />
+    <content url="file://$MODULE_DIR$/../docs" />
+    <content url="file://$MODULE_DIR$/../lib" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/actors" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/compiler" isTestSource="false" />
@@ -22,19 +25,12 @@
       <excludeFolder url="file://$MODULE_DIR$/jvm14-library" />
       <excludeFolder url="file://$MODULE_DIR$/mono" />
     </content>
-    <orderEntry type="library" name="lib1" level="project" />
+    <content url="file://$MODULE_DIR$/../test" />
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="ant" level="project" />
-    <orderEntry type="module-library">
-      <library name="my_ant">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../ant/ant.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
+    <orderEntry type="library" name="lib1" level="project" />
+    <orderEntry type="library" name="testlib" level="project" />
   </component>
 </module>
 
diff --git a/test/files/scalap/abstractClass/A.scala b/test/files/scalap/abstractClass/A.scala
new file mode 100644
index 0000000000..31fc819ae9
--- /dev/null
+++ b/test/files/scalap/abstractClass/A.scala
@@ -0,0 +1,5 @@
+abstract class AbstractClass {
+
+    def foo: String
+
+}
\ No newline at end of file
diff --git a/test/files/scalap/abstractClass/result.test b/test/files/scalap/abstractClass/result.test
new file mode 100644
index 0000000000..5483353339
--- /dev/null
+++ b/test/files/scalap/abstractClass/result.test
@@ -0,0 +1,4 @@
+abstract class AbstractClass extends java.lang.Object with scala.ScalaObject {
+  def this() = { /* compiled code */ }
+  def foo : scala.Predef.String
+}
\ No newline at end of file
diff --git a/test/files/scalap/abstractMethod/A.scala b/test/files/scalap/abstractMethod/A.scala
new file mode 100644
index 0000000000..419abdaa67
--- /dev/null
+++ b/test/files/scalap/abstractMethod/A.scala
@@ -0,0 +1,4 @@
+trait AbstractMethod {
+  def arity: Int
+  def isCool = true
+}
\ No newline at end of file
diff --git a/test/files/scalap/abstractMethod/result.test b/test/files/scalap/abstractMethod/result.test
new file mode 100644
index 0000000000..8668a7761e
--- /dev/null
+++ b/test/files/scalap/abstractMethod/result.test
@@ -0,0 +1,5 @@
+trait AbstractMethod extends java.lang.Object with scala.ScalaObject {
+  def $init$() : scala.Unit = { /* compiled code */ }
+  def arity : scala.Int
+  def isCool : scala.Boolean = { /* compiled code */ }
+}
\ No newline at end of file
diff --git a/test/files/scalap/caseClass/A.scala b/test/files/scalap/caseClass/A.scala
new file mode 100644
index 0000000000..3addfbdaaa
--- /dev/null
+++ b/test/files/scalap/caseClass/A.scala
@@ -0,0 +1,3 @@
+case class CaseClass[A <: Seq[Int]](i: A, s: String) {
+    def foo = 239
+}
\ No newline at end of file
diff --git a/test/files/scalap/caseClass/result.test b/test/files/scalap/caseClass/result.test
new file mode 100644
index 0000000000..5057f87a3f
--- /dev/null
+++ b/test/files/scalap/caseClass/result.test
@@ -0,0 +1,11 @@
+case class CaseClass[A >: scala.Nothing <: scala.Seq[scala.Int]](a : A, s : scala.Predef.String) extends java.lang.Object with scala.ScalaObject with scala.Product {
+  val i : A = { /* compiled code */ }
+  val s : scala.Predef.String = { /* compiled code */ }
+  def foo : scala.Int = { /* compiled code */ }
+  override def hashCode() : scala.Int = { /* compiled code */ }
+  override def toString() : scala.Predef.String = { /* compiled code */ }
+  override def equals(a : scala.Any) : scala.Boolean = { /* compiled code */ }
+  override def productPrefix : java.lang.String = { /* compiled code */ }
+  override def productArity : scala.Int = { /* compiled code */ }
+  override def productElement(i : scala.Int) : scala.Any = { /* compiled code */ }
+}
\ No newline at end of file
diff --git a/test/files/scalap/caseObject/A.scala b/test/files/scalap/caseObject/A.scala
new file mode 100644
index 0000000000..7c15416841
--- /dev/null
+++ b/test/files/scalap/caseObject/A.scala
@@ -0,0 +1,3 @@
+case object CaseObject {
+    def bar = 239
+}
\ No newline at end of file
diff --git a/test/files/scalap/caseObject/result.test b/test/files/scalap/caseObject/result.test
new file mode 100644
index 0000000000..c265c8a529
--- /dev/null
+++ b/test/files/scalap/caseObject/result.test
@@ -0,0 +1,8 @@
+final case object CaseObject extends java.lang.Object with scala.ScalaObject with scala.Product {
+  def bar : scala.Int = { /* compiled code */ }
+  final override def toString() : java.lang.String = { /* compiled code */ }
+  override def productPrefix : java.lang.String = { /* compiled code */ }
+  override def productArity : scala.Int = { /* compiled code */ }
+  override def productElement(i : scala.Int) : scala.Any = { /* compiled code */ }
+  protected def readResolve() : java.lang.Object = { /* compiled code */ }
+}
\ No newline at end of file
diff --git a/test/files/scalap/cbnParam/A.scala b/test/files/scalap/cbnParam/A.scala
new file mode 100644
index 0000000000..d804ba6502
--- /dev/null
+++ b/test/files/scalap/cbnParam/A.scala
@@ -0,0 +1 @@
+class CbnParam(s: => String)
\ No newline at end of file
diff --git a/test/files/scalap/cbnParam/result.test b/test/files/scalap/cbnParam/result.test
new file mode 100644
index 0000000000..7b18228986
--- /dev/null
+++ b/test/files/scalap/cbnParam/result.test
@@ -0,0 +1,3 @@
+class CbnParam extends java.lang.Object with scala.ScalaObject {
+  def this(s : => scala.Predef.String) = { /* compiled code */ }
+}
\ No newline at end of file
diff --git a/test/files/scalap/classWithExistential/A.scala b/test/files/scalap/classWithExistential/A.scala
new file mode 100644
index 0000000000..2a77a842c9
--- /dev/null
+++ b/test/files/scalap/classWithExistential/A.scala
@@ -0,0 +1,3 @@
+class ClassWithExistential {
+  def foo[A, B] : A=> B forSome {type A <: Seq[Int]; type B >: String} = null
+}
\ No newline at end of file
diff --git a/test/files/scalap/classWithExistential/result.test b/test/files/scalap/classWithExistential/result.test
new file mode 100644
index 0000000000..377edff7ef
--- /dev/null
+++ b/test/files/scalap/classWithExistential/result.test
@@ -0,0 +1,4 @@
+class ClassWithExistential extends java.lang.Object with scala.ScalaObject {
+  def this() = { /* compiled code */ }
+  def foo[A >: scala.Nothing <: scala.Any, B >: scala.Nothing <: scala.Any] : scala.Function1[A, B forSome {type A >: scala.Nothing <: scala.Seq[scala.Int]; type B >: scala.Predef.String <: scala.Any}] = { /* compiled code */ }
+}
\ No newline at end of file
diff --git a/test/files/scalap/classWithSelfAnnotation/A.scala b/test/files/scalap/classWithSelfAnnotation/A.scala
new file mode 100644
index 0000000000..f665630690
--- /dev/null
+++ b/test/files/scalap/classWithSelfAnnotation/A.scala
@@ -0,0 +1,4 @@
+class ClassWithSelfAnnotation {
+  this: CharSequence =>
+  def foo = 239
+}
\ No newline at end of file
diff --git a/test/files/scalap/classWithSelfAnnotation/result.test b/test/files/scalap/classWithSelfAnnotation/result.test
new file mode 100644
index 0000000000..9e20790fa2
--- /dev/null
+++ b/test/files/scalap/classWithSelfAnnotation/result.test
@@ -0,0 +1,5 @@
+class ClassWithSelfAnnotation extends java.lang.Object with scala.ScalaObject {
+ this : ClassWithSelfAnnotation with java.lang.CharSequence =>
+  def this() = { /* compiled code */ }
+  def foo : scala.Int = { /* compiled code */ }
+}
\ No newline at end of file
diff --git a/test/files/scalap/covariantParam/A.scala b/test/files/scalap/covariantParam/A.scala
new file mode 100644
index 0000000000..19fb8805b7
--- /dev/null
+++ b/test/files/scalap/covariantParam/A.scala
@@ -0,0 +1,3 @@
+class CovariantParam[+A] {
+    def foo[A](a: A) = 42
+}
\ No newline at end of file
diff --git a/test/files/scalap/covariantParam/result.test b/test/files/scalap/covariantParam/result.test
new file mode 100644
index 0000000000..e7c4a00bcb
--- /dev/null
+++ b/test/files/scalap/covariantParam/result.test
@@ -0,0 +1,4 @@
+class CovariantParam[+A >: scala.Nothing <: scala.Any] extends java.lang.Object with scala.ScalaObject {
+  def this() = { /* compiled code */ }
+  def foo[A >: scala.Nothing <: scala.Any](a : A) : scala.Int = { /* compiled code */ }
+}
\ No newline at end of file
diff --git a/test/files/scalap/implicitParam/A.scala b/test/files/scalap/implicitParam/A.scala
new file mode 100644
index 0000000000..5a5c88bc69
--- /dev/null
+++ b/test/files/scalap/implicitParam/A.scala
@@ -0,0 +1,3 @@
+class ImplicitParam {
+    def foo(i: Int)(implicit f: Float, d: Double) = 42
+}
\ No newline at end of file
diff --git a/test/files/scalap/implicitParam/result.test b/test/files/scalap/implicitParam/result.test
new file mode 100644
index 0000000000..4d2f49e803
--- /dev/null
+++ b/test/files/scalap/implicitParam/result.test
@@ -0,0 +1,4 @@
+class ImplicitParam extends java.lang.Object with scala.ScalaObject {
+  def this() = { /* compiled code */ }
+  def foo(i : scala.Int)(implicit f : scala.Float, d : scala.Double) : scala.Int = { /* compiled code */ }
+}
\ No newline at end of file
diff --git a/test/files/scalap/paramClauses/A.scala b/test/files/scalap/paramClauses/A.scala
new file mode 100644
index 0000000000..bcc76f50e3
--- /dev/null
+++ b/test/files/scalap/paramClauses/A.scala
@@ -0,0 +1,3 @@
+class ParamClauses {
+    def foo(i: Int)(s: String)(t: Double) = 239
+}
\ No newline at end of file
diff --git a/test/files/scalap/paramClauses/result.test b/test/files/scalap/paramClauses/result.test
new file mode 100644
index 0000000000..4a3138d3c9
--- /dev/null
+++ b/test/files/scalap/paramClauses/result.test
@@ -0,0 +1,4 @@
+class ParamClauses extends java.lang.Object with scala.ScalaObject {
+  def this() = { /* compiled code */ }
+  def foo(i : scala.Int)(s : scala.Predef.String)(d : scala.Double) : scala.Int = { /* compiled code */ }
+}
\ No newline at end of file
diff --git a/test/files/scalap/paramNames/A.scala b/test/files/scalap/paramNames/A.scala
new file mode 100644
index 0000000000..7ba9ff0feb
--- /dev/null
+++ b/test/files/scalap/paramNames/A.scala
@@ -0,0 +1,3 @@
+class ParamNames {
+  def foo (s: => Seq[Int], s2: => Seq[Any]) {}
+}
diff --git a/test/files/scalap/paramNames/result.test b/test/files/scalap/paramNames/result.test
new file mode 100644
index 0000000000..2d59f72ec1
--- /dev/null
+++ b/test/files/scalap/paramNames/result.test
@@ -0,0 +1,4 @@
+class ParamNames extends java.lang.Object with scala.ScalaObject {
+  def this() = { /* compiled code */ }
+  def foo(s : => scala.Seq[scala.Int], s : => scala.Seq[scala.Any]) : scala.Unit = { /* compiled code */ }
+}
\ No newline at end of file
diff --git a/test/files/scalap/sequenceParam/A.scala b/test/files/scalap/sequenceParam/A.scala
new file mode 100644
index 0000000000..98874fafb1
--- /dev/null
+++ b/test/files/scalap/sequenceParam/A.scala
@@ -0,0 +1 @@
+class SequenceParam(s: String, i: Int*)
\ No newline at end of file
diff --git a/test/files/scalap/sequenceParam/result.test b/test/files/scalap/sequenceParam/result.test
new file mode 100644
index 0000000000..a4769c81df
--- /dev/null
+++ b/test/files/scalap/sequenceParam/result.test
@@ -0,0 +1,3 @@
+class SequenceParam extends java.lang.Object with scala.ScalaObject {
+  def this(s : scala.Predef.String, s : scala.Int*) = { /* compiled code */ }
+}
\ No newline at end of file
diff --git a/test/files/scalap/simpleClass/A.scala b/test/files/scalap/simpleClass/A.scala
new file mode 100644
index 0000000000..04a2f5ee31
--- /dev/null
+++ b/test/files/scalap/simpleClass/A.scala
@@ -0,0 +1,3 @@
+class SimpleClass {
+  def foo = 239
+}
\ No newline at end of file
diff --git a/test/files/scalap/simpleClass/result.test b/test/files/scalap/simpleClass/result.test
new file mode 100644
index 0000000000..b2ed8d0b34
--- /dev/null
+++ b/test/files/scalap/simpleClass/result.test
@@ -0,0 +1,4 @@
+class SimpleClass extends java.lang.Object with scala.ScalaObject {
+  def this() = { /* compiled code */ }
+  def foo : scala.Int = { /* compiled code */ }
+}
\ No newline at end of file
diff --git a/test/files/scalap/traitObject/A.scala b/test/files/scalap/traitObject/A.scala
new file mode 100644
index 0000000000..3ad9c4954c
--- /dev/null
+++ b/test/files/scalap/traitObject/A.scala
@@ -0,0 +1,7 @@
+trait TraitObject {
+    def foo = 239
+}
+
+object TraitObject {
+    def bar = 42
+}
\ No newline at end of file
diff --git a/test/files/scalap/traitObject/result.test b/test/files/scalap/traitObject/result.test
new file mode 100644
index 0000000000..dc5b9b5f9e
--- /dev/null
+++ b/test/files/scalap/traitObject/result.test
@@ -0,0 +1,8 @@
+trait TraitObject extends java.lang.Object with scala.ScalaObject {
+  def $init$() : scala.Unit = { /* compiled code */ }
+  def foo : scala.Int = { /* compiled code */ }
+}
+final object TraitObject extends java.lang.Object with scala.ScalaObject {
+  def this() = { /* compiled code */ }
+  def bar : scala.Int = { /* compiled code */ }
+}
\ No newline at end of file
diff --git a/test/files/scalap/valAndVar/A.scala b/test/files/scalap/valAndVar/A.scala
new file mode 100644
index 0000000000..2d89348401
--- /dev/null
+++ b/test/files/scalap/valAndVar/A.scala
@@ -0,0 +1,4 @@
+class ValAndVar {
+  val foo = ""
+  var bar = 42
+}
diff --git a/test/files/scalap/valAndVar/result.test b/test/files/scalap/valAndVar/result.test
new file mode 100644
index 0000000000..011d57c64e
--- /dev/null
+++ b/test/files/scalap/valAndVar/result.test
@@ -0,0 +1,5 @@
+class ValAndVar extends java.lang.Object with scala.ScalaObject {
+  def this() = { /* compiled code */ }
+  val foo : java.lang.String = { /* compiled code */ }
+  var bar : scala.Int = { /* compiled code */ }
+}
\ No newline at end of file
diff --git a/test/files/scalap/wildcardType/A.scala b/test/files/scalap/wildcardType/A.scala
new file mode 100644
index 0000000000..d99841cb36
--- /dev/null
+++ b/test/files/scalap/wildcardType/A.scala
@@ -0,0 +1 @@
+class WildcardType(f: Int => _)
\ No newline at end of file
diff --git a/test/files/scalap/wildcardType/result.test b/test/files/scalap/wildcardType/result.test
new file mode 100644
index 0000000000..78a24ef22a
--- /dev/null
+++ b/test/files/scalap/wildcardType/result.test
@@ -0,0 +1,3 @@
+class WildcardType extends java.lang.Object with scala.ScalaObject {
+  def this(f : scala.Function1[scala.Int, _]) = { /* compiled code */ }
+}
\ No newline at end of file
-- 
cgit v1.2.3