From 0497c0a914c5a7f684d7fec90e1eca7085ee32fd Mon Sep 17 00:00:00 2001
From: Anders Nilsson <csandersn@garde>
Date: Tue, 5 May 2009 14:17:28 +0200
Subject: [PATCH] Managed to combine both xlim and xdf parsers so we can build
programs that use both at the same time.
---
.bzrignore | 2 ++
examples/actors/{xlim => }/AddFiveOnce_0.xlim | 0
examples/actors/{xlim => }/AddOne_0.xlim | 0
examples/actors/{xlim => }/Double_0.xlim | 0
examples/actors/{xlim => }/SDFAnalysis.java | 2 +-
examples/actors/{xdf => }/SSRAnalysis.java | 2 +-
examples/actors/{xlim => }/SubOne_0.xlim | 0
examples/actors/{xdf => }/sdftest.xdf | 0
examples/actors/xdf/build.xml | 8 ++++----
examples/actors/xlim/build.xml | 8 ++++----
10 files changed, 12 insertions(+), 10 deletions(-)
rename examples/actors/{xlim => }/AddFiveOnce_0.xlim (100%)
rename examples/actors/{xlim => }/AddOne_0.xlim (100%)
rename examples/actors/{xlim => }/Double_0.xlim (100%)
rename examples/actors/{xlim => }/SDFAnalysis.java (90%)
rename examples/actors/{xdf => }/SSRAnalysis.java (94%)
rename examples/actors/{xlim => }/SubOne_0.xlim (100%)
rename examples/actors/{xdf => }/sdftest.xdf (100%)
diff --git a/.bzrignore b/.bzrignore
index 4a1becb..6e4e32b 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -23,3 +23,5 @@ xdf.ast
xdf.jjt
examples/actors/xdf/xdfAST
examples/actors/xlim/xlimAST
+examples/actors/xlimAST
+examples/actors/xdfAST
diff --git a/examples/actors/xlim/AddFiveOnce_0.xlim b/examples/actors/AddFiveOnce_0.xlim
similarity index 100%
rename from examples/actors/xlim/AddFiveOnce_0.xlim
rename to examples/actors/AddFiveOnce_0.xlim
diff --git a/examples/actors/xlim/AddOne_0.xlim b/examples/actors/AddOne_0.xlim
similarity index 100%
rename from examples/actors/xlim/AddOne_0.xlim
rename to examples/actors/AddOne_0.xlim
diff --git a/examples/actors/xlim/Double_0.xlim b/examples/actors/Double_0.xlim
similarity index 100%
rename from examples/actors/xlim/Double_0.xlim
rename to examples/actors/Double_0.xlim
diff --git a/examples/actors/xlim/SDFAnalysis.java b/examples/actors/SDFAnalysis.java
similarity index 90%
rename from examples/actors/xlim/SDFAnalysis.java
rename to examples/actors/SDFAnalysis.java
index 16217fb..0a9d42c 100644
--- a/examples/actors/xlim/SDFAnalysis.java
+++ b/examples/actors/SDFAnalysis.java
@@ -9,7 +9,7 @@
import xlimAST.Start;
-public class SDFAnalysis extends Parser {
+public class SDFAnalysis extends XlimParser {
public static void main(String args[]) {
Start ast = parse(args);
diff --git a/examples/actors/xdf/SSRAnalysis.java b/examples/actors/SSRAnalysis.java
similarity index 94%
rename from examples/actors/xdf/SSRAnalysis.java
rename to examples/actors/SSRAnalysis.java
index 6615ac5..a39078e 100644
--- a/examples/actors/xdf/SSRAnalysis.java
+++ b/examples/actors/SSRAnalysis.java
@@ -10,7 +10,7 @@ import xdfAST.Start;
import xdfAST.Instance;
import java.util.LinkedList;
-public class SSRAnalysis extends Parser {
+public class SSRAnalysis extends XdfParser {
public static void main(String args[]) {
Start ast = parse(args);
diff --git a/examples/actors/xlim/SubOne_0.xlim b/examples/actors/SubOne_0.xlim
similarity index 100%
rename from examples/actors/xlim/SubOne_0.xlim
rename to examples/actors/SubOne_0.xlim
diff --git a/examples/actors/xdf/sdftest.xdf b/examples/actors/sdftest.xdf
similarity index 100%
rename from examples/actors/xdf/sdftest.xdf
rename to examples/actors/sdftest.xdf
diff --git a/examples/actors/xdf/build.xml b/examples/actors/xdf/build.xml
index 21d3502..53a6aa0 100644
--- a/examples/actors/xdf/build.xml
+++ b/examples/actors/xdf/build.xml
@@ -35,7 +35,7 @@
<!-- create AST node types and weave aspect modules -->
<echo message = "Running JastAdd"/>
<!-- <jastadd package="${package}" rewrite="true" beaver="true" novisitcheck="true"> -->
- <jastadd package="${package}" grammar="${parser.name}" rewrite="true" jjtree="true">
+ <jastadd outdir="." package="${package}" grammar="${parser.name}" rewrite="true" jjtree="true">
<fileset dir=".">
<include name="*.ast"/>
<include name="*.jrag"/>
@@ -44,7 +44,7 @@
</jastadd>
<jjtree
target="xdf.jjt"
- outputdirectory="${package}"
+ outputdirectory="../${package}"
javacchome="${javacc.home}"
buildnodefiles="true"
static="false"
@@ -55,8 +55,8 @@
nodepackage="${package}"
/>
<javacc
- target="${package}/xdf.jj"
- outputdirectory="${package}"
+ target="../${package}/xdf.jj"
+ outputdirectory="../${package}"
javacchome="${javacc.home}"
buildparser="true"
buildtokenmanager="true"
diff --git a/examples/actors/xlim/build.xml b/examples/actors/xlim/build.xml
index e8c77ad..b276728 100644
--- a/examples/actors/xlim/build.xml
+++ b/examples/actors/xlim/build.xml
@@ -35,7 +35,7 @@
<!-- create AST node types and weave aspect modules -->
<echo message = "Running JastAdd"/>
<!-- <jastadd package="${package}" rewrite="true" beaver="true" novisitcheck="true"> -->
- <jastadd package="${package}" grammar="${parser.name}" rewrite="true" jjtree="true">
+ <jastadd outdir="." package="${package}" grammar="${parser.name}" rewrite="true" jjtree="true">
<fileset dir=".">
<include name="*.ast"/>
<include name="*.jrag"/>
@@ -44,7 +44,7 @@
</jastadd>
<jjtree
target="xlim.jjt"
- outputdirectory="${package}"
+ outputdirectory="../${package}"
javacchome="${javacc.home}"
buildnodefiles="true"
static="false"
@@ -55,8 +55,8 @@
nodepackage="${package}"
/>
<javacc
- target="${package}/xlim.jj"
- outputdirectory="${package}"
+ target="../${package}/xlim.jj"
+ outputdirectory="../${package}"
javacchome="${javacc.home}"
buildparser="true"
buildtokenmanager="true"
--
GitLab