Fix error in stack management, all primitives now share single stack

Author: vsilaev

net.tascalate.javaflow.api/.classpath

@@ -33,6 +33,7 @@
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>

net.tascalate.javaflow.api/.project

@@ -5,15 +5,24 @@
         This project is based on completely re-worked Apache Jakarta Commons JavaFlow library. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
   <projects/>
   <buildSpec>
+    <buildCommand>
+      <name>org.eclipse.wst.common.project.facet.core.builder</name>
+    </buildCommand>
     <buildCommand>
       <name>org.eclipse.jdt.core.javabuilder</name>
     </buildCommand>
+    <buildCommand>
+      <name>org.eclipse.wst.validation.validationbuilder</name>
+    </buildCommand>
     <buildCommand>
       <name>org.eclipse.m2e.core.maven2Builder</name>
     </buildCommand>
   </buildSpec>
   <natures>
+    <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+    <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
     <nature>org.eclipse.m2e.core.maven2Nature</nature>
     <nature>org.eclipse.jdt.core.javanature</nature>
+    <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
   </natures>
 </projectDescription>

net.tascalate.javaflow.api/.settings/org.eclipse.jdt.core.prefs

@@ -1,5 +1,8 @@
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
 org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.source=1.5

net.tascalate.javaflow.api/src/main/java/org/apache/commons/javaflow/core/Stack.java

@@ -36,23 +36,20 @@ public class Stack implements Serializable {
     private static final Log log = LogFactory.getLog(Stack.class);
     private static final long serialVersionUID = 3L;
 
-    private int[] istack;
     private long[] pstack;
     private Object[] ostack;
     private Object[] rstack;
-    private int iTop, fTop, dTop, lTop, oTop, rTop;
+    private int dTop, fTop, lTop, iTop, oTop, rTop;
     protected Runnable runnable;
 
     Stack(Runnable pRunnable) {
-        istack = new int[8];
         pstack = new long[8];
         ostack = new Object[8];
         rstack = new Object[4];
         runnable = pRunnable;
     }
 
     Stack(final Stack pParent) {
-        istack = new int[pParent.istack.length];
         pstack = new long[pParent.pstack.length];
         ostack = new Object[pParent.ostack.length];
         rstack = new Object[pParent.rstack.length];
@@ -62,8 +59,7 @@ public class Stack implements Serializable {
         lTop = pParent.lTop;
         oTop = pParent.oTop;
         rTop = pParent.rTop;
-        System.arraycopy(pParent.istack, 0, istack, 0, iTop);
-        System.arraycopy(pParent.pstack, 0, pstack, 0, dTop + fTop + lTop);
+        System.arraycopy(pParent.pstack, 0, pstack, 0, dTop + fTop + lTop + iTop);
         System.arraycopy(pParent.ostack, 0, ostack, 0, oTop);
         System.arraycopy(pParent.rstack, 0, rstack, 0, rTop);
         runnable = pParent.runnable;
@@ -78,8 +74,8 @@ public final double popDouble() {
             throw new EmptyStackException("pop double");
         }
 
-        final double d = Double.longBitsToDouble(popPrimitive());
         --dTop;
+        final double d = Double.longBitsToDouble(popPrimitive());
         if (log.isDebugEnabled()) {
             log.debug("pop double " + d + " " + getStats());
         }
@@ -95,8 +91,8 @@ public final float popFloat() {
             throw new EmptyStackException("pop float");
         }
 
-        final float f = Float.intBitsToFloat((int)popPrimitive());
         --fTop;
+        final float f = Float.intBitsToFloat((int)popPrimitive());
         if (log.isDebugEnabled()) {
             log.debug("pop float " + f + " " + getStats());
         }
@@ -112,8 +108,8 @@ public final long popLong() {
             throw new EmptyStackException("pop long");
         }
 
-        final long l = popPrimitive();
         --lTop;
+        final long l = popPrimitive();
         if (log.isDebugEnabled()) {
             log.debug("pop long " + l + " " + getStats());
         }
@@ -129,7 +125,8 @@ public final int popInt() {
             throw new EmptyStackException("pop int");
         }
 
-        final int i = istack[--iTop];
+        --iTop;
+        final int i = (int)popPrimitive();
         if (log.isDebugEnabled()) {
             log.debug("pop int " + i + " " + getStats());
         }
@@ -208,14 +205,11 @@ public final void pushInt(int i) {
         if (log.isDebugEnabled()) {
             log.debug("push int " + i + " " + getStats());
         }
-        if (iTop == istack.length) {
-            int[] hlp = new int[Math.max(8, istack.length * 2)];
-            System.arraycopy(istack, 0, hlp, 0, istack.length);
-            istack = hlp;
-        }
-        istack[iTop++] = i;
+        ensurePrimitivesStackSize();
+        pushPrimitive(i);
+        iTop++;
     }
-
+    
     public final void pushObject(Object o) {
         if (log.isDebugEnabled()) {
             log.debug("push object " + ReflectionUtils.descriptionOfObject(o) + " " + getStats());
@@ -305,32 +299,32 @@ public String toString() {
         return getContent();
     }
 
+    private final int pTop() {
+        return dTop + fTop + lTop + iTop;
+    }
+    
     private final void pushPrimitive(long value) {
-        pstack[dTop + fTop + lTop] = value;
+        pstack[pTop()] = value;
     }
 
     private final long popPrimitive() {
-        return pstack[dTop + fTop + lTop];
+        return pstack[pTop()];
     }
 
     private final void ensurePrimitivesStackSize() {
-        if (dTop + fTop + lTop == pstack.length) {
+        if (pTop() == pstack.length) {
             long[] hlp = new long[Math.max(8, pstack.length * 2)];
             System.arraycopy(pstack, 0, hlp, 0, pstack.length);
             pstack = hlp;
         }
     }
 
     private void writeObject(ObjectOutputStream s) throws IOException {
-        s.writeInt(iTop);
-        for (int i = 0; i < iTop; i++) {
-            s.writeInt(istack[i]);
-        }
-        
         s.writeInt(dTop);
         s.writeInt(fTop);
         s.writeInt(lTop);
-        int pTop = dTop + fTop + lTop;
+        s.writeInt(iTop);
+        int pTop = pTop();
         for (int i = 0; i < pTop; i++) {
             s.writeLong(pstack[i]);
         }
@@ -349,16 +343,11 @@ private void writeObject(ObjectOutputStream s) throws IOException {
     }
 
     private void readObject(ObjectInputStream s) throws IOException, ClassNotFoundException {
-        iTop = s.readInt();
-        istack = new int[iTop];
-        for (int i = 0; i < iTop; i++) {
-            istack[i] = s.readInt();
-        }
-        
         dTop = s.readInt();
         fTop = s.readInt();
         lTop = s.readInt();
-        int pTop = dTop + fTop + lTop;
+        iTop = s.readInt();
+        int pTop = pTop();
         pstack = new long[pTop];
         for (int i = 0; i < pTop; i++) {
             pstack[i] = s.readLong();