Fixed a bug in the constant eliminator.

src/main/java/de/b2tla/analysis/ConstantsEliminator.java

@@ -150,6 +150,7 @@ public class ConstantsEliminator extends DepthFirstAdapter {
 		for (String key : constants.keySet()) {
 			if (constants.get(key) == id) {
 				constantName = key;
+				break;
 			}
 		}
 		constants.remove(constantName);
@@ -169,6 +170,12 @@ public class ConstantsEliminator extends DepthFirstAdapter {
 			Node parentParent = conjunction.parent();
 			if (parentParent instanceof APropertiesMachineClause) {
 				((APropertiesMachineClause) parentParent).setPredicates(other);
+			}else if (parentParent instanceof AConjunctPredicate){
+				if (((AConjunctPredicate) parentParent).getLeft() == parent){
+					((AConjunctPredicate) parentParent).setLeft(other);
+				}else{
+					((AConjunctPredicate) parentParent).setRight(other);
+				}
 			}
 		} else if (parent instanceof APropertiesMachineClause) {
 			machineContext.setPropertiesMachineClaus(null);

src/main/java/de/b2tla/analysis/ConstantsEvaluator.java

@@ -238,6 +238,7 @@ public class ConstantsEvaluator extends DepthFirstAdapter {
 			PExpression left = node.getLeft();
 			Node left_ref = machineContext.getReferences().get(left);
 			PExpression right = node.getRight();
+			System.out.println(node.getStartPos());
 			Node right_ref = machineContext.getReferences().get(right);
 
 			if (left instanceof ACardExpression) {

src/test/java/de/b2tla/analysis/ConstantsTest.java

@@ -103,4 +103,19 @@ public class ConstantsTest {
 		compare(expected, machine);
 	}
 	
+	
+	@Test
+	public void testConstants2() throws Exception {
+		String machine = "MACHINE test\n"
+				+ "CONSTANTS N \n" 
+				+ "PROPERTIES N <: NATURAL & N={1,2,3,4}\n"
+				+ "END";
+		
+		String expected = "---- MODULE test----\n" + "EXTENDS Naturals\n"
+				+ "N == {1,2,3,4}\n"
+				+ "ASSUME N \\subseteq Nat \n"
+				+ "======";
+		compare(expected, machine);
+	}
+	
 }