From 4d9876d45254c014966126604e57eb4d7019fe77 Mon Sep 17 00:00:00 2001
From: msridhar1 <msridhar1@f5eafffb-2e1d-0410-98e4-8ec43c5233c4>
Date: Fri, 6 Jan 2012 21:18:06 +0000
Subject: [PATCH] Fixed a bug where the property read expander was generating a
 DAG, and another one which prevented CFG node targets from being properly
 copied.

git-svn-id: https://wala.svn.sourceforge.net/svnroot/wala/trunk@4302 f5eafffb-2e1d-0410-98e4-8ec43c5233c4
---
 .../cast/js/translator/PropertyReadExpander.java  | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/translator/PropertyReadExpander.java b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/translator/PropertyReadExpander.java
index aa8e2b1de..991ee06c5 100644
--- a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/translator/PropertyReadExpander.java
+++ b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/translator/PropertyReadExpander.java
@@ -18,14 +18,11 @@ import com.ibm.wala.util.debug.Assertions;
  */
 public class PropertyReadExpander extends CAstRewriter<PropertyReadExpander.RewriteContext, PropertyReadExpander.ExpanderKey> {
 
-  static class ExpanderKey implements CopyKey<ExpanderKey> {
-
-    public ExpanderKey parent() {
-      return null;
-    }
-   
-    static final ExpanderKey EVERYWHERE = new ExpanderKey();
-    static final ExpanderKey EXTRA = new ExpanderKey();
+  static enum ExpanderKey implements CopyKey<ExpanderKey> {
+    EVERYWHERE, EXTRA {
+      public ExpanderKey parent() { return EVERYWHERE; }
+    };
+    public ExpanderKey parent() { return null; }
   }
   
   private int readTempCounter = 0;
@@ -241,7 +238,7 @@ public class PropertyReadExpander extends CAstRewriter<PropertyReadExpander.Rewr
             // assign lval to temp1 (where lval is a block that includes the prototype chain loop)
             Ast.makeNode(CAstNode.DECL_STMT, Ast.makeConstant(new InternalCAstSymbol(temp1, true, false)), lval),
             // ? --MS
-            rval,
+            //rval,
             // assign temp2 the new value to be assigned
             Ast.makeNode(CAstNode.DECL_STMT, Ast.makeConstant(new InternalCAstSymbol(temp2, true, false)),
                 Ast.makeNode(CAstNode.BINARY_EXPR, op, Ast.makeNode(CAstNode.VAR, Ast.makeConstant(temp1)), rval)),