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

updates to processing of Web pages: 

1) adopted the code from Rational for HTML handling
    i) extended it to integrate better source mapping into IR
    ii) integrated fixes from the old html processing to collect more info on forms
    iii) added some copyright comments
  2) updated version of jericho
  3) added support for nu.validator for html5
  4) added script to fetch html parser jars, and removed binary jar
  

git-svn-id: https://wala.svn.sourceforge.net/svnroot/wala/trunk@4092 f5eafffb-2e1d-0410-98e4-8ec43c5233c4
This commit is contained in:
dolby-oss 2011-04-04 15:27:11 +00:00
parent b0849e3ab6
commit 79b44cc3bc
3 changed files with 30 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,16 +15,16 @@ import java.io.IOException;
import com.ibm.wala.cast.ir.translator.TranslatorToCAst;
import com.ibm.wala.cast.tree.CAstEntity;
import com.ibm.wala.cast.tree.impl.CAstImpl;
import com.ibm.wala.classLoader.ModuleEntry;
import com.ibm.wala.classLoader.SourceFileModule;
import com.ibm.wala.classLoader.SourceModule;
public class CAstRhinoTranslator implements TranslatorToCAst {
private final CAstImpl Ast = new CAstImpl();
private final ModuleEntry M;
private final SourceModule M;
public CAstRhinoTranslator(ModuleEntry M) {
public CAstRhinoTranslator(SourceModule M) {
this.M = M;
}

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

@ -1,14 +1,12 @@
package com.ibm.wala.cast.js.translator;
import java.net.URL;
import com.ibm.wala.cast.ir.translator.TranslatorToCAst;
import com.ibm.wala.cast.tree.CAst;
import com.ibm.wala.classLoader.ModuleEntry;
import com.ibm.wala.classLoader.SourceModule;
public class CAstRhinoTranslatorFactory implements JavaScriptTranslatorFactory {
public TranslatorToCAst make(CAst ast, ModuleEntry M, URL sourceURL, String localFileName) {
public TranslatorToCAst make(CAst ast, SourceModule M) {
return new CAstRhinoTranslator(M);
}
}

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

@ -10,8 +10,7 @@
*****************************************************************************/
package com.ibm.wala.cast.js.translator;
import java.io.InputStreamReader;
import java.net.MalformedURLException;
import java.io.Reader;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
@ -30,6 +29,7 @@ import org.mozilla.javascript.ScriptOrFnNode;
import org.mozilla.javascript.Token;
import org.mozilla.javascript.tools.ToolErrorReporter;
import com.ibm.wala.cast.js.html.MappedSourceModule;
import com.ibm.wala.cast.js.loader.JavaScriptLoader;
import com.ibm.wala.cast.js.types.JavaScriptTypes;
import com.ibm.wala.cast.tree.CAst;
@ -37,6 +37,7 @@ import com.ibm.wala.cast.tree.CAstControlFlowMap;
import com.ibm.wala.cast.tree.CAstEntity;
import com.ibm.wala.cast.tree.CAstNode;
import com.ibm.wala.cast.tree.CAstNodeTypeMap;
import com.ibm.wala.cast.tree.CAstQualifier;
import com.ibm.wala.cast.tree.CAstSourcePositionMap;
import com.ibm.wala.cast.tree.CAstType;
import com.ibm.wala.cast.tree.impl.CAstControlFlowRecorder;
@ -44,12 +45,11 @@ import com.ibm.wala.cast.tree.impl.CAstOperator;
import com.ibm.wala.cast.tree.impl.CAstSourcePositionRecorder;
import com.ibm.wala.cast.tree.impl.CAstSymbolImpl;
import com.ibm.wala.cast.tree.impl.LineNumberPosition;
import com.ibm.wala.classLoader.ModuleEntry;
import com.ibm.wala.classLoader.SourceFileModule;
import com.ibm.wala.classLoader.SourceURLModule;
import com.ibm.wala.classLoader.SourceModule;
import com.ibm.wala.util.collections.EmptyIterator;
import com.ibm.wala.util.collections.HashMapFactory;
import com.ibm.wala.util.collections.HashSetFactory;
import com.ibm.wala.util.collections.Pair;
import com.ibm.wala.util.debug.Assertions;
public class RhinoToAstTranslator {
@ -271,7 +271,7 @@ public class RhinoToAstTranslator {
return pos;
}
public String getForInVar(String loopVarName, Node initExpr) {
public String getForInVar(Node initExpr) {
return null;
}
@ -279,10 +279,6 @@ public class RhinoToAstTranslator {
return null;
}
public String getForInLoopVar() {
return null;
}
public void addInitializer(CAstNode n) {
initializers.add(n);
}
@ -625,9 +621,9 @@ public class RhinoToAstTranslator {
return Collections.unmodifiableMap(subs);
}
public Iterator getScopedEntities(CAstNode construct) {
public Iterator<CAstEntity> getScopedEntities(CAstNode construct) {
if (subs.containsKey(construct))
return ((Set) subs.get(construct)).iterator();
return subs.get(construct).iterator();
else
return EmptyIterator.instance();
}
@ -652,7 +648,7 @@ public class RhinoToAstTranslator {
return null;
}
public Collection getQualifiers() {
public Collection<CAstQualifier> getQualifiers() {
Assertions.UNREACHABLE("JuliansUnnamedCAstEntity$2.getQualifiers()");
return null;
}
@ -693,19 +689,16 @@ public class RhinoToAstTranslator {
}
private CAstSourcePositionMap.Position makePosition(Node n) {
URL url;
if (sourceModule instanceof SourceFileModule) {
try {
url = ((SourceFileModule) sourceModule).getFile().toURI().toURL();
} catch (MalformedURLException e) {
Assertions.UNREACHABLE();
return null;
}
} else {
url = ((SourceURLModule) sourceModule).getURL();
URL url = sourceModule.getURL();
int line = n.getLineno();
if (sourceModule instanceof MappedSourceModule) {
Pair<URL, Integer> loc = ((MappedSourceModule)sourceModule).getMapping().getAssociatedFileAndLine(line);
if (loc != null) {
line = loc.snd;
url = loc.fst;
}
}
return new LineNumberPosition(url, url, n.getLineno());
return new LineNumberPosition(url, url, line);
}
private CAstNode noteSourcePosition(WalkContext context, CAstNode n, Node p) {
@ -1358,18 +1351,22 @@ public class RhinoToAstTranslator {
Parser P = new Parser(compilerEnv, compilerEnv.getErrorReporter());
return walkEntity(P.parse(new InputStreamReader(sourceModule.getInputStream()), scriptName, 1), new RootContext());
sourceReader = sourceModule.getInputReader();
return walkEntity(P.parse(sourceReader, scriptName, 1), new RootContext());
}
private final CAst Ast;
private final String scriptName;
private final ModuleEntry sourceModule;
private final SourceModule sourceModule;
private Reader sourceReader;
private int anonymousCounter = 0;
public RhinoToAstTranslator(CAst Ast, ModuleEntry M, String scriptName) {
public RhinoToAstTranslator(CAst Ast, SourceModule M, String scriptName) {
this.Ast = Ast;
this.scriptName = scriptName;
this.sourceModule = M;