delete id method, delete next method

Author: ProALgebra

solver/src/main/kotlin/org/ucfs/descriptors/DescriptorsStorage.kt

@@ -1,6 +1,7 @@
 package org.ucfs.descriptors
 
 import org.ucfs.parser.ParsingException
+import java.util.LinkedList
 
 /**
  * Collection of default descriptors
@@ -12,19 +13,10 @@ open class DescriptorsStorage<VertexType> {
      */
     private val handledDescriptors = HashSet<Descriptor<VertexType>>()
 
-    private val descriptorsToHandle = ArrayDeque<Descriptor<VertexType>>()
+    private val descriptorsToHandle = LinkedList<Descriptor<VertexType>>()
 
     private fun isEmpty() = descriptorsToHandle.isEmpty()
 
-    /**
-     * @return next default descriptor to handle
-     */
-    open fun next(): Descriptor<VertexType> {
-        if (isEmpty()) {
-            throw ParsingException("Descriptor storage is empty")
-        }
-        return descriptorsToHandle.removeLast()
-    }
 
     fun addToHandled(descriptor: Descriptor<VertexType>) {
         handledDescriptors.add(descriptor)
@@ -42,7 +34,7 @@ open class DescriptorsStorage<VertexType> {
      */
     fun nextToHandle(): Descriptor<VertexType>? {
         if (!isEmpty()) {
-            return next()
+            return descriptorsToHandle.removeLast()
         }
         return null
     }

solver/src/main/kotlin/org/ucfs/parser/IGll.kt

@@ -54,7 +54,7 @@ interface IGll<InputNodeType, LabelType : ILabel> {
 
             val gssNode = ctx.gss.getOrCreateNode(startVertex, ctx.fictiveStartState)
             val startDescriptor = Descriptor(
-                startVertex, gssNode, ctx.fictiveStartState, getEmptyRange(ctx.sppfStorage.getId())
+                startVertex, gssNode, ctx.fictiveStartState, getEmptyRange()
             )
             ctx.descriptors.add(startDescriptor)
         }
@@ -69,7 +69,7 @@ interface IGll<InputNodeType, LabelType : ILabel> {
         )
 
         var newDescriptor = Descriptor(
-            descriptor.inputPosition, newGssNode, rsmStartState, getEmptyRange(ctx.sppfStorage.getId())
+            descriptor.inputPosition, newGssNode, rsmStartState, getEmptyRange()
         )
         ctx.descriptors.add(newDescriptor)
 

solver/src/main/kotlin/org/ucfs/sppf/SppfStorage.kt

@@ -14,12 +14,6 @@ open class SppfStorage<InputEdgeType> {
      */
     private val createdSppfNodes: HashMap<RangeSppfNode<InputEdgeType>, RangeSppfNode<InputEdgeType>> = HashMap()
 
-    private var lastRangeId: Int = 0;
-
-    public fun getId(): Int{
-        return lastRangeId++
-    }
-
     private fun addNode(node: RangeSppfNode<InputEdgeType>): RangeSppfNode<InputEdgeType> {
         return createdSppfNodes.getOrPut(node, { node })
     }

solver/src/main/kotlin/org/ucfs/sppf/node/RangeSppfNode.kt

@@ -17,7 +17,6 @@ import org.ucfs.rsm.symbol.ITerminal
  * May be used as extended packed sppfNode.
  * @param VertexType - type of vertex in input graph
  */
-var lastId = 0
 
 data class RangeSppfNode<VertexType>(
     val inputRange: InputRange<VertexType>?,
@@ -27,7 +26,7 @@ data class RangeSppfNode<VertexType>(
     val children = ArrayList<RangeSppfNode<VertexType>>()
 }
 
-fun <VertexType> getEmptyRange(id: Int, isStart: Boolean = false): RangeSppfNode<VertexType>  {
+fun <VertexType> getEmptyRange( isStart: Boolean = false): RangeSppfNode<VertexType>  {
     val type = EmptyType()
     if(isStart) {
         type.isStart = isStart