From 487f6cc150b7fd03cf92a61a2b5ce9506891800c Mon Sep 17 00:00:00 2001
From: Julian Dolby <dolby@us.ibm.com>
Date: Fri, 14 Aug 2015 12:27:13 -0400
Subject: [PATCH] move to Rhino 1.7.6

---
 com.ibm.wala.cast.js.rhino/.classpath                       | 2 +-
 com.ibm.wala.cast.js.rhino/META-INF/MANIFEST.MF             | 3 +--
 com.ibm.wala.cast.js.rhino/build.properties                 | 4 ++--
 com.ibm.wala.cast.js.rhino/build.xml                        | 4 ++--
 com.ibm.wala.cast.js.rhino/pom.xml                          | 2 +-
 .../ibm/wala/cast/js/translator/RhinoToAstTranslator.java   | 6 ++++++
 .../com/ibm/wala/cast/js/translator/TypedNodeVisitor.java   | 5 +++++
 7 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/com.ibm.wala.cast.js.rhino/.classpath b/com.ibm.wala.cast.js.rhino/.classpath
index d9149e76e..e6cc1ba83 100644
--- a/com.ibm.wala.cast.js.rhino/.classpath
+++ b/com.ibm.wala.cast.js.rhino/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="source"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="lib" path="lib/rhino-1.7R3.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="lib" path="lib/rhino-1.7.6.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/com.ibm.wala.cast.js.rhino/META-INF/MANIFEST.MF b/com.ibm.wala.cast.js.rhino/META-INF/MANIFEST.MF
index 437672dc8..845aa7b7e 100644
--- a/com.ibm.wala.cast.js.rhino/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.cast.js.rhino/META-INF/MANIFEST.MF
@@ -30,7 +30,6 @@ Export-Package: com.ibm.wala.cast.js.translator,
  org.mozilla.javascript.tools.jsc,
  org.mozilla.javascript.tools.shell,
  org.mozilla.javascript.xml,
- org.mozilla.javascript.xml.impl.xmlbeans,
  org.mozilla.javascript.xmlimpl
 Bundle-ClassPath: .,
- lib/rhino-1.7R3.jar
+ lib/rhino-1.7.6.jar
diff --git a/com.ibm.wala.cast.js.rhino/build.properties b/com.ibm.wala.cast.js.rhino/build.properties
index 2986328a0..1b652aeb2 100644
--- a/com.ibm.wala.cast.js.rhino/build.properties
+++ b/com.ibm.wala.cast.js.rhino/build.properties
@@ -2,5 +2,5 @@ source.. = source/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               lib/rhino-1.7R3.jar
-jars.extra.classpath = lib/rhino-1.7R3.jar
+               lib/rhino-1.7.6.jar
+jars.extra.classpath = lib/rhino-1.7.6.jar
diff --git a/com.ibm.wala.cast.js.rhino/build.xml b/com.ibm.wala.cast.js.rhino/build.xml
index 606ec87e8..2397ebaa3 100644
--- a/com.ibm.wala.cast.js.rhino/build.xml
+++ b/com.ibm.wala.cast.js.rhino/build.xml
@@ -33,7 +33,7 @@
 	<property name="bundleBootClasspath" value="${bootclasspath}"/>
 
      <target name="RhinoPresent" depends="init">
-        <available file="${plugin.destination}/lib/rhino-1.7R3.jar" property="rhino.present"/>
+        <available file="${plugin.destination}/lib/rhino-1.7.6.jar" property="rhino.present"/>
      </target>
 
    <target name="fetchRhino" depends="RhinoPresent" unless="rhino.present">
@@ -41,7 +41,7 @@
      <mkdir dir="${temp.folder}"/>
      <get src="http://ftp.mozilla.org/pub/mozilla.org/js/rhino1_7R3.zip" dest="${temp.folder}/rhino1_7R3.zip" />
      <unzip src="${temp.folder}/rhino1_7R3.zip" dest="${temp.folder}"/>
-     <copy file="${temp.folder}/rhino1_7R3/js.jar" tofile="${plugin.destination}/lib/rhino-1.7R3.jar" />
+     <copy file="${temp.folder}/rhino1_7R3/js.jar" tofile="${plugin.destination}/lib/rhino-1.7.6.jar" />
      <delete dir="${temp.folder}"/>
    </target>
 	
diff --git a/com.ibm.wala.cast.js.rhino/pom.xml b/com.ibm.wala.cast.js.rhino/pom.xml
index 9f97c9c9c..ae901fcf0 100644
--- a/com.ibm.wala.cast.js.rhino/pom.xml
+++ b/com.ibm.wala.cast.js.rhino/pom.xml
@@ -24,7 +24,7 @@
                                           <artifactItem>
                                             <groupId>org.mozilla</groupId>
                                             <artifactId>rhino</artifactId>
-                                            <version>1.7R3</version>
+                                            <version>1.7.6</version>
                                             <type>jar</type>
                                             <overWrite>false</overWrite>
                                           </artifactItem>
diff --git a/com.ibm.wala.cast.js.rhino/source/com/ibm/wala/cast/js/translator/RhinoToAstTranslator.java b/com.ibm.wala.cast.js.rhino/source/com/ibm/wala/cast/js/translator/RhinoToAstTranslator.java
index 9df5108f7..09a1ffe3d 100755
--- a/com.ibm.wala.cast.js.rhino/source/com/ibm/wala/cast/js/translator/RhinoToAstTranslator.java
+++ b/com.ibm.wala.cast.js.rhino/source/com/ibm/wala/cast/js/translator/RhinoToAstTranslator.java
@@ -42,6 +42,7 @@ import org.mozilla.javascript.ast.ContinueStatement;
 import org.mozilla.javascript.ast.DoLoop;
 import org.mozilla.javascript.ast.ElementGet;
 import org.mozilla.javascript.ast.EmptyExpression;
+import org.mozilla.javascript.ast.EmptyStatement;
 import org.mozilla.javascript.ast.ErrorNode;
 import org.mozilla.javascript.ast.ExpressionStatement;
 import org.mozilla.javascript.ast.ForInLoop;
@@ -809,6 +810,11 @@ public class RhinoToAstTranslator {
 		return Ast.makeNode(CAstNode.EMPTY);
 	}
 
+	@Override
+	public CAstNode visitEmptyStatement(EmptyStatement node, WalkContext arg) {
+	  return Ast.makeNode(CAstNode.EMPTY);
+	}
+
 	@Override
 	public CAstNode visitErrorNode(ErrorNode node, WalkContext arg) {
 		assert false;
diff --git a/com.ibm.wala.cast.js.rhino/source/com/ibm/wala/cast/js/translator/TypedNodeVisitor.java b/com.ibm.wala.cast.js.rhino/source/com/ibm/wala/cast/js/translator/TypedNodeVisitor.java
index a26c53b95..52977794a 100644
--- a/com.ibm.wala.cast.js.rhino/source/com/ibm/wala/cast/js/translator/TypedNodeVisitor.java
+++ b/com.ibm.wala.cast.js.rhino/source/com/ibm/wala/cast/js/translator/TypedNodeVisitor.java
@@ -25,6 +25,7 @@ import org.mozilla.javascript.ast.ContinueStatement;
 import org.mozilla.javascript.ast.DoLoop;
 import org.mozilla.javascript.ast.ElementGet;
 import org.mozilla.javascript.ast.EmptyExpression;
+import org.mozilla.javascript.ast.EmptyStatement;
 import org.mozilla.javascript.ast.ErrorNode;
 import org.mozilla.javascript.ast.ExpressionStatement;
 import org.mozilla.javascript.ast.ForInLoop;
@@ -104,6 +105,8 @@ public abstract class TypedNodeVisitor<R,A> {
 			return visitElementGet((ElementGet) node, arg);
 		} else if (node instanceof EmptyExpression) {
 			return visitEmptyExpression((EmptyExpression) node, arg);
+    } else if (node instanceof EmptyStatement) {
+      return visitEmptyStatement((EmptyStatement) node, arg);
 		} else if (node instanceof ErrorNode) {
 			return visitErrorNode((ErrorNode) node, arg);
 		} else if (node instanceof ExpressionStatement) {
@@ -220,6 +223,8 @@ public abstract class TypedNodeVisitor<R,A> {
 
 	public abstract R visitEmptyExpression(EmptyExpression node, A arg) ;
 
+	public abstract R visitEmptyStatement(EmptyStatement node, A arg) ;
+
 	public abstract R visitErrorNode(ErrorNode node, A arg) ;
 
 	public abstract R visitExpressionStatement(ExpressionStatement node, A arg) ;