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

merge code from loop unroller into standard CAstRewriter 

git-svn-id: https://wala.svn.sourceforge.net/svnroot/wala/trunk@1559 f5eafffb-2e1d-0410-98e4-8ec43c5233c4
This commit is contained in:
dolby-oss 2007-08-01 15:37:10 +00:00
parent b45f0aa8b9
commit f6185c6e98
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/translator/Java2IRTranslator.java
View File

@ -16,11 +16,8 @@ package com.ibm.wala.cast.java.translator;
import java.io.PrintWriter; import java.io.PrintWriter;
import com.ibm.wala.cast.java.loader.JavaSourceLoaderImpl; import com.ibm.wala.cast.java.loader.JavaSourceLoaderImpl;
import com.ibm.wala.cast.tree.CAst; import com.ibm.wala.cast.tree.*;
import com.ibm.wala.cast.tree.CAstEntity; import com.ibm.wala.cast.tree.impl.*;
import com.ibm.wala.cast.tree.impl.CAstImpl;
import com.ibm.wala.cast.tree.impl.CAstRewriter;
import com.ibm.wala.cast.tree.impl.CAstRewriterFactory;
import com.ibm.wala.cast.util.CAstPrinter; import com.ibm.wala.cast.util.CAstPrinter;
public class Java2IRTranslator { public class Java2IRTranslator {
@ -30,7 +27,7 @@ public class Java2IRTranslator {
protected final TranslatorToCAst fSourceTranslator; protected final TranslatorToCAst fSourceTranslator;
CAstRewriterFactory<?> castRewriterFactory = null; CAstRewriterFactory castRewriterFactory = null;
public Java2IRTranslator(TranslatorToCAst sourceTranslator, JavaSourceLoaderImpl srcLoader) { public Java2IRTranslator(TranslatorToCAst sourceTranslator, JavaSourceLoaderImpl srcLoader) {
this(sourceTranslator, srcLoader, false); this(sourceTranslator, srcLoader, false);
@ -41,12 +38,12 @@ public class Java2IRTranslator {
} }
public Java2IRTranslator(TranslatorToCAst sourceTranslator, JavaSourceLoaderImpl srcLoader, public Java2IRTranslator(TranslatorToCAst sourceTranslator, JavaSourceLoaderImpl srcLoader,
CAstRewriterFactory<?> castRewriterFactory) { CAstRewriterFactory castRewriterFactory) {
this(sourceTranslator, srcLoader, castRewriterFactory, false); this(sourceTranslator, srcLoader, castRewriterFactory, false);
} }
public Java2IRTranslator(TranslatorToCAst sourceTranslator, JavaSourceLoaderImpl srcLoader, public Java2IRTranslator(TranslatorToCAst sourceTranslator, JavaSourceLoaderImpl srcLoader,
CAstRewriterFactory<?> castRewriterFactory, boolean debug) { CAstRewriterFactory castRewriterFactory, boolean debug) {
DEBUG = debug; DEBUG = debug;
fLoader = srcLoader; fLoader = srcLoader;
fSourceTranslator = sourceTranslator; fSourceTranslator = sourceTranslator;
@ -64,7 +61,7 @@ public class Java2IRTranslator {
if (castRewriterFactory != null) { if (castRewriterFactory != null) {
CAst cast = new CAstImpl(); CAst cast = new CAstImpl();
CAstRewriter<?> rw = castRewriterFactory.createCAstRewriter(cast); CAstRewriter rw = castRewriterFactory.createCAstRewriter(cast);
ce = rw.rewrite(ce); ce = rw.rewrite(ce);
if (DEBUG) { if (DEBUG) {
PrintWriter printWriter = new PrintWriter(System.out); PrintWriter printWriter = new PrintWriter(System.out);

6
com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/translator/polyglot/JavaIRTranslatorExtension.java
View File

@ -27,7 +27,7 @@ import com.ibm.wala.cast.tree.impl.CAstRewriterFactory;
public class JavaIRTranslatorExtension extends JLExtensionInfo implements IRTranslatorExtension { public class JavaIRTranslatorExtension extends JLExtensionInfo implements IRTranslatorExtension {
protected PolyglotSourceLoaderImpl fSourceLoader; protected PolyglotSourceLoaderImpl fSourceLoader;
protected PolyglotIdentityMapper fMapper; protected PolyglotIdentityMapper fMapper;
protected CAstRewriterFactory<?> rewriterFactory; protected CAstRewriterFactory rewriterFactory;
public void setSourceLoader(PolyglotSourceLoaderImpl sourceLoader) { public void setSourceLoader(PolyglotSourceLoaderImpl sourceLoader) {
fSourceLoader= sourceLoader; fSourceLoader= sourceLoader;
@ -42,11 +42,11 @@ public class JavaIRTranslatorExtension extends JLExtensionInfo implements IRTran
return fMapper; return fMapper;
} }
public void setCAstRewriterFactory(CAstRewriterFactory<?> factory) { public void setCAstRewriterFactory(CAstRewriterFactory factory) {
rewriterFactory = factory; rewriterFactory = factory;
} }
public CAstRewriterFactory<?> getCAstRewriterFactory() { public CAstRewriterFactory getCAstRewriterFactory() {
return rewriterFactory; return rewriterFactory;
} }
} }