summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* removing dead code in BCodeSyncAndTryMiguel Garcia2013-12-151-4/+0
|
* there's a reason for this code in GenBCodeMiguel Garcia2013-12-154-4/+40
| | | | | | aced32d05c97651534f468bc9a475ea5f6ae75b8 removed unused code, along with code that populates a cache with entries needed in some program runs. I'm re-adding the latter.
* GenBCode version of "not eliminate loadmodule on static methods."Miguel Garcia2013-12-151-1/+2
| | | | | f27f2d80d759130597b652d6cc9d789f8c472e5a modifies GenASM, we follow suite here, making test/files/run/static-module-method.scala pass under GenBCode.
* GenBCode version of "Updating Position call sites" commitMiguel Garcia2013-12-151-1/+1
| | | | 7d62df035cd4393c73e7530e1cad1130e79d90c6 modifies GenASM, we follow suite here.
* Merge pull request #3272 from adriaanm/modularize-cps-fixAdriaan Moors2013-12-132-2/+2
|\ | | | | Fix osgi bundle name for continuations.
| * Fix osgi bundle name for continuations.Adriaan Moors2013-12-132-2/+2
|/
* Merge pull request #3221 from adriaanm/modularize-cpsAdriaan Moors2013-12-13251-9643/+71
|\ | | | | Final library modularization for 2.11
| * Modularize the swing library.Adriaan Moors2013-12-13104-5445/+19
| | | | | | | | | | The Scala Swing library will still ship with 2.11 (albeit unsupported). It now resides at https://github.com/scala/scala-swing.
| * Modularize continuations plugin.Adriaan Moors2013-12-13153-4203/+57
| | | | | | | | | | The continuations plugin and library will still ship with 2.11 (albeit unsupported). They now reside at https://github.com/scala/scala-continuations.
* | Merge pull request #3266 from soc/SI-7546Adriaan Moors2013-12-134-11/+19
|\ \ | |/ |/| SI-7546 Use likely monotonic clock source for durations
| * SI-7546 Use likely monotonic clock source for durationsSimon Ochsenreither2013-12-134-11/+19
| | | | | | | | | | | | | | | | | | | | System.currentTimeMillis is affected by wall-clock time, which means things can appear to jump back in time. Use System.nanoTime which is more likely¹ to be monotonic instead. ¹ See http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6458294 "nanoTime affected by system clock change on Linux (RH9) or in general lacks monotonicity".
* | Merge pull request #3270 from adriaanm/fix-dist.docAdriaan Moors2013-12-131-3/+0
|\ \ | | | | | | Fixup for #3265
| * | Fixup for #3265Adriaan Moors2013-12-131-3/+0
|/ /
* | Merge pull request #3233 from scottcarey/SI-8042Adriaan Moors2013-12-131-24/+34
|\ \ | | | | | | Use Serialization Proxy Pattern in List
| * | SI-8042 Use Serialization Proxy Pattern in ListScott Carey2013-12-121-24/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify List to use the Serialization Proxy Pattern instead of directly mutating its state during deserialization. Use the proxy at the List level for both Nil and :: for simplicity. Change one member variable (hd) to val from var as a result. The other member variable (tl) cannot yet be changed to val because it is mutated by ListBuffer in the library and Types in reflection.
* | | Merge pull request #3258 from ↵Adriaan Moors2013-12-134-4/+4
|\ \ \ | | | | | | | | | | | | | | | | jrudolph/w/fix-typo-that-that-occurs-twice-in-error-messages fix typo in error messages
| * | | fix typo in error messagesJohannes Rudolph2013-12-104-4/+4
| | |/ | |/|
* | | Merge pull request #3240 from soc/SI-7618Adriaan Moors2013-12-133-43/+16
|\ \ \ | | | | | | | | SI-7618 Remove octal number literals
| * | | SI-7618 Remove octal number literalsSimon Ochsenreither2013-12-093-43/+16
| | | | | | | | | | | | | | | | | | | | | | | | This also fixes a spurious detection of octal literals in floating point literals: Literals like 01.23 are neither deprecated nor planned for removal.
* | | | Merge pull request #3262 from densh/si/8030Adriaan Moors2013-12-137-20/+181
|\ \ \ \ | | | | | | | | | | SI-8030 force symbols on presentation compiler initialization
| * | | | SI-8030 force symbols on presentation compiler initializationDen Shabalin2013-12-127-20/+181
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit forces a number of built-in symbols in presentation compiler to prevent them from being entered during parsing. The property “parsing doesn’t enter new symbols” is tested on a rich source file that contains significant number of variations of Scala syntax.
* | | | Merge pull request #3250 from soc/SI-8059Adriaan Moors2013-12-133-4/+29
|\ \ \ \ | | | | | | | | | | SI-8059 Override immutable.Queue#{+:,:+} for performance
| * | | | SI-8059 Override immutable.Queue#{+:,:+} for performanceSimon Ochsenreither2013-12-113-4/+29
| |/ / / | | | | | | | | | | | | Without those overrides, all elements are unnecessarily copied.
* | | | Merge pull request #3204 from retronym/topic/patmat-classtag-compoundAdriaan Moors2013-12-133-0/+24
|\ \ \ \ | | | | | | | | | | Test case for recently improved unchecked warning
| * | | | Test case for recently improved unchecked warningJason Zaugg2013-12-123-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to https://github.com/scala/scala/pull/2848, the enclosed test compiled without warning and printed: true false Features interacting: - implicit class tags to enable type patterns on abstract types - type tests on compound types. I think the unchecked warning is acceptable for now.
* | | | | Merge pull request #3214 from retronym/ticket/8024Adriaan Moors2013-12-136-5/+52
|\ \ \ \ \ | | | | | | | | | | | | SI-8024 Fix inaccurate message on overloaded ambiguous ident
| * | | | | SI-8024 Improve user-level toString of package objectsJason Zaugg2013-12-122-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were outputing a the unattractive `package package`; now we opt for `package object pack`. Under `-Ydebug`, we still go to the "accurate" mode of the old `toString` implementation, which differentiates package objects vs package object classes.
| * | | | | SI-8024 Fix inaccurate message on overloaded ambiguous identJason Zaugg2013-12-125-6/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `Symbol#owner` of an overloaded symbol doesn't necessarily correspond to the owner of any of the alternatives, and as such it shouldn't be used in error message. neg/t8024.scala actually represents a progression since 2.10.3; the ambiguity was not reported. I bisected the change to https://github.com/scala/scala/pull/1554.
| * | | | | SI-8024 Pending test case for package object / overloading bugJason Zaugg2013-12-122-0/+20
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The error is new in 2.11, but actually seems correct. It appeared in 2.11.0-M4, more specifically, after https://github.com/scala/scala/pull/1554 But, the error message itself is wrong, and suggests that a method symbol has latched itself to an incorrect owner.
* | | | | Merge pull request #3263 from retronym/ticket/6780Adriaan Moors2013-12-133-28/+67
|\ \ \ \ \ | | | | | | | | | | | | SI-6780 Better handling of cycles in in-scope implicit search
| * | | | | SI-6780 Refactor Context#implicitssJason Zaugg2013-12-111-30/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - split out a method for the part concernted with implicits from the current context - leaving the outer code to handle caching, cycle detection, and recursion up the context chain.
| * | | | | SI-6780 Better handling of cycles in in-scope implicit searchJason Zaugg2013-12-113-9/+45
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implicit searches in the body of implicit members with inferred types were leading to cycles. Before we used to resolve that by saying there were no implicits in scope at all; now we just skip the current context and still include the enclosing implicits. Care is taken not to cache results under these circumstances. This entails reworking `Context#implicitss` so that: - the implicit info cache only contains implicits from the current level. The List[List[_]] is now contructed on demand; - we can detect cycles by setting `implicitsCacheRunId` to -1 during the computation. The outer implicits when we encounter that. - we avoid caching when we hit a cycle or when the owner is uninitialized.
* | | | | Merge pull request #3265 from retronym/merge/2.10.x-to-masterAdriaan Moors2013-12-13124-6211/+562
|\ \ \ \ \ | | | | | | | | | | | | Merge 2.10.x to master
| * \ \ \ \ Merge commit '9cdbe28' into merge/2.10.x-to-masterJason Zaugg2013-12-11113-6150/+344
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build.examples.xml build.xml docs/examples/actors/pingpong.scala docs/examples/fors.scala docs/examples/iterators.scala docs/examples/jolib/Ref.scala docs/examples/jolib/parallelOr.scala docs/examples/monads/callccInterpreter.scala docs/examples/monads/directInterpreter.scala docs/examples/monads/errorInterpreter.scala docs/examples/monads/simpleInterpreter.scala docs/examples/monads/stateInterpreter.scala docs/examples/parsing/ArithmeticParser.scala docs/examples/patterns.scala docs/examples/pilib/elasticBuffer.scala docs/examples/pilib/handover.scala docs/examples/pilib/piNat.scala docs/examples/typeinf.scala src/build/pack.xml
| | * | | | | Fixup #3248 missed a spot in pack.xmlAdriaan Moors2013-12-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forgot to run `ant distpack` to verify, only did `dist.done`. Implemented the rename of `doc/scala-devel-docs` to `api`.
| | * | | | | Merge pull request #3249 from retronym/ticket/7912Adriaan Moors2013-12-102-2/+24
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | SI-7912 Be defensive calling `toString` in `MatchError#getMessage`
| | | * | | | | SI-7912 Be defensive calling `toString` in `MatchError#getMessage`Jason Zaugg2013-12-102-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise, objects with exception-throwing `toString` lead to a cascading error far removed from the originally failed match.
| | * | | | | | Merge pull request #3251 from retronym/ticket/8060Adriaan Moors2013-12-102-1/+12
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | SI-8060 Avoid infinite loop with higher kinded type alias
| | | * | | | | | SI-8060 Avoid infinite loop with higher kinded type aliasJason Zaugg2013-12-102-1/+12
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `dealiasLocals` map was assuming that: tp.isAliasType implies (tp.dealias ne tp) This isn't true if `!typeParamsMatchArgs`. This commit avoids the infinite loop by checking whether or not dealiasing progresses.
| | * | | | | | Merge pull request #3248 from adriaanm/dist-cleanup-licensesAdriaan Moors2013-12-10113-6236/+303
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | Clean up Scala distribution a bit.
| | | * | | | | Update README, include doc/licenses in distroAdriaan Moors2013-12-107-66/+301
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We forgot to copy the licenses directory to the dists/ directory, so that they weren't included in the binary distribution. I did some house cleaning while I was at it. We no longer distribute ant as far as I can see (we used to for the sbt build, but that was long since removed). Added license for ASM, and Jansi (just to be sure).
| | | * | | | | Add attribution for Typesafe.Adriaan Moors2013-12-091-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was agreed on a while ago, but not yet implemented.
| | | * | | | | Remove docs/examples; they reside at scala/scala-distAdriaan Moors2013-12-09104-6120/+1
| | | | | | | |
| | | * | | | | Remove unused android test and corresponding license.Adriaan Moors2013-12-093-43/+0
| | | | | | | |
| | | * | | | | Do not distribute partest and its dependencies.Adriaan Moors2013-12-091-8/+0
| | | | | | | |
| * | | | | | | Merge commit '0c92704' into merge/2.10.x-to-masterJason Zaugg2013-12-119-61/+183
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bincompat-forward.whitelist.conf src/interactive/scala/tools/nsc/interactive/Global.scala test/files/presentation/scope-completion-2.check test/files/presentation/scope-completion-3.check test/files/presentation/scope-completion-import.check Conflicts in the scope completion tests handled with the help of @skyluc in https://github.com/scala/scala/pull/3264
| | * | | | | | Merge pull request #3222 from skyluc/issue/completion-import-vals-210-7995Adriaan Moors2013-12-096-54/+112
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | SI-7995 completion imported vars and vals
| | | * | | | | | SI-7995 completion imported vars and valsLuc Bourlier2013-12-066-54/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Imported member vals and vars were always marked inaccessible, even if referencing them at the location of the completion is valid in code. The accessible flag is now set accordingly to the accessibility of the getter.
| | * | | | | | | Merge pull request #3244 from rtyley/si-8019-swing-publisher-check-pf-definedAdriaan Moors2013-12-091-1/+1
| | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | SI-8019 Make Publisher check PartialFunction is defined for Event
| | | * | | | | | SI-8019 Make Publisher check PartialFunction is defined for EventRoberto Tyley2013-12-091-1/+1
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reactions are PartialFunctions, so if events come through indiscriminately that the listener is not defined for, errors occur. Eg: -- Exception in thread "AWT-EventQueue-0" scala.MatchError: FocusGained(scala.swing wrapper scala.swing.TextField -- A Coursera thread with people affected by this issue: https://class.coursera.org/reactive-001/forum/thread?thread_id=1315
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-15 10:38:09 +0000