[GNUnet-SVN] r24096 - in monkey/trunk/seaspider: . org/gnunet/seaspider

[gnunet]

Author: grothoff
Date: 2012-09-28 14:16:14 +0200 (Fri, 28 Sep 2012)
New Revision: 24096

Modified:
   monkey/trunk/seaspider/C.jj
   monkey/trunk/seaspider/org/gnunet/seaspider/Seaspider.java
Log:
-switch to UTF8, support int foo, __*__bar;, support common Tor macros, 
0x1234UUL, etc.

Modified: monkey/trunk/seaspider/C.jj
===================================================================
--- monkey/trunk/seaspider/C.jj 2012-09-28 12:00:21 UTC (rev 24095)
+++ monkey/trunk/seaspider/C.jj 2012-09-28 12:16:14 UTC (rev 24096)
@@ -51,6 +51,10 @@
 - support for string concatenations
 */
 
+options {
+       UNICODE_INPUT=true;
+}
+
 PARSER_BEGIN(CParser)
 
 import java.util.*;
@@ -97,6 +101,9 @@
 
 SKIP : {
  " "
+|  <"INLINE">
+|  <"DMALLOC_PARAMS">
+|  <"DMALLOC_FN_ARGS">
 |  <"WSAPI">
 |  <"WSPAPI">
 |  <"WSAAPI">
@@ -132,9 +139,9 @@
 
 
 TOKEN : {
- <INTEGER_LITERAL: <DECIMAL_LITERAL> (["l","L"])? (["l","L"])? (["U","u"])? | 
<HEX_LITERAL> (["l","L"])? (["l","L"])? | <OCTAL_LITERAL> (["l","L"])? 
(["l","L"])?>
+ <INTEGER_LITERAL: <DECIMAL_LITERAL>  (["U","u"])? (["l","L"])? (["l","L"])? | 
<HEX_LITERAL> (["l","L"])? (["l","L"])? | <OCTAL_LITERAL> (["l","L"])? 
(["l","L"])?>
 |  <#DECIMAL_LITERAL: ["1"-"9"] (["0"-"9"])* >
-|  <#HEX_LITERAL: "0" ["x","X"] (["0"-"9","a"-"f","A"-"F"])+>
+|  <#HEX_LITERAL: "0" ["x","X"] (["0"-"9","a"-"f","A"-"F"])+ (["U","u"])? 
(["l","L"])? (["l","L"])? >
 |  <#OCTAL_LITERAL: "0" (["0"-"7"])*>
 |  <FLOATING_POINT_LITERAL: (["0"-"9"])+ "." (["0"-"9"])* (<EXPONENT>)? 
(["f","F","d","D"])? | "." (["0"-"9"])+ (<EXPONENT>)? (["f","F","d","D"])? | 
(["0"-"9"])+ <EXPONENT> (["f","F","d","D"])? | (["0"-"9"])+ (<EXPONENT>)? 
["f","F","d","D"]>
 |  <#EXPONENT: ["e","E"] (["+","-"])? (["0"-"9"])+>
@@ -156,6 +163,7 @@
       (   (~["\"","\\","\n","\r"])
         | ("\\"
             ( ["n","t","b","r","f","\\","'","\""]
+            | ["x","X"] (["0"-"9","a"-"f","A"-"F"]) 
             | ["0"-"7"] ( ["0"-"7"] )?
             | ["0"-"3"] ["0"-"7"] ["0"-"7"]
             )
@@ -344,7 +352,7 @@
 
 void InitDeclaratorList() : {}
 {
-       InitDeclarator() ("," InitDeclarator())*
+       InitDeclarator() ("," ("*")* InitDeclarator())*
 }
 
 void InitDeclarator() : {}

Modified: monkey/trunk/seaspider/org/gnunet/seaspider/Seaspider.java
===================================================================
--- monkey/trunk/seaspider/org/gnunet/seaspider/Seaspider.java  2012-09-28 
12:00:21 UTC (rev 24095)
+++ monkey/trunk/seaspider/org/gnunet/seaspider/Seaspider.java  2012-09-28 
12:16:14 UTC (rev 24096)
@@ -2,7 +2,9 @@
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.InputStreamReader;
 import java.io.FileNotFoundException;
+import java.io.UnsupportedEncodingException;
 import java.io.FilenameFilter;
 import java.util.ArrayList;
 
@@ -34,11 +36,11 @@
        {
                try {
                 if (isFirstFile) {
-                        parser = new CParser(new FileInputStream(filePath));
+                    parser = new CParser(new InputStreamReader (new 
FileInputStream(filePath), "UTF-8"));
                         isFirstFile = false;
                 }
                 else
-                        parser.ReInit(new FileInputStream(filePath));
+                    parser.ReInit(new InputStreamReader (new 
FileInputStream(filePath), "UTF-8"));
                 }
                 catch (FileNotFoundException e) {
                         /* This should never happen */
@@ -46,6 +48,11 @@
                         e.printStackTrace();
                         System.exit(1);
                 }
+                catch (UnsupportedEncodingException uee)
+                {
+                    System.err.println (uee.toString());
+                    System.exit(1);
+                }
                 try {
                         System.out.println("Parsing file: " + filePath);
                 Node root = parser.TranslationUnit();