[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r13612 - in gnunet/src/monkey/seaspider: . org/gnunet/seasp
From: |
gnunet |
Subject: |
[GNUnet-SVN] r13612 - in gnunet/src/monkey/seaspider: . org/gnunet/seaspider |
Date: |
Mon, 8 Nov 2010 12:12:48 +0100 |
Author: grothoff
Date: 2010-11-08 12:12:48 +0100 (Mon, 08 Nov 2010)
New Revision: 13612
Modified:
gnunet/src/monkey/seaspider/C.jj
gnunet/src/monkey/seaspider/org/gnunet/seaspider/ExpressionExtractorVisitor.java
Log:
trying to fix grammar
Modified: gnunet/src/monkey/seaspider/C.jj
===================================================================
--- gnunet/src/monkey/seaspider/C.jj 2010-11-08 11:01:08 UTC (rev 13611)
+++ gnunet/src/monkey/seaspider/C.jj 2010-11-08 11:12:48 UTC (rev 13612)
@@ -123,8 +123,31 @@
| <#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"])+>
-| <CHARACTER_LITERAL: "\'" (~["\'","\\","\n","\r"] | "\\"
(["n","t","b","r","f","\\","\'","\""] | ["0"-"7"] (["0"-"7"])? | ["0"-"3"]
["0"-"7"] ["0"-"7"])) "\'">
-| <STRING_LITERAL: "\"" ( ~["\"","\\","\n","\r"] | "\\" (
["n","t","b","r","f","\\","\'","\""] | ["0"-"7"] (["0"-"7"])? | ["0"-"3"]
["0"-"7"] ["0"-"7"] | ( ["\n","\r"] | "\r\n")))* "\"" ( ( ["\r","\n"," "] )*
"\"" ( ~["\"","\\","\n","\r"] | "\\" ( ["n","t","b","r","f","\\","\'","\""] |
["0"-"7"] (["0"-"7"])? | ["0"-"3"] ["0"-"7"] ["0"-"7"] | ( ["\n","\r"] |
"\r\n")))* "\"" )* >
+|
+ < CHARACTER_LITERAL:
+ "'"
+ ( (~["'","\\","\n","\r"])
+ | ("\\"
+ ( ["n","t","b","r","f","\\","'","\""]
+ | ["0"-"7"] ( ["0"-"7"] )?
+ | ["0"-"3"] ["0"-"7"] ["0"-"7"]
+ )
+ )
+ )
+ "'"
+ >
+| < STRING_LITERAL:
+ "\""
+ ( (~["\"","\\","\n","\r"])
+ | ("\\"
+ ( ["n","t","b","r","f","\\","'","\""]
+ | ["0"-"7"] ( ["0"-"7"] )?
+ | ["0"-"3"] ["0"-"7"] ["0"-"7"]
+ )
+ )
+ )*
+ "\""
+ >
}
TOKEN : {
@@ -222,7 +245,7 @@
void ParameterDeclaration() : {}
{
- TypeSpecifier() <IDENTIFIER> [ Array () ]
+ TypeSpecifier() [<IDENTIFIER> [ Array () ]]
}
void VariableDeclaration() : {}
Modified:
gnunet/src/monkey/seaspider/org/gnunet/seaspider/ExpressionExtractorVisitor.java
===================================================================
---
gnunet/src/monkey/seaspider/org/gnunet/seaspider/ExpressionExtractorVisitor.java
2010-11-08 11:01:08 UTC (rev 13611)
+++
gnunet/src/monkey/seaspider/org/gnunet/seaspider/ExpressionExtractorVisitor.java
2010-11-08 11:12:48 UTC (rev 13612)
@@ -26,6 +26,7 @@
import org.gnunet.seaspider.parser.nodes.LogicalANDExpression;
import org.gnunet.seaspider.parser.nodes.LogicalORExpression;
import org.gnunet.seaspider.parser.nodes.MultiplicativeExpression;
+import org.gnunet.seaspider.parser.nodes.Node;
import org.gnunet.seaspider.parser.nodes.NodeChoice;
import org.gnunet.seaspider.parser.nodes.NodeSequence;
import org.gnunet.seaspider.parser.nodes.NodeToken;
@@ -141,10 +142,15 @@
public void visit(ParameterDeclaration n) {
skip_mode = false;
assert current_expression == null;
- current_expression = new ExpressionBuilder();
- n.f1.accept(this);
- LineNumberInfo lin = LineNumberInfo.get(n);
- current_expression.commit(lin.lineEnd);
+ if (n.f1.present())
+ {
+ NodeSequence ns = (NodeSequence) n.f1.node;
+ Node var = ns.elementAt(0);
+ current_expression = new ExpressionBuilder();
+ var.accept(this);
+ LineNumberInfo lin = LineNumberInfo.get(var);
+ current_expression.commit(lin.lineEnd);
+ }
current_expression = null;
skip_mode = true;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r13612 - in gnunet/src/monkey/seaspider: . org/gnunet/seaspider,
gnunet <=