[GNUnet-SVN] r13434 - gnunet/src/monkey/seaspider/org/gnunet/seaspider

[gnunet]

Author: grothoff
Date: 2010-10-27 15:19:52 +0200 (Wed, 27 Oct 2010)
New Revision: 13434

Modified:
   
gnunet/src/monkey/seaspider/org/gnunet/seaspider/ExpressionDatabaseHandler.java
   
gnunet/src/monkey/seaspider/org/gnunet/seaspider/ExpressionExtractorVisitor.java
Log:
fixes

Modified: 
gnunet/src/monkey/seaspider/org/gnunet/seaspider/ExpressionDatabaseHandler.java
===================================================================
--- 
gnunet/src/monkey/seaspider/org/gnunet/seaspider/ExpressionDatabaseHandler.java 
    2010-10-27 12:52:52 UTC (rev 13433)
+++ 
gnunet/src/monkey/seaspider/org/gnunet/seaspider/ExpressionDatabaseHandler.java 
    2010-10-27 13:19:52 UTC (rev 13434)
@@ -56,6 +56,8 @@
                if (expressionSyntax.startsWith("\""))
                        return;
                System.out.println (fileName  + ":[" + startLineNo + "-" + 
endLineNo + "]: " + expressionSyntax);
+               if (true)
+                       return;
                if (db == null) {
                        System.out.println("Error:Database handle is not 
initialized. Program will exit now!");
                        System.exit(1);

Modified: 
gnunet/src/monkey/seaspider/org/gnunet/seaspider/ExpressionExtractorVisitor.java
===================================================================
--- 
gnunet/src/monkey/seaspider/org/gnunet/seaspider/ExpressionExtractorVisitor.java
    2010-10-27 12:52:52 UTC (rev 13433)
+++ 
gnunet/src/monkey/seaspider/org/gnunet/seaspider/ExpressionExtractorVisitor.java
    2010-10-27 13:19:52 UTC (rev 13434)
@@ -19,6 +19,9 @@
 import org.gnunet.seaspider.parser.nodes.IfStatement;
 import org.gnunet.seaspider.parser.nodes.InclusiveORExpression;
 import org.gnunet.seaspider.parser.nodes.InitDeclarator;
+import org.gnunet.seaspider.parser.nodes.InitDeclaratorList;
+import org.gnunet.seaspider.parser.nodes.Initializer;
+import org.gnunet.seaspider.parser.nodes.InitializerList;
 import org.gnunet.seaspider.parser.nodes.JumpStatement;
 import org.gnunet.seaspider.parser.nodes.LogicalANDExpression;
 import org.gnunet.seaspider.parser.nodes.LogicalORExpression;
@@ -37,6 +40,7 @@
 import org.gnunet.seaspider.parser.nodes.TypeDeclaration;
 import org.gnunet.seaspider.parser.nodes.UnaryExpression;
 import org.gnunet.seaspider.parser.nodes.UnaryOperator;
+import org.gnunet.seaspider.parser.nodes.VariableDeclaration;
 import org.gnunet.seaspider.parser.nodes.WhileStatement;
 import org.gnunet.seaspider.parser.visitors.DepthFirstVisitor;
 import org.grothoff.LineNumberInfo;
@@ -99,6 +103,29 @@
                // do nothing -- skip!
        }
 
+       public void visit(InitDeclaratorList n) {
+               assert skip_mode == true;
+               super.visit (n);                
+               assert skip_mode == true;
+       }
+       
+       public void visit(Initializer n) {
+               assert skip_mode == true;
+               super.visit (n);                
+               assert skip_mode == true;
+       }
+
+       public void visit(InitializerList n) {
+               assert skip_mode == true;
+               super.visit (n);                
+               assert skip_mode == true;
+       }
+       
+       public void visit(VariableDeclaration n) {
+               assert skip_mode == true;
+               super.visit (n);
+       }
+
        public void visit(FunctionDeclaration n) {
                if (n.f5.which == 0)
                        return; // no body
@@ -146,6 +173,8 @@
        }
 
        public void visit(CompoundStatement n) {
+               assert current_expression == null;
+               assert skip_mode == true;
                int old_end = scope_end_line;
                scope_end_line = n.f2.endLine;
                n.f1.accept(this);
@@ -252,8 +281,8 @@
        }
 
        public void visit(AssignmentExpression n) {
+               boolean old_mode = skip_mode;
                skip_mode = false;
-               assert current_expression == null;
                ExpressionBuilder old = current_expression;
                current_expression = new ExpressionBuilder();
                n.f0.accept(this);
@@ -263,6 +292,7 @@
                        old.commit(lin.lineEnd);
                }
                current_expression = old;
+               skip_mode = old_mode;
        }
 
        public void visit(AssignmentOperator n) {