From b229a887dfd73dcb2e8bd3d54dc21878fa189ddc Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Wed, 27 Oct 2010 14:32:10 +0000
Subject: seaspidering

---
 src/monkey/gnunet-monkey.c                                |  2 +-
 src/monkey/seaspider/C.jj                                 |  3 ++-
 .../org/gnunet/seaspider/ExpressionDatabaseHandler.java   |  3 ++-
 src/monkey/seaspider/org/gnunet/seaspider/Seaspider.java  | 15 ++++++++++-----
 4 files changed, 15 insertions(+), 8 deletions(-)

(limited to 'src/monkey')

diff --git a/src/monkey/gnunet-monkey.c b/src/monkey/gnunet-monkey.c
index 342601774..b7feb1c51 100644
--- a/src/monkey/gnunet-monkey.c
+++ b/src/monkey/gnunet-monkey.c
@@ -46,7 +46,7 @@ void cb_from(const char *str, void *data)
  printf("<< %s\n",str);
 }
 
-volatile int async_c=0;
+static int async_c=0;
 
 void cb_async(mi_output *o, void *data)
 {
diff --git a/src/monkey/seaspider/C.jj b/src/monkey/seaspider/C.jj
index c7156069e..9cab0974a 100644
--- a/src/monkey/seaspider/C.jj
+++ b/src/monkey/seaspider/C.jj
@@ -179,7 +179,8 @@ void ExternalDeclaration() : {}
 	(StorageClassSpecifier())*
 	(
             LOOKAHEAD (FunctionDeclaration()) FunctionDeclaration() | 
-	    LOOKAHEAD (StructOrUnionSpecifier()) StructOrUnionSpecifier() ";" |
+	    LOOKAHEAD (StructOrUnionSpecifier() ";") StructOrUnionSpecifier() ";" |
+	    LOOKAHEAD (EnumSpecifier() ";") EnumSpecifier() ";" |
 	    LOOKAHEAD (VariableDeclaration()) VariableDeclaration() |
   	    LOOKAHEAD (TypeDeclaration()) TypeDeclaration () 
         ) 
diff --git a/src/monkey/seaspider/org/gnunet/seaspider/ExpressionDatabaseHandler.java b/src/monkey/seaspider/org/gnunet/seaspider/ExpressionDatabaseHandler.java
index 95e3f3c10..5886fc90b 100644
--- a/src/monkey/seaspider/org/gnunet/seaspider/ExpressionDatabaseHandler.java
+++ b/src/monkey/seaspider/org/gnunet/seaspider/ExpressionDatabaseHandler.java
@@ -55,7 +55,8 @@ public class ExpressionDatabaseHandler {
 			return;
 		if (expressionSyntax.startsWith("\""))
 			return;
-		System.out.println (fileName  + ":[" + startLineNo + "-" + endLineNo + "]: " + expressionSyntax);
+		if (false)
+			System.out.println (fileName  + ":[" + startLineNo + "-" + endLineNo + "]: " + expressionSyntax);
 		if (true)
 			return;
 		if (db == null) {
diff --git a/src/monkey/seaspider/org/gnunet/seaspider/Seaspider.java b/src/monkey/seaspider/org/gnunet/seaspider/Seaspider.java
index ed305ba74..f07413657 100644
--- a/src/monkey/seaspider/org/gnunet/seaspider/Seaspider.java
+++ b/src/monkey/seaspider/org/gnunet/seaspider/Seaspider.java
@@ -7,11 +7,12 @@ import java.io.FileNotFoundException;
 
 import org.gnunet.seaspider.parser.CParser;
 import org.gnunet.seaspider.parser.ParseException;
+import org.gnunet.seaspider.parser.TokenMgrError;
 import org.gnunet.seaspider.parser.nodes.Node;
 
 public class Seaspider {
 	
-	static final boolean DEBUG = true;
+	static final boolean DEBUG = false;
    
    public static void main(String args[])
    {
@@ -41,8 +42,7 @@ public class Seaspider {
      FileFilter sourceFilter = new FileFilter() {
     	public boolean accept(File file) {
     		String fileName = file.getName();
-    		System.out.println ("Found file " + fileName);
-    		return (fileName.endsWith(".c") || fileName.endsWith(".h"));
+    		return fileName.endsWith(".c");
     	}
      };
      
@@ -67,17 +67,22 @@ public class Seaspider {
     			 e.printStackTrace();
     		 }
     		 try {
-    			 System.out.println("Parsing file: " + dir + "/" + fileArr[j].getName());
     	         Node root = parser.TranslationUnit();
     	         root.accept(new ExpressionExtractorVisitor(fileArr[j].getName()));
     	         System.out.println("File " + dir + "/" + fileArr[j].getName() + " parsed successfully.");
     	         successCount++;
     	     }
     	     catch (ParseException e) {
-    	         System.out.println("Encountered errors during parsing file " + fileArr[j].getName());
+    	         System.err.println("Encountered errors during parsing file " + fileArr[j].getName() + ":" + e.getMessage());
     	         failureCount++;
     	         if (DEBUG)
     	        	 e.printStackTrace();
+    	     } catch (TokenMgrError e)
+    	     {
+    	    	 System.err.println("Encountered errors during parsing file " + fileArr[j].getName() + ":" + e.getMessage());
+    	         failureCount++;
+    	         if (DEBUG)
+    	        	 e.printStackTrace();    	    	 
     	     }
     	 }
      }
-- 
cgit v1.2.3