Revision: 19768
http://sourceforge.net/p/gate/code/19768
Author: markagreenwood
Date: 2016-11-22 08:07:02 +0000 (Tue, 22 Nov 2016)
Log Message:
-----------
pulled in Ian's newline fix from yesterday
Modified Paths:
--------------
gate/branches/sawdust2/plugins/ANNIE/src/main/java/gate/jape/parser/ParseCpsl.jj
Property Changed:
----------------
gate/branches/sawdust2/plugins/ANNIE/src/main/java/gate/jape/parser/ParseCpsl.jj
Modified:
gate/branches/sawdust2/plugins/ANNIE/src/main/java/gate/jape/parser/ParseCpsl.jj
===================================================================
---
gate/branches/sawdust2/plugins/ANNIE/src/main/java/gate/jape/parser/ParseCpsl.jj
2016-11-22 02:22:41 UTC (rev 19767)
+++
gate/branches/sawdust2/plugins/ANNIE/src/main/java/gate/jape/parser/ParseCpsl.jj
2016-11-22 08:07:02 UTC (rev 19768)
@@ -408,10 +408,10 @@
<phasesWhiteSpace: (<space>)+>
}
<IN_PHASES> SPECIAL_TOKEN: { // single-line C++/Java style comments
- <phasesSingleLineCStyleComment: "//" (~["\n", "\r"])* <newline> >
+ <phasesSingleLineCStyleComment: "//" (~["\n", "\r"])* (<newline>)? >
}
<IN_PHASES> SPECIAL_TOKEN: { // single-line comments CPSL style
- <phasesSingleLineCpslStyleComment: ";;" (~["\n", "\r"])* <newline> >
+ <phasesSingleLineCpslStyleComment: ";;" (~["\n", "\r"])* (<newline>)? >
}
<IN_PHASES> SPECIAL_TOKEN: {
<phasesCommentStart: ("/*" | "#|")> : PHASES_WITHIN_COMMENT
@@ -526,10 +526,10 @@
<whiteSpace: (<space>)+>
}
<DEFAULT> SPECIAL_TOKEN: { // single-line C++/Java style comments
- <singleLineCStyleComment: "//" (~["\n", "\r"])* <newline> >
+ <singleLineCStyleComment: "//" (~["\n", "\r"])* (<newline>)? >
}
<DEFAULT> SPECIAL_TOKEN: { // single-line comments CPSL style
- <singleLineCpslStyleComment: ";;" (~["\n", "\r"])* <newline> >
+ <singleLineCpslStyleComment: ";;" (~["\n", "\r"])* (<newline>)? >
}
<DEFAULT> SPECIAL_TOKEN: { <commentStart: ("/*" | "#|")> : WITHIN_COMMENT }
<WITHIN_COMMENT> MORE: { <commentChars: ~[]> }
Property changes on:
gate/branches/sawdust2/plugins/ANNIE/src/main/java/gate/jape/parser/ParseCpsl.jj
___________________________________________________________________
Added: svn:mergeinfo
## -0,0 +1,7 ##
+/gate/branches/new-ontology-api/plugins/ANNIE/src/main/java/gate/jape/parser/ParseCpsl.jj:10584-11598
+/gate/branches/release-7.0/plugins/ANNIE/src/main/java/gate/jape/parser/ParseCpsl.jj:15335-15398
+/gate/branches/release-8.1/plugins/ANNIE/src/main/java/gate/jape/parser/ParseCpsl.jj:18736-18747
+/gate/branches/sawdust/plugins/ANNIE/src/main/java/gate/jape/parser/ParseCpsl.jj:17055-17079
+/gate/tags/release-7.0/plugins/ANNIE/src/main/java/gate/jape/parser/ParseCpsl.jj:15399-15407
+/gate/trunk/plugins/ANNIE/src/main/java/gate/jape/parser/ParseCpsl.jj:3-390,19180-19294
+/gate/trunk/src/main/gate/jape/parser/ParseCpsl.jj:19180-19767
\ No newline at end of property
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
