From 5428549a57b710b11e57aab4eee24e9b89b8b97c Mon Sep 17 00:00:00 2001
From: Martin Odersky <odersky@gmail.com>
Date: Sun, 6 Jul 2014 12:41:08 +0200
Subject: New Flag: Inline

Added now because it affects purity if expressions: Inlined pure values
are pure even if referenced from impure prefixes (i.e. prefix need not
be evaluated).
---
 src/dotty/tools/dotc/core/Flags.scala | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'src/dotty/tools/dotc/core/Flags.scala')

diff --git a/src/dotty/tools/dotc/core/Flags.scala b/src/dotty/tools/dotc/core/Flags.scala
index 07259276e..b68e7dc42 100644
--- a/src/dotty/tools/dotc/core/Flags.scala
+++ b/src/dotty/tools/dotc/core/Flags.scala
@@ -324,8 +324,8 @@ object Flags {
   /** Symbol is initialized to the default value, e.g. var x: T = _ */
   final val DefaultInit = termFlag(29, "<defaultinit>")
 
-  /** Symbol is a macro */
-  final val Macro = commonFlag(30, "<macro>")
+  /** Symbol is inlined */
+  final val Inline = commonFlag(30, "inline")
 
   /** Symbol is defined by a Java class */
   final val JavaDefined = commonFlag(31, "<java>")
@@ -395,14 +395,17 @@ object Flags {
   /** A definition that's initialized before the super call (Scala 2.x only) */
   final val Scala2PreSuper = termFlag(58, "<presuper>")
 
+  /** A macro (Scala 2.x only) */
+  final val Macro = commonFlag(59, "<macro>")
+
   /** A method that is known to have inherited default parameters */
-  final val InheritedDefaultParams = termFlag(59, "<inherited-default-param>")
+  final val InheritedDefaultParams = termFlag(60, "<inherited-default-param>")
 
-  /** A method that is known to no default parameters */
-  final val NoDefaultParams = termFlag(60, "<no-default-param>")
+  /** A method that is known to have no default parameters */
+  final val NoDefaultParams = termFlag(61, "<no-default-param>")
 
   /** A denotation that is valid in all run-ids */
-  final val Permanent = commonFlag(61, "<permanent>")
+  final val Permanent = commonFlag(62, "<permanent>")
 
 // --------- Combined Flag Sets and Conjunctions ----------------------
 
-- 
cgit v1.2.3