moves

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 @@
-# Script that generates syntax tree and launches SeaSpider for creating GNUnet expression database
-JTB_COMMAND=$(../../../bin/jtb .)
-JAVACC_COMMAND=$(../../../bin/javacc .)
-
-$(JTB_COMMAND)
-$(JAVACC_COMMAND)
- 
\ No newline at end of file
+all:
+        jtb C.jj
+        javacc C.jj.out
+        javac `find * -name "*.java"`
+        jar -cvf seaspider.jar `find * -name "*.class"` 
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 @@
-package org.gnunet.seaspider.parser.visitors;
-import java.util.ArrayList;
-
-import org.gnunet.seaspider.parser.LineNumberInfo;
-import org.gnunet.seaspider.parser.nodes.AssignmentOperator;
-import org.gnunet.seaspider.parser.nodes.CompoundStatement;
-import org.gnunet.seaspider.parser.nodes.Expression;
-
-
-public class GNUnetDepthFirstVisitor extends DepthFirstVisitor {
-        /* Inner utilities classes */
-        private class Scope {
-                public Scope(int scopeStart, int scopeEnd) {
-                        this.scopeStart = scopeStart;
-                        this.scopeEnd = scopeEnd;
-                }
-                public int scopeStart;
-                public int scopeEnd;
-        }
-
-        private class ExpressionEntry {
-                public ArrayList<ExpressionEntry> expressionComponents= new ArrayList<ExpressionEntry>();
-                public LineNumberInfo lineNumberInfo;
-                public Scope expressionScope;
-        }
-        
-        /* Fields */
-        private int current_endline;
-        private Scope currentScope;
-        private ExpressionEntry currentExpression;
-        
-        /* Methods */
-        /**
-    * f0 -> ConditionalExpression()
-    * f1 -> [ AssignmentOperator() Expression() ]
-    */
-        public void visit(Expression n) {
-                currentExpression = new ExpressionEntry();
-                currentExpression.lineNumberInfo = LineNumberInfo.get(n);
-                currentExpression.expressionScope = currentScope;
-                
-                n.f0.accept(this);
-                n.f1.accept(this);
-        }
-        
-        public void visit(AssignmentOperator n) {
-            n.f0.accept(this);
-        }
-           
-        /**
-    * <PRE>
-    * f0 -> "{"
-    * f1 -> ( LocalVariableDeclaration() | Statement() )*
-    * f2 -> "}"
-    * </PRE>
-    */
-    public void visit(CompoundStatement n) {            
-        currentScope.scopeStart = n.f0.endLine;
-        currentScope.scopeEnd = n.f2.endLine;
-        n.f0.accept(this);
-        n.f1.accept(this);
-        n.f2.accept(this);
-    }
-}
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