Revision: 17766
http://sourceforge.net/p/gate/code/17766
Author: markagreenwood
Date: 2014-04-03 11:31:19 +0000 (Thu, 03 Apr 2014)
Log Message:
-----------
a little bit of rearranging of the imports in generated jape code, and making
more hard coded class references fully qualified to cut down the class search
at compile time
Modified Paths:
--------------
gate/trunk/src/main/gate/jape/RightHandSide.java
gate/trunk/src/main/gate/jape/parser/ParseCpsl.java
gate/trunk/src/main/gate/jape/parser/ParseCpsl.jj
Modified: gate/trunk/src/main/gate/jape/RightHandSide.java
===================================================================
--- gate/trunk/src/main/gate/jape/RightHandSide.java 2014-04-03 09:54:56 UTC
(rev 17765)
+++ gate/trunk/src/main/gate/jape/RightHandSide.java 2014-04-03 11:31:19 UTC
(rev 17766)
@@ -121,12 +121,12 @@
"package " + actionsDirName + "; " + nl +
importblock + nl +
"public class " + actionClassName + nl +
- "implements java.io.Serializable, RhsAction { " + nl +
- " private ActionContext ctx;"+nl+
- " public String ruleName() { return \""+ruleName+"\"; }"+nl+
- " public String phaseName() { return \""+phaseName+"\"; }"+nl+
- " public void setActionContext(ActionContext ac) { ctx = ac; }"+nl+
- " public ActionContext getActionContext() { return ctx; }"+nl+
+ "implements java.io.Serializable, gate.jape.RhsAction { " + nl +
+ " private gate.jape.ActionContext ctx;"+nl+
+ " public java.lang.String ruleName() { return \""+ruleName+"\"; }"+nl+
+ " public java.lang.String phaseName() { return \""+phaseName+"\"; }"+nl+
+ " public void setActionContext(gate.jape.ActionContext ac) { ctx = ac;
}"+nl+
+ " public gate.jape.ActionContext getActionContext() { return ctx; }"+nl+
" public void doit(gate.Document doc, " + nl +
" java.util.Map<java.lang.String, gate.AnnotationSet>
bindings, " + nl +
//" gate.AnnotationSet annotations, " + nl +
Modified: gate/trunk/src/main/gate/jape/parser/ParseCpsl.java
===================================================================
--- gate/trunk/src/main/gate/jape/parser/ParseCpsl.java 2014-04-03 09:54:56 UTC
(rev 17765)
+++ gate/trunk/src/main/gate/jape/parser/ParseCpsl.java 2014-04-03 11:31:19 UTC
(rev 17766)
@@ -211,7 +211,7 @@
blockBuffer.append(" );" + nl);
blockBuffer.append(" }" + nl);
blockBuffer.append(" catch(gate.util.InvalidOffsetException ioe)
{" + nl);
- blockBuffer.append(" throw new LuckyException(\u005c"Invalid
offset exception generated \u005c" +" + nl);
+ blockBuffer.append(" throw new
gate.util.LuckyException(\u005c"Invalid offset exception generated \u005c" +" +
nl);
blockBuffer.append(" \u005c"from offsets taken from same
document!\u005c");" + nl);
blockBuffer.append(" }" + nl);
blockBuffer.append(" }" + nl);
@@ -681,13 +681,12 @@
// otherwise set it to the default block
final public String JavaImportBlock() throws ParseException {// default java
imports
String defaultimportblock =
+ "import gate.*;\u005cn" +
"import java.io.*;\u005cn" +
"import java.util.*;\u005cn" +
- "import gate.*;\u005cn" +
+ "import gate.util.*;\u005cn" +
"import gate.jape.*;\u005cn" +
- "import gate.creole.ontology.*;\u005cn" +
- "import gate.annotation.*;\u005cn" +
- "import gate.util.*;\u005cn";
+ "import gate.creole.ontology.*;\u005cn";
String importblock = null;
switch (jj_nt.kind) {
case javaimport:{
@@ -1495,7 +1494,7 @@
blockBuffer.append("// RHS assignment block" + nl);
blockBuffer.append(
- " FeatureMap features = Factory.newFeatureMap();" + nl
+ " gate.FeatureMap features = gate.Factory.newFeatureMap();" + nl
);
switch (jj_nt.kind) {
case colon:{
@@ -1529,7 +1528,7 @@
newAnnotType = nameTok.image;
// start of the attribute stuff
- blockBuffer.append(" Object val = null;" + nl);
+ blockBuffer.append(" java.lang.Object val = null;" + nl);
jj_consume_token(assign);
jj_consume_token(leftBrace);
label_14:
@@ -1565,10 +1564,10 @@
break;
case integer:
blockBuffer.append(" try { " +
- "val = Long.valueOf(");
+ "val = java.lang.Long.valueOf(");
appendJavaStringLiteral(blockBuffer, attrVal.second.toString());
blockBuffer.append("); }" +
- nl + " catch(NumberFormatException e) { }" + nl
+ nl + " catch(java.lang.NumberFormatException e) { }" + nl
);
break;
case ident:
@@ -1579,16 +1578,16 @@
break;
case bool:
blockBuffer.append(
- " val = Boolean.valueOf(");
+ " val = java.lang.Boolean.valueOf(");
appendJavaStringLiteral(blockBuffer, attrVal.second.toString());
blockBuffer.append(");" + nl);
break;
case floatingPoint:
blockBuffer.append(" try { " +
- "val = Double.valueOf(");
+ "val = java.lang.Double.valueOf(");
appendJavaStringLiteral(blockBuffer, attrVal.second.toString());
blockBuffer.append("); }" +
- nl + " catch(NumberFormatException e) { }" + nl
+ nl + " catch(java.lang.NumberFormatException e) { }" + nl
);
break;
default:
@@ -1621,7 +1620,7 @@
" = (gate.AnnotationSet)bindings.get(");
appendJavaStringLiteral(blockBuffer, nameTok.image);
blockBuffer.append("); " + nl +
- " Object existingFeatureValue;" + nl);
+ " java.lang.Object existingFeatureValue;" + nl);
switch (jj_nt.kind) {
case period:{
jj_consume_token(period);
@@ -1850,6 +1849,18 @@
finally { jj_save(1, xla); }
}
+ private boolean jj_3R_27()
+ {
+ if (jj_scan_token(pling)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_26()
+ {
+ if (jj_3R_15()) return true;
+ return false;
+ }
+
private boolean jj_3R_25()
{
Token xsp;
@@ -1953,18 +1964,6 @@
return false;
}
- private boolean jj_3R_27()
- {
- if (jj_scan_token(pling)) return true;
- return false;
- }
-
- private boolean jj_3R_26()
- {
- if (jj_3R_15()) return true;
- return false;
- }
-
/** Generated Token Manager. */
public ParseCpslTokenManager token_source;
SimpleCharStream jj_input_stream;
Modified: gate/trunk/src/main/gate/jape/parser/ParseCpsl.jj
===================================================================
--- gate/trunk/src/main/gate/jape/parser/ParseCpsl.jj 2014-04-03 09:54:56 UTC
(rev 17765)
+++ gate/trunk/src/main/gate/jape/parser/ParseCpsl.jj 2014-04-03 11:31:19 UTC
(rev 17766)
@@ -237,7 +237,7 @@
blockBuffer.append(" );" + nl);
blockBuffer.append(" }" + nl);
blockBuffer.append(" catch(gate.util.InvalidOffsetException ioe)
{" + nl);
- blockBuffer.append(" throw new LuckyException(\"Invalid offset
exception generated \" +" + nl);
+ blockBuffer.append(" throw new
gate.util.LuckyException(\"Invalid offset exception generated \" +" + nl);
blockBuffer.append(" \"from offsets taken from same
document!\");" + nl);
blockBuffer.append(" }" + nl);
blockBuffer.append(" }" + nl);
@@ -767,13 +767,12 @@
{
// default java imports
String defaultimportblock =
+ "import gate.*;\n" +
"import java.io.*;\n" +
"import java.util.*;\n" +
- "import gate.*;\n" +
+ "import gate.util.*;\n" +
"import gate.jape.*;\n" +
- "import gate.creole.ontology.*;\n" +
- "import gate.annotation.*;\n" +
- "import gate.util.*;\n";
+ "import gate.creole.ontology.*;\n";
String importblock = null;
}
{
@@ -1395,7 +1394,7 @@
blockBuffer.append("// RHS assignment block" + nl);
blockBuffer.append(
- " FeatureMap features = Factory.newFeatureMap();" + nl
+ " gate.FeatureMap features = gate.Factory.newFeatureMap();" + nl
);
}
{
@@ -1430,7 +1429,7 @@
newAnnotType = nameTok.image;
// start of the attribute stuff
- blockBuffer.append(" Object val = null;" + nl);
+ blockBuffer.append(" java.lang.Object val = null;" + nl);
}
// equals sign, and the opening brace of the assignments list
@@ -1456,10 +1455,10 @@
break;
case integer:
blockBuffer.append(" try { " +
- "val = Long.valueOf(");
+ "val = java.lang.Long.valueOf(");
appendJavaStringLiteral(blockBuffer, attrVal.second.toString());
blockBuffer.append("); }" +
- nl + " catch(NumberFormatException e) { }" + nl
+ nl + " catch(java.lang.NumberFormatException e) { }" + nl
);
break;
case ident:
@@ -1470,16 +1469,16 @@
break;
case bool:
blockBuffer.append(
- " val = Boolean.valueOf(");
+ " val = java.lang.Boolean.valueOf(");
appendJavaStringLiteral(blockBuffer, attrVal.second.toString());
blockBuffer.append(");" + nl);
break;
case floatingPoint:
blockBuffer.append(" try { " +
- "val = Double.valueOf(");
+ "val = java.lang.Double.valueOf(");
appendJavaStringLiteral(blockBuffer, attrVal.second.toString());
blockBuffer.append("); }" +
- nl + " catch(NumberFormatException e) { }" + nl
+ nl + " catch(java.lang.NumberFormatException e) { }" + nl
);
break;
default:
@@ -1514,7 +1513,7 @@
" = (gate.AnnotationSet)bindings.get(");
appendJavaStringLiteral(blockBuffer, nameTok.image);
blockBuffer.append("); " + nl +
- " Object existingFeatureValue;" + nl);
+ " java.lang.Object existingFeatureValue;" + nl);
}
(
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs
