summaryrefslogtreecommitdiff
path: root/test/files/jvm
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'axel22/feature/collection-concurrent' into developPaul Phillips2012-03-272-11/+12
|\
| * Rename ConcurrentTrieMap to concurrent.TrieMap.Aleksandar Prokopec2012-03-272-11/+12
| | | | | | | | | | | | | | | | Introduced the collection.concurrent package and introduced the concurrent.Map trait there. Deprecated the mutable.ConcurrentMap trait. Pending work - introduce the appropriate changes to JavaConversions and JavaConverters.
* | Cleaned up Duration for the standard library.Vojin Jovanovic2012-03-201-1/+1
|/ | | | | | | | | | | - Removed Timeout from the library. Each library should provide its own implementation of Timeout - Removed duration package object and replaced it with regular object - Removed usages of post Java 1.5 TimeUnit members - Added factory methods for FiniteDuration - Cleaned up some unnecessary comments - Merged duration DSL with Duration.scala file Review by: @phaller
*-. Merge remote-tracking branches 'VladUreche/feature/inheritdoc-clean', ↵Paul Phillips2012-03-1611-32/+64
|\ \ | | | | | | | | | 'acruise/t1118', 'hubertp/issue/5572', 'hubertp/topic/nightly-checkinit', 'axel22/feature/pc-ctrie', 'jsuereth/master-version-fixin' and 'axel22/feature/checkinit-transient' into develop
| | * Renaming Ctrie to ConcurrentTrieMap.Aleksandar Prokopec2012-03-162-11/+11
| |/ |/|
| * Fixed broken testsAlex Cruise2012-03-154-5/+6
| |
| * SI-1118:Alex Cruise2012-03-153-31/+31
| | | | | | | | | | | | * Use new-style deprecation annotations * Slightly less cutesy test text * Move t1118.scala to the right directory
| * SI-1118 WIPAlex Cruise2012-03-156-17/+48
| |
| * SI-1118 WIPAlex Cruise2012-03-152-0/+0
| |
| * Merge remote-tracking branch 'odersky/topic/inline' into merge-inlinePaul Phillips2012-03-141-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/scala-compiler.jar.desired.sha1 lib/scala-library-src.jar.desired.sha1 lib/scala-library.jar.desired.sha1 src/compiler/scala/reflect/internal/Definitions.scala src/compiler/scala/reflect/internal/Symbols.scala src/compiler/scala/tools/nsc/Global.scala src/compiler/scala/tools/nsc/transform/Constructors.scala src/compiler/scala/tools/nsc/transform/Erasure.scala src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala src/compiler/scala/tools/nsc/typechecker/Contexts.scala src/compiler/scala/tools/nsc/typechecker/RefChecks.scala src/compiler/scala/tools/nsc/typechecker/SyntheticMethods.scala src/library/scala/Function0.scala src/library/scala/Function1.scala src/library/scala/Function10.scala src/library/scala/Function11.scala src/library/scala/Function12.scala src/library/scala/Function13.scala src/library/scala/Function14.scala src/library/scala/Function15.scala src/library/scala/Function16.scala src/library/scala/Function17.scala src/library/scala/Function18.scala src/library/scala/Function19.scala src/library/scala/Function2.scala src/library/scala/Function20.scala src/library/scala/Function21.scala src/library/scala/Function22.scala src/library/scala/Function3.scala src/library/scala/Function4.scala src/library/scala/Function5.scala src/library/scala/Function6.scala src/library/scala/Function7.scala src/library/scala/Function8.scala src/library/scala/Function9.scala test/files/codelib/code.jar.desired.sha1 test/files/neg/anyval-children-2.check test/files/run/programmatic-main.check
| * \ Merge branch 'master' into merge-inlinePaul Phillips2012-03-146-6/+575
| |\ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/scala-compiler.jar.desired.sha1 lib/scala-library-src.jar.desired.sha1 lib/scala-library.jar.desired.sha1 src/compiler/scala/reflect/internal/Definitions.scala src/compiler/scala/reflect/internal/Importers.scala src/compiler/scala/reflect/internal/Symbols.scala src/compiler/scala/reflect/internal/Trees.scala src/compiler/scala/reflect/internal/Types.scala src/compiler/scala/tools/nsc/Global.scala src/compiler/scala/tools/nsc/transform/Erasure.scala src/compiler/scala/tools/nsc/transform/LiftCode.scala src/compiler/scala/tools/nsc/transform/UnCurry.scala src/compiler/scala/tools/nsc/typechecker/RefChecks.scala src/compiler/scala/tools/nsc/typechecker/Typers.scala test/files/run/programmatic-main.check test/files/speclib/instrumented.jar.desired.sha1
| * | Updated checkfiles to subtract ScalaObject.Paul Phillips2012-02-041-1/+1
| | |
* | | SI-5189 fixed: safe type infer for constr patternAdriaan Moors2012-03-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | several fixes to the standard library due to - the safer type checker this fix gives us (thus, some casts had to be inserted) - SI-5548 - type inference gets a bit more complicated, it needs help (chainl1 in combinator.Parsers) To deal with the type slack between actual (run-time) types and statically known types, for each abstract type T, reflect its variance as a skolem that is upper-bounded by T (covariant position), or lower-bounded by T (contravariant). Consider the following example: class AbsWrapperCov[+A] case class Wrapper[B](x: Wrapped[B]) extends AbsWrapperCov[B] def unwrap[T](x: AbsWrapperCov[T]): Wrapped[T] = x match { case Wrapper(wrapped) => // Wrapper's type parameter must not be assumed to be equal to T, // it's *upper-bounded* by it wrapped // : Wrapped[_ <: T] } this method should type check if and only if Wrapped is covariant in its type parameter before inferring Wrapper's type parameter B from x's type AbsWrapperCov[T], we must take into account that x's actual type is: AbsWrapperCov[Tactual] forSome {type Tactual <: T} since AbsWrapperCov is covariant in A -- in other words, we must not assume we know T exactly, all we know is its upper bound since method application is the only way to generate this slack between run-time and compile-time types (TODO: right!?), we can simply replace skolems that represent method type parameters as seen from the method's body by other skolems that are (upper/lower)-bounded by that type-parameter skolem (depending on the variance position of the skolem in the statically assumed type of the scrutinee, pt) this type slack is introduced by adaptConstrPattern: before it calls inferConstructorInstance, it creates a new context that holds the new existential skolems the context created by adaptConstrPattern must not be a CaseDef, since that confuses instantiateTypeVar and the whole pushTypeBounds/restoreTypeBounds dance (CaseDef contexts remember the bounds of the type params that we clobbered during GADT typing) typedCase deskolemizes the existential skolems back to the method skolems, since they don't serve any further purpose (except confusing the old pattern matcher) typedCase is now better at finding that context (using nextEnclosing)
* | | Fix race condition in scala-concurrent-tck testPhilipp Haller2012-02-191-1/+1
| | |
* | | Disable execution context and futures implementation in the default package.Aleksandar Prokopec2012-02-163-409/+19
| | | | | | | | | | | | | | | | | | | | | Fixed some tests so that they work now. The Transactions.scala test was failing when defined in scala.concurrent package, reporting that type `_$1` is defined twice. Until we figure out the reason for this, the package name in that test is renamed.
* | | Merge branch 'master' into execution-contextAleksandar Prokopec2012-02-162-5/+23
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: src/library/scala/package.scala
| * | | Apply the fix for si-5293 to hash maps.Aleksandar Prokopec2012-02-151-4/+4
| | |/ | |/| | | | | | | This fix was previously only applied to hash sets.
| * | Add tests for parallel Ctrie.Aleksandar Prokopec2012-02-032-0/+9
| | | | | | | | | | | | Changed parameters in some tests to speed them up.
| * | Incorporate Ctrie into standard library.Aleksandar Prokopec2012-02-022-1/+10
| |/ | | | | | | Implemented Ctrie serialization. Improved hashcode computation.
* | Merge branch 'master' into execution-contextVojin Jovanovic2012-01-252-3/+12
|\|
| * Preserve attribute order in inline XMLSzabolcs Berecz2012-01-141-2/+2
| |
| * Merge branch 'master' into issue/4147aleksandar2012-01-121-1/+1
| |\ | | | | | | | | | | | | Conflicts: .gitignore
| * | Add mutable tree sets to the standard library.aleksandar2012-01-122-1/+10
| | | | | | | | | | | | | | | | | | | | | This implementation is based on AVL trees. The current implementation is contributed by Lucien Pereira. Fixes #4147.
* | | Migrate akka promises. Changes to some of the interfaces.aleksandar2012-01-131-7/+5
| | |
* | | Port of akka Future implementation in progress.aleksandar2012-01-121-1/+14
| | |
* | | Refactor await calls for awaitable objects to ready and result calls.aleksandar2012-01-121-37/+49
| | |
* | | Merge branch 'master' into execution-contextVojin Jovanovic2012-01-093-6/+6
|\ \ \ | | |/ | |/|
| * | Fixed equality and string representation of xml attributes with null valueSzabolcs Berecz2012-01-071-1/+1
| |/ | | | | | | | | | | | | | | | | Prior to this patch <t a={ null: String }/> was not equal to <t/> and it's string representation was "<t ></t>" instead of "<t></t>" This includes changing MetaData.normalize() so that it doesn't reverse the chain. On the downside, the iterate function in MetaData.normalize() is not tail-recursive now.
| * Merge remote-tracking branches 'axel22/issue/5293' and ↵Paul Phillips2011-12-191-1/+1
| |\ | | | | | | | | | 'jsuereth/fix-5053-view-unzip' into develop
| | * Batch files no longer swallow exit codesEugene Burmako2011-12-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Usually scripts like scala.bat and scalac.bat correctly propagate exit codes from underlying Java invocations. However, if you run these scripts as follows: "cmd /c scala ...", then errorlevel gets swallowed. This simple patch fixes the aforementioned problem. Fixes SI-5295, no review.
| * | Fix #5293 - changed the way hashcode is improved in hash sets.aleksandar2011-12-191-4/+4
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The hash code is further improved by using a special value in the hash sets called a `seed`. For sequential hash tables, this value depends on the size of the hash table. It determines the number of bits the hashcode should be rotated. This ensures that hash tables with different sizes use different bits to compute the position of the element. This way traversing the elements of the source hash table will yield them in the order where they had similar hashcodes (and hence, positions) in the source table, but different ones in the destination table. Ideally, in the future we want to be able to have a family of hash functions and assign a different hash function from that family to each hash table instance. That would statistically almost completely eliminate the possibility that the hash table element traversal causes excessive collisions. I should probably @mention extempore here.
* | Make base TCK more uniform with Akka TCKPhilipp Haller2011-12-131-3/+4
| |
* | Add test for recover to Akka TCKPhilipp Haller2011-12-132-4/+25
| |
* | Force output of exception in assert. Add tests for recover.Philipp Haller2011-12-131-2/+33
| |
* | Add tests for blocking/await to Akka version of the TCKPhilipp Haller2011-12-131-6/+37
| |
* | Merge branch 'execution-context' of github.com:phaller/scala into ↵aleksandar2011-12-131-0/+338
|\ \ | | | | | | | | | execution-context
| * | Add Akka version of Futures TCK.Philipp Haller2011-12-131-0/+338
| | |
* | | Change promise method signature.aleksandar2011-12-131-1/+1
|/ /
* | Add test cases for blocking. Fix in the failed projection.aleksandar2011-12-131-3/+27
| |
* | Rename block->await. Add more tck test cases.aleksandar2011-12-131-8/+87
| |
* | Add stubs for future combinator tests.Philipp Haller2011-12-131-1/+67
| |
* | Fix default.ExecutionContextImpl.promise. Add promise test.Philipp Haller2011-12-131-1/+24
| |
* | Adding the tck test file.aleksandar2011-12-121-0/+166
| |
* | Merge branch 'execution-context' of github.com:phaller/scala into ↵aleksandar2011-12-121-8/+7
|\ \ | | | | | | | | | | | | | | | | | | execution-context Conflicts: test/files/jvm/concurrent-future.scala
| * | Fix future testsPhilipp Haller2011-12-091-5/+5
| | |
* | | Syntax changes for the scala.concurrent package and some cleanup.aleksandar2011-12-121-5/+10
|/ / | | | | | | | | | | | | | | | | | | block on { } is now changed to: block(timeout) { }
* / Add tests for future callbacksPhilipp Haller2011-12-072-0/+134
|/
* Delegate to Java's implementation of signum for Long and Int.Ismael Juma2011-12-031-0/+15
| | | | | | | | The Java implementation is faster as it doesn't have branches. java.lang.Math includes implementations of signum for Double and Float, but I didn't change the ones in scala.math because there is a difference on how negative zero is handled.
* Make partest work with spaces in the path (from...Stefan Zeiger2011-11-221-4/+4
| | | | | | | | | | | | | | Make partest work with spaces in the path (from batch script and ant task). - The 'partest' ant task gets a new 'compilerargs' element for scalac - options (like in scalacfork and javac). Fixed argument list handling - in partest task. Further improvements to argument list handling for - all ant tasks. Fixed argument list handling in DirectTest (used by - partest shell scripts) Fixed path handling in several test cases. Closes SI-622. Review by phaller.
* More repl work.Paul Phillips2011-11-041-1/+1
| | | | | | | | | Hardened the repl against a bunch of erroneous conditions. Added a :reset command which causes the repl to forget everything you have told it. Added classloader tracing when repl tracing is enabled. :reset is not that useful in its current form but it's the precursor to something more interesting. No review.
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-19 04:13:43 +0000