Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerLexer.tokens URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerLexer.tokens?rev=1230506&r1=1230505&r2=1230506&view=diff ============================================================================== --- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerLexer.tokens (original) +++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerLexer.tokens Thu Jan 12 12:44:39 2012 @@ -50,105 +50,102 @@ Exponent=52 FALSE=53 FEATURE=54 FILL=55 -FILTERMARKUP=56 -FILTERTYPE=57 -FLOATLIST=58 -FloatString=59 -FloatTypeSuffix=60 -FloatingPointLiteral=61 -GATHER=62 -GET=63 -GETFEATURE=64 -GETLIST=65 -GREATER=66 -GREATEREQUAL=67 -HexDigit=68 -HexLiteral=69 -IF=70 -INLIST=71 -INTLIST=72 -IS=73 -ISINTAG=74 -Identifier=75 -IntString=76 -IntegerTypeSuffix=77 -JavaIDDigit=78 -LAST=79 -LBRACK=80 -LCURLY=81 -LESS=82 -LESSEQUAL=83 -LINE_COMMENT=84 -LOG=85 -LOGN=86 -LPAREN=87 -Letter=88 -ListIdentifier=89 -LogLevel=90 -MARK=91 -MARKFAST=92 -MARKLAST=93 -MARKONCE=94 -MARKSCORE=95 -MARKTABLE=96 -MATCHEDTEXT=97 -MERGE=98 -MINUS=99 -MOFN=100 -NEAR=101 -NOT=102 -NOTEQUAL=103 -OR=104 -OctalEscape=105 -OctalLiteral=106 -OldColor=107 -PARSE=108 -PARTOF=109 -PARTOFNEQ=110 -PERCENT=111 -PLUS=112 -POSITION=113 -PackageString=114 -QUESTION=115 -RBRACK=116 -RCURLY=117 -REGEXP=118 -REMOVE=119 -REMOVEDUPLICATE=120 -REMOVESTRING=121 -REPLACE=122 -RETAINMARKUP=123 -RETAINTYPE=124 -RPAREN=125 -RessourceLiteral=126 -SCORE=127 -SEMI=128 -SETFEATURE=129 -SIN=130 -SIZE=131 -SLASH=132 -STAR=133 -STARTSWITH=134 -STRINGLIST=135 -ScriptString=136 -StringLiteral=137 -StringString=138 -SymbolString=139 -TAN=140 -THEN=141 -TOTALCOUNT=142 -TRANSFER=143 -TRIE=144 -TRUE=145 -TYPELIST=146 -TypeString=147 -TypeSystemString=148 -UNMARK=149 -UNMARKALL=150 -UnicodeEscape=151 -VBAR=152 -VOTE=153 -WORDLIST=154 -WORDTABLE=155 -WS=156 -XOR=157 +FILTERTYPE=56 +FLOATLIST=57 +FloatString=58 +FloatTypeSuffix=59 +FloatingPointLiteral=60 +GATHER=61 +GET=62 +GETFEATURE=63 +GETLIST=64 +GREATER=65 +GREATEREQUAL=66 +HexDigit=67 +HexLiteral=68 +IF=69 +INLIST=70 +INTLIST=71 +IS=72 +Identifier=73 +IntString=74 +IntegerTypeSuffix=75 +JavaIDDigit=76 +LAST=77 +LBRACK=78 +LCURLY=79 +LESS=80 +LESSEQUAL=81 +LINE_COMMENT=82 +LOG=83 +LOGN=84 +LPAREN=85 +Letter=86 +ListIdentifier=87 +LogLevel=88 +MARK=89 +MARKFAST=90 +MARKLAST=91 +MARKONCE=92 +MARKSCORE=93 +MARKTABLE=94 +MATCHEDTEXT=95 +MERGE=96 +MINUS=97 +MOFN=98 +NEAR=99 +NOT=100 +NOTEQUAL=101 +OR=102 +OctalEscape=103 +OctalLiteral=104 +OldColor=105 +PARSE=106 +PARTOF=107 +PARTOFNEQ=108 +PERCENT=109 +PLUS=110 +POSITION=111 +PackageString=112 +QUESTION=113 +RBRACK=114 +RCURLY=115 +REGEXP=116 +REMOVE=117 +REMOVEDUPLICATE=118 +REMOVESTRING=119 +REPLACE=120 +RETAINTYPE=121 +RPAREN=122 +RessourceLiteral=123 +SCORE=124 +SEMI=125 +SETFEATURE=126 +SIN=127 +SIZE=128 +SLASH=129 +STAR=130 +STARTSWITH=131 +STRINGLIST=132 +ScriptString=133 +StringLiteral=134 +StringString=135 +SymbolString=136 +TAN=137 +THEN=138 +TOTALCOUNT=139 +TRANSFER=140 +TRIE=141 +TRUE=142 +TYPELIST=143 +TypeString=144 +TypeSystemString=145 +UNMARK=146 +UNMARKALL=147 +UnicodeEscape=148 +VBAR=149 +VOTE=150 +WORDLIST=151 +WORDTABLE=152 +WS=153 +XOR=154
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.g URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.g?rev=1230506&r1=1230505&r2=1230506&view=diff ============================================================================== --- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.g (original) +++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.g Thu Jan 12 12:44:39 2012 @@ -85,9 +85,6 @@ INLIST : 'INLIST' ; -ISINTAG - : 'ISINTAG' - ; LAST : 'LAST' @@ -197,18 +194,10 @@ REPLACE : 'REPLACE' ; -RETAINMARKUP - : 'RETAINMARKUP' - ; - RETAINTYPE : 'RETAINTYPE' ; -FILTERMARKUP - : 'FILTERMARKUP' - ; - FILTERTYPE : 'FILTERTYPE' ; Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.tokens URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.tokens?rev=1230506&r1=1230505&r2=1230506&view=diff ============================================================================== --- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.tokens (original) +++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.tokens Thu Jan 12 12:44:39 2012 @@ -50,105 +50,102 @@ Exponent=52 FALSE=53 FEATURE=54 FILL=55 -FILTERMARKUP=56 -FILTERTYPE=57 -FLOATLIST=58 -FloatString=59 -FloatTypeSuffix=60 -FloatingPointLiteral=61 -GATHER=62 -GET=63 -GETFEATURE=64 -GETLIST=65 -GREATER=66 -GREATEREQUAL=67 -HexDigit=68 -HexLiteral=69 -IF=70 -INLIST=71 -INTLIST=72 -IS=73 -ISINTAG=74 -Identifier=75 -IntString=76 -IntegerTypeSuffix=77 -JavaIDDigit=78 -LAST=79 -LBRACK=80 -LCURLY=81 -LESS=82 -LESSEQUAL=83 -LINE_COMMENT=84 -LOG=85 -LOGN=86 -LPAREN=87 -Letter=88 -ListIdentifier=89 -LogLevel=90 -MARK=91 -MARKFAST=92 -MARKLAST=93 -MARKONCE=94 -MARKSCORE=95 -MARKTABLE=96 -MATCHEDTEXT=97 -MERGE=98 -MINUS=99 -MOFN=100 -NEAR=101 -NOT=102 -NOTEQUAL=103 -OR=104 -OctalEscape=105 -OctalLiteral=106 -OldColor=107 -PARSE=108 -PARTOF=109 -PARTOFNEQ=110 -PERCENT=111 -PLUS=112 -POSITION=113 -PackageString=114 -QUESTION=115 -RBRACK=116 -RCURLY=117 -REGEXP=118 -REMOVE=119 -REMOVEDUPLICATE=120 -REMOVESTRING=121 -REPLACE=122 -RETAINMARKUP=123 -RETAINTYPE=124 -RPAREN=125 -RessourceLiteral=126 -SCORE=127 -SEMI=128 -SETFEATURE=129 -SIN=130 -SIZE=131 -SLASH=132 -STAR=133 -STARTSWITH=134 -STRINGLIST=135 -ScriptString=136 -StringLiteral=137 -StringString=138 -SymbolString=139 -TAN=140 -THEN=141 -TOTALCOUNT=142 -TRANSFER=143 -TRIE=144 -TRUE=145 -TYPELIST=146 -TypeString=147 -TypeSystemString=148 -UNMARK=149 -UNMARKALL=150 -UnicodeEscape=151 -VBAR=152 -VOTE=153 -WORDLIST=154 -WORDTABLE=155 -WS=156 -XOR=157 +FILTERTYPE=56 +FLOATLIST=57 +FloatString=58 +FloatTypeSuffix=59 +FloatingPointLiteral=60 +GATHER=61 +GET=62 +GETFEATURE=63 +GETLIST=64 +GREATER=65 +GREATEREQUAL=66 +HexDigit=67 +HexLiteral=68 +IF=69 +INLIST=70 +INTLIST=71 +IS=72 +Identifier=73 +IntString=74 +IntegerTypeSuffix=75 +JavaIDDigit=76 +LAST=77 +LBRACK=78 +LCURLY=79 +LESS=80 +LESSEQUAL=81 +LINE_COMMENT=82 +LOG=83 +LOGN=84 +LPAREN=85 +Letter=86 +ListIdentifier=87 +LogLevel=88 +MARK=89 +MARKFAST=90 +MARKLAST=91 +MARKONCE=92 +MARKSCORE=93 +MARKTABLE=94 +MATCHEDTEXT=95 +MERGE=96 +MINUS=97 +MOFN=98 +NEAR=99 +NOT=100 +NOTEQUAL=101 +OR=102 +OctalEscape=103 +OctalLiteral=104 +OldColor=105 +PARSE=106 +PARTOF=107 +PARTOFNEQ=108 +PERCENT=109 +PLUS=110 +POSITION=111 +PackageString=112 +QUESTION=113 +RBRACK=114 +RCURLY=115 +REGEXP=116 +REMOVE=117 +REMOVEDUPLICATE=118 +REMOVESTRING=119 +REPLACE=120 +RETAINTYPE=121 +RPAREN=122 +RessourceLiteral=123 +SCORE=124 +SEMI=125 +SETFEATURE=126 +SIN=127 +SIZE=128 +SLASH=129 +STAR=130 +STARTSWITH=131 +STRINGLIST=132 +ScriptString=133 +StringLiteral=134 +StringString=135 +SymbolString=136 +TAN=137 +THEN=138 +TOTALCOUNT=139 +TRANSFER=140 +TRIE=141 +TRUE=142 +TYPELIST=143 +TypeString=144 +TypeSystemString=145 +UNMARK=146 +UNMARKALL=147 +UnicodeEscape=148 +VBAR=149 +VOTE=150 +WORDLIST=151 +WORDTABLE=152 +WS=153 +XOR=154 Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g?rev=1230506&r1=1230505&r2=1230506&view=diff ============================================================================== --- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g (original) +++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g Thu Jan 12 12:44:39 2012 @@ -831,7 +831,6 @@ condition returns [TextMarkerCondition r | c = conditionCount | c = conditionCurrentCount | c = conditionInList - | c = conditionIsInTag | c = conditionLast | c = conditionMofN | c = conditionNear @@ -964,23 +963,7 @@ conditionInList returns [TextMarkerCondi else {cond = ConditionFactory.createCondition(name, list2, dist, rel);};} RPAREN ; - - -conditionIsInTag returns [TextMarkerCondition cond = null] -@init { -List<Expression> list1 = new ArrayList<Expression>(); -List<Expression> list2 = new ArrayList<Expression>(); -} - : - name = ISINTAG LPAREN id = stringExpression (COMMA id1 = stringExpression ASSIGN_EQUAL id2 = stringExpression {list1.add(id1);list2.add(id2);})* - {List exprs = new ArrayList(); - exprs.add(id); - exprs.addAll(list1); - exprs.addAll(list2); - cond = ConditionFactory.createCondition(name, exprs);} - RPAREN - ; - + conditionLast returns [TextMarkerCondition cond = null] : name = LAST LPAREN type = typeExpression @@ -1135,9 +1118,7 @@ action returns [TextMarkerAction result | a = actionMarkFast | a = actionMarkLast | a = actionReplace - | a = actionRetainMarkup | a = actionRetainType - | a = actionFilterMarkup | a = actionFilterType | a = actionCreate | a = actionFill @@ -1380,18 +1361,6 @@ actionReplace returns [TextMarkerAction RPAREN ; -actionRetainMarkup returns [TextMarkerAction action = null] -@init { -List<Expression> list = new ArrayList<Expression>(); -} - : - name = RETAINMARKUP (LPAREN id = stringExpression {list.add(id);} - {action = ActionFactory.createAction(name, list);} - (COMMA id = stringExpression {list.add(id);})* - {action = ActionFactory.createAction(name, list);} - RPAREN)? - {action = ActionFactory.createAction(name, list);} - ; actionRetainType returns [TextMarkerAction action = null] @init { @@ -1406,18 +1375,6 @@ List<Expression> list = new ArrayList<Ex {action = ActionFactory.createAction(name, list);} ; -actionFilterMarkup returns [TextMarkerAction action = null] -@init { -List<Expression> list = new ArrayList<Expression>(); -} - : - name = FILTERMARKUP (LPAREN id = stringExpression {list.add(id);} - {action = ActionFactory.createAction(name, list);} - (COMMA id = stringExpression {list.add(id);})* - {action = ActionFactory.createAction(name, list);} - RPAREN)? - {action = ActionFactory.createAction(name, list);} - ; actionFilterType returns [TextMarkerAction action = null] @init {