diff --git a/com.ibm.wala.stringAnalysis.js.test/src/com/ibm/wala/stringAnalysis/js/examples/SimpleStringAnalysisDriver.java b/com.ibm.wala.stringAnalysis.js.test/src/com/ibm/wala/stringAnalysis/js/examples/SimpleStringAnalysisDriver.java index 56259c590..7f8868480 100644 --- a/com.ibm.wala.stringAnalysis.js.test/src/com/ibm/wala/stringAnalysis/js/examples/SimpleStringAnalysisDriver.java +++ b/com.ibm.wala.stringAnalysis.js.test/src/com/ibm/wala/stringAnalysis/js/examples/SimpleStringAnalysisDriver.java @@ -1,12 +1,11 @@ package com.ibm.wala.stringAnalysis.js.examples; -import com.ibm.wala.classLoader.*; -import com.ibm.wala.ipa.callgraph.*; -import com.ibm.wala.stringAnalysis.js.client.*; -import com.ibm.wala.util.debug.*; +import java.io.File; +import java.util.Collections; -import java.io.*; -import java.util.*; +import com.ibm.wala.classLoader.SourceFileModule; +import com.ibm.wala.stringAnalysis.js.client.JSStringAnalysisEngine; +import com.ibm.wala.util.debug.Assertions; public class SimpleStringAnalysisDriver { @@ -21,7 +20,7 @@ public class SimpleStringAnalysisDriver { JSStringAnalysisEngine engine = new JSStringAnalysisEngine(); engine.setModuleFiles( Collections.singleton(new SourceFileModule(scriptFile, testName))); - CallGraph CG = engine.buildDefaultCallGraph(); + engine.buildDefaultCallGraph(); String variableName = args[1]; String patternString = args[2]; diff --git a/com.ibm.wala.stringAnalysis.js.test/src/com/ibm/wala/stringAnalysis/js/test/translator/TestCG2GR.java b/com.ibm.wala.stringAnalysis.js.test/src/com/ibm/wala/stringAnalysis/js/test/translator/TestCG2GR.java index 99539c235..57a5a6162 100644 --- a/com.ibm.wala.stringAnalysis.js.test/src/com/ibm/wala/stringAnalysis/js/test/translator/TestCG2GR.java +++ b/com.ibm.wala.stringAnalysis.js.test/src/com/ibm/wala/stringAnalysis/js/test/translator/TestCG2GR.java @@ -29,7 +29,6 @@ public class TestCG2GR extends TestJSTranslatorBase { CG2GR cg2gr = new CG2GR(ir2gr, new FunctionNameCalleeResolver(new JSFunctionNameResolver())); ISimplify g = cg2gr.translate(getCallGraphBuilder()); assertTrue(g instanceof GR); - GR gr = (GR) g; //Trace.println("--- GR:"); //Trace.println(SAUtil.prettyFormat(gr)); } diff --git a/com.ibm.wala.stringAnalysis.js.test/src/com/ibm/wala/stringAnalysis/js/test/translator/TestGR2CFG.java b/com.ibm.wala.stringAnalysis.js.test/src/com/ibm/wala/stringAnalysis/js/test/translator/TestGR2CFG.java index bf1fde381..ddb1ad080 100644 --- a/com.ibm.wala.stringAnalysis.js.test/src/com/ibm/wala/stringAnalysis/js/test/translator/TestGR2CFG.java +++ b/com.ibm.wala.stringAnalysis.js.test/src/com/ibm/wala/stringAnalysis/js/test/translator/TestGR2CFG.java @@ -76,7 +76,6 @@ public class TestGR2CFG extends TestJSTranslatorBase { public void testConditionalBranch() { - IVariable r2 = new LexicalVariable("r2"); IContextFreeGrammar cfg = verifyCFG(new LexicalVariable("r2"), "astrA|bstrB"); assertTrue(CFLReachability.containsSome(cfg, pattern("a" + "strA"))); assertTrue(CFLReachability.containsSome(cfg, pattern("b" + "strB"))); @@ -125,7 +124,7 @@ public class TestGR2CFG extends TestJSTranslatorBase { public void testAssocArray1() { //TODO: //assertTrue(CFLReachability.containsAll(pattern("strA|strB|ASSOC"), cfg)); - IContextFreeGrammar cfg = verifyCFG(new LexicalVariable("r21"), "ASSOC"); + verifyCFG(new LexicalVariable("r21"), "ASSOC"); } public void testSubstring1() { @@ -197,7 +196,7 @@ public class TestGR2CFG extends TestJSTranslatorBase { } public void testSplit1() { - IContextFreeGrammar cfg = verifyCFG(new LexicalVariable("rSplit1"), "a|b|c|()"); + verifyCFG(new LexicalVariable("rSplit1"), "a|b|c|()"); } public void testProp1() { @@ -207,10 +206,10 @@ public class TestGR2CFG extends TestJSTranslatorBase { pattern("foo"), Automatons.createAutomaton(new ISymbol[]{new NumberSymbol(123.0)})); */ - IContextFreeGrammar cfg = verifyCFG(new LexicalVariable("rProp1"), pattern("foo")); + verifyCFG(new LexicalVariable("rProp1"), pattern("foo")); } public void testCyclic1() { - IContextFreeGrammar cfg = verifyCFG(new LexicalVariable("rCyclic1"), "(abcdefg)|(bcd)"); + verifyCFG(new LexicalVariable("rCyclic1"), "(abcdefg)|(bcd)"); } }