diff options
| author | Martin Odersky <odersky@gmail.com> | 2015-03-12 09:54:20 +0100 |
|---|---|---|
| committer | Dmitry Petrashko <dmitry.petrashko@gmail.com> | 2015-03-18 11:16:38 +0100 |
| commit | 1e0856ba575d17df4d2eded5662dde26a5b750e0 (patch) | |
| tree | cd5413af315868b6eefd81ab864ebb675d2b9b5a /src/dotty/tools/dotc/core/pickling/PickleFormat.scala | |
| parent | f7f10c856a5e3ae0f6172e2bb9cac832bb17c592 (diff) | |
| download | dotty-1e0856ba575d17df4d2eded5662dde26a5b750e0.tar.gz dotty-1e0856ba575d17df4d2eded5662dde26a5b750e0.tar.bz2 dotty-1e0856ba575d17df4d2eded5662dde26a5b750e0.zip | |
Tweaks to pickle format
MODULE -> OBJECT, as suggested by Simon.
Header is 4 hex digits, not 8 chars.
Diffstat (limited to 'src/dotty/tools/dotc/core/pickling/PickleFormat.scala')
| -rw-r--r-- | src/dotty/tools/dotc/core/pickling/PickleFormat.scala | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/dotty/tools/dotc/core/pickling/PickleFormat.scala b/src/dotty/tools/dotc/core/pickling/PickleFormat.scala index 8347c50a8..d37a3673d 100644 --- a/src/dotty/tools/dotc/core/pickling/PickleFormat.scala +++ b/src/dotty/tools/dotc/core/pickling/PickleFormat.scala @@ -23,7 +23,7 @@ Macro-format: File = Header majorVersion_Nat minorVersion_Nat UUID nameTable_Length Name* Section* - Header = "5CA1AB1F" + Header = 0x5CA1AB1F UUID = Byte*16 // random UUID Section = NameRef Length Bytes @@ -33,7 +33,7 @@ Macro-format: QUALIFIED Length qualified_NameRef selector_NameRef SIGNED Length original_NameRef resultSig_NameRef paramSig_NameRef* EXPANDED Length original_NameRef - MODULECLASS Length module_NameRef + OBJECTCLASS Length module_NameRef SUPERACCESSOR Length accessed_NameRef DEFAULTGETTER Length method_NameRef paramNumber_Nat SHADOWED Length original_NameRef @@ -160,7 +160,7 @@ Standard-Section: "ASTs" TopLevelStat* INLINE // macro ABSOVERRIDE // abstract override STATIC // mapped to static Java member - MODULE // an object or its class + OBJECT // an object or its class TRAIT // a trait LOCAL // private[this] or protected[this] SYNTHETIC // generated by Scala compiler @@ -205,7 +205,7 @@ Standard Section: "Positions" sourceLength_Nat Assoc* object PickleFormat { - final val header = "5CA1AB1F" + final val header = Array(0x5C, 0xA1, 0xAB, 0x1F) final val MajorVersion = 0 final val MinorVersion = 5 @@ -215,7 +215,7 @@ object PickleFormat { final val QUALIFIED = 2 final val SIGNED = 3 final val EXPANDED = 4 - final val MODULECLASS = 5 + final val OBJECTCLASS = 5 final val SUPERACCESSOR = 6 final val DEFAULTGETTER = 7 final val SHADOWED = 8 @@ -239,7 +239,7 @@ object PickleFormat { final val INLINE = 16 final val ABSOVERRIDE = 17 final val STATIC = 18 - final val MODULE = 19 + final val OBJECT = 19 final val TRAIT = 20 final val LOCAL = 21 final val SYNTHETIC = 22 @@ -350,7 +350,7 @@ object PickleFormat { | INLINE | ABSOVERRIDE | STATIC - | MODULE + | OBJECT | TRAIT | LOCAL | SYNTHETIC @@ -375,7 +375,7 @@ object PickleFormat { case QUALIFIED => "QUALIFIED" case SIGNED => "SIGNED" case EXPANDED => "EXPANDED" - case MODULECLASS => "MODULECLASS" + case OBJECTCLASS => "OBJECTCLASS" case SUPERACCESSOR => "SUPERACCESSOR" case DEFAULTGETTER => "DEFAULTGETTER" } @@ -398,7 +398,7 @@ object PickleFormat { case INLINE => "INLINE" case ABSOVERRIDE => "ABSOVERRIDE" case STATIC => "STATIC" - case MODULE => "MODULE" + case OBJECT => "OBJECT" case TRAIT => "TRAIT" case LOCAL => "LOCAL" case SYNTHETIC => "SYNTHETIC" |