diff options
author | Eugene Burmako <xeno.by@gmail.com> | 2014-02-07 14:44:46 +0100 |
---|---|---|
committer | Eugene Burmako <xeno.by@gmail.com> | 2014-02-07 14:55:55 +0100 |
commit | 1adb3379c7ac568317db5739f1d6df628f58b65d (patch) | |
tree | 37b6f3992d04fe3bb8fa133e9709ccb73f7e0127 /src/compiler/scala/reflect | |
parent | 97515efec9baac6ff38a2a83059c8a6a92549385 (diff) | |
download | scala-1adb3379c7ac568317db5739f1d6df628f58b65d.tar.gz scala-1adb3379c7ac568317db5739f1d6df628f58b65d.tar.bz2 scala-1adb3379c7ac568317db5739f1d6df628f58b65d.zip |
renames resetLocalAttrs to resetAttrs
Now when resetAllAttrs is gone, we can use a shorter name for the one
and only resetLocalAttrs.
Diffstat (limited to 'src/compiler/scala/reflect')
-rw-r--r-- | src/compiler/scala/reflect/macros/contexts/Typers.scala | 4 | ||||
-rw-r--r-- | src/compiler/scala/reflect/reify/Reifier.scala | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/scala/reflect/macros/contexts/Typers.scala b/src/compiler/scala/reflect/macros/contexts/Typers.scala index c06ab60e52..c1ab17027f 100644 --- a/src/compiler/scala/reflect/macros/contexts/Typers.scala +++ b/src/compiler/scala/reflect/macros/contexts/Typers.scala @@ -46,7 +46,7 @@ trait Typers { universe.analyzer.inferImplicit(tree, viewTpe, true, callsiteTyper.context, silent, withMacrosDisabled, pos, (pos, msg) => throw TypecheckException(pos, msg)) } - def resetLocalAttrs(tree: Tree): Tree = universe.resetLocalAttrs(universe.duplicateAndKeepPositions(tree)) + def resetLocalAttrs(tree: Tree): Tree = universe.resetAttrs(universe.duplicateAndKeepPositions(tree)) - def untypecheck(tree: Tree): Tree = universe.resetLocalAttrs(universe.duplicateAndKeepPositions(tree)) + def untypecheck(tree: Tree): Tree = resetLocalAttrs(tree) } diff --git a/src/compiler/scala/reflect/reify/Reifier.scala b/src/compiler/scala/reflect/reify/Reifier.scala index 16114c7ef5..6b0a0ee8d7 100644 --- a/src/compiler/scala/reflect/reify/Reifier.scala +++ b/src/compiler/scala/reflect/reify/Reifier.scala @@ -110,7 +110,7 @@ abstract class Reifier extends States // todo. this is a common problem with non-trivial macros in our current macro system // needs to be solved some day // upd. a new hope: https://groups.google.com/forum/#!topic/scala-internals/TtCTPlj_qcQ - val untyped = resetLocalAttrs(result, leaveAlone = { + val untyped = resetAttrs(result, leaveAlone = { case ValDef(_, u, _, _) if u == nme.UNIVERSE_SHORT => true case ValDef(_, m, _, _) if m == nme.MIRROR_SHORT => true case tree if symtab.syms contains tree.symbol => true |