You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by pk...@apache.org on 2015/03/27 15:08:36 UTC
svn commit: r1669590 - in /uima/ruta/trunk:
ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/RutaParser.g
ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.g
Author: pkluegl
Date: Fri Mar 27 14:08:35 2015
New Revision: 1669590
URL: http://svn.apache.org/r1669590
Log:
4312
- allow both types of inlined rules in grammars
Modified:
uima/ruta/trunk/ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/RutaParser.g
uima/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.g
Modified: uima/ruta/trunk/ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/RutaParser.g
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/RutaParser.g?rev=1669590&r1=1669589&r2=1669590&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/RutaParser.g (original)
+++ uima/ruta/trunk/ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/RutaParser.g Fri Mar 27 14:08:35 2015
@@ -824,7 +824,14 @@ List<RutaStatement> innerRules = new Arr
| (ruleElementWildCard[null])=> re5 = ruleElementWildCard[container] {re = re5;}
)
{re.setStartAnchor(start != null);}
- (t = (THEN | THEN2)
+ (t = (THEN2)
+ LCURLY
+ (rule = simpleStatement {innerRules.add(rule);})+
+ RCURLY
+ {re.setInlinedRules(innerRules);
+ boolean block = t != null && t.getText().equals("->");
+ re.setInlineMode(block);})?
+ (t = (THEN)
LCURLY
(rule = simpleStatement {innerRules.add(rule);})+
RCURLY
Modified: uima/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.g
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.g?rev=1669590&r1=1669589&r2=1669590&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.g (original)
+++ uima/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.g Fri Mar 27 14:08:35 2015
@@ -713,7 +713,9 @@ List<RutaRule> innerRules = new ArrayLis
| re3 = ruleElementComposed {re = re3;}
| re4 = ruleElementWildCard {re = re4;}
)
- (t = (THEN | THEN2) LCURLY (rule = simpleStatement {innerRules.add(rule);})+
+ (t = THEN2 LCURLY (rule = simpleStatement {innerRules.add(rule);})+
+ RCURLY {re.setInlinedRules(innerRules);re.setInlineMode(t == null ? null : t.getText());})?
+ (t = THEN LCURLY (rule = simpleStatement {innerRules.add(rule);})+
RCURLY {re.setInlinedRules(innerRules);re.setInlineMode(t == null ? null : t.getText());})?
;