diff options
| -rw-r--r-- | scala-lang.ipr | 1030 | ||||
| -rw-r--r-- | src/manual/scala/man1/scalap.scala | 6 | ||||
| -rw-r--r-- | src/scala-lang.iml (renamed from src/Scala-lang.iml) | 16 | ||||
| -rw-r--r-- | src/scalap/scala/tools/scalap/Main.scala | 6 | ||||
| -rw-r--r-- | src/scalap/scala/tools/scalap/Properties.scala | 4 | ||||
| -rw-r--r-- | src/scalap/scala/tools/scalap/decoder.properties | 2 | ||||
| -rw-r--r-- | src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSigPrinter.scala | 7 | ||||
| -rw-r--r-- | test/files/files.iml (renamed from test/files/Files.iml) | 0 |
8 files changed, 54 insertions, 1017 deletions
diff --git a/scala-lang.ipr b/scala-lang.ipr index 27ac71dd68..08313cc822 100644 --- a/scala-lang.ipr +++ b/scala-lang.ipr @@ -2,6 +2,14 @@ <project relativePaths="false" version="4"> <component name="AntConfiguration"> <defaultAnt bundledAnt="true" /> + <buildFile url="file://$PROJECT_DIR$/build.xml"> + <additionalClassPath /> + <antReference projectDefault="true" /> + <customJdkName value="" /> + <maximumHeapSize value="128" /> + <maximumStackSize value="32" /> + <properties /> + </buildFile> </component> <component name="BuildJarProjectSettings"> <option name="BUILD_JARS_ON_MAKE" value="false" /> @@ -44,6 +52,7 @@ <option name="MAXIMUM_HEAP_SIZE" value="128" /> </component> <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" /> + <component name="IdProvider" IDEtalkID="522B472C2EA573563CC2BA93160270BE" /> <component name="InspectionProjectProfileManager"> <option name="PROJECT_PROFILE" value="Project Default" /> <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" /> @@ -218,13 +227,20 @@ </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" /> + <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"> <output url="file://$PROJECT_DIR$/out" /> </component> + <component name="ResourceManagerContainer"> + <option name="myResourceBundles"> + <value> + <list size="0" /> + </value> + </option> + </component> <component name="RmicSettings"> <option name="IS_EANABLED" value="false" /> <option name="DEBUGGING_INFO" value="true" /> @@ -232,513 +248,16 @@ <option name="GENERATE_IIOP_STUBS" value="false" /> <option name="ADDITIONAL_OPTIONS_STRING" value="" /> </component> + <component name="ScalacSettings"> + <option name="MAXIMUM_HEAP_SIZE" value="512" /> + <option name="NO_GENERICS" value="true" /> + </component> <component name="SvnBranchConfigurationManager"> <option name="myConfigurationMap"> <map> <entry key="$PROJECT_DIR$"> <value> <SvnBranchConfiguration> - <option name="branchMap"> - <map> - <entry key="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches"> - <value> - <list> - <SvnBranchItem> - <option name="creationDateMillis" value="1231861025618" /> - <option name="revision" value="16901" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/scala-detach" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1231858976614" /> - <option name="revision" value="16898" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/2.7.x" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1231508965295" /> - <option name="revision" value="16880" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/scala-jvm6" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1231501413531" /> - <option name="revision" value="16879" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/java2scala" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1228838751575" /> - <option name="revision" value="16736" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/specialized" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1228323217725" /> - <option name="revision" value="16701" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/2.7.2" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1227628855483" /> - <option name="revision" value="16624" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/devel-base-2.8.0" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1226225671732" /> - <option name="revision" value="16518" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/virtual-traits" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1225446395463" /> - <option name="revision" value="16451" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/maven2" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1218651634942" /> - <option name="revision" value="15787" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/jvm-src" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1216745765826" /> - <option name="revision" value="15590" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/scala-hlc" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1216628886609" /> - <option name="revision" value="15575" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/named-args" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1213603818236" /> - <option name="revision" value="15382" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/manifests" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1210161350771" /> - <option name="revision" value="14942" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/2.7.1" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1209493835634" /> - <option name="revision" value="14844" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/metamodel" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1204881523837" /> - <option name="revision" value="14305" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/2.7.0" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1201885916291" /> - <option name="revision" value="13865" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/scala-refactor" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1201616792699" /> - <option name="revision" value="13831" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/remoteactors" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1200143791523" /> - <option name="revision" value="13693" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/scala-actorgroups" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1199981833779" /> - <option name="revision" value="13682" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/scala-detach-old" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1198074394427" /> - <option name="revision" value="13594" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/2.6.1" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1196227891383" /> - <option name="revision" value="13368" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/annots-normtrees" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1189538025971" /> - <option name="revision" value="12850" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/2.6.0" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1189346174982" /> - <option name="revision" value="12828" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/extractified" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1189179036169" /> - <option name="revision" value="12825" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/scala-cont" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1188480259560" /> - <option name="revision" value="12733" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/scala-partest" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1187725049790" /> - <option name="revision" value="12617" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/annots-asf" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1182954216798" /> - <option name="revision" value="12147" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/lazyvals" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1181743213119" /> - <option name="revision" value="12007" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/2.5.1" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1181058413098" /> - <option name="revision" value="11910" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/plugins" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1179757277648" /> - <option name="revision" value="11113" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/2.5.0" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1177501547066" /> - <option name="revision" value="10816" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/cldc-scala" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1175802131684" /> - <option name="revision" value="10641" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/tcpoly" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1174496322841" /> - <option name="revision" value="10435" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/2.4.0" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1172856005606" /> - <option name="revision" value="10176" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/nullary" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1170171835368" /> - <option name="revision" value="9809" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/dotnet-scala" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1161699710794" /> - <option name="revision" value="9042" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/unapply" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1156940790560" /> - <option name="revision" value="8538" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/typestate" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1156342245244" /> - <option name="revision" value="8487" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/staged-scala" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1153239352056" /> - <option name="revision" value="8187" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/ape" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1139574278505" /> - <option name="revision" value="5728" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/old-scala" /> - </SvnBranchItem> - </list> - </value> - </entry> - <entry key="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags"> - <value> - <list> - <SvnBranchItem> - <option name="creationDateMillis" value="1231421566832" /> - <option name="revision" value="16872" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_7_3_RC2" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1230037118235" /> - <option name="revision" value="16823" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_7_3_RC1" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1226268572933" /> - <option name="revision" value="16530" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_7_2_final" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1225577892279" /> - <option name="revision" value="16480" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_7_2_RC6" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1225367857342" /> - <option name="revision" value="16435" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_7_2_RC5" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1225119477029" /> - <option name="revision" value="16373" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_7_2_RC4" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1223635372208" /> - <option name="revision" value="16232" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_7_2_RC3" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1221829536529" /> - <option name="revision" value="16148" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_7_2_RC2" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1219238740812" /> - <option name="revision" value="15867" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_7_2_RC1" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1209989776237" /> - <option name="revision" value="14911" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_7_1_final" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1208899234348" /> - <option name="revision" value="14793" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_7_1_RC2" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1207845666631" /> - <option name="revision" value="14619" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_7_1_RC1" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1204881724315" /> - <option name="revision" value="14314" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_7_0-final" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1204279668696" /> - <option name="revision" value="14216" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_7_0-RC3" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1202999233257" /> - <option name="revision" value="14000" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_7_0-RC2" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1202403244489" /> - <option name="revision" value="13929" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_7_0-RC1" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1198074965911" /> - <option name="revision" value="13605" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_6_1-final" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1197637823188" /> - <option name="revision" value="13552" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_6_1-RC2" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1196435533102" /> - <option name="revision" value="13396" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_6_1-RC1" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1189538057378" /> - <option name="revision" value="12859" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_6_0-final" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1189002926325" /> - <option name="revision" value="12810" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_6_0-RC3" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1188828108613" /> - <option name="revision" value="12768" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_6_0-RC2" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1185548231248" /> - <option name="revision" value="12454" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_6_0-RC1" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1181743256442" /> - <option name="revision" value="12016" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_5_1-final" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1181060054894" /> - <option name="revision" value="11921" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_5_1-RC1" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1179757314562" /> - <option name="revision" value="11122" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_5_0-final" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1178887127917" /> - <option name="revision" value="11009" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_5_0-RC2" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1178116502004" /> - <option name="revision" value="10939" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_5_0-RC1" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1174495986723" /> - <option name="revision" value="10433" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_4_0-final" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1174066168422" /> - <option name="revision" value="10386" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_4_0-RC2" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1173452814773" /> - <option name="revision" value="10291" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_4_0-RC1" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1171984673239" /> - <option name="revision" value="10054" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_3_3_10048" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1169767062401" /> - <option name="revision" value="9749" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_3_3" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1169579945413" /> - <option name="revision" value="9699" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_3_2" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1165431112806" /> - <option name="revision" value="9479" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_3_1" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1164302060008" /> - <option name="revision" value="9340" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_3_0" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1163759795167" /> - <option name="revision" value="9285" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_2_0_9278" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1162818772041" /> - <option name="revision" value="9154" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_2_0_9153" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1161687822963" /> - <option name="revision" value="9028" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_2_0_9025" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1160573945985" /> - <option name="revision" value="8933" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_2_0" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1156338855539" /> - <option name="revision" value="8479" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_1_8" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1154099800448" /> - <option name="revision" value="8284" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_1_7_patch8283" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1153336113043" /> - <option name="revision" value="8209" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_1_7" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1150469198848" /> - <option name="revision" value="7889" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_1_6" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1148491824332" /> - <option name="revision" value="7591" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_1_5" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1146486546009" /> - <option name="revision" value="7299" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_1_4" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1144939316350" /> - <option name="revision" value="7140" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_1_3" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1143831697396" /> - <option name="revision" value="7021" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_1_2" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1143630923057" /> - <option name="revision" value="6966" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_1_1" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1142614219544" /> - <option name="revision" value="6828" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_1_0" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1142205516228" /> - <option name="revision" value="6723" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_0_0" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1137666255340" /> - <option name="revision" value="5579" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_1_4_0_4" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1132146448000" /> - <option name="revision" value="4928" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_1_4_0_3" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1077010311000" /> - <option name="revision" value="2598" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/release-1_1_0-b0" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1074610927000" /> - <option name="revision" value="2427" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/release-1_0_0-b6" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1074534383000" /> - <option name="revision" value="2409" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/release-1_0_0-b5" /> - </SvnBranchItem> - </list> - </value> - </entry> - </map> - </option> <option name="branchUrls"> <list> <option value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches" /> @@ -752,507 +271,6 @@ <entry key="$PROJECT_DIR$/test/files"> <value> <SvnBranchConfiguration> - <option name="branchMap"> - <map> - <entry key="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches"> - <value> - <list> - <SvnBranchItem> - <option name="creationDateMillis" value="1231861025618" /> - <option name="revision" value="16901" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/scala-detach" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1231858976614" /> - <option name="revision" value="16898" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/2.7.x" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1231508965295" /> - <option name="revision" value="16880" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/scala-jvm6" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1231501413531" /> - <option name="revision" value="16879" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/java2scala" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1228838751575" /> - <option name="revision" value="16736" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/specialized" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1228323217725" /> - <option name="revision" value="16701" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/2.7.2" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1227628855483" /> - <option name="revision" value="16624" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/devel-base-2.8.0" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1226225671732" /> - <option name="revision" value="16518" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/virtual-traits" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1225446395463" /> - <option name="revision" value="16451" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/maven2" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1218651634942" /> - <option name="revision" value="15787" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/jvm-src" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1216745765826" /> - <option name="revision" value="15590" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/scala-hlc" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1216628886609" /> - <option name="revision" value="15575" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/named-args" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1213603818236" /> - <option name="revision" value="15382" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/manifests" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1210161350771" /> - <option name="revision" value="14942" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/2.7.1" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1209493835634" /> - <option name="revision" value="14844" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/metamodel" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1204881523837" /> - <option name="revision" value="14305" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/2.7.0" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1201885916291" /> - <option name="revision" value="13865" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/scala-refactor" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1201616792699" /> - <option name="revision" value="13831" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/remoteactors" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1200143791523" /> - <option name="revision" value="13693" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/scala-actorgroups" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1199981833779" /> - <option name="revision" value="13682" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/scala-detach-old" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1198074394427" /> - <option name="revision" value="13594" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/2.6.1" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1196227891383" /> - <option name="revision" value="13368" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/annots-normtrees" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1189538025971" /> - <option name="revision" value="12850" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/2.6.0" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1189346174982" /> - <option name="revision" value="12828" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/extractified" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1189179036169" /> - <option name="revision" value="12825" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/scala-cont" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1188480259560" /> - <option name="revision" value="12733" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/scala-partest" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1187725049790" /> - <option name="revision" value="12617" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/annots-asf" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1182954216798" /> - <option name="revision" value="12147" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/lazyvals" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1181743213119" /> - <option name="revision" value="12007" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/2.5.1" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1181058413098" /> - <option name="revision" value="11910" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/plugins" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1179757277648" /> - <option name="revision" value="11113" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/2.5.0" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1177501547066" /> - <option name="revision" value="10816" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/cldc-scala" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1175802131684" /> - <option name="revision" value="10641" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/tcpoly" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1174496322841" /> - <option name="revision" value="10435" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/2.4.0" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1172856005606" /> - <option name="revision" value="10176" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/nullary" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1170171835368" /> - <option name="revision" value="9809" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/dotnet-scala" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1161699710794" /> - <option name="revision" value="9042" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/unapply" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1156940790560" /> - <option name="revision" value="8538" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/typestate" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1156342245244" /> - <option name="revision" value="8487" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/staged-scala" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1153239352056" /> - <option name="revision" value="8187" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/ape" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1139574278505" /> - <option name="revision" value="5728" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/old-scala" /> - </SvnBranchItem> - </list> - </value> - </entry> - <entry key="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags"> - <value> - <list> - <SvnBranchItem> - <option name="creationDateMillis" value="1231421566832" /> - <option name="revision" value="16872" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_7_3_RC2" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1230037118235" /> - <option name="revision" value="16823" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_7_3_RC1" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1226268572933" /> - <option name="revision" value="16530" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_7_2_final" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1225577892279" /> - <option name="revision" value="16480" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_7_2_RC6" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1225367857342" /> - <option name="revision" value="16435" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_7_2_RC5" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1225119477029" /> - <option name="revision" value="16373" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_7_2_RC4" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1223635372208" /> - <option name="revision" value="16232" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_7_2_RC3" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1221829536529" /> - <option name="revision" value="16148" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_7_2_RC2" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1219238740812" /> - <option name="revision" value="15867" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_7_2_RC1" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1209989776237" /> - <option name="revision" value="14911" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_7_1_final" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1208899234348" /> - <option name="revision" value="14793" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_7_1_RC2" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1207845666631" /> - <option name="revision" value="14619" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_7_1_RC1" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1204881724315" /> - <option name="revision" value="14314" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_7_0-final" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1204279668696" /> - <option name="revision" value="14216" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_7_0-RC3" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1202999233257" /> - <option name="revision" value="14000" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_7_0-RC2" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1202403244489" /> - <option name="revision" value="13929" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_7_0-RC1" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1198074965911" /> - <option name="revision" value="13605" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_6_1-final" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1197637823188" /> - <option name="revision" value="13552" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_6_1-RC2" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1196435533102" /> - <option name="revision" value="13396" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_6_1-RC1" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1189538057378" /> - <option name="revision" value="12859" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_6_0-final" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1189002926325" /> - <option name="revision" value="12810" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_6_0-RC3" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1188828108613" /> - <option name="revision" value="12768" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_6_0-RC2" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1185548231248" /> - <option name="revision" value="12454" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_6_0-RC1" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1181743256442" /> - <option name="revision" value="12016" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_5_1-final" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1181060054894" /> - <option name="revision" value="11921" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_5_1-RC1" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1179757314562" /> - <option name="revision" value="11122" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_5_0-final" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1178887127917" /> - <option name="revision" value="11009" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_5_0-RC2" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1178116502004" /> - <option name="revision" value="10939" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_5_0-RC1" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1174495986723" /> - <option name="revision" value="10433" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_4_0-final" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1174066168422" /> - <option name="revision" value="10386" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_4_0-RC2" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1173452814773" /> - <option name="revision" value="10291" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_4_0-RC1" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1171984673239" /> - <option name="revision" value="10054" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_3_3_10048" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1169767062401" /> - <option name="revision" value="9749" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_3_3" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1169579945413" /> - <option name="revision" value="9699" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_3_2" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1165431112806" /> - <option name="revision" value="9479" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_3_1" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1164302060008" /> - <option name="revision" value="9340" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_3_0" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1163759795167" /> - <option name="revision" value="9285" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_2_0_9278" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1162818772041" /> - <option name="revision" value="9154" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_2_0_9153" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1161687822963" /> - <option name="revision" value="9028" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_2_0_9025" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1160573945985" /> - <option name="revision" value="8933" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_2_0" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1156338855539" /> - <option name="revision" value="8479" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_1_8" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1154099800448" /> - <option name="revision" value="8284" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_1_7_patch8283" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1153336113043" /> - <option name="revision" value="8209" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_1_7" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1150469198848" /> - <option name="revision" value="7889" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_1_6" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1148491824332" /> - <option name="revision" value="7591" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_1_5" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1146486546009" /> - <option name="revision" value="7299" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_1_4" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1144939316350" /> - <option name="revision" value="7140" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_1_3" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1143831697396" /> - <option name="revision" value="7021" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_1_2" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1143630923057" /> - <option name="revision" value="6966" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_1_1" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1142614219544" /> - <option name="revision" value="6828" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_1_0" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1142205516228" /> - <option name="revision" value="6723" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_0_0" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1137666255340" /> - <option name="revision" value="5579" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_1_4_0_4" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1132146448000" /> - <option name="revision" value="4928" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_1_4_0_3" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1077010311000" /> - <option name="revision" value="2598" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/release-1_1_0-b0" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1074610927000" /> - <option name="revision" value="2427" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/release-1_0_0-b6" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1074534383000" /> - <option name="revision" value="2409" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/release-1_0_0-b5" /> - </SvnBranchItem> - </list> - </value> - </entry> - </map> - </option> <option name="branchUrls"> <list> <option value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches" /> @@ -1300,13 +318,11 @@ <root url="jar://$PROJECT_DIR$/lib/scala-library.jar!/" /> <root url="jar://$PROJECT_DIR$/lib/jline.jar!/" /> <root url="jar://$PROJECT_DIR$/lib/scala-compiler.jar!/" /> - <root url="jar://$PROJECT_DIR$/lib/midpapi10.jar!/" /> <root url="jar://$PROJECT_DIR$/lib/fjbg.jar!/" /> <root url="jar://$PROJECT_DIR$/lib/ScalaCheckHelper.jar!/" /> - <root url="jar://$PROJECT_DIR$/lib/msil.jar!/" /> - <root url="jar://$PROJECT_DIR$/lib/cldcapi10.jar!/" /> <root url="jar://$PROJECT_DIR$/lib/ScalaCheck.jar!/" /> <root url="jar://$PROJECT_DIR$/lib/scala-library-src.jar!/" /> + <root url="jar://$PROJECT_DIR$/lib/msil.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> diff --git a/src/manual/scala/man1/scalap.scala b/src/manual/scala/man1/scalap.scala index 7d780ffdb8..465bc79037 100644 --- a/src/manual/scala/man1/scalap.scala +++ b/src/manual/scala/man1/scalap.scala @@ -18,7 +18,7 @@ object scalap extends Command { val synopsis = Section("SYNOPSIS", - CmdLine(" [ " & Argument("options") & " ] " & Argument("source file"))) + CmdLine(" [ " & Argument("options") & " ] " & Argument("class name"))) val parameters = Section("PARAMETERS", @@ -28,8 +28,8 @@ object scalap extends Command { "Command line options. See " & Link(Bold("OPTIONS"), "#options") & " below."), Definition( - Mono(Argument("source file")), - "One class file to be decoded (such as " & + Mono(Argument("class name")), + "Full-qualified name of a class to be decoded (such as " & Mono("hello.HelloWorld") & ")."))) val description = Section("DESCRIPTION", diff --git a/src/Scala-lang.iml b/src/scala-lang.iml index 0d23d1a719..365c7cd7f7 100644 --- a/src/Scala-lang.iml +++ b/src/scala-lang.iml @@ -12,13 +12,29 @@ <sourceFolder url="file://$MODULE_DIR$/compiler" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/dbc" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/library" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/manual" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/partest" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/scalap" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/swing" isTestSource="false" /> + <excludeFolder url="file://$MODULE_DIR$/android-library" /> + <excludeFolder url="file://$MODULE_DIR$/cldc-library" /> + <excludeFolder url="file://$MODULE_DIR$/dotnet-library" /> + <excludeFolder url="file://$MODULE_DIR$/jvm14-library" /> + <excludeFolder url="file://$MODULE_DIR$/mono" /> </content> <orderEntry type="library" name="lib1" level="project" /> <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> </component> </module> diff --git a/src/scalap/scala/tools/scalap/Main.scala b/src/scalap/scala/tools/scalap/Main.scala index 6e91e00234..71b93835e6 100644 --- a/src/scalap/scala/tools/scalap/Main.scala +++ b/src/scalap/scala/tools/scalap/Main.scala @@ -22,11 +22,12 @@ object Main { val SCALA_SIG = "ScalaSig" val versionMsg = "Scala classfile decoder " + Properties.versionString + " -- " + - Properties.copyrightString + Properties.copyrightString + "\n" /**Verbose program run? */ var verbose = false + var printPrivates = false /**Prints usage information for scalap. */ @@ -74,7 +75,7 @@ object Main { case _ => } // Print classes - val printer = new ScalaSigPrinter(stream) + val printer = new ScalaSigPrinter(stream, printPrivates) for (c <- syms) { printer.printSymbol(c) } @@ -246,6 +247,7 @@ object Main { if (arguments contains "-help") usage verbose = arguments contains "-verbose" + printPrivates = arguments contains "-private" // construct a custom class path val classPath0 = new ClassPath(false) val path = arguments.getArgument("-classpath") match { diff --git a/src/scalap/scala/tools/scalap/Properties.scala b/src/scalap/scala/tools/scalap/Properties.scala index 1c23626aae..0be23d351d 100644 --- a/src/scalap/scala/tools/scalap/Properties.scala +++ b/src/scalap/scala/tools/scalap/Properties.scala @@ -15,7 +15,7 @@ package scala.tools.scalap object Properties { /** The name of the properties file */ - private val propFilename = "/decoder.properties" + private val propFilename = "decoder.properties" /** The loaded properties */ private val props = { @@ -35,7 +35,7 @@ object Properties { } val copyrightString: String = { - val defaultString = "(c) 2002-2006 LAMP/EPFL" + val defaultString = "(c) 2002-2009 LAMP/EPFL" props.getProperty("copyright.string", defaultString) } diff --git a/src/scalap/scala/tools/scalap/decoder.properties b/src/scalap/scala/tools/scalap/decoder.properties new file mode 100644 index 0000000000..2aeb55400c --- /dev/null +++ b/src/scalap/scala/tools/scalap/decoder.properties @@ -0,0 +1,2 @@ +version.number=2.0.1 +copyright.string=(c) 2002-2009 LAMP/EPFL diff --git a/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSigPrinter.scala b/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSigPrinter.scala index abdb28e1f7..94a15b1c85 100644 --- a/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSigPrinter.scala +++ b/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSigPrinter.scala @@ -5,7 +5,7 @@ import java.io.{PrintStream, ByteArrayOutputStream} import util.StringUtil import java.util.regex.Pattern -class ScalaSigPrinter(stream: PrintStream) { +class ScalaSigPrinter(stream: PrintStream, printPrivates: Boolean) { import stream._ val CONSTRUCTOR_NAME = "<init>" @@ -15,7 +15,8 @@ class ScalaSigPrinter(stream: PrintStream) { def printSymbol(symbol: Symbol) {printSymbol(0, symbol)} def printSymbol(level: Int, symbol: Symbol) { - if (!symbol.isLocal) { + if (!symbol.isLocal && + !(symbol.isPrivate && !printPrivates)) { def indent() {for (i <- 1 to level) print(" ")} symbol match { @@ -104,7 +105,7 @@ class ScalaSigPrinter(stream: PrintStream) { case Some(m: MethodSymbol) => { val baos = new ByteArrayOutputStream val stream = new PrintStream(baos) - val printer = new ScalaSigPrinter(stream) + val printer = new ScalaSigPrinter(stream, printPrivates) printer.printMethodType(m.infoType, false) baos.toString } diff --git a/test/files/Files.iml b/test/files/files.iml index ac78e33f39..ac78e33f39 100644 --- a/test/files/Files.iml +++ b/test/files/files.iml |