[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r15259 - gnunet/src/monkey/seaspider/org/gnunet/seaspider
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r15259 - gnunet/src/monkey/seaspider/org/gnunet/seaspider |
|
Date: |
Thu, 19 May 2011 10:36:54 +0200 |
Author: grothoff
Date: 2011-05-19 10:36:54 +0200 (Thu, 19 May 2011)
New Revision: 15259
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
2011-05-19 08:17:35 UTC (rev 15258)
+++
gnunet/src/monkey/seaspider/org/gnunet/seaspider/ExpressionDatabaseHandler.java
2011-05-19 08:36:54 UTC (rev 15259)
@@ -197,7 +197,8 @@
}
String[] fileNameArr = fileName.split("src/");
- fileName = fileNameArr[1];
+ if (fileNameArr.length > 1)
+ fileName = fileNameArr[1];
insertExpression(fileName, expressionSyntax, startLineNo,
endLineNo);
}
}
Modified:
gnunet/src/monkey/seaspider/org/gnunet/seaspider/ExpressionExtractorVisitor.java
===================================================================
---
gnunet/src/monkey/seaspider/org/gnunet/seaspider/ExpressionExtractorVisitor.java
2011-05-19 08:17:35 UTC (rev 15258)
+++
gnunet/src/monkey/seaspider/org/gnunet/seaspider/ExpressionExtractorVisitor.java
2011-05-19 08:36:54 UTC (rev 15259)
@@ -411,11 +411,19 @@
current_expression = new ExpressionBuilder();
n.f0.accept(this);
if (n.f1.present()) {
+ LineNumberInfo lin = LineNumberInfo.get(n.f0);
+ current_expression.commit(lin.lineEnd);
operator = true;
NodeSequence ns = (NodeSequence) n.f1.node;
ns.nodes.get(0).accept(this);
operator = false;
+ ExpressionBuilder tmp = current_expression;
+ current_expression = new ExpressionBuilder();
ns.nodes.get(1).accept(this);
+ lin = LineNumberInfo.get(ns.nodes.get(1));
+ current_expression.commit(lin.lineEnd);
+ tmp.push (current_expression.expression);
+ current_expression = tmp;
}
old.push(current_expression.expression);
current_expression = old;
@@ -427,11 +435,19 @@
current_expression = new ExpressionBuilder();
n.f0.accept(this);
if (n.f1.present()) {
+ LineNumberInfo lin = LineNumberInfo.get(n.f0);
+ current_expression.commit(lin.lineEnd);
operator = true;
NodeSequence ns = (NodeSequence) n.f1.node;
ns.nodes.get(0).accept(this);
operator = false;
+ ExpressionBuilder tmp = current_expression;
+ current_expression = new ExpressionBuilder();
ns.nodes.get(1).accept(this);
+ lin = LineNumberInfo.get(ns.nodes.get(1));
+ current_expression.commit(lin.lineEnd);
+ tmp.push (current_expression.expression);
+ current_expression = tmp;
}
old.push(current_expression.expression);
current_expression = old;
@@ -443,11 +459,19 @@
current_expression = new ExpressionBuilder();
n.f0.accept(this);
if (n.f1.present()) {
+ LineNumberInfo lin = LineNumberInfo.get(n.f0);
+ current_expression.commit(lin.lineEnd);
operator = true;
NodeSequence ns = (NodeSequence) n.f1.node;
ns.nodes.get(0).accept(this);
operator = false;
+ ExpressionBuilder tmp = current_expression;
+ current_expression = new ExpressionBuilder();
ns.nodes.get(1).accept(this);
+ lin = LineNumberInfo.get(ns.nodes.get(1));
+ current_expression.commit(lin.lineEnd);
+ tmp.push (current_expression.expression);
+ current_expression = tmp;
}
old.push(current_expression.expression);
current_expression = old;
@@ -503,11 +527,19 @@
current_expression = new ExpressionBuilder();
n.f0.accept(this);
if (n.f1.present()) {
+ LineNumberInfo lin = LineNumberInfo.get(n.f0);
+ current_expression.commit(lin.lineEnd);
operator = true;
NodeSequence ns = (NodeSequence) n.f1.node;
ns.nodes.get(0).accept(this);
operator = false;
+ ExpressionBuilder tmp = current_expression;
+ current_expression = new ExpressionBuilder();
ns.nodes.get(1).accept(this);
+ lin = LineNumberInfo.get(ns.nodes.get(1));
+ current_expression.commit(lin.lineEnd);
+ tmp.push (current_expression.expression);
+ current_expression = tmp;
}
old.push(current_expression.expression);
current_expression = old;
@@ -519,11 +551,19 @@
current_expression = new ExpressionBuilder();
n.f0.accept(this);
if (n.f1.present()) {
+ LineNumberInfo lin = LineNumberInfo.get(n.f0);
+ current_expression.commit(lin.lineEnd);
operator = true;
NodeSequence ns = (NodeSequence) n.f1.node;
ns.nodes.get(0).accept(this);
operator = false;
+ ExpressionBuilder tmp = current_expression;
+ current_expression = new ExpressionBuilder();
ns.nodes.get(1).accept(this);
+ lin = LineNumberInfo.get(ns.nodes.get(1));
+ current_expression.commit(lin.lineEnd);
+ tmp.push (current_expression.expression);
+ current_expression = tmp;
}
old.push(current_expression.expression);
current_expression = old;
@@ -535,11 +575,19 @@
current_expression = new ExpressionBuilder();
n.f0.accept(this);
if (n.f1.present()) {
+ LineNumberInfo lin = LineNumberInfo.get(n.f0);
+ current_expression.commit(lin.lineEnd);
operator = true;
NodeSequence ns = (NodeSequence) n.f1.node;
ns.nodes.get(0).accept(this);
operator = false;
+ ExpressionBuilder tmp = current_expression;
+ current_expression = new ExpressionBuilder();
ns.nodes.get(1).accept(this);
+ lin = LineNumberInfo.get(ns.nodes.get(1));
+ current_expression.commit(lin.lineEnd);
+ tmp.push (current_expression.expression);
+ current_expression = tmp;
}
old.push(current_expression.expression);
current_expression = old;
@@ -634,6 +682,8 @@
current_expression = new ExpressionBuilder();
NodeSequence ns = (NodeSequence) n.f0.choice;
ns.elementAt(1).accept(this);
+ LineNumberInfo lin1 = LineNumberInfo.get
(ns.elementAt(1));
+ current_expression.commit(lin1.lineEnd);
old.push("(");
old.push(current_expression.expression);
old.push(")");
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r15259 - gnunet/src/monkey/seaspider/org/gnunet/seaspider,
gnunet <=