Skip to main content
Explore
Sign in
Explore
Snippets Groups Projects
Commit f5897f79 authored by Emma Söderberg's avatar Emma Söderberg
Browse files

No commit message 

No commit message
parent 24532b33
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
ast/JaddCodeGen.jrag
+ 92
− 4
View file @ f5897f79
......@@ -1079,8 +1079,10 @@ aspect JaddCodeGen {
}
// ES_2011-09-20: Code generation for incremental evaluation, modifying tree, set child 3
public void ASTDecl.jjtGenIncrementalASTChangeSetChild3(PrintWriter stream) {
stream.println(ind(2) + "if (!state().IN_REWRITE_EVAL && children[i] != null) {");
stream.println(ind(3) + "children[i].notifyForRemove();");
stream.println(ind(2) + "if (children[i] != null) {");
stream.println(ind(3) + "if (!state().IN_REWRITE_EVAL)");
stream.println(ind(4) + "children[i].notifyForRemove();");
stream.println(ind(3) + "else children[i].clearDepsInTree();");
stream.println(ind(2) + "}");
}
// ES_2011-09-20: Code generation for incremental evaluation, modifying tree, set child 4
......@@ -1990,6 +1992,86 @@ aspect JaddCodeGen {
// ES_2011-09-20: Code generation for incremental evaluation,
public void ASTDecl.jjtGenIncrementalReactToASTChange(PrintWriter stream) {
// Method: clearDepsInTree
stream.println(" public void " + name() + ".clearDepsInTree() {");
if (name().equals("ASTNode")) {
if (ASTNode.incrementalLevelParam) {
stream.println(" getParent_handler.clearDependants();");
stream.println(" numChildren_handler.clearDependants();");
stream.println(" for (int i = 0; i < numChildren; i++) {");
stream.println(" if (!childIsNTA(i) && getChild_handler[i].hasDependants()) {");
stream.println(" getChildNoTransform(i).clearDepsInTree();");
stream.println(" getChild_handler[i].clearDependants();");
stream.println(" }");
stream.println(" }");
}
if (ASTNode.incrementalLevelAttr) {
stream.println(" getParent_handler.clearDependants();");
stream.println(" numChildren_handler.clearDependants();");
stream.println(" if (getChild_handler.hasDependants()) {");
stream.println(" getChild_handler.clearDependants();");
stream.println(" for (int i = 0; i < getNumChildNoTransform(); i++) {");
stream.println(" getChildNoTransform(i).clearDepsInTree();");
stream.println(" }");
stream.println(" }");
}
if (ASTNode.incrementalLevelNode) {
stream.println(" handler.clearDependants();");
stream.println(" for (int i = 0; i < getNumChildNoTransform(); i++) {");
stream.println(" getChildNoTransform(i).clearDepsInTree();");
stream.println(" }");
}
} else {
stream.println(" super.clearDepsInTree();");
if (ASTNode.incrementalLevelParam || ASTNode.incrementalLevelAttr) {
// tokens
for (int c = 0; c < getNumComponents(); c++) {
Components comp = getComponents(c);
if (comp instanceof TokenComponent) {
stream.println(" get" + ((TokenComponent)comp).getTokenId().getID() +
"_handler.clearDependants();");
}
}
}
// Collect attributes: syn then inh
ArrayList list = new ArrayList();
for(int k = 0; k < getNumSynEq(); k++) {
AttrDecl attr = getSynEq(k).decl();
if (attr != null && (attr.getLazy() || attr.isCircular()))
list.add(attr);
}
for(int k = 0; k < getNumInhDecl(); k++) {
AttrDecl attr = getInhDecl(k);
if (attr != null && (attr.getLazy() || attr.isCircular()))
list.add(attr);
}
// Attribute code: propagate change of all cached values being removed
for(Iterator itr = list.iterator(); itr.hasNext();) {
AttrDecl attr = (AttrDecl)itr.next();
if (ASTNode.incrementalLevelParam) {
if (attr.getNumParameter() > 0) {
stream.println(" for (java.util.Iterator itr = " + attr.attributeSignature() +
"_handler.values().iterator(); itr.hasNext();) {");
stream.println(" ASTNode$DepGraphNode h = (ASTNode$DepGraphNode)itr.next();");
stream.println(" h.clearDependants();");
stream.println(" }");
} else {
stream.println(" if (" + attr.attributeSignature() + "_handler != null) {");
stream.println(" " + attr.attributeSignature() + "_handler.clearDependants();");
stream.println(" }");
}
}
if (ASTNode.incrementalLevelAttr) {
stream.println(" if (" + attr.attributeSignature() + "_handler != null) {");
stream.println(" " + attr.attributeSignature() + "_handler.clearDependants();");
stream.println(" }");
}
}
}
// end method
stream.println(" }");
// Method: notifyForRemove
stream.println(" public void " + name() + ".notifyForRemove() {");
if (name().equals("ASTNode")) {
......@@ -2251,6 +2333,12 @@ aspect JaddCodeGen {
stream.println(" public boolean hasDependants() {");
stream.println(" return !fDependantSet.isEmpty();");
stream.println(" }");
stream.println(" public void clearDependants() {");
stream.println(" for (ASTNode$DepGraphNode node : fDependantSet) {");
stream.println(" node.removeDependant(this);");
stream.println(" }");
stream.println(" fDependantSet.clear();");
stream.println(" }");
stream.println(" public void addDependency(ASTNode$DepGraphNode node) {");
stream.println(" if (node != this) {");
stream.println(" fDependencySet.add(node);");
......@@ -2294,11 +2382,11 @@ aspect JaddCodeGen {
if (ASTNode.incrementalDebug) {
stream.println(" public void dumpDeps() {");
stream.println(" TreeSet<String> sorted = new TreeSet<String>();");
stream.println(" for (ASTNode$DepGraphNode node : fDependantSet) {");
stream.println(" for (ASTNode$DepGraphNode node : fDependencySet) {");
stream.println(" sorted.add(node.toString());");
stream.println(" }");
stream.println(" for (String s : sorted) {");
stream.println(" System.out.println(\"dep(\" + s + \" -> \" + this + \")\");");
stream.println(" System.out.println(\"dep(\" + this + \" -> \" + s + \")\");");
stream.println(" }");
stream.println(" }");
stream.println(" public String toString() {");
......
......
doc/incremental.txt
+ 7
− 0
View file @ f5897f79
......@@ -67,3 +67,10 @@ init_child is saved when a static rewrite is investigated. This must not lead to
may be false. Regardless of if there is an actual rewrite the initial child will at this point be stored. This will
cause a cache dump to write out that a rewrite has happend. It may then be hard to determine if there was a rewrite
if the root of the rewritten tree is the same as that of the initial tree.
Dependants in the initial rewritten AST will be preserved at rewrite unless all dependants are removed. This is currently
done during set via the "clearDependants" in the handler class. This is a temporary solution until we move on to full
tracking during rewrites. The implementation of "clearDepsInTree" should not invoke new dependencies during its execution.
For this reason, the looping over child nodes uses the "numChildren" attribute directly to circumvent a call to "getNumChild"
or "getNumChildNoTransform".
jastadd/JastAdd.java
+ 1
− 1
View file @ f5897f79
......@@ -12,7 +12,7 @@ import jrag.*;
public class JastAdd {
public static final String VERSION = "JastAdd II (http://jastadd.org) version R20110929";
public static final String VERSION = "JastAdd II (http://jastadd.org) version R20110930";
public static final String VERSIONINFO = "\n// Generated with " + VERSION + "\n\n";
protected java.util.List files;
......
......
manifest
+ 1
− 1
View file @ f5897f79
Main-Class: jastadd.JastAdd
Implementation-Title: JastAdd II
Implementation-Version: R20110929
Implementation-Version: R20110930
Implementation-Vendor: The JastAdd Team
Implementation-URL: http://jastadd.org
test/Test128.class
+ 0
− 0
View file @ f5897f79
No preview for this file type
test/Test128.java
+ 19
− 18
View file @ f5897f79
......@@ -7,36 +7,37 @@ public class Test128 {
public static void main(String[] args) {
A a = new A(new B(), "b");
B b = new B();
A a = new A(b, "b");
// Activate rewrite
// B bOld = a.getBNoTransform();
B b = a.getB();
C c = (C)a.getB();
System.out.println("Dependencies/Cache after rewrite:");
System.out.println("-- Dependencies/Cache after rewrite:");
System.out.println("a:");
a.dumpDependencies();
b.dumpDependencies();
a.dumpCachedValues();
System.out.println("b:");
b.dumpDependencies();
b.dumpCachedValues();
System.out.println("c:");
c.dumpDependencies();
c.dumpCachedValues();
// System.out.println("Dependencies/Cache in initial rewritten child:");
// bOld.dumpDependencies();
// bOld.dumpCachedValues();
/*
// Change a dependency of the rewrite condition
// Change
a.setName("b");
System.out.println("Dependencies/Cache after setName:");
System.out.println("-- Dependencies/Cache after setName:");
System.out.println("a:");
a.dumpDependencies();
b.dumpDependencies();
a.dumpCachedValues();
System.out.println("b:");
b.dumpDependencies();
b.dumpCachedValues();
System.out.println("c:");
c.dumpDependencies();
c.dumpCachedValues();
System.out.println("Dependencies/Cache in initial child:");
bOld.dumpDependencies();
bOld.dumpCachedValues();
*/
}
}
test/Test128.result
+ 13
− 0
View file @ f5897f79
-- Dependencies/Cache after rewrite:
a:
dep(A:getChild[0] -> A/B:getParent)
dep(A:getChild[0] -> A/C[0]:getParent)
dep(A:getChild[0] -> A:getName)
A/C[0] rewritten from A/B
b:
c:
-- Dependencies/Cache after setName:
a:
b:
c:
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment