DASCA
/
WALA
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

move to Rhino 1.7.6

This commit is contained in:
Julian Dolby 2015-08-14 12:27:13 -04:00
parent 3ddaa9eaf7
commit 487f6cc150
7 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
com.ibm.wala.cast.js.rhino/.classpath
View File

@ -2,7 +2,7 @@
<classpath> <classpath>
<classpathentry kind="src" path="source"/> <classpathentry kind="src" path="source"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <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="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="lib/rhino-1.7.6.jar"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>

3
com.ibm.wala.cast.js.rhino/META-INF/MANIFEST.MF
View File

@ -30,7 +30,6 @@ Export-Package: com.ibm.wala.cast.js.translator,
org.mozilla.javascript.tools.jsc, org.mozilla.javascript.tools.jsc,
org.mozilla.javascript.tools.shell, org.mozilla.javascript.tools.shell,
org.mozilla.javascript.xml, org.mozilla.javascript.xml,
org.mozilla.javascript.xml.impl.xmlbeans,
org.mozilla.javascript.xmlimpl org.mozilla.javascript.xmlimpl
Bundle-ClassPath: ., Bundle-ClassPath: .,
lib/rhino-1.7R3.jar lib/rhino-1.7.6.jar

4
com.ibm.wala.cast.js.rhino/build.properties
View File

@ -2,5 +2,5 @@ source.. = source/
output.. = bin/ output.. = bin/
bin.includes = META-INF/,\ bin.includes = META-INF/,\
.,\ .,\
lib/rhino-1.7R3.jar lib/rhino-1.7.6.jar
jars.extra.classpath = lib/rhino-1.7R3.jar jars.extra.classpath = lib/rhino-1.7.6.jar

4
com.ibm.wala.cast.js.rhino/build.xml
View File

@ -33,7 +33,7 @@
<property name="bundleBootClasspath" value="${bootclasspath}"/> <property name="bundleBootClasspath" value="${bootclasspath}"/>
<target name="RhinoPresent" depends="init"> <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>
<target name="fetchRhino" depends="RhinoPresent" unless="rhino.present"> <target name="fetchRhino" depends="RhinoPresent" unless="rhino.present">
@ -41,7 +41,7 @@
<mkdir dir="${temp.folder}"/> <mkdir dir="${temp.folder}"/>
<get src="http://ftp.mozilla.org/pub/mozilla.org/js/rhino1_7R3.zip" dest="${temp.folder}/rhino1_7R3.zip" /> <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}"/> <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}"/> <delete dir="${temp.folder}"/>
</target> </target>

2
com.ibm.wala.cast.js.rhino/pom.xml
View File

@ -24,7 +24,7 @@
<artifactItem> <artifactItem>
<groupId>org.mozilla</groupId> <groupId>org.mozilla</groupId>
<artifactId>rhino</artifactId> <artifactId>rhino</artifactId>
<version>1.7R3</version> <version>1.7.6</version>
<type>jar</type> <type>jar</type>
<overWrite>false</overWrite> <overWrite>false</overWrite>
</artifactItem> </artifactItem>

6
com.ibm.wala.cast.js.rhino/source/com/ibm/wala/cast/js/translator/RhinoToAstTranslator.java
View File

@ -42,6 +42,7 @@ import org.mozilla.javascript.ast.ContinueStatement;
import org.mozilla.javascript.ast.DoLoop; import org.mozilla.javascript.ast.DoLoop;
import org.mozilla.javascript.ast.ElementGet; import org.mozilla.javascript.ast.ElementGet;
import org.mozilla.javascript.ast.EmptyExpression; import org.mozilla.javascript.ast.EmptyExpression;
import org.mozilla.javascript.ast.EmptyStatement;
import org.mozilla.javascript.ast.ErrorNode; import org.mozilla.javascript.ast.ErrorNode;
import org.mozilla.javascript.ast.ExpressionStatement; import org.mozilla.javascript.ast.ExpressionStatement;
import org.mozilla.javascript.ast.ForInLoop; import org.mozilla.javascript.ast.ForInLoop;
@ -809,6 +810,11 @@ public class RhinoToAstTranslator {
return Ast.makeNode(CAstNode.EMPTY); return Ast.makeNode(CAstNode.EMPTY);
} }
@Override
public CAstNode visitEmptyStatement(EmptyStatement node, WalkContext arg) {
return Ast.makeNode(CAstNode.EMPTY);
}
@Override @Override
public CAstNode visitErrorNode(ErrorNode node, WalkContext arg) { public CAstNode visitErrorNode(ErrorNode node, WalkContext arg) {
assert false; assert false;

5
com.ibm.wala.cast.js.rhino/source/com/ibm/wala/cast/js/translator/TypedNodeVisitor.java
View File

@ -25,6 +25,7 @@ import org.mozilla.javascript.ast.ContinueStatement;
import org.mozilla.javascript.ast.DoLoop; import org.mozilla.javascript.ast.DoLoop;
import org.mozilla.javascript.ast.ElementGet; import org.mozilla.javascript.ast.ElementGet;
import org.mozilla.javascript.ast.EmptyExpression; import org.mozilla.javascript.ast.EmptyExpression;
import org.mozilla.javascript.ast.EmptyStatement;
import org.mozilla.javascript.ast.ErrorNode; import org.mozilla.javascript.ast.ErrorNode;
import org.mozilla.javascript.ast.ExpressionStatement; import org.mozilla.javascript.ast.ExpressionStatement;
import org.mozilla.javascript.ast.ForInLoop; import org.mozilla.javascript.ast.ForInLoop;
@ -104,6 +105,8 @@ public abstract class TypedNodeVisitor<R,A> {
return visitElementGet((ElementGet) node, arg); return visitElementGet((ElementGet) node, arg);
} else if (node instanceof EmptyExpression) { } else if (node instanceof EmptyExpression) {
return visitEmptyExpression((EmptyExpression) node, arg); return visitEmptyExpression((EmptyExpression) node, arg);
} else if (node instanceof EmptyStatement) {
return visitEmptyStatement((EmptyStatement) node, arg);
} else if (node instanceof ErrorNode) { } else if (node instanceof ErrorNode) {
return visitErrorNode((ErrorNode) node, arg); return visitErrorNode((ErrorNode) node, arg);
} else if (node instanceof ExpressionStatement) { } 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 visitEmptyExpression(EmptyExpression node, A arg) ;
public abstract R visitEmptyStatement(EmptyStatement node, A arg) ;
public abstract R visitErrorNode(ErrorNode node, A arg) ; public abstract R visitErrorNode(ErrorNode node, A arg) ;
public abstract R visitExpressionStatement(ExpressionStatement node, A arg) ; public abstract R visitExpressionStatement(ExpressionStatement node, A arg) ;