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 2012/01/18 13:54:54 UTC
svn commit: r1232868 [1/4] - in /uima/sandbox/trunk/TextMarker:
uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/
uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/
uimaj-ep-textmarker-ide/src/main/jav...
Author: pkluegl
Date: Wed Jan 18 12:54:54 2012
New Revision: 1232868
URL: http://svn.apache.org/viewvc?rev=1232868&view=rev
Log:
UIMA-2335
deactivated variables for conditions and actions in language.
Modified:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/VariableAction.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.g
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/TextMarkerKeywords.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.java
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/VariableAction.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/VariableAction.java?rev=1232868&r1=1232867&r2=1232868&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/VariableAction.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/VariableAction.java Wed Jan 18 12:54:54 2012
@@ -36,7 +36,7 @@ public class VariableAction extends Abst
@Override
public void execute(RuleMatch match, RuleElement element, TextMarkerStream stream,
InferenceCrowd crowd) {
-
+ // TODO
}
public String getVar() {
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.g
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.g?rev=1232868&r1=1232867&r2=1232868&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.g (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.g Wed Jan 18 12:54:54 2012
@@ -320,29 +320,29 @@ List<String> vars = new ArrayList<String
type = TYPELIST
{!isVariableOfType($blockDeclaration::env, input.LT(1).getText(), type.getText())}?
name = Identifier (ASSIGN_EQUAL tl = typeListExpression)? SEMI {addVariable($blockDeclaration::env, name.getText(), type.getText());if(tl != null){setValue($blockDeclaration::env, name.getText(), tl);}}
- |
- stmt1 = conditionDeclaration {stmt = stmt1;}
- |
- stmt2 = actionDeclaration {stmt = stmt2;}
+ //|
+ //stmt1 = conditionDeclaration {stmt = stmt1;}
+ //|
+ //stmt2 = actionDeclaration {stmt = stmt2;}
;
//TODO added rule
-conditionDeclaration returns [TextMarkerStatement stmt = null]
- :
- type = CONDITION id = Identifier ASSIGN_EQUAL LPAREN cons = conditions RPAREN SEMI
- {addVariable($blockDeclaration::env, id.getText(), type.getText());
- AbstractTextMarkerCondition condition = ConditionFactory.createConditionAnd(cons,$blockDeclaration::env);
- setValue($blockDeclaration::env, id.getText(), condition);}
- ;
+//conditionDeclaration returns [TextMarkerStatement stmt = null]
+ // :
+// type = CONDITION id = Identifier ASSIGN_EQUAL LPAREN cons = conditions RPAREN SEMI
+// {addVariable($blockDeclaration::env, id.getText(), type.getText());
+// AbstractTextMarkerCondition condition = ConditionFactory.createConditionAnd(cons,$blockDeclaration::env);
+// setValue($blockDeclaration::env, id.getText(), condition);}
+// ;
//TODO added rule
-actionDeclaration returns [TextMarkerStatement stmt = null]
- :
- type = ACTION id = Identifier ASSIGN_EQUAL LPAREN a = actions RPAREN SEMI
- {addVariable($blockDeclaration::env, id.getText(), type.getText());
- AbstractTextMarkerAction action = ActionFactory.createComposedAction(a,$blockDeclaration::env);
- setValue($blockDeclaration::env, id.getText(), action);}
- ;
+//actionDeclaration returns [TextMarkerStatement stmt = null]
+// :
+// type = ACTION id = Identifier ASSIGN_EQUAL LPAREN a = actions RPAREN SEMI
+// {addVariable($blockDeclaration::env, id.getText(), type.getText());
+// AbstractTextMarkerAction action = ActionFactory.createComposedAction(a,$blockDeclaration::env);
+// setValue($blockDeclaration::env, id.getText(), action);}
+// ;
importStatement returns [TextMarkerStatement stmt = null]
:
@@ -873,19 +873,19 @@ condition returns [AbstractTextMarkerCo
| c = conditionPartOfNeq
| c = conditionSize
| (c = externalCondition)=> c = externalCondition
- | c = variableCondition
+// | c = variableCondition
) {result = c;}
;
-variableCondition returns [AbstractTextMarkerCondition condition = null]
- :
-
- id = Identifier
- {
- condition = ConditionFactory.createConditionVariable(id);
- }
- ;
+//variableCondition returns [AbstractTextMarkerCondition condition = null]
+// :
+//
+// id = Identifier
+// {
+// condition = ConditionFactory.createConditionVariable(id);
+// }
+// ;
externalCondition returns [AbstractTextMarkerCondition condition = null]
:
@@ -1111,18 +1111,18 @@ action returns [AbstractTextMarkerActio
| a = actionConfigure
| a = actionDynamicAnchoring
| (a = externalAction)=> a = externalAction
- | a = variableAction
+// | a = variableAction
) {result = a;}
;
-variableAction returns [AbstractTextMarkerAction action = null]
- :
-
- id = Identifier
- {
- action = ActionFactory.createActionVariable(id);
- }
- ;
+//variableAction returns [AbstractTextMarkerAction action = null]
+// :
+//
+// id = Identifier
+// {
+// action = ActionFactory.createActionVariable(id);
+// }
+// ;
externalAction returns [AbstractTextMarkerAction action = null]