[jboss-svn-commits] JBL Code SVN: r25815 - in labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule: type and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: adinn
Date: 2009-03-25 09:15:11 -0400 (Wed, 25 Mar 2009)
New Revision: 25815

Modified:
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/expression/ComparisonExpression.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/expression/MethodExpression.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/type/Type.java
Log:
fixed some errors in the compiler

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/expression/ComparisonExpression.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/expression/ComparisonExpression.java	2009-03-25 12:27:32 UTC (rev 25814)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/expression/ComparisonExpression.java	2009-03-25 13:15:11 UTC (rev 25815)
@@ -446,8 +446,8 @@
                 mv.visitLabel(endtarget);
             }
         }
-        // we add a single boolean to the stack
-        currentStackHeights.addStackCount(1);
+        // we remove max words and add a single boolean to the stack
+        currentStackHeights.addStackCount(1 - max);
         // no need to check the max heights as we stacked one or two words per operand and
         // the compile and compileConvert calls will have already bumped the maximum stack
     }

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/expression/MethodExpression.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/expression/MethodExpression.java	2009-03-25 12:27:32 UTC (rev 25814)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/expression/MethodExpression.java	2009-03-25 13:15:11 UTC (rev 25815)
@@ -307,8 +307,10 @@
         // no need for type conversion as return type was derived from method
         if (type.getNBytes() > 4) {
             expected = 2;
+        } else if (type != Type.VOID){
+            expected = 1;
         } else {
-            expected = 1;
+            expected = 0;
         }
 
         // decrement the stack height to account for stacked param values (removed) and return value (added)

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/type/Type.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/type/Type.java	2009-03-25 12:27:32 UTC (rev 25814)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/type/Type.java	2009-03-25 13:15:11 UTC (rev 25815)
@@ -120,6 +120,8 @@
             return "[" + baseType.getInternalName(forDescriptor);
         } else if (isPrimitive()) {
             return internalNames.get(typeName);
+        } else if (isVoid()) {
+            return internalNames.get(typeName);
         } else {
             String name = aliasFor.getTargetClass().getCanonicalName();
             name = name.replaceAll("\\.", "/");