diff options
| author | ilyas <ilyas@epfl.ch> | 2009-06-29 16:09:59 +0000 |
|---|---|---|
| committer | ilyas <ilyas@epfl.ch> | 2009-06-29 16:09:59 +0000 |
| commit | e659affbea5daf934f2f078fd8b872930bbaa09c (patch) | |
| tree | 8bc757562f2ab5ddcca47b2663821993cdcc92dd | |
| parent | 91643c355b853e9bdfb70a5afab426a3537bfc1d (diff) | |
| download | scala-e659affbea5daf934f2f078fd8b872930bbaa09c.tar.gz scala-e659affbea5daf934f2f078fd8b872930bbaa09c.tar.bz2 scala-e659affbea5daf934f2f078fd8b872930bbaa09c.zip | |
scalap changed to treat named parameters and pa...
scalap changed to treat named parameters and package objects
| -rw-r--r-- | scala-lang.ipr | 1093 | ||||
| -rw-r--r-- | src/partest/scala/tools/partest/nest/Worker.scala | 9 | ||||
| -rw-r--r-- | src/scala-lang.iml | 34 | ||||
| -rw-r--r-- | src/scalap/scala/tools/scalap/Main.scala | 26 | ||||
| -rw-r--r-- | src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSig.scala | 166 | ||||
| -rw-r--r-- | src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSigPrinter.scala | 75 | ||||
| -rw-r--r-- | src/scalap/scala/tools/scalap/scalax/rules/scalasig/Type.scala | 4 | ||||
| -rw-r--r-- | src/scalap/scala/tools/scalap/scalax/util/StringUtil.scala | 2 | ||||
| -rw-r--r-- | test/disabled/scalap/caseClass/result.test | 11 | ||||
| -rw-r--r-- | test/disabled/scalap/paramNames/result.test | 4 | ||||
| -rw-r--r-- | test/files/scalap/caseClass/A.scala (renamed from test/disabled/scalap/caseClass/A.scala) | 0 | ||||
| -rw-r--r-- | test/files/scalap/caseClass/result.test | 14 | ||||
| -rw-r--r-- | test/files/scalap/caseObject/A.scala (renamed from test/disabled/scalap/caseObject/A.scala) | 0 | ||||
| -rw-r--r-- | test/files/scalap/caseObject/result.test (renamed from test/disabled/scalap/caseObject/result.test) | 4 | ||||
| -rw-r--r-- | test/files/scalap/cbnParam/A.scala (renamed from test/disabled/scalap/cbnParam/A.scala) | 0 | ||||
| -rw-r--r-- | test/files/scalap/cbnParam/result.test (renamed from test/disabled/scalap/cbnParam/result.test) | 0 | ||||
| -rw-r--r-- | test/files/scalap/classWithExistential/A.scala (renamed from test/disabled/scalap/classWithExistential/A.scala) | 0 | ||||
| -rw-r--r-- | test/files/scalap/classWithExistential/result.test (renamed from test/disabled/scalap/classWithExistential/result.test) | 0 | ||||
| -rw-r--r-- | test/files/scalap/covariantParam/A.scala (renamed from test/disabled/scalap/covariantParam/A.scala) | 0 | ||||
| -rw-r--r-- | test/files/scalap/covariantParam/result.test (renamed from test/disabled/scalap/covariantParam/result.test) | 0 | ||||
| -rw-r--r-- | test/files/scalap/implicitParam/A.scala (renamed from test/disabled/scalap/implicitParam/A.scala) | 0 | ||||
| -rw-r--r-- | test/files/scalap/implicitParam/result.test (renamed from test/disabled/scalap/implicitParam/result.test) | 0 | ||||
| -rw-r--r-- | test/files/scalap/packageObject/A.scala | 4 | ||||
| -rw-r--r-- | test/files/scalap/packageObject/result.test | 5 | ||||
| -rw-r--r-- | test/files/scalap/paramClauses/A.scala (renamed from test/disabled/scalap/paramClauses/A.scala) | 0 | ||||
| -rw-r--r-- | test/files/scalap/paramClauses/result.test (renamed from test/disabled/scalap/paramClauses/result.test) | 2 | ||||
| -rw-r--r-- | test/files/scalap/paramNames/A.scala (renamed from test/disabled/scalap/paramNames/A.scala) | 0 | ||||
| -rw-r--r-- | test/files/scalap/paramNames/result.test | 4 | ||||
| -rw-r--r-- | test/files/scalap/sequenceParam/A.scala (renamed from test/disabled/scalap/sequenceParam/A.scala) | 0 | ||||
| -rw-r--r-- | test/files/scalap/sequenceParam/result.test (renamed from test/disabled/scalap/sequenceParam/result.test) | 2 | ||||
| -rw-r--r-- | test/files/scalap/traitObject/result.test | 2 | ||||
| -rw-r--r-- | test/files/scalap/wildcardType/A.scala (renamed from test/disabled/scalap/wildcardType/A.scala) | 0 | ||||
| -rw-r--r-- | test/files/scalap/wildcardType/result.test (renamed from test/disabled/scalap/wildcardType/result.test) | 0 |
33 files changed, 237 insertions, 1224 deletions
diff --git a/scala-lang.ipr b/scala-lang.ipr index a697cfb1c6..90b39813fa 100644 --- a/scala-lang.ipr +++ b/scala-lang.ipr @@ -1413,547 +1413,6 @@ <entry key="$PROJECT_DIR$/src/actors"> <value> <SvnBranchConfiguration> - <option name="branchMap"> - <map> - <entry key="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches"> - <value> - <list> - <SvnBranchItem> - <option name="creationDateMillis" value="1246006879543" /> - <option name="revision" value="18120" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/earlydefs" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1245943338098" /> - <option name="revision" value="18113" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/scala-detach" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1245757970801" /> - <option name="revision" value="18086" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/scaladoc" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1245338576809" /> - <option name="revision" value="18057" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/specialized" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1243794621415" /> - <option name="revision" value="17936" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/2.7.x" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1243702081813" /> - <option name="revision" value="17924" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/named-args" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1241777690596" /> - <option name="revision" value="17674" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/2.8.0x" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1240108902257" /> - <option name="revision" value="17534" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/280-recovered" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1236598836424" /> - <option name="revision" value="17258" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/new-collections" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1235416865835" /> - <option name="revision" value="17182" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/devel-base-2.8.0" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1233570703283" /> - <option name="revision" value="17011" /> - <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="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="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="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="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="1243957892834" /> - <option name="revision" value="17972" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_7_5_final" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1240588357749" /> - <option name="revision" value="17574" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_7_4_final" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1239791988124" /> - <option name="revision" value="17511" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_7_4_RC1" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1231872127913" /> - <option name="revision" value="16910" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_7_3_final" /> - </SvnBranchItem> - <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" /> @@ -1967,547 +1426,19 @@ <entry key="$PROJECT_DIR$/src/compiler"> <value> <SvnBranchConfiguration> - <option name="branchMap"> - <map> - <entry key="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches"> - <value> - <list> - <SvnBranchItem> - <option name="creationDateMillis" value="1246006879543" /> - <option name="revision" value="18120" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/earlydefs" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1245943338098" /> - <option name="revision" value="18113" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/scala-detach" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1245757970801" /> - <option name="revision" value="18086" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/scaladoc" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1245338576809" /> - <option name="revision" value="18057" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/specialized" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1243794621415" /> - <option name="revision" value="17936" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/2.7.x" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1243702081813" /> - <option name="revision" value="17924" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/named-args" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1241777690596" /> - <option name="revision" value="17674" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/2.8.0x" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1240108902257" /> - <option name="revision" value="17534" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/280-recovered" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1236598836424" /> - <option name="revision" value="17258" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/new-collections" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1235416865835" /> - <option name="revision" value="17182" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches/devel-base-2.8.0" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1233570703283" /> - <option name="revision" value="17011" /> - <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="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="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="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="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="1243957892834" /> - <option name="revision" value="17972" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_7_5_final" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1240588357749" /> - <option name="revision" value="17574" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_7_4_final" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1239791988124" /> - <option name="revision" value="17511" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_7_4_RC1" /> - </SvnBranchItem> - <SvnBranchItem> - <option name="creationDateMillis" value="1231872127913" /> - <option name="revision" value="16910" /> - <option name="url" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_7_3_final" /> - </SvnBranchItem> - <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 name="branchUrls"> + <list> + <option value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches" /> + <option value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags" /> + </list> </option> + <option name="trunkUrl" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk" /> + </SvnBranchConfiguration> + </value> + </entry> + <entry key="$PROJECT_DIR$/src/library"> + <value> + <SvnBranchConfiguration> <option name="branchUrls"> <list> <option value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches" /> diff --git a/src/partest/scala/tools/partest/nest/Worker.scala b/src/partest/scala/tools/partest/nest/Worker.scala index 967374e6ee..0ecd9986f3 100644 --- a/src/partest/scala/tools/partest/nest/Worker.scala +++ b/src/partest/scala/tools/partest/nest/Worker.scala @@ -754,12 +754,12 @@ class Worker(val fileManager: FileManager) extends Actor { case "scalap" => { - def decompileFile(clazz: Class[_]) = { + def decompileFile(clazz: Class[_], packObj: Boolean) = { 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) + parseScalaSignature(sig, packObj) } runInContext(file, kind, (logFile: File, outDir: File) => { @@ -781,12 +781,13 @@ class Worker(val fileManager: FileManager) extends Actor { } else { // 3. Decompile file and compare results - val className = sourceDirName.capitalize + val isPackageObject = sourceDir.getName.startsWith("package") + val className = sourceDirName.capitalize + (if (!isPackageObject) "" else ".package") val url = outDir.toURI.toURL val loader = new URLClassLoader(Array(url), getClass.getClassLoader) val clazz = loader.loadClass(className) - val result = decompileFile(clazz) + val result = decompileFile(clazz, isPackageObject) try { val fstream = new FileWriter(logFile); diff --git a/src/scala-lang.iml b/src/scala-lang.iml deleted file mode 100644 index d860a9ce0f..0000000000 --- a/src/scala-lang.iml +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module relativePaths="true" type="JAVA_MODULE" version="4"> - <component name="FacetManager"> - <facet type="Scala" name="Scala"> - <configuration /> - </facet> - </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" /> - <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$/dotnet-library" /> - <excludeFolder url="file://$MODULE_DIR$/mono" /> - </content> - <content url="file://$MODULE_DIR$/../test" /> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="library" name="ant" level="project" /> - <orderEntry type="library" name="lib1" level="project" /> - <orderEntry type="library" name="testlib" level="project" /> - </component> -</module> - diff --git a/src/scalap/scala/tools/scalap/Main.scala b/src/scalap/scala/tools/scalap/Main.scala index 71b93835e6..54fe21d4e6 100644 --- a/src/scalap/scala/tools/scalap/Main.scala +++ b/src/scalap/scala/tools/scalap/Main.scala @@ -61,16 +61,28 @@ object Main { out.flush() } - def parseScalaSignature(scalaSig: ScalaSig) = { + def isPackageObjectFile(s: String) = s != null && (s.endsWith(File.separator + "package") || s == "package") + + def parseScalaSignature(scalaSig: ScalaSig, isPackageObject: Boolean) = { val baos = new ByteArrayOutputStream val stream = new PrintStream(baos) val syms = scalaSig.topLevelClasses ::: scalaSig.topLevelObjects syms.first.parent match { //Partial match case Some(p) if (p.name != "<empty>") => { - stream.print("package "); - stream.print(p.path); - stream.print("\n") + val path = p.path + if (!isPackageObject) { + stream.print("package "); + stream.print(path); + stream.print("\n") + } else { + val i = path.lastIndexOf(".") + if (i > 0) { + stream.print("package "); + stream.print(path.substring(0, i)) + stream.print("\n") + } + } } case _ => } @@ -83,11 +95,11 @@ object Main { } - def decompileScala(bytes: Array[Byte]) = { + def decompileScala(bytes: Array[Byte], isPackageObject: Boolean) = { val byteCode = ByteCode(bytes) val classFile = ClassFileParser.parse(byteCode) classFile.attribute(SCALA_SIG).map(_.byteCode).map(ScalaSigAttributeParsers.parse) match { - case Some(scalaSig) => Console.println(parseScalaSignature(scalaSig)) + case Some(scalaSig) => Console.println(parseScalaSignature(scalaSig, isPackageObject)) case None => //Do nothing } } @@ -112,7 +124,7 @@ object Main { } val bytes = cfile.toByteArray if (isScalaFile(bytes)) { - decompileScala(bytes) + decompileScala(bytes, isPackageObjectFile(filename)) } else { // construct a reader for the classfile content val reader = new ByteArrayReader(cfile.toByteArray) diff --git a/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSig.scala b/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSig.scala index c660bdd7c3..ad29ac0701 100644 --- a/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSig.scala +++ b/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSig.scala @@ -138,14 +138,64 @@ object ScalaSigEntryParsers extends RulesWithState with MemoisableRules { val symbolInfo = nameRef ~ symbolRef ~ nat ~ (symbolRef?) ~ ref ~ get ^~~~~~^ SymbolInfo - def symbolEntry(key : Int) = (key -~ none | (key + 64) -~ nat) -~ symbolInfo + def symHeader(key: Int) = (key -~ none | (key + 64) -~ nat) + + def symbolEntry(key : Int) = symHeader(key) -~ symbolInfo + + /*************************************************** + * Symbol table attribute format: + * Symtab = nentries_Nat {Entry} + * Entry = 1 TERMNAME len_Nat NameInfo + * | 2 TYPENAME len_Nat NameInfo + * | 3 NONEsym len_Nat + * | 4 TYPEsym len_Nat SymbolInfo + * | 5 ALIASsym len_Nat SymbolInfo + * | 6 CLASSsym len_Nat SymbolInfo [thistype_Ref] + * | 7 MODULEsym len_Nat SymbolInfo + * | 8 VALsym len_Nat [defaultGetter_Ref] SymbolInfo [alias_Ref] + * | 9 EXTref len_Nat name_Ref [owner_Ref] + * | 10 EXTMODCLASSref len_Nat name_Ref [owner_Ref] + * | 11 NOtpe len_Nat + * | 12 NOPREFIXtpe len_Nat + * | 13 THIStpe len_Nat sym_Ref + * | 14 SINGLEtpe len_Nat type_Ref sym_Ref + * | 15 CONSTANTtpe len_Nat type_Ref constant_Ref + * | 16 TYPEREFtpe len_Nat type_Ref sym_Ref {targ_Ref} + * | 17 TYPEBOUNDStpe len_Nat tpe_Ref tpe_Ref + * | 18 REFINEDtpe len_Nat classsym_Ref {tpe_Ref} + * | 19 CLASSINFOtpe len_Nat classsym_Ref {tpe_Ref} + * | 20 METHODtpe len_Nat tpe_Ref {sym_Ref} + * | 21 POLYTtpe len_Nat tpe_Ref {sym_Ref} + * | 22 IMPLICITMETHODtpe len_Nat tpe_Ref {tpe_Ref} + * | 52 SUPERtpe len_Nat tpe_Ref tpe_Ref + * | 24 LITERALunit len_Nat + * | 25 LITERALboolean len_Nat value_Long + * | 26 LITERALbyte len_Nat value_Long + * | 27 LITERALshort len_Nat value_Long + * | 28 LITERALchar len_Nat value_Long + * | 29 LITERALint len_Nat value_Long + * | 30 LITERALlong len_Nat value_Long + * | 31 LITERALfloat len_Nat value_Long + * | 32 LITERALdouble len_Nat value_Long + * | 33 LITERALstring len_Nat name_Ref + * | 34 LITERALnull len_Nat + * | 35 LITERALclass len_Nat tpe_Ref + * | 36 LITERALenum len_Nat sym_Ref + * | 40 SYMANNOT len_Nat sym_Ref AnnotInfoBody + * | 41 CHILDREN len_Nat sym_Ref {sym_Ref} + * | 42 ANNOTATEDtpe len_Nat [sym_Ref] tpe_Ref {annotinfo_Ref} + * | 43 ANNOTINFO len_Nat AnnotInfoBody + * | 44 ANNOTARGARRAY len_Nat {constAnnotArg_Ref} + * | 47 DEBRUIJNINDEXtpe len_Nat level_Nat index_Nat + * | 48 EXISTENTIALtpe len_Nat type_Ref {symbol_Ref} + */ val noSymbol = 3 -^ NoSymbol val typeSymbol = symbolEntry(4) ^^ TypeSymbol as "typeSymbol" val aliasSymbol = symbolEntry(5) ^^ AliasSymbol as "alias" val classSymbol = symbolEntry(6) ~ (ref?) ^~^ ClassSymbol as "class" val objectSymbol = symbolEntry(7) ^^ ObjectSymbol as "object" - val methodSymbol = symbolEntry(8) ~ (ref?) ^~^ MethodSymbol as "method" + val methodSymbol = symHeader(8) -~ /*(ref?) -~*/ symbolInfo ~ (ref?) ^~^ MethodSymbol as "method" val extRef = 9 -~ nameRef ~ (symbolRef?) ~ get ^~~^ ExternalSymbol as "extRef" val extModClassRef = 10 -~ nameRef ~ (symbolRef?) ~ get ^~~^ ExternalSymbol as "extModClassRef" @@ -174,9 +224,9 @@ object ScalaSigEntryParsers extends RulesWithState with MemoisableRules { 17 -~ typeRef ~ typeRef ^~^ TypeBoundsType, 18 -~ classSymRef ~ (typeRef*) ^~^ RefinedType, 19 -~ symbolRef ~ (typeRef*) ^~^ ClassInfoType, - 20 -~ typeRef ~ (typeRef*) ^~^ MethodType, + 20 -~ typeRef ~ (symbolRef*) ^~^ MethodType, 21 -~ typeRef ~ (refTo(typeSymbol)*) ^~^ PolyType, - 22 -~ typeRef ~ (typeRef*) ^~^ ImplicitMethodType, + 22 -~ typeRef ~ (symbolRef*) ^~^ ImplicitMethodType, 42 -~ typeRef ~ (attribTreeRef*) ^~^ AnnotatedType, 51 -~ typeRef ~ symbolRef ~ (attribTreeRef*) ^~~^ AnnotatedWithSelfType, 47 -~ typeLevel ~ typeIndex ^~^ DeBruijnIndexType, @@ -215,55 +265,59 @@ object ScalaSigEntryParsers extends RulesWithState with MemoisableRules { case class AnnotInfo(refs : Seq[Int]) // attarg_Ref {constant_Ref attarg_Ref} - /* | 49 TREE len_Nat 1 EMPTYtree - * | 49 TREE len_Nat 2 PACKAGEtree type_Ref sym_Ref mods_Ref name_Ref {tree_Ref} - * | 49 TREE len_Nat 3 CLASStree type_Ref sym_Ref mods_Ref name_Ref tree_Ref {tree_Ref} - * | 49 TREE len_Nat 4 MODULEtree type_Ref sym_Ref mods_Ref name_Ref tree_Ref - * | 49 TREE len_Nat 5 VALDEFtree type_Ref sym_Ref mods_Ref name_Ref tree_Ref tree_Ref - * | 49 TREE len_Nat 6 DEFDEFtree type_Ref sym_Ref mods_Ref name_Ref numtparams_Nat {tree_Ref} numparamss_Nat {numparams_Nat {tree_Ref}} tree_Ref tree_Ref - * | 49 TREE len_Nat 7 TYPEDEFtree type_Ref sym_Ref mods_Ref name_Ref tree_Ref {tree_Ref} - * | 49 TREE len_Nat 8 LABELtree type_Ref sym_Ref tree_Ref {tree_Ref} - * | 49 TREE len_Nat 9 IMPORTtree type_Ref sym_Ref tree_Ref {name_Ref name_Ref} - * | 49 TREE len_Nat 10 ANNOTATIONtree type_Ref sym_Ref tree_Ref {tree_Ref} - * | 49 TREE len_Nat 11 DOCDEFtree type_Ref sym_Ref string_Ref tree_Ref - * | 49 TREE len_Nat 12 TEMPLATEtree type_Ref sym_Ref numparents_Nat {tree_Ref} tree_Ref {tree_Ref} - * | 49 TREE len_Nat 13 BLOCKtree type_Ref tree_Ref {tree_Ref} - * | 49 TREE len_Nat 14 CASEtree type_Ref tree_Ref tree_Ref tree_Ref - * | 49 TREE len_Nat 15 SEQUENCEtree type_Ref {tree_Ref} - * | 49 TREE len_Nat 16 ALTERNATIVEtree type_Ref {tree_Ref} - * | 49 TREE len_Nat 17 STARtree type_Ref {tree_Ref} - * | 49 TREE len_Nat 18 BINDtree type_Ref sym_Ref name_Ref tree_Ref - * | 49 TREE len_Nat 19 UNAPPLYtree type_Ref tree_Ref {tree_Ref} - * | 49 TREE len_Nat 20 ARRAYVALUEtree type_Ref tree_Ref {tree_Ref} - * | 49 TREE len_Nat 21 FUNCTIONtree type_Ref sym_Ref tree_Ref {tree_Ref} - * | 49 TREE len_Nat 22 ASSIGNtree type_Ref tree_Ref tree_Ref - * | 49 TREE len_Nat 23 IFtree type_Ref tree_Ref tree_Ref tree_Ref - * | 49 TREE len_Nat 24 MATCHtree type_Ref tree_Ref {tree_Ref} - * | 49 TREE len_Nat 25 RETURNtree type_Ref sym_Ref tree_Ref - * | 49 TREE len_Nat 26 TREtree type_Ref tree_Ref tree_Ref {tree_Ref} - * | 49 TREE len_Nat 27 THROWtree type_Ref tree_Ref - * | 49 TREE len_Nat 28 NEWtree type_Ref tree_Ref - * | 49 TREE len_Nat 29 TYPEDtree type_Ref tree_Ref tree_Ref - * | 49 TREE len_Nat 30 TYPEAPPLYtree type_Ref tree_Ref {tree_Ref} - * | 49 TREE len_Nat 31 APPLYtree type_Ref tree_Ref {tree_Ref} - * | 49 TREE len_Nat 32 APPLYDYNAMICtree type_Ref sym_Ref tree_Ref {tree_Ref} - * | 49 TREE len_Nat 33 SUPERtree type_Ref sym_Ref tree_Ref name_Ref - * | 49 TREE len_Nat 34 THIStree type_Ref sym_Ref name_Ref - * | 49 TREE len_Nat 35 SELECTtree type_Ref sym_Ref tree_Ref name_Ref - * | 49 TREE len_Nat 36 IDENTtree type_Ref sym_Ref name_Ref - * | 49 TREE len_Nat 37 LITERALtree type_Ref constant_Ref - * | 49 TREE len_Nat 38 TYPEtree type_Ref - * | 49 TREE len_Nat 39 ANNOTATEDtree type_Ref tree_Ref tree_Ref - * | 49 TREE len_Nat 40 SINGLETONTYPEtree type_Ref tree_Ref - * | 49 TREE len_Nat 41 SELECTFROMTYPEtree type_Ref tree_Ref name_Ref - * | 49 TREE len_Nat 42 COMPOUNDTYPEtree type_Ref tree_Ref - * | 49 TREE len_Nat 43 APPLIEDTYPEtree type_Ref tree_Ref {tree_Ref} - * | 49 TREE len_Nat 44 TYPEBOUNDStree type_Ref tree_Ref tree_Ref - * | 49 TREE len_Nat 45 EXISTENTIALTYPEtree type_Ref tree_Ref {tree_Ref} - * | 50 MODIFIERS len_Nat flags_Long privateWithin_Ref {Annotation_Ref} - - * Attarg = Refltree | Constant - * - * len is remaining length after `len'. - */ - + /*************************************************** + * | 49 TREE len_Nat 1 EMPTYtree + * | 49 TREE len_Nat 2 PACKAGEtree type_Ref sym_Ref mods_Ref name_Ref {tree_Ref} + * | 49 TREE len_Nat 3 CLASStree type_Ref sym_Ref mods_Ref name_Ref tree_Ref {tree_Ref} + * | 49 TREE len_Nat 4 MODULEtree type_Ref sym_Ref mods_Ref name_Ref tree_Ref + * | 49 TREE len_Nat 5 VALDEFtree type_Ref sym_Ref mods_Ref name_Ref tree_Ref tree_Ref + * | 49 TREE len_Nat 6 DEFDEFtree type_Ref sym_Ref mods_Ref name_Ref numtparams_Nat {tree_Ref} numparamss_Nat {numparams_Nat {tree_Ref}} tree_Ref tree_Ref + * | 49 TREE len_Nat 7 TYPEDEFtree type_Ref sym_Ref mods_Ref name_Ref tree_Ref {tree_Ref} + * | 49 TREE len_Nat 8 LABELtree type_Ref sym_Ref tree_Ref {tree_Ref} + * | 49 TREE len_Nat 9 IMPORTtree type_Ref sym_Ref tree_Ref {name_Ref name_Ref} + * | 49 TREE len_Nat 11 DOCDEFtree type_Ref sym_Ref string_Ref tree_Ref + * | 49 TREE len_Nat 12 TEMPLATEtree type_Ref sym_Ref numparents_Nat {tree_Ref} tree_Ref {tree_Ref} + * | 49 TREE len_Nat 13 BLOCKtree type_Ref tree_Ref {tree_Ref} + * | 49 TREE len_Nat 14 CASEtree type_Ref tree_Ref tree_Ref tree_Ref + * | 49 TREE len_Nat 15 SEQUENCEtree type_Ref {tree_Ref} + * | 49 TREE len_Nat 16 ALTERNATIVEtree type_Ref {tree_Ref} + * | 49 TREE len_Nat 17 STARtree type_Ref {tree_Ref} + * | 49 TREE len_Nat 18 BINDtree type_Ref sym_Ref name_Ref tree_Ref + * | 49 TREE len_Nat 19 UNAPPLYtree type_Ref tree_Ref {tree_Ref} + * | 49 TREE len_Nat 20 ARRAYVALUEtree type_Ref tree_Ref {tree_Ref} + * | 49 TREE len_Nat 21 FUNCTIONtree type_Ref sym_Ref tree_Ref {tree_Ref} + * | 49 TREE len_Nat 22 ASSIGNtree type_Ref tree_Ref tree_Ref + * | 49 TREE len_Nat 23 IFtree type_Ref tree_Ref tree_Ref tree_Ref + * | 49 TREE len_Nat 24 MATCHtree type_Ref tree_Ref {tree_Ref} + * | 49 TREE len_Nat 25 RETURNtree type_Ref sym_Ref tree_Ref + * | 49 TREE len_Nat 26 TREtree type_Ref tree_Ref tree_Ref {tree_Ref} + * | 49 TREE len_Nat 27 THROWtree type_Ref tree_Ref + * | 49 TREE len_Nat 28 NEWtree type_Ref tree_Ref + * | 49 TREE len_Nat 29 TYPEDtree type_Ref tree_Ref tree_Ref + * | 49 TREE len_Nat 30 TYPEAPPLYtree type_Ref tree_Ref {tree_Ref} + * | 49 TREE len_Nat 31 APPLYtree type_Ref tree_Ref {tree_Ref} + * | 49 TREE len_Nat 32 APPLYDYNAMICtree type_Ref sym_Ref tree_Ref {tree_Ref} + * | 49 TREE len_Nat 33 SUPERtree type_Ref sym_Ref tree_Ref name_Ref + * | 49 TREE len_Nat 34 THIStree type_Ref sym_Ref name_Ref + * | 49 TREE len_Nat 35 SELECTtree type_Ref sym_Ref tree_Ref name_Ref + * | 49 TREE len_Nat 36 IDENTtree type_Ref sym_Ref name_Ref + * | 49 TREE len_Nat 37 LITERALtree type_Ref constant_Ref + * | 49 TREE len_Nat 38 TYPEtree type_Ref + * | 49 TREE len_Nat 39 ANNOTATEDtree type_Ref tree_Ref tree_Ref + * | 49 TREE len_Nat 40 SINGLETONTYPEtree type_Ref tree_Ref + * | 49 TREE len_Nat 41 SELECTFROMTYPEtree type_Ref tree_Ref name_Ref + * | 49 TREE len_Nat 42 COMPOUNDTYPEtree type_Ref tree_Ref + * | 49 TREE len_Nat 43 APPLIEDTYPEtree type_Ref tree_Ref {tree_Ref} + * | 49 TREE len_Nat 44 TYPEBOUNDStree type_Ref tree_Ref tree_Ref + * | 49 TREE len_Nat 45 EXISTENTIALTYPEtree type_Ref tree_Ref {tree_Ref} + * | 50 MODIFIERS len_Nat flags_Long privateWithin_Ref + * SymbolInfo = name_Ref owner_Ref flags_LongNat [privateWithin_Ref] info_Ref + * NameInfo = <character sequence of length len_Nat in Utf8 format> + * NumInfo = <len_Nat-byte signed number in big endian format> + * Ref = Nat + * AnnotInfoBody = info_Ref {annotArg_Ref} {name_Ref constAnnotArg_Ref} + * AnnotArg = Tree | Constant + * ConstAnnotArg = Constant | AnnotInfo | AnnotArgArray + * + * len is remaining length after `len'. + */
\ No newline at end of file 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 dd711e41db..f3e395ae75 100644 --- a/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSigPrinter.scala +++ b/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSigPrinter.scala @@ -32,7 +32,12 @@ class ScalaSigPrinter(stream: PrintStream, printPrivates: Boolean) { case o: ObjectSymbol => if (!isCaseClassObject(o)) { indent - printObject(level, o) + if (o.name == "package") { + // print package object + printPackageObject(level, o) + } else { + printObject(level, o) + } } case c: ClassSymbol if !refinementClass(c) && !c.isModule => indent @@ -76,7 +81,7 @@ class ScalaSigPrinter(stream: PrintStream, printPrivates: Boolean) { def printModifiers(symbol: Symbol) { if (symbol.isSealed) print("sealed ") if (symbol.isImplicit) print("implicit ") - if (symbol.isFinal) print("final ") + if (symbol.isFinal && !symbol.isInstanceOf[ObjectSymbol]) print("final ") if (symbol.isPrivate) print("private ") else if (symbol.isProtected) print("protected ") if (symbol.isOverride) print("override ") @@ -120,13 +125,27 @@ class ScalaSigPrinter(stream: PrintStream, printPrivates: Boolean) { val baos = new ByteArrayOutputStream val stream = new PrintStream(baos) val printer = new ScalaSigPrinter(stream, printPrivates) - printer.printMethodType(m.infoType, false) +// printer.printMethodType(m.infoType, false) baos.toString case None => "" } } + def printPackageObject(level: Int, o: ObjectSymbol) { + printModifiers(o) + print("package ") + print("object ") + val poName = o.symbolInfo.owner.name + print(processName(poName)) + val TypeRefType(prefix, classSymbol: ClassSymbol, typeArgs) = o.infoType + printType(classSymbol) + print(" {\n") + printChildren(level, classSymbol) + printWithIndent(level, "}\n") + + } + def printObject(level: Int, o: ObjectSymbol) { printModifiers(o) print("object ") @@ -148,33 +167,49 @@ class ScalaSigPrinter(stream: PrintStream, printPrivates: Boolean) { if (res.length > 1) StringUtil.decapitalize(res.substring(0, 1)) else res.toLowerCase }) - def printMethodType(t: Type, printResult: Boolean): Unit = { - def _pmt(mt: Type {def resultType: Type; def paramTypes: Seq[Type]}) = { - print(genParamNames(mt).zip(mt.paramTypes.toList.map(toString(_)(TypeFlags(true)))).map(p => p._1 + " : " + p._2).mkString( - "(" + (mt match {case ImplicitMethodType(_, _) => "implicit "; case _ => ""}) + def printMethodType(t: Type, printResult: Boolean)(implicit cont : => Unit): Unit = { + + def _pmt(mt: Type {def resultType: Type; def paramSymbols: Seq[Symbol]}) = { + + val paramEntries = mt.paramSymbols.map({ + case ms: MethodSymbol => ms.name + " : " + toString(ms.infoType)(TypeFlags(true)) + case _ => "^___^" + }) + + // Printe parameter clauses + print(paramEntries.mkString( + "(" + (mt match {case _ : ImplicitMethodType => "implicit "; case _ => ""}) , ", ", ")")) + + // Print result type mt.resultType match { - case mt: MethodType => printMethodType(mt, printResult) - case imt: ImplicitMethodType => printMethodType(imt, printResult) + case mt: MethodType => printMethodType(mt, printResult)({}) + case imt: ImplicitMethodType => printMethodType(imt, printResult)({}) case x => if (printResult) { print(" : "); printType(x) } } } + t match { - case mt@MethodType(resType, paramTypes) => _pmt(mt) - case mt@ImplicitMethodType(resType, paramTypes) => _pmt(mt) + case mt@MethodType(resType, paramSymbols) => _pmt(mt) + case mt@ImplicitMethodType(resType, paramSymbols) => _pmt(mt) case pt@PolyType(mt, typeParams) => { print(typeParamString(typeParams)) - printMethodType(mt, printResult) + printMethodType(mt, printResult)({}) } //todo consider another method types case x => print(" : "); printType(x) } + + // Print rest of the symbol output + cont } def printMethod(level: Int, m: MethodSymbol, indent: () => Unit) { + def cont = print(" = { /* compiled code */ }") + val n = m.name if (underCaseClass(m) && n == CONSTRUCTOR_NAME) return if (m.isAccessor && n.endsWith("_$eq")) return @@ -190,18 +225,15 @@ class ScalaSigPrinter(stream: PrintStream, printPrivates: Boolean) { n match { case CONSTRUCTOR_NAME => print("this") - printMethodType(m.infoType, false) - print(" = { /* compiled code */ }") + printMethodType(m.infoType, false)(cont) case name => val nn = processName(name) print(nn) - printMethodType(m.infoType, true) - if (!m.isDeferred) { // Print body only for non-abstract metods - print(" = { /* compiled code */ }") - } + printMethodType(m.infoType, true)( + {if (!m.isDeferred) print(" = { /* compiled code */ }" /* Print body only for non-abstract metods */ )} + ) } print("\n") - printChildren(level, m) } def printAlias(level: Int, a: AliasSymbol) { @@ -276,7 +308,10 @@ class ScalaSigPrinter(stream: PrintStream, printPrivates: Boolean) { case _ => "scala.Seq" + typeArgString(typeArgs) } case "scala.<byname>" => "=> " + toString(typeArgs.first) - case _ => StringUtil.trimStart(processName(symbol.path) + typeArgString(typeArgs), "<empty>.") + case _ => { + val path = StringUtil.cutSubstring(symbol.path)(".package") //remove package object reference + StringUtil.trimStart(processName(path) + typeArgString(typeArgs), "<empty>.") + } }) case TypeBoundsType(lower, upper) => " >: " + toString(lower) + " <: " + toString(upper) case RefinedType(classSym, typeRefs) => sep + typeRefs.map(toString).mkString("", " with ", "") diff --git a/src/scalap/scala/tools/scalap/scalax/rules/scalasig/Type.scala b/src/scalap/scala/tools/scalap/scalax/rules/scalasig/Type.scala index c812a94af7..f6986b28b7 100644 --- a/src/scalap/scala/tools/scalap/scalax/rules/scalasig/Type.scala +++ b/src/scalap/scala/tools/scalap/scalax/rules/scalasig/Type.scala @@ -12,10 +12,10 @@ case class TypeRefType(prefix : Type, symbol : Symbol, typeArgs : Seq[Type]) ext case class TypeBoundsType(lower : Type, upper : Type) extends Type case class RefinedType(classSym : Symbol, typeRefs : List[Type]) extends Type case class ClassInfoType(symbol : Symbol, typeRefs : Seq[Type]) extends Type -case class MethodType(resultType : Type, paramTypes : Seq[Type]) extends Type +case class MethodType(resultType : Type, paramSymbols : Seq[Symbol]) extends Type case class PolyType(typeRef : Type, symbols : Seq[TypeSymbol]) extends Type case class PolyTypeWithCons(typeRef : Type, symbols : Seq[TypeSymbol], cons: String) extends Type -case class ImplicitMethodType(resultType : Type, paramTypes : Seq[Type]) extends Type +case class ImplicitMethodType(resultType : Type, paramSymbols : Seq[Symbol]) extends Type case class AnnotatedType(typeRef : Type, attribTreeRefs : List[Int]) extends Type case class AnnotatedWithSelfType(typeRef : Type, symbol : Symbol, attribTreeRefs : List[Int]) extends Type case class DeBruijnIndexType(typeLevel : Int, typeIndex : Int) extends Type diff --git a/src/scalap/scala/tools/scalap/scalax/util/StringUtil.scala b/src/scalap/scala/tools/scalap/scalax/util/StringUtil.scala index d48597fd9a..7986763b7b 100644 --- a/src/scalap/scala/tools/scalap/scalax/util/StringUtil.scala +++ b/src/scalap/scala/tools/scalap/scalax/util/StringUtil.scala @@ -12,4 +12,6 @@ object StringUtil { def decapitalize(s: String) = Introspector.decapitalize(s) + def cutSubstring(dom: String)(s: String) = if (dom != null && s != null) dom.replace(s, "") else dom + }
\ No newline at end of file diff --git a/test/disabled/scalap/caseClass/result.test b/test/disabled/scalap/caseClass/result.test deleted file mode 100644 index 5057f87a3f..0000000000 --- a/test/disabled/scalap/caseClass/result.test +++ /dev/null @@ -1,11 +0,0 @@ -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/disabled/scalap/paramNames/result.test b/test/disabled/scalap/paramNames/result.test deleted file mode 100644 index 2d59f72ec1..0000000000 --- a/test/disabled/scalap/paramNames/result.test +++ /dev/null @@ -1,4 +0,0 @@ -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/disabled/scalap/caseClass/A.scala b/test/files/scalap/caseClass/A.scala index 3addfbdaaa..3addfbdaaa 100644 --- a/test/disabled/scalap/caseClass/A.scala +++ b/test/files/scalap/caseClass/A.scala diff --git a/test/files/scalap/caseClass/result.test b/test/files/scalap/caseClass/result.test new file mode 100644 index 0000000000..3daa036d18 --- /dev/null +++ b/test/files/scalap/caseClass/result.test @@ -0,0 +1,14 @@ +case class CaseClass[A >: scala.Nothing <: scala.Seq[scala.Int]] 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 */ } + def copy[A >: scala.Nothing <: scala.Seq[scala.Int]]() : CaseClass[A] = { /* compiled code */ } + def copy$default$1[A >: scala.Nothing <: scala.Seq[scala.Int]] : A = { /* compiled code */ } + def copy$default$2[A >: scala.Nothing <: scala.Seq[scala.Int]] : scala.Predef.String = { /* compiled code */ } + override def hashCode() : scala.Int = { /* compiled code */ } + override def toString() : scala.Predef.String = { /* compiled code */ } + override def equals(x$1 : scala.Any) : scala.Boolean = { /* compiled code */ } + override def productPrefix : java.lang.String = { /* compiled code */ } + override def productArity : scala.Int = { /* compiled code */ } + override def productElement(x$1 : scala.Int) : scala.Any = { /* compiled code */ } +}
\ No newline at end of file diff --git a/test/disabled/scalap/caseObject/A.scala b/test/files/scalap/caseObject/A.scala index 7c15416841..7c15416841 100644 --- a/test/disabled/scalap/caseObject/A.scala +++ b/test/files/scalap/caseObject/A.scala diff --git a/test/disabled/scalap/caseObject/result.test b/test/files/scalap/caseObject/result.test index c265c8a529..2097c5a71d 100644 --- a/test/disabled/scalap/caseObject/result.test +++ b/test/files/scalap/caseObject/result.test @@ -1,8 +1,8 @@ -final case object CaseObject extends java.lang.Object with scala.ScalaObject with scala.Product { +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 */ } + override def productElement(x$1 : scala.Int) : scala.Any = { /* compiled code */ } protected def readResolve() : java.lang.Object = { /* compiled code */ } }
\ No newline at end of file diff --git a/test/disabled/scalap/cbnParam/A.scala b/test/files/scalap/cbnParam/A.scala index d804ba6502..d804ba6502 100644 --- a/test/disabled/scalap/cbnParam/A.scala +++ b/test/files/scalap/cbnParam/A.scala diff --git a/test/disabled/scalap/cbnParam/result.test b/test/files/scalap/cbnParam/result.test index 7b18228986..7b18228986 100644 --- a/test/disabled/scalap/cbnParam/result.test +++ b/test/files/scalap/cbnParam/result.test diff --git a/test/disabled/scalap/classWithExistential/A.scala b/test/files/scalap/classWithExistential/A.scala index 2a77a842c9..2a77a842c9 100644 --- a/test/disabled/scalap/classWithExistential/A.scala +++ b/test/files/scalap/classWithExistential/A.scala diff --git a/test/disabled/scalap/classWithExistential/result.test b/test/files/scalap/classWithExistential/result.test index 377edff7ef..377edff7ef 100644 --- a/test/disabled/scalap/classWithExistential/result.test +++ b/test/files/scalap/classWithExistential/result.test diff --git a/test/disabled/scalap/covariantParam/A.scala b/test/files/scalap/covariantParam/A.scala index 19fb8805b7..19fb8805b7 100644 --- a/test/disabled/scalap/covariantParam/A.scala +++ b/test/files/scalap/covariantParam/A.scala diff --git a/test/disabled/scalap/covariantParam/result.test b/test/files/scalap/covariantParam/result.test index e7c4a00bcb..e7c4a00bcb 100644 --- a/test/disabled/scalap/covariantParam/result.test +++ b/test/files/scalap/covariantParam/result.test diff --git a/test/disabled/scalap/implicitParam/A.scala b/test/files/scalap/implicitParam/A.scala index 5a5c88bc69..5a5c88bc69 100644 --- a/test/disabled/scalap/implicitParam/A.scala +++ b/test/files/scalap/implicitParam/A.scala diff --git a/test/disabled/scalap/implicitParam/result.test b/test/files/scalap/implicitParam/result.test index 4d2f49e803..4d2f49e803 100644 --- a/test/disabled/scalap/implicitParam/result.test +++ b/test/files/scalap/implicitParam/result.test diff --git a/test/files/scalap/packageObject/A.scala b/test/files/scalap/packageObject/A.scala new file mode 100644 index 0000000000..959517c4c4 --- /dev/null +++ b/test/files/scalap/packageObject/A.scala @@ -0,0 +1,4 @@ +package object PackageObject { + type A = String + def foo(i: Int) = 239 +}
\ No newline at end of file diff --git a/test/files/scalap/packageObject/result.test b/test/files/scalap/packageObject/result.test new file mode 100644 index 0000000000..6a7cc16ba8 --- /dev/null +++ b/test/files/scalap/packageObject/result.test @@ -0,0 +1,5 @@ +package object PackageObject extends java.lang.Object with scala.ScalaObject { + def this() = { /* compiled code */ } + type A = scala.Predef.String + def foo(i : scala.Int) : scala.Int = { /* compiled code */ } +}
\ No newline at end of file diff --git a/test/disabled/scalap/paramClauses/A.scala b/test/files/scalap/paramClauses/A.scala index bcc76f50e3..bcc76f50e3 100644 --- a/test/disabled/scalap/paramClauses/A.scala +++ b/test/files/scalap/paramClauses/A.scala diff --git a/test/disabled/scalap/paramClauses/result.test b/test/files/scalap/paramClauses/result.test index 4a3138d3c9..6ecbcec873 100644 --- a/test/disabled/scalap/paramClauses/result.test +++ b/test/files/scalap/paramClauses/result.test @@ -1,4 +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 */ } + def foo(i : scala.Int)(s : scala.Predef.String)(t : scala.Double) : scala.Int = { /* compiled code */ } }
\ No newline at end of file diff --git a/test/disabled/scalap/paramNames/A.scala b/test/files/scalap/paramNames/A.scala index 7ba9ff0feb..7ba9ff0feb 100644 --- a/test/disabled/scalap/paramNames/A.scala +++ b/test/files/scalap/paramNames/A.scala diff --git a/test/files/scalap/paramNames/result.test b/test/files/scalap/paramNames/result.test new file mode 100644 index 0000000000..59565dc782 --- /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], s2 : => scala.Seq[scala.Any]) : scala.Unit = { /* compiled code */ } +}
\ No newline at end of file diff --git a/test/disabled/scalap/sequenceParam/A.scala b/test/files/scalap/sequenceParam/A.scala index 98874fafb1..98874fafb1 100644 --- a/test/disabled/scalap/sequenceParam/A.scala +++ b/test/files/scalap/sequenceParam/A.scala diff --git a/test/disabled/scalap/sequenceParam/result.test b/test/files/scalap/sequenceParam/result.test index a4769c81df..928ab45ef1 100644 --- a/test/disabled/scalap/sequenceParam/result.test +++ b/test/files/scalap/sequenceParam/result.test @@ -1,3 +1,3 @@ class SequenceParam extends java.lang.Object with scala.ScalaObject { - def this(s : scala.Predef.String, s : scala.Int*) = { /* compiled code */ } + def this(s : scala.Predef.String, i : scala.Int*) = { /* compiled code */ } }
\ No newline at end of file diff --git a/test/files/scalap/traitObject/result.test b/test/files/scalap/traitObject/result.test index dc5b9b5f9e..c05a4b0968 100644 --- a/test/files/scalap/traitObject/result.test +++ b/test/files/scalap/traitObject/result.test @@ -2,7 +2,7 @@ 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 { +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/disabled/scalap/wildcardType/A.scala b/test/files/scalap/wildcardType/A.scala index d99841cb36..d99841cb36 100644 --- a/test/disabled/scalap/wildcardType/A.scala +++ b/test/files/scalap/wildcardType/A.scala diff --git a/test/disabled/scalap/wildcardType/result.test b/test/files/scalap/wildcardType/result.test index 78a24ef22a..78a24ef22a 100644 --- a/test/disabled/scalap/wildcardType/result.test +++ b/test/files/scalap/wildcardType/result.test |