Skip to content

Remove Enum modifier #6583

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

Merged
merged 1 commit into from
May 29, 2019
Merged

Remove Enum modifier #6583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions compiler/src/dotty/tools/dotc/ast/untpd.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,6 @@ object untpd extends Trees.Instance[Untyped] with UntypedTreeInfo {

case class Inline()(implicit @constructorOnly src: SourceFile) extends Mod(Flags.Inline)

case class Enum()(implicit @constructorOnly src: SourceFile) extends Mod(Flags.Enum)

case class Instance()(implicit @constructorOnly src: SourceFile) extends Mod(Flags.Implied)
}

Expand Down
8 changes: 4 additions & 4 deletions compiler/src/dotty/tools/dotc/parsing/Parsers.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2599,7 +2599,7 @@ object Parsers {
case CASEOBJECT =>
objectDef(start, posMods(start, mods | Case | Module))
case ENUM =>
enumDef(start, mods, atSpan(in.skipToken()) { Mod.Enum() })
enumDef(start, posMods(start, mods | Enum))
case IMPLIED =>
instanceDef(start, mods, atSpan(in.skipToken()) { Mod.Instance() })
case _ =>
Expand Down Expand Up @@ -2647,18 +2647,18 @@ object Parsers {

/** EnumDef ::= id ClassConstr InheritClauses EnumBody
*/
def enumDef(start: Offset, mods: Modifiers, enumMod: Mod): TypeDef = atSpan(start, nameStart) {
def enumDef(start: Offset, mods: Modifiers): TypeDef = atSpan(start, nameStart) {
val modName = ident()
val clsName = modName.toTypeName
val constr = classConstr()
val templ = template(constr, isEnum = true)
finalizeDef(TypeDef(clsName, templ), addMod(mods, enumMod), start)
finalizeDef(TypeDef(clsName, templ), mods, start)
}

/** EnumCase = `case' (id ClassConstr [`extends' ConstrApps] | ids)
*/
def enumCase(start: Offset, mods: Modifiers): DefTree = {
val mods1 = addMod(mods, atSpan(in.offset)(Mod.Enum())) | Case
val mods1 = mods | EnumCase
in.skipCASE()

atSpan(start, nameStart) {
Expand Down