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 2013/12/07 15:14:00 UTC
svn commit: r1548915 - 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: Sat Dec 7 14:14:00 2013
New Revision: 1548915
URL: http://svn.apache.org/r1548915
Log:
UIMA-3493
- fixed list expressions as arguments
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=1548915&r1=1548914&r2=1548915&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 Sat Dec 7 14:14:00 2013
@@ -1845,6 +1845,7 @@ options {
| a2 = booleanExpression {expr = a2;}
| a3 = numberExpression {expr = a3;}
| a4 = stringExpression {expr = a4;}
+ | (listExpression)=> l = listExpression {expr = l;}
| a1 = typeExpression {expr = a1;}
//(a2 = booleanExpression)=> a2 = booleanExpression {expr = a2;}
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=1548915&r1=1548914&r2=1548915&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 Sat Dec 7 14:14:00 2013
@@ -1966,6 +1966,7 @@ argument returns [Expression expr = null
(stringExpression)=> a4 = stringExpression {expr = a4;}
| (booleanExpression)=> a2 = booleanExpression {expr = a2;}
| (numberExpression)=> a3 = numberExpression {expr = a3;}
+ | (listExpression)=> l = listExpression {expr = l;}
| a1 = typeExpression {expr = a1;}
//token = (
//(booleanExpression[par]) => booleanExpression[par]