Commit Graph

9455 Commits

Author SHA1 Message Date
dragos 9c8533847e Fixed annoying dead-code elimination bug.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@16438 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2008-10-30 13:23:19 +00:00
DRMacIver b56e33aa4a Minor control flow tinkering.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@16425 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2008-10-30 00:26:38 +00:00
DRMacIver 14f342c400 Make ParallelMatching's indentation not be a lie. :)
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@16424 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2008-10-30 00:13:29 +00:00
DRMacIver e859d01eb2 Apparently this test *hasn't* been fixed. My mistake.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@16423 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2008-10-30 00:00:08 +00:00
DRMacIver 32b3b2c924 Added a test for #1107.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@16422 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2008-10-29 23:33:12 +00:00
DRMacIver 26aec0f796 Minor cleanup of my last change.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@16420 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2008-10-29 22:35:01 +00:00
DRMacIver 61ce8bc8ed Fix for ticket #1087.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@16419 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2008-10-29 21:14:12 +00:00
DRMacIver 6117627c62 Another test case emerging from paul playing with the compiler's constant propagation.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@16418 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2008-10-29 18:34:12 +00:00
DRMacIver d07d7422bd Test case extracted from Paul's broken patch for #1458
Essentially one needs to make sure Base { val changesBaseClasses = true } doesn't infer the refinement type Base { val changesBaseClasses : Boolean(true) = true }



git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@16417 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2008-10-29 15:42:38 +00:00
dragos 5b261d5e68 Made anonymous classes non-synthetic. It makes more sense and fixes #1375.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@16416 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2008-10-29 14:55:07 +00:00
dragos cae6cd9bda Reverted change made to fix #1375. Now generic signatures are not generated for synthetic and private symbols (was breaking javac).
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@16414 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2008-10-29 14:09:23 +00:00
imaier 6066ecbf30 oops, worked on branch, merging back into trunk
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@16410 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2008-10-29 09:04:30 +00:00
imaier 96212732d5 added javax to known package prefixes, so scaladocs will properly link to Java Swing docs
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@16408 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2008-10-29 08:48:11 +00:00
DRMacIver c73e2b6f5e I feel like I should be waving a dead chicken with this commit.
As was discussed in scala-devel, the pattern matching for Scanners generates very nested if statements. This makes the typechecker work really hard to check these if statements, descending into a deeply nested tree. This can blow the stack.

So, what's the solution? Don't touch Scanners at all. Change the definition format for four character constants in SourceFile.scala. Suddenly the problem goes away and we get a lovely big switch statement. The type checker no longer has to do all that work.

Clearly this is a bug in the pattern matcher. See #1456. But as I don't know when I'll have a fix for that, this works as a temporary workaround. I don't understand why it works yet, but it does. 

Hence the sacrificial chicken. 

All hail Zog, protector of the type checker!



git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@16407 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2008-10-29 00:52:55 +00:00
DRMacIver 8490196db4 Modifications to pattern matching to allow the threading of a Typer all the way through. This is in aid of fixing bug #1087.
It doesn't actually fix it, but it makes the error message produces a little more enlightening. That's something. :) 

(It also seems this is a neccessary change for correctness with respect to the typechecker anyway). 



git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@16406 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2008-10-29 00:30:23 +00:00
phaller 159e2ef464 Added pos5 tests to test.suite target.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@16405 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2008-10-28 22:41:49 +00:00
phaller b3a47e0fdd Moved test requiring 1.5 javac/jvm to pos5.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@16404 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2008-10-28 22:39:53 +00:00
phaller 396e946682 Added handling of pos5 tests.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@16403 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2008-10-28 22:38:52 +00:00
michelou 5393d78ead removed hidden char in 1st position and leading tabs.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@16394 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2008-10-28 10:59:01 +00:00
DRMacIver fe8e76b950 Random cleanups eliminating ListBuffers.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@16393 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2008-10-28 01:38:35 +00:00
DRMacIver da0e5d6261 Tidying up the control flow in applyRule.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@16392 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2008-10-28 01:24:04 +00:00
DRMacIver 18c99b3aca Random hygiene:
- converting from Iterator to Iterable
  - Squashing of while loops
  - A few minor changes.



git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@16391 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2008-10-28 01:06:18 +00:00
DRMacIver 230283a822 General code tidy ups.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@16390 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2008-10-28 00:26:02 +00:00
DRMacIver 95e023aa17 Made DBG call by name.
Commonized code between CaseRuleApplication and MixLiterals.



git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@16389 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2008-10-27 22:54:19 +00:00
DRMacIver 62c888bc28 Ditching debugString(s).
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@16387 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2008-10-27 21:10:12 +00:00
DRMacIver 1bb54da256 More from Paul. Extracting common functionality into Row.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@16386 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2008-10-27 21:00:35 +00:00
DRMacIver 29dc629bc5 Another pile of paul phillips's pattern match patches.
This one's to remove TagIndexPairs and replace it with IntMap.



git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@16385 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2008-10-27 20:21:07 +00:00
phaller bfad453c8f Improved log file output if javac fails.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@16384 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2008-10-27 17:41:40 +00:00
dragos ae0d35ce17 Fixed #1374.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@16383 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2008-10-27 17:04:43 +00:00
cunei 81f88dcb2e updating version number and starr to 2.7.2.RC4
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@16381 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2008-10-27 16:53:09 +00:00
phaller 1a6b6162bb Improved error output in case invoking javac fails.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@16380 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2008-10-27 16:38:26 +00:00
DRMacIver 2e260d982e Fixing IntMap/LongMap.getOrElse.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@16379 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2008-10-27 16:35:42 +00:00
imaier c4b7e55cf5 added some swing scaladocs
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@16378 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2008-10-27 16:35:04 +00:00
dragos 3cc9da9771 Fixed optimization phases (#1379).
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@16377 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2008-10-27 16:25:50 +00:00
DRMacIver 6605a796e6 Added firstKey and lastKey to IntMap. (It doesn't implement SortedMap at the moment, but I'll make it do so at some point).
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@16376 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2008-10-27 15:24:43 +00:00
DRMacIver f7e40ffc2c More code cleanups from paul.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@16364 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2008-10-27 14:52:50 +00:00
DRMacIver 8d99449eca More code shrinkage.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@16361 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2008-10-27 09:30:29 +00:00
DRMacIver 29822514d8 Test to check a few combinations of pattern matching features.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@16360 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2008-10-27 08:30:05 +00:00
DRMacIver aa7c95a065 while => map2.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@16359 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2008-10-27 08:14:05 +00:00
DRMacIver 89b56e98fd More dead code removal.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@16358 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2008-10-27 08:03:40 +00:00
DRMacIver bd81ce2070 More code cleanups.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@16357 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2008-10-26 23:09:48 +00:00
DRMacIver 8b3f148315 More code cleanups from paul.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@16356 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2008-10-26 21:27:16 +00:00
DRMacIver ef9626b0c9 Switching getDefaultRows over to a defaultRows lazy val.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@16355 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2008-10-26 20:57:30 +00:00
DRMacIver f917410582 Patch from paulp to tidy up MixLiterals.getDefaultRows.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@16353 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2008-10-26 19:54:41 +00:00
DRMacIver 04b8540816 Minor edits - primarily comments and code removal.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@16350 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2008-10-26 19:04:00 +00:00
DRMacIver b24cfe27d6 Removing the mixed use of Set64/ sorted List[Int]s in the pattern matcher and moving to using a mutable.BitSet
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@16349 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2008-10-26 18:35:03 +00:00
DRMacIver 4458d2df78 Minimized the test - one case, a default and 64 entries.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@16348 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2008-10-26 17:46:14 +00:00
DRMacIver 2f0e902ae7 Test case for large case statements (similar to those found in e.g. Scanners.scala).
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@16347 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2008-10-26 17:33:48 +00:00
DRMacIver f026d2b178 Cleaning up a lot of dead code from regular expression patterns. Added a couple tests to verify correctness of cleanup.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@16345 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2008-10-26 15:55:23 +00:00
DRMacIver 07951f470f Fix to #1450. Moved test from pending.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@16344 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2008-10-26 12:52:21 +00:00