Skip to content
Snippets Groups Projects
Commit 675cd578 authored by Anders Nilsson's avatar Anders Nilsson
Browse files

Demoed at Actors meeting in Lund 090526.

parent c7e9da89
No related branches found
No related tags found
No related merge requests found
...@@ -27,7 +27,7 @@ public class MergeActors extends XdfParser { ...@@ -27,7 +27,7 @@ public class MergeActors extends XdfParser {
// } // }
ast.mergeActors(); ast.mergeActors();
// ast.prettyPrint("",System.out); ast.prettyPrint("",System.out);
} }
} }
...@@ -53,14 +53,6 @@ aspect MergeActors { ...@@ -53,14 +53,6 @@ aspect MergeActors {
i.genFile(); i.genFile();
} }
} }
// void Connection.mergeActors() {
// Instance src = getSource();
// Instance dest = getDest();
// if (dest.isSDF() && src.isSDF()) {
// src.merge(dest);
// src.setName(src.name()+"_"+dest.name());
// }
// }
void Instance.merge(Instance inst) { void Instance.merge(Instance inst) {
xlimInstance().merge(inst.xlimInstance()); xlimInstance().merge(inst.xlimInstance());
...@@ -70,7 +62,7 @@ aspect MergeActors { ...@@ -70,7 +62,7 @@ aspect MergeActors {
System.out.println("generating actor: "+name()); System.out.println("generating actor: "+name());
try { try {
if (!(xlimInstance() instanceof xlimAST.EmptyStart)) { if (!(xlimInstance() instanceof xlimAST.EmptyStart)) {
System.out.println(" Writing"); // System.out.println(" Writing");
xlimInstance().prettyPrint("",new PrintStream(new File(name()+".xlim"))); xlimInstance().prettyPrint("",new PrintStream(new File(name()+".xlim")));
} }
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment