[GNUnet-SVN] r20798 - monkey/branches/MonkeyBacktracking/monkey/src/monkey/seaspider/org/gnunet/seaspider

[gnunet]

Author: grothoff
Date: 2012-03-28 14:42:34 +0200 (Wed, 28 Mar 2012)
New Revision: 20798

Modified:
   
monkey/branches/MonkeyBacktracking/monkey/src/monkey/seaspider/org/gnunet/seaspider/ExpressionExtractorVisitor.java
Log:
enable suppressing function calls in EDB

Modified: 
monkey/branches/MonkeyBacktracking/monkey/src/monkey/seaspider/org/gnunet/seaspider/ExpressionExtractorVisitor.java
===================================================================
--- 
monkey/branches/MonkeyBacktracking/monkey/src/monkey/seaspider/org/gnunet/seaspider/ExpressionExtractorVisitor.java
 2012-03-28 11:12:19 UTC (rev 20797)
+++ 
monkey/branches/MonkeyBacktracking/monkey/src/monkey/seaspider/org/gnunet/seaspider/ExpressionExtractorVisitor.java
 2012-03-28 12:42:34 UTC (rev 20798)
@@ -55,11 +55,20 @@
        class ExpressionBuilder {
                String expression = "";
 
+               boolean contains_call;
+
                void push(String token) {
                        expression = expression + token;
                }
 
+               void push(ExpressionBuilder eb) {
+                       expression = expression + eb.expression;
+                       contains_calls |= eb.contains_call;
+               }
+
                void commit(int line) {
+                       if (contains_calls)
+                           return; // skip this, we don't want to run function 
calls
                        
ExpressionDatabaseHandler.insertIntoExpressionTable(filename,
                                        expression, line, scope_end_line);
                }
@@ -648,6 +657,7 @@
                                old.push(current_expression.expression);
                                old.push(")");
                                current_expression = old;
+                               current_expression.contains_call = true;
                        }
                                break;
                        case 2: // .