aboutsummaryrefslogtreecommitdiff
path: root/src/main/scala/scala
Commit message (Collapse)AuthorAgeFilesLines
...
* | Less hacky check for presentation compiler.Jason Zaugg2013-11-201-1/+1
| | | | | | | | "There's a method for that!"
* | Return original macro application under presentation compiler.Jason Zaugg2013-11-202-7/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Right now, the body of an async block suffers from diminished IDE support: most notably hyperlinking doesn't work [1]. During the course of the blackbox/whitebox macro discussion, we've often talked about how the former give us the latitude to simply disable macro expansion in the IDE so we could get these features working again, at the cost of losing domain specific errors, such as "await must not be used under a nested function". But why not have our cake and eat too? This commit detects if we are running the presentation compiler and, after running our regular macro, returns the original macro application. We need to annotate that tree to prevent the typechecker from stubbornly calling our macro again. EXPERIMENTAL NOTE: This logic shouldn't live in macros: this is just a short term measure. If these experiments in async prove successful, we'll roll something similar into the macro expansion engine itself. TODO: as a performance optimization, we could just run the "unsupported await" checks, and avoid doing the more expensive state machine transformation. [1] https://www.assembla.com/spaces/scala-ide/tickets/1001449-code-navigation-fails-when-macros-are-used#/activity/ticket:
* | Fix a NPE in the presentation compilerJason Zaugg2013-11-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were using a TypingTransformer and we called `atOwner` before we had called `transform`. This meant that `currTree` was null, which was observed when that was passed to `Context#make`. IDE ticket: https://scala-ide-portfolio.assembla.com/spaces/scala-ide/tickets/1001971#/activity/ticket: Stack trace: exception during macro expansion: java.lang.NullPointerException at scala.tools.nsc.interactive.ContextTrees$class.addContext(ContextTrees.scala:78) at scala.tools.nsc.interactive.Global.addContext(Global.scala:28) at scala.tools.nsc.interactive.Global.registerContext(Global.scala:268) at scala.tools.nsc.typechecker.Contexts$Context.make(Contexts.scala:295) at scala.tools.nsc.typechecker.Contexts$Context.make0(Contexts.scala:320) at scala.tools.nsc.typechecker.Contexts$Context.make(Contexts.scala:327) at scala.tools.nsc.typechecker.Typers$Typer.atOwner(Typers.scala:5662) at scala.tools.nsc.transform.TypingTransformers$TypingTransformer.atOwner(TypingTransformers.scala:33) at scala.tools.nsc.transform.TypingTransformers$TypingTransformer.atOwner(TypingTransformers.scala:28) at scala.async.internal.AsyncTransform$class.fixup$1(AsyncTransform.scala:191)
* | Clean-ups found during review of PR #43Philipp Haller2013-11-141-10/+2
| |
* | Fix crasher in icode due to symbol mismatches in lifted methodsJason Zaugg2013-11-141-37/+44
|/ | | | | | | | | These stem from the handling of the internal/external view or method type parameters by `thisMethodType` in `Namers`. I've now preseversed the orginal ValDefs favoured the latter when constructing the new DefDef, and made construction of all liftables consistent in this regard.
* Don't aggressively null out captured varsJason Zaugg2013-11-123-11/+54
| | | | | Once they escape, we leave the references in the state machines fields untouched.
* Remove left-overs of CPS fallback logicPhilipp Haller2013-11-072-5/+3
| | | | Completes removal performed in #37.
* Remove scala.async.StateMachineJason Zaugg2013-11-072-19/+8
| | | | | | The generated code can simply extends Function1 and Function0. This class was a hacky means to get the macro working a long time ago.
* Minimize the public APIJason Zaugg2013-11-0714-233/+73
| | | | | | | | | | - Remove the CPS fallback version of async. That was not intended to be part of 1.0. - Lookup the await method beside the macro, rather than requiring all calls to go to AsyncBase.await. - Create a minimal version of Async that just contains await/async and delegates to the macro implementation in internal._ - Add scaladoc.
* Scala 2.11 compatibilityJason Zaugg2013-11-071-1/+15
| | | | We were relying on an internal API that no longer exists.
* Add more doc commentsPhilipp Haller2013-10-221-1/+8
|
* Avoid zero-ing out dead fields of primitive value class typePhilipp Haller2013-10-222-4/+4
| | | | | - Zero out fields of type Any - Zero out fields of value class type
* Enables testing the resetting of lifted local variablesPhilipp Haller2013-10-225-8/+41
| | | | | | | - Adds a hook that lets a derived macro insert additional code when zero-ing out a lifted field. - Adds a variant of the `AsyncId` macro that logs zeroed-out fields. - Adds a test using this mechanism
* Fix looping issue when computing last usages of fieldsPhilipp Haller2013-10-222-23/+20
| | | | | - A missing condition could cause an infinite loop - Various clean-ups
* Liveness analysis to avoid memory retention issuesPhilipp Haller2013-10-224-18/+248
| | | | | | | | - Iterative, backwards data-flow analysis - Make sure fields captured by nested defs are never zeroed out. This is done elegantly by declaring such fields a being live at the exit of the final state; thus, they will never be zeroed out.
* More complete doc commentsPhilipp Haller2013-10-181-19/+33
|
* Simplify a generated CaseDef tree in resume methodPhilipp Haller2013-10-181-3/+2
| | | | | | | | | | | | | | | | | | | OLD: case (throwable @ _) if NonFatal.apply(throwable) => { { stateMachine$1.this.result.complete(Failure.apply[Nothing](throwable)); () }; () } NEW: case (throwable @ _) if NonFatal.apply(throwable) => { stateMachine$1.this.result.complete(Failure.apply[Nothing](throwable)); () }
* Minor clean-upsPhilipp Haller2013-10-182-9/+11
|
* Handle while loops as expressions in ANF transform.Jason Zaugg2013-10-141-2/+6
| | | | | | | Append a `()`, as we do for `Unit` returning `if`-s and `try-s` We don't currently support `await` in try/catch, otherwise I'd write tests for that case, too.
* Merge pull request #30 from retronym/topic/unchecked-boundsJason Zaugg2013-08-235-12/+28
|\ | | | | Use @uncheckedBounds to avoid introducing refchecks errors …
| * Use @uncheckedBounds to avoid introducing refchecks errorsJason Zaugg2013-08-225-12/+28
| | | | | | | | | | | | | | | | | | ... in code that would otherwise have smuggled through these slack LUBs in the types of trees but never in a TypeTree. More details in SI-7694. Fixes #29
* | Collection of clean-upsPhilipp Haller2013-08-145-39/+30
|/ | | | | | - removed outdated comments in ANF transform - added a few comments - removed some unnecessary imports
* Don't set the body of If to the original type.Jason Zaugg2013-08-071-3/+3
| | | | Tweak the way we set tpe = Unit in matches.
* Remove unneeded special case in ANF transform.Jason Zaugg2013-08-071-2/+0
| | | | Obsolete now that we carry all the types around.
* Remove obsolete TODO comment.Jason Zaugg2013-08-071-2/+1
|
* Set the type of case bodies to Unit after ANF.Jason Zaugg2013-08-071-1/+1
| | | | Avoids runtime errors like: "java.lang.Double cannot be cast to scala.runtime.BoxedUnit"
* Disallow await in pattern guards (for now)Jason Zaugg2013-07-251-0/+3
|
* Preserve ApplyImplicitView / ApplyImplicitArgs in AnfTransform.Jason Zaugg2013-07-252-7/+16
|
* Support await in Typed nodes.Jason Zaugg2013-07-241-0/+4
|
* Support await in throws.Jason Zaugg2013-07-242-2/+8
| | | | | Also support AsyncId.async[Nothing], which was triggering a NPE in the generated `null.asInstanceOf[Nothing]`.
* Comply with range position checking.Jason Zaugg2013-07-115-14/+21
| | | | | | | | | - Make sure all trees are positioned - Mark range positions for synthetic code as transparent to allow some wiggle room for overlapping ranges. Enables -Yrangepos for our test suite. We can't add it for the entire build until the fix for SI-7649 lands in the compiler.
* Fix "BoxedUnit cannot be cast to String" error.Jason Zaugg2013-07-091-3/+3
| | | | | When convering If and Match nodes to ANF, set the type to Unit. Otherwise, erasure might end up casting BoxedUnit to a real type.
* Move implementation details to scala.async.internal._.Jason Zaugg2013-07-0716-99/+119
| | | | | If we intend to keep CPS fallback around for any length of time it should probably move there too.
* Fix another interation with existentials and a name clash.Jason Zaugg2013-07-072-6/+15
|
* An overdue overhaul of macro internals.Jason Zaugg2013-07-0313-888/+906
| | | | | | | | | | | | - Avoid reset + retypecheck, instead hang onto the original types/symbols - Eliminated duplication between AsyncDefinitionUseAnalyzer and ExprBuilder - Instead, decide what do lift *after* running ExprBuilder - Account for transitive references local classes/objects and lift them as needed. - Make the execution context an regular implicit parameter of the macro - Fixes interaction with existential skolems and singleton types Fixes #6, #13, #16, #17, #19, #21.
* call setSymbol only on outermost Apply for multi-arg-list applicationsLukas Rytz2013-04-291-1/+1
| | | | fixes a typo in 5a0b1918
* minor cleanups accumulated while reading the codeLukas Rytz2013-04-271-13/+14
|
* Mark `await` as @compileTimeOnlyJason Zaugg2013-04-171-2/+2
| | | | | | Rather than as @deprecated. This commit means we can no longer build against 2.10.0.
* Merge pull request #9 from retronym/ticket/4-multi-paramPhilipp Haller2013-04-172-46/+69
|\ | | | | Allow await in applications with multiple argument lists
| * Rephrase a few pattern matches, fix ANF tracing.Jason Zaugg2013-04-152-11/+9
| | | | | | | | Addresses review comments
| * Allow await in applications with multiple argument listsJason Zaugg2013-04-112-42/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before, we levied an implementation restriction to prevent this. As it turned out, that needlessly prevented use of `await` in the receiver of a multi-param-list application. This commit lifts the restriction altogether, and treats such applications holistically, being careful to preserve the left-to-right evaluation order of arguments in the translated code. - use `TreeInfo.Applied` and `Type#paramss` from `reflect.internal` to get the info we need - use the parameter name for the lifted argument val, rather than `argN` - encapsulate handling of by-name-ness and parameter names in `mapArgumentss` - test for evaluation order preservation
* | Remove CPS dependency from default async implementationPhilipp Haller2013-04-129-67/+195
| | | | | | | | | | | | - move all CPS-related code to `continuations` sub package - fix CPS-based async implementation - enable testing of CPS-based async implementation
* | Avoid needless Unit literal as the expression of a Block.Jason Zaugg2013-04-111-1/+1
|/ | | | We've got a perfectly good expression at hand.
* Scala 2.10.1 compat: apply renaming to originals of TypeTreesJason Zaugg2013-04-101-0/+5
| | | | This time in the ANF/Inline transformation.
* Scala 2.10.1 compat: account for change in PartialFunction synthesis.Jason Zaugg2013-04-101-1/+9
| | | | | | | | | | | Since SI-6187, the default case of a partial function is now included in the tree. Before, it was a tree attachment, conditionally inserted in the pattern matcher. I had hoped that that change would allow us to do away with `RestorePatternMatchingFunctions` altogether, but it seems that we aren't so lucky. Instead, I've adapted that transformer to account for the new scheme.
* Scala 2.10.1 compat: apply renaming to originals of TypeTreesJason Zaugg2013-04-101-0/+7
|
* Address deprecation warnings in Scala 2.10.1Jason Zaugg2013-04-103-8/+8
|
* Resolve merge conflictphaller2012-12-195-17/+93
|\
| * New fix for #1861: Add fall-back to CPS for all unsupported uses of awaitphaller2012-12-195-16/+93
| | | | | | | | | | | | | | This is a re-implementation of a previous fix. It is more modular, since it enables the definition of a CPS-based fall-back as a subclass of `AsyncBase`. Thus, it's possible to define fall-back-enabled subclasses of `AsyncBase` targetting not only Scala Futures.
* | Merge pull request #49 from phaller/topic/patmat-partial-functionJason Zaugg2012-12-193-22/+70
|\ \ | |/ |/| Topic/patmat partial function
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-28 15:24:05 +0000