# HG changeset patch
# User wenzelm
# Date 1396953077 -7200
# Node ID 013dfac0811a7527259e10746d6c8cabb1807a91
# Parent  b64b0cb845fef2fe0b207c4c0a07fdfc672afabc
more uniform Command.Chunk operations;

diff -r b64b0cb845fe -r 013dfac0811a src/Pure/PIDE/command.scala
--- a/src/Pure/PIDE/command.scala	Tue Apr 08 12:19:33 2014 +0200
+++ b/src/Pure/PIDE/command.scala	Tue Apr 08 12:31:17 2014 +0200
@@ -61,10 +61,22 @@
   abstract class Chunk
   {
     def name: Chunk.Name
-    def length: Int
     def range: Text.Range
     def symbol_index: Symbol.Index
 
+    private lazy val hash: Int = (name, range, symbol_index).hashCode
+    override def hashCode: Int = hash
+    override def equals(that: Any): Boolean =
+      that match {
+        case other: Chunk =>
+          hash == other.hash &&
+          name == other.name &&
+          range == other.range &&
+          symbol_index == other.symbol_index
+        case _ => false
+      }
+    override def toString: String = "Command.Chunk(" + name + ")"
+
     def decode(symbol_offset: Symbol.Offset): Text.Offset = symbol_index.decode(symbol_offset)
     def decode(symbol_range: Symbol.Range): Text.Range = symbol_index.decode(symbol_range)
     def incorporate(symbol_range: Symbol.Range): Option[Text.Range] =
@@ -84,28 +96,11 @@
     case object Self extends Name
     case class File_Name(file_name: String) extends Name
 
-    class File(
-      file_name: String,
-      text: CharSequence  // non-persistent!
-    ) extends Chunk
+    class File(file_name: String, text: CharSequence) extends Chunk
     {
       val name = Chunk.File_Name(file_name)
-      val length = text.length
-      val range = Text.Range(0, length)
+      val range = Text.Range(0, text.length)
       val symbol_index = Symbol.Index(text)
-
-      private val hash: Int = (name, length, symbol_index).hashCode
-      override def hashCode: Int = hash
-      override def equals(that: Any): Boolean =
-        that match {
-          case other: File =>
-            hash == other.hash &&
-            name == other.name &&
-            length == other.length &&
-            symbol_index == other.symbol_index
-          case _ => false
-        }
-      override def toString: String = "Command.Chunk.File(" + file_name + ")"
     }
   }
 
@@ -397,7 +392,6 @@
   val chunk: Command.Chunk =
     new Command.Chunk {
       def name: Command.Chunk.Name = Command.Chunk.Self
-      def length: Int = Command.this.length
       def range: Text.Range = Command.this.range
       lazy val symbol_index = Symbol.Index(source)
     }