Skip to content

Fix/#55 #56 modules #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Fix/#55 #56 modules #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fae61cb
Fix for #56
odersky Mar 12, 2014
e2b879a
Fix for #55
odersky Mar 12, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/dotty/tools/dotc/core/Flags.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,10 +395,14 @@ object Flags {
// --------- Combined Flag Sets and Conjunctions ----------------------

/** Flags representing source modifiers */
final val ModifierFlags =
final val SourceModifierFlags =
commonFlags(Private, Protected, Abstract, Final,
Sealed, Case, Implicit, Override, AbsOverride, Lazy)

/** Flags representing modifiers that can appear in trees */
final val ModifierFlags =
SourceModifierFlags | Trait | Module | Param | Synthetic | Package

/** Flags representing access rights */
final val AccessFlags = Private | Protected | Local

Expand Down
2 changes: 1 addition & 1 deletion src/dotty/tools/dotc/core/Symbols.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ trait Symbols { this: Context =>
infoFn(module, modcls), privateWithin)
val mdenot = SymDenotation(
module, owner, name, modFlags | ModuleCreationFlags,
if (cdenot.isCompleted) TypeRef(owner.thisType, modclsName) withSym modcls
if (cdenot.isCompleted) TypeRef(owner.thisType, modcls)
else new ModuleCompleter(modcls))
module.denot = mdenot
modcls.denot = cdenot
Expand Down
2 changes: 1 addition & 1 deletion src/dotty/tools/dotc/printing/RefinedPrinter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {

override protected def recursionLimitExceeded() = {}

protected val PrintableFlags = (ModifierFlags | Label | Module).toCommonFlags
protected val PrintableFlags = (SourceModifierFlags | Label | Module).toCommonFlags

/** The closest enclosing DefDef, TypeDef, or ClassDef node */
private var currentOwner: untpd.Tree = untpd.EmptyTree
Expand Down