summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* TreeMap/TreeSet no longer keep track of the size (the RedBlack treeErik Rozendaal2011-12-282-40/+31
| | | | already does so).
* Made RedBlack private to the scala.collection.immutable package.Erik Rozendaal2011-12-282-10/+12
| | | | | Use ArrayStack instead of Stack in TreeIterator for slightly increased performance.
* Make sure the redblack test compiles and runs.Erik Rozendaal2011-12-282-42/+37
|
* Use single shared Empty instance across all RedBlack trees.Erik Rozendaal2011-12-283-23/+32
|
* Changed abstract class RedBlack to singleton object.Erik Rozendaal2011-12-283-10/+13
|
* Moved type parameter A from RedBlack to Tree.Erik Rozendaal2011-12-283-71/+71
|
* Moved from Empty case object to case class in preparation of movingErik Rozendaal2011-12-283-15/+15
| | | | type parameter A.
* Moved from implicit ordering value to implicit parameter.Erik Rozendaal2011-12-281-17/+15
|
* Switched from isSmaller to ordering.Erik Rozendaal2011-12-281-9/+9
|
* Implemented takeWhile/dropWhile/span to use tree splitting. ThisErik Rozendaal2011-12-282-0/+26
| | | | | changes the operation from O(n log n) to O(n) and allows for more structural sharing.
* Implemented drop/take/slice/splitAt/dropRight/takeRight forErik Rozendaal2011-12-283-0/+53
| | | | | | TreeMap/TreeSet by splitting the underlying RedBlack tree. This makes the operation O(log n) instead of O(n) and allows more structural sharing.
* RedBlack.scala: Change count from 'def' to 'val' in NonEmpty treeErik Rozendaal2011-12-281-1/+1
| | | | | to ensure TreeSet/TreeMap 'range' operations are O(log n) instead of O(n).
* Optimized implementation of init/tail for TreeSet/TreeMap.Erik Rozendaal2011-12-282-0/+6
|
* Optimized implementations of head/headOption/last/lastOption forErik Rozendaal2011-12-283-0/+19
| | | | TreeMap/TreeSet.
* Use custom implementation for iterating over RedBlack trees. RawErik Rozendaal2011-12-281-5/+31
| | | | performance is much better than '++' based iterator.
* Use RedBlack.iterator to create iterators for TreeSet/TreeMap.Erik Rozendaal2011-12-282-2/+2
| | | | | | | This turns iterator creation from an O(n) operation into an O(log n) operation. Unfortunately, it halves actual iteration speed (consuming the iterator fully), probably due to the many by-name closures that are needed.
* Merge branch 'type-currying-mini' of /scala/trunk into developPaul Phillips2011-12-273-3/+76
|\
| * Consecutive type application.Paul Phillips2011-12-273-3/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | The parser through I think a quirk of history would not allow back to back type applications, like expr[T1, T2][T3, T4] Now it does, meaning the only thing it can: val n0 = Partial[immutable.HashMap][String][Int] ++ Seq(("a", 1)) val n1 = Partial.apply[immutable.HashMap].apply[String].apply[Int] ++ Seq(("a", 1)) assert(n0 == n1)
| |
| \
| \
| \
| \
| \
| \
| \
*-------. \ Merge remote-tracking branches 'ijuma/issue/5341', ↵Paul Phillips2011-12-2726-1/+458
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | 'kepler/topic/reifyclosuretests', 'kepler/topic/antscalacheck', 'szabolcsberecz/SI-5104', 'kepler/ticket/5334' and 'kepler/topic/miscfixes' into develop
| | | | | * | Documented emptyValDef fieldEugene Burmako2011-12-231-0/+5
| | | | | | |
| | | | * | | Tests for recently submitted SI-5334Eugene Burmako2011-12-232-0/+30
| | | | |/ /
| | | * / / fixes #5104 and related NaN ordering inconsistenciesSzabolcs Berecz2011-12-252-0/+170
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bug was caused by the inconsistency between j.l.Math.min() and j.l.Double.compareTo() wrt NaN (j.l.Math.min() considers NaN to be less than any other value while j.l.Double.compareTo() says it's greater...) The fix changes Ordering.{FloatOrdering,DoubleOrdering) to base it's results on primitive comparisons and math.{min,max} instead of j.l.{Float,Double}.compareTo()
| | * | | scalacheck now also has pre-scalacheck and its personal timerEugene Burmako2011-12-261-1/+10
| | | | |
| * | | | A handful of tests for closures under reificationEugene Burmako2011-12-2620-0/+243
| | |_|/ | |/| |
* / | | Fix SI-5341: PhaseAssembly.removeDanglingNodes removes elements from mutable.MapIsmael Juma2011-12-271-1/+1
|/ / / | | | | | | | | | during iteration.
* | | Fixed regression in lub calculation.Paul Phillips2011-12-262-9/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing NullaryMethodType to be a SimpleTypeProxy because nearly all its operations forward to its result type was it seems not such a good idea, because it also meant that calling .underlying returned the result type rather than the method type. The way this materialized was in subtype checks of refinement types. A lub is calculated for two nullary method types in the course of calculating a refinement, and then the input types are checked against the calculated lub. However in the lub refinement, the nullary method type has become a bare typeref, and so the subtype check failed. Closes SI-5317. This does give me confidence that all the malformed lubs one sees logged under -Ydebug (and there are still many, especially with type constructors) are alerting us to real bugs elsewhere in Types.
* | | Merge pull request #77 from scalamacros/topic/antlocalePaul Phillips2011-12-251-1/+1
|\ \ \ | |/ / |/| | Addresses a bug in SimpleDateFormatter
| * | Addresses a bug in SimpleDateFormatterEugene Burmako2011-12-251-1/+1
| |/
* | Optimizing at the Name/String boundary.Paul Phillips2011-12-2511-87/+114
| | | | | | | | | | | | Working on reducing the now significant amount of both garbage and retained but duplicated Strings taking place as Names become Strings and vice versa. Long way to go.
* | Optimization in ZipArchive.Paul Phillips2011-12-251-4/+8
| | | | | | | | Avoid creating empty array when len == 0.
* | Merge remote-tracking branch 'origin/develop' into developPaul Phillips2011-12-240-0/+0
|\ \
| * \ Merge pull request #1 from odersky/topic/reifyodersky2011-12-226-89/+78
| |\ \ | | | | | | | | | | | | Improvements to reification and resetAttrs
| | * | Hardening of resetAllAttrs to work in the case where TypeTrees refer to ↵Martin Odersky2011-12-222-41/+44
| | | | | | | | | | | | | | | | locally erased symbols.
| | * | Hardening of isJavaClass to survive IncompatibleClassChange errors.Martin Odersky2011-12-221-1/+1
| | | |
| | * | wipEugene Burmako2011-12-224-40/+2
| | | |
| | * | Non-essential TypeApply trees must be omitted, or they will cause a ↵Eugene Burmako2011-12-221-0/+4
| | | | | | | | | | | | | | | | typecheck error
* | | | [vpm] when there's a default case, don't throw matcherrorAdriaan Moors2011-12-241-9/+16
| | | |
* | | | [vpm] lambdalift becomes less NSDNHO-proneAdriaan Moors2011-12-241-0/+1
| | | | | | | | | | | | | | | | made lambdalift complaint more useful
* | | | [vpm] emitting switches -- BodyTreeMakerAdriaan Moors2011-12-249-166/+319
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) introduce BodyTreeMaker to get rid of special casing for body now each case is a list of TreeMakers rather than a pair of such a list and a tree needed to do this since emitting switches requires access to the untranslated body 2) emitting switches - alternatives are flattened: each alternative block ends with a jump to the next alternative (if there is one) - to avoid stack overflow in typedMatch: detect when translateMatch returns a Match the patch to uncurry would be nicer with an extractor, but that breaks due to a bug in old patmat made trees into dags again -- NPE in erasure tree.duplicate seems to break lambdalift because it does not give fresh symbols (or trees?) to the valdefs for the arguments of duplicated functions duplicate enclosing tree, not subtrees improved propagateSubstitution for AlternativesTreeMaker - it now propagates to all its alternatives, so we don't have to do that in chainBefore - by making propagation more regular, a bug in substitution in AlternativesTreeMaker manifested itself it introduced a new binder, unnecessarily, which then was unbound -- now reusing binder of outer pattern having removeSubstOnly in propagateSubstitution unveiled a bug: guard treemaker should substitute move fixerUpper closer to what it fixes up
* | | | [vpm] better codegen, especially for alternatives (suggested by Tiark)Adriaan Moors2011-12-243-246/+221
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | factored out some of the optimizing codegen that had snuck into treemakers (guardtreemaker) removed `caseResult`, back to just `one` no longer emitting intermediate `one`s (using guard instead -- when not optimizing) so uncurry can't accidentally blow them away (it removes the `one` that represents the case's result, but should leave intermediate computation alone) still TODO: reusing-treemakers sharing prefixes of length 1 helps inlining suffix of alternatives if small enough
* | | | [vpm] common sub-expression elimination for conditionsAdriaan Moors2011-12-245-81/+456
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TreeMakers (esp. CondTreeMakers) are approximated by hash-cons'ed Conds sharing is detected for prefixes of Conds, and shared conditions are only tested once their results are stored, and repeated tests branch on the last shared condition, reusing the results from the first time they were checked a Test is 1-to-1 with a TreeMaker, but may share its Cond TODO: clean separation of the two translation strategies: - naive flatMap/orElse (for virtualization) - less-naive if-then-else (with CSE etc coming) sharing trees caused wrong bytecode to be emitted (verifyerror) tentative explanation: "because lambdalift uses mutable state to track which variables have been captured if you refer to the same variable with the same tree twice it'll get confused" Sent at 8:27 PM on Thursday >> grzegorz.kossakowski: so we found a bug in jvm according to http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc2.html checkcast should throw a classcastexception becuase it's a shorthand for if !(x instanceof T) throw ClassCastExcpt but jvm decided to throw verifyerror and yeah, the check is wrong if jvm was not throwing verifyerror it would throw classcast exception saying that ObjectRef cannot be casted to $colon$colon ... >> me: so now where does it come from? since a ref is involved, i thought LambdaLift >> grzegorz.kossakowski: yup or now I don't think lambalift introduces that kind of low-level casts but I might be wrong btw. it's interesting that it unpacks stuff from objectref twice in your code and in one place checkcast is correct and in another is wrong Sent at 9:33 PM on Thursday >> grzegorz.kossakowski: also, since it's a verifyerror I think genjvm should have an assertion >> grzegorz.kossakowski: 193: getfield #54; //Field scala/runtime/ObjectRef.elem:Ljava/lang/Object; 196: checkcast #8; //class scala/runtime/ObjectRef 199: invokevirtual #95; //Method scala/collection/immutable/$colon$colon.tl$1:()Lscala/collection/immutable/List; it's this see you have checkcast for ObjectRef and then on that value, you try to call tl() method from List Sent at 9:56 PM on Thursday >> me: fixed sharing trees is bad very bad because lambdalift uses mutable state to track which variables have been captured if you refer to the same variable with the same tree twice it'll get confused
* | | | [vpm] optimized codegen avoids option-boxingAdriaan Moors2011-12-244-65/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | introducing two mutable variables per pattern match: matchRes and keepGoing keepGoing denotes whether the result was Some or None, and matchRes holds the Some's contents or the right zero for the match's type Race(() => fastMatch(list), () => virtMatch_no_option(list))(100000).converge() is a virtual tie on my machine after this see https://gist.github.com/1400910 conveniently also works around SI-5245 don't assign to Unit-typed var's, in fact, make matchRes a val when its only prospect in life is to be unit-valued propagate eventual type for matchRes thru codegen so that we can have more robust checks for unit&nothing, when assignment makes no sense also, added a hack to caseResult to avoid boxed units in if(keepGoing) { matchRes = ... } else zero after erasure, we get if(keepGoing) { matchRes = ...; BoxedUNIT } else zero genicode broke because i was sharing trees: [scalacfork] error: java.lang.AssertionError: assertion failed: type error: can't convert from UNIT to REF(class Object) in unit ScalaSig.scala at source-/Users/adriaan/git/scala-dev/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSig.scala,line-26,offset=868 fixed by duplicating -- so be it (for now -- make this more fine-grained, more efficient) dodging inliner issues with one/zero (it won't inline, so also directly inline those methods)
* | | | [vpm] unapplyProd: faster matching for case classesAdriaan Moors2011-12-244-84/+206
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | behold the mythical unapplyProd: it does not exist, yet it promises to speed up pattern matching on case classes instead of calling the synthetic unapply/unapplySeq, we don't call the mythical synthetic unapplyProd, since -- if it existed -- it would be the identity anyway for case classes eventually, we will allow user-defined unapplyProd's, which should give you almost the same speed as case class matching for user-defined extractors (i.e., you don't have to wrap in an option, just return something on which we can select _i for i = 1 to N, unless it is null, which indicates match failure) still need to figure out a way to derive the types for the subpatterns, without requiring you to wrap your result in a ProductN unapplyProd support for vararg case classes using caseFieldAccessors instead of synthetic _i now the compiler bootstraps again, and after this optimization, quick.lib overhead is 70%, quick.comp is 50% (compiling with a locker built using -Yvirtpatmat, and itself generating code for -Yvirtpatmat) before the optimization, I think the overhead for quick.comp was close to 100% in this scenario more robust tupleSel for case classes TODO: - pos/t602 -- clean up after type inference as in fromCaseClassUnapply - run/pf-catch -- implement new-style orElse for partial function in uncurry
* | | global.abort calls global.error.Paul Phillips2011-12-222-2/+8
| | | | | | | | | | | | | | | | | | Otherwise it is possible (as I discovered the hard way) for tests running into compiler bugs to be treated as successful compiles.
* | | Hardening of resetAllAttrs.Martin Odersky2011-12-222-41/+44
| | | | | | | | | | | | Now works in the case where TypeTrees refer to locally erased symbols.
* | | Hardening of isJavaClass.Martin Odersky2011-12-221-1/+1
| | | | | | | | | | | | To survive IncompatibleClassChange errors.
* | | Omit non-essential TypeApply trees.Eugene Burmako2011-12-225-40/+6
| |/ |/| | | | | Otherwise they cause type errors.
* | Type checking now puts tree to be typed in local contextMartin Odersky2011-12-221-11/+31
|/
*---. Merge remote-tracking branches 'jsuereth/xsbt', 'kepler/ticket/5226' and ↵Paul Phillips2011-12-2115-165/+1233
|\ \ \ | | | | | | | | | | | | 'kepler/topic/ystopafter' into develop
| | | * Made -Ystop-after:parser work correctlyEugene Burmako2011-12-211-2/+4
| | | | | | | | | | | | | | | | | | | | Without this fix running a compiler with the aforementioned option leads to a crash (because namerPhase gets resolved to a NoPhase).
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-31 19:21:46 +0000