youseries %!s(int64=7) %!d(string=hai) anos
pai
achega
c44592bd02
Modificáronse 4 ficheiros con 9 adicións e 3 borrados
  1. 2 2
      urule-console/pom.xml
  2. 4 0
      urule-core/dsl/RuleLexer.g4
  3. 2 0
      urule-core/dsl/RuleParser.g4
  4. 1 1
      urule-core/pom.xml

+ 2 - 2
urule-console/pom.xml

@@ -6,12 +6,12 @@
     <version>2.0.4</version>
   </parent>
   <artifactId>urule-console</artifactId>
-  <version>2.1.5-SNAPSHOT</version>
+  <version>2.1.6-SNAPSHOT</version>
   <dependencies>
   	<dependency>
   		<groupId>com.bstek.urule</groupId>
   		<artifactId>urule-core</artifactId>
-  		<version>2.1.5-SNAPSHOT</version>
+  		<version>2.1.6-SNAPSHOT</version>
   	</dependency>
   	<dependency>
   		<groupId>org.apache.jackrabbit</groupId>

+ 4 - 0
urule-core/dsl/RuleLexer.g4

@@ -61,6 +61,10 @@ Match : 'Match'|'\u5339\u914d';
 
 NotMatch : 'NotMatch'|'\u4e0d\u5339\u914d';
 
+Contain : 'Contain'|'\u5305\u542b';
+
+NotContain : 'NotContain'|'\u4e0d\u5305\u542b';
+
 EqualsIgnoreCase : 'EqualsIgnoreCase'|'\u5ffd\u7565\u5927\u5c0f\u5199\u7b49\u4e8e';
 
 NotEqualsIgnoreCase : 'NotEqualsIgnoreCase'|'\u5ffd\u7565\u5927\u5c0f\u5199\u4e0d\u7b49\u4e8e';

+ 2 - 0
urule-core/dsl/RuleParser.g4

@@ -252,4 +252,6 @@ op
 	| NotMatch
 	| EqualsIgnoreCase
 	| NotEqualsIgnoreCase
+	| Contain
+	| NotContain
 ;	  

+ 1 - 1
urule-core/pom.xml

@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>urule-core</artifactId>
-  <version>2.1.5-SNAPSHOT</version>
+  <version>2.1.6-SNAPSHOT</version>
   <properties>
 	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>