diff options
-rwxr-xr-x | src/monkey/seaspider/Makefile | 12 | ||||
-rw-r--r-- | src/monkey/seaspider/org/gnunet/seaspider/Seaspider.java (renamed from src/monkey/seaspider/org/gnunet/seaspider/parser/GNUnetParser.java) | 0 | ||||
-rw-r--r-- | src/monkey/seaspider/org/gnunet/seaspider/parser/visitors/GNUnetDepthFirstVisitor.java | 64 | ||||
-rw-r--r-- | src/monkey/seaspider/org/grothoff/LineNumberInfo.java (renamed from src/monkey/seaspider/org/gnunet/seaspider/parser/LineNumberInfo.java) | 0 |
4 files changed, 5 insertions, 71 deletions
diff --git a/src/monkey/seaspider/Makefile b/src/monkey/seaspider/Makefile index a6a1ffdbd..6933bdac3 100755 --- a/src/monkey/seaspider/Makefile +++ b/src/monkey/seaspider/Makefile | |||
@@ -1,7 +1,5 @@ | |||
1 | # Script that generates syntax tree and launches SeaSpider for creating GNUnet expression database | 1 | all: |
2 | JTB_COMMAND=$(../../../bin/jtb .) | 2 | jtb C.jj |
3 | JAVACC_COMMAND=$(../../../bin/javacc .) | 3 | javacc C.jj.out |
4 | 4 | javac `find * -name "*.java"` | |
5 | $(JTB_COMMAND) | 5 | jar -cvf seaspider.jar `find * -name "*.class"` |
6 | $(JAVACC_COMMAND) | ||
7 | \ No newline at end of file | ||
diff --git a/src/monkey/seaspider/org/gnunet/seaspider/parser/GNUnetParser.java b/src/monkey/seaspider/org/gnunet/seaspider/Seaspider.java index 14ee4450e..14ee4450e 100644 --- a/src/monkey/seaspider/org/gnunet/seaspider/parser/GNUnetParser.java +++ b/src/monkey/seaspider/org/gnunet/seaspider/Seaspider.java | |||
diff --git a/src/monkey/seaspider/org/gnunet/seaspider/parser/visitors/GNUnetDepthFirstVisitor.java b/src/monkey/seaspider/org/gnunet/seaspider/parser/visitors/GNUnetDepthFirstVisitor.java deleted file mode 100644 index 1067a2ca3..000000000 --- a/src/monkey/seaspider/org/gnunet/seaspider/parser/visitors/GNUnetDepthFirstVisitor.java +++ /dev/null | |||
@@ -1,64 +0,0 @@ | |||
1 | package org.gnunet.seaspider.parser.visitors; | ||
2 | import java.util.ArrayList; | ||
3 | |||
4 | import org.gnunet.seaspider.parser.LineNumberInfo; | ||
5 | import org.gnunet.seaspider.parser.nodes.AssignmentOperator; | ||
6 | import org.gnunet.seaspider.parser.nodes.CompoundStatement; | ||
7 | import org.gnunet.seaspider.parser.nodes.Expression; | ||
8 | |||
9 | |||
10 | public class GNUnetDepthFirstVisitor extends DepthFirstVisitor { | ||
11 | /* Inner utilities classes */ | ||
12 | private class Scope { | ||
13 | public Scope(int scopeStart, int scopeEnd) { | ||
14 | this.scopeStart = scopeStart; | ||
15 | this.scopeEnd = scopeEnd; | ||
16 | } | ||
17 | public int scopeStart; | ||
18 | public int scopeEnd; | ||
19 | } | ||
20 | |||
21 | private class ExpressionEntry { | ||
22 | public ArrayList<ExpressionEntry> expressionComponents= new ArrayList<ExpressionEntry>(); | ||
23 | public LineNumberInfo lineNumberInfo; | ||
24 | public Scope expressionScope; | ||
25 | } | ||
26 | |||
27 | /* Fields */ | ||
28 | private int current_endline; | ||
29 | private Scope currentScope; | ||
30 | private ExpressionEntry currentExpression; | ||
31 | |||
32 | /* Methods */ | ||
33 | /** | ||
34 | * f0 -> ConditionalExpression() | ||
35 | * f1 -> [ AssignmentOperator() Expression() ] | ||
36 | */ | ||
37 | public void visit(Expression n) { | ||
38 | currentExpression = new ExpressionEntry(); | ||
39 | currentExpression.lineNumberInfo = LineNumberInfo.get(n); | ||
40 | currentExpression.expressionScope = currentScope; | ||
41 | |||
42 | n.f0.accept(this); | ||
43 | n.f1.accept(this); | ||
44 | } | ||
45 | |||
46 | public void visit(AssignmentOperator n) { | ||
47 | n.f0.accept(this); | ||
48 | } | ||
49 | |||
50 | /** | ||
51 | * <PRE> | ||
52 | * f0 -> "{" | ||
53 | * f1 -> ( LocalVariableDeclaration() | Statement() )* | ||
54 | * f2 -> "}" | ||
55 | * </PRE> | ||
56 | */ | ||
57 | public void visit(CompoundStatement n) { | ||
58 | currentScope.scopeStart = n.f0.endLine; | ||
59 | currentScope.scopeEnd = n.f2.endLine; | ||
60 | n.f0.accept(this); | ||
61 | n.f1.accept(this); | ||
62 | n.f2.accept(this); | ||
63 | } | ||
64 | } | ||
diff --git a/src/monkey/seaspider/org/gnunet/seaspider/parser/LineNumberInfo.java b/src/monkey/seaspider/org/grothoff/LineNumberInfo.java index 3c6832fa8..3c6832fa8 100644 --- a/src/monkey/seaspider/org/gnunet/seaspider/parser/LineNumberInfo.java +++ b/src/monkey/seaspider/org/grothoff/LineNumberInfo.java | |||