fixed bug on static var

Author: nmacedo

electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/parser/Action2Alloy.java

@@ -81,7 +81,7 @@ public void expand(final A4Reporter rep, final CompModule root) throws Err {
 		}
 		// define sig Arg as the sum of all argument types
 		// TODO: avoid repeated arg types
-		Sig arg_sig = root.addSig("_Arg", ExprVar.make(null,"="), args, null, null, Attr.PRIVATE);
+		Sig arg_sig = root.addSig("_Arg", ExprVar.make(null,"="), args, null, null, Attr.PRIVATE, Attr.VARIABLE);
 		System.out.println("Max args is "+max_args+", sig "+arg_sig.label+" defined = "+ ((SubsetSig) arg_sig).parents + " with "+arg_sig.attributes+".");	
 
 		final ExprVar arg_var = ExprVar.make(null, arg_sig.label);

electrum/src/main/java/edu/mit/csail/sdg/alloy4graph/Graph.java

@@ -217,22 +217,13 @@ private void layout_assignOrder() {
          bins.get(grBIN[x.pos()]).remove(x);
          for(GraphNode n:grIN.get(x.pos()))  grOUT.get(n.pos()).remove(x);
          for(GraphNode n:grOUT.get(x.pos())) grIN.get(n.pos()).remove(x);
-         List<GraphNode> aux = new ArrayList<>(grIN.get(x.pos())); // [HASLab]
-         aux.addAll(grOUT.get(x.pos())); // [HASLab]
-         aux.sort(new Comparator<GraphNode>() { // [HASLab]
-			@Override
-			public int compare(GraphNode o1, GraphNode o2) {
-				return -	o1.uuid.toString().compareTo(o2.uuid.toString());
-			}
-    		 });
-//         Iterable<GraphNode> aux = Util.fastJoin(grIN.get(x.pos()), ); // [HASLab]
-         for(GraphNode n:aux) { // [HASLab]
-            int ni=n.pos(), out=grOUT.get(ni).size(), in=grIN.get(ni).size();
-            int b=(out==0)?0:(in==0?(2*num):(out-in+num));
-            if (grBIN[ni]!=b) { bins.get(grBIN[ni]).remove(n); grBIN[ni]=b; bins.get(b).add(n); }
-         }
-      }
-      sortNodes(Util.fastJoin(s1,s2));
+         for(GraphNode n:Util.fastJoin(grIN.get(x.pos()), grOUT.get(x.pos()))) {
+             int ni=n.pos(), out=grOUT.get(ni).size(), in=grIN.get(ni).size();
+             int b=(out==0)?0:(in==0?(2*num):(out-in+num));
+             if (grBIN[ni]!=b) { bins.get(grBIN[ni]).remove(n); grBIN[ni]=b; bins.get(b).add(n); }
+          }
+       }
+       sortNodes(Util.fastJoin(s1,s2));
    }
 
    //============================================================================================================================//