You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/01/28 23:22:02 UTC

[52/96] [abbrv] git commit: rename antlr package

rename antlr package


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/b8c01f3d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/b8c01f3d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/b8c01f3d

Branch: refs/pull/39/merge
Commit: b8c01f3d0ce56f6a1c00003b28ed7a8d4c073a59
Parents: 2c2acbe
Author: Lewis John McGibbney <le...@apache.org>
Authored: Tue Jan 28 21:24:14 2014 +0000
Committer: Lewis John McGibbney <le...@apache.org>
Committed: Tue Jan 28 21:24:14 2014 +0000

----------------------------------------------------------------------
 .../persistence/query/tree/QueryFilter.g        | 311 +++++++++++++++++++
 .../persistence/query/tree/QueryFilter.g        | 311 -------------------
 2 files changed, 311 insertions(+), 311 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b8c01f3d/stack/core/src/main/antlr3/org/apache/usergrid/persistence/query/tree/QueryFilter.g
----------------------------------------------------------------------
diff --git a/stack/core/src/main/antlr3/org/apache/usergrid/persistence/query/tree/QueryFilter.g b/stack/core/src/main/antlr3/org/apache/usergrid/persistence/query/tree/QueryFilter.g
new file mode 100644
index 0000000..c566ef9
--- /dev/null
+++ b/stack/core/src/main/antlr3/org/apache/usergrid/persistence/query/tree/QueryFilter.g
@@ -0,0 +1,311 @@
+grammar QueryFilter;
+//NOTES:  '^' denotes operator, all others in the string become operands
+
+options {
+    output=AST;
+//    ASTLabelType=CommonTree;
+}
+
+@rulecatch { }
+
+
+@header {
+package org.apache.usergrid.persistence.query.tree;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.apache.usergrid.persistence.Query;
+import org.apache.usergrid.persistence.Query.SortPredicate;
+
+}
+
+
+@members {
+	Query query = new Query();
+
+  private static final Logger logger = LoggerFactory
+      .getLogger(QueryFilterLexer.class);
+
+	@Override
+	public void emitErrorMessage(String msg) {
+		logger.info(msg);
+	}
+}
+
+
+@lexer::header {
+package org.apache.usergrid.persistence.query.tree;
+
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.apache.usergrid.persistence.exceptions.QueryTokenException;
+
+}
+
+@lexer::members {
+
+
+
+  private static final Logger logger = LoggerFactory
+      .getLogger(QueryFilterLexer.class);
+
+
+
+
+	@Override
+	public void emitErrorMessage(String msg) {
+		logger.info(msg);
+	}
+
+	@Override
+    public void recover(RecognitionException e) {
+         //We don't want to recover, we want to re-throw to the user since they passed us invalid input
+         throw new QueryTokenException(e);
+    }
+
+
+}
+
+//these must come before ID. Otherwise lt, lte, eq, etc will be returned as id tokens
+LT  : '<' | 'lt';
+
+LTE : '<=' |  'lte';
+
+EQ  : '=' | 'eq';
+
+GT  : '>' | 'gt';
+
+GTE : '>=' |  'gte';  
+
+
+//keywords before var ids
+BOOLEAN : (TRUE|FALSE);
+
+AND : ('A'|'a')('N'|'n')('D'|'d') | '&&';
+
+OR  : ('O'|'o')('R'|'r') | '||' ;
+
+NOT : ('N'|'n')('O'|'o')('T'|'t');
+
+ASC : ('A'|'a')('S'|'s')('C'|'c');
+
+DESC : ('D'|'d')('E'|'e')('S'|'s')('C'|'c');
+
+CONTAINS : ('C'|'c')('O'|'o')('N'|'n')('T'|'t')('A'|'a')('I'|'i')('N'|'n')('S'|'s');
+
+WITHIN : ('W'|'w')('I'|'i')('T'|'t')('H'|'h')('I'|'i')('N'|'n');
+
+OF : ('O'|'o')('F'|'f');
+
+UUID :  HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT
+  HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT '-' 
+  HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT '-' 
+  HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT '-' 
+  HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT '-' 
+  HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT
+  HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT
+  HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT
+  ;
+
+//ids and values
+ID  :	('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'0'..'9'|'_'|'.'|'-')*
+    ;
+
+LONG :	('-')? '0'..'9'+
+    ;
+
+FLOAT
+    :  ('-')? ( ('0'..'9')+ '.' ('0'..'9')* EXPONENT?
+    |   '.' ('0'..'9')+ EXPONENT?
+    |   ('0'..'9')+ EXPONENT)
+    ;
+    
+STRING
+    :  '\'' ( ESC_SEQ | ~('\\'|'\'') )* '\''
+    ;
+
+
+    
+WS : (' ' | '\t' | '\n' | '\r' | '\f')+  {$channel=HIDDEN;};
+
+
+
+    
+
+
+
+fragment TRUE : ('T'|'t')('R'|'r')('U'|'u')('E'|'e');
+
+fragment FALSE : ('F'|'f')('A'|'a')('L'|'l')('S'|'s')('E'|'e');
+
+
+fragment
+EXPONENT : ('e'|'E') ('+'|'-')? ('0'..'9')+ ;
+
+fragment
+HEX_DIGIT : ('0'..'9'|'a'..'f'|'A'..'F') ;
+
+fragment
+ESC_SEQ
+    :   '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\')
+    |   UNICODE_ESC
+    |   OCTAL_ESC
+    ;
+
+fragment
+OCTAL_ESC
+    :   '\\' ('0'..'3') ('0'..'7') ('0'..'7')
+    |   '\\' ('0'..'7') ('0'..'7')
+    |   '\\' ('0'..'7')
+    ;
+
+fragment
+UNICODE_ESC
+    :   '\\' 'u' HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT
+    ;
+
+
+
+
+//NE : '!=';
+
+
+
+property :	ID<Property>;
+
+containsproperty : ID<ContainsProperty>;
+
+withinproperty : ID<WithinProperty>;
+	
+booleanliteral: BOOLEAN<BooleanLiteral>;
+
+
+longliteral :
+  LONG<LongLiteral> ;
+
+uuidliteral :
+  UUID<UUIDLiteral>;
+
+stringliteral :
+  STRING<StringLiteral>;
+  
+floatliteral :
+  FLOAT<FloatLiteral> ;
+
+//We delegate to each sub class literal so we can get each type	
+value : 
+  booleanliteral
+  | longliteral
+  | uuidliteral
+  | stringliteral
+  | floatliteral
+  ;
+  
+
+
+//Every operand returns with the name of 'op'.  This is used because all subtrees require operands,
+//this allows us to link the java code easily by using the same name as a converntion
+
+//begin search expressions
+  
+//mathmatical equality operations
+equalityop :
+  property LT<LessThan>^ value
+  |property LTE<LessThanEqual>^ value
+  |property EQ<Equal>^ value
+  |property GT<GreaterThan>^ value
+  |property GTE<GreaterThanEqual>^ value
+  ; 
+
+//geo location search
+locationop :
+  withinproperty WITHIN<WithinOperand>^ (floatliteral|longliteral) OF! (floatliteral|longliteral) ','! (floatliteral|longliteral);
+  
+//string search
+containsop :
+  containsproperty CONTAINS<ContainsOperand>^ stringliteral;
+
+//
+operation :
+ '('! expression ')'!
+   | equalityop 
+   | locationop 
+   | containsop 
+   ;
+
+//negations of expressions
+notexp :
+//only link if we have the not
+ NOT<NotOperand>^ operation  
+ |operation 
+ ;
+
+//and expressions contain operands.  These should always be closer to the leaves of a tree, it allows
+//for faster result intersection sooner in the query execution
+andexp :
+ notexp (AND<AndOperand>^ notexp )*;
+ 
+ 
+//or expression should always be after AND expressions.  This will give us a smaller result set to union when evaluating trees
+//also a root level expression
+expression :
+ andexp (OR<OrOperand>^ andexp )*;
+
+
+
+//end expressions
+
+//begin order clauses
+
+//direction for ordering
+direction  : (ASC | DESC);
+
+//order clause
+order
+  : (property direction?){
+		String property = $property.text; 
+		String direction = $direction.text;
+		query.addSort(new SortPredicate(property, direction));
+    
+  };
+
+//end order clauses
+  
+//Begin select clauses
+
+select_subject
+  : ID {
+
+  query.addSelect($ID.text);
+
+};
+
+ 
+
+select_assign
+  : target=ID ':' source=ID {
+
+  query.addSelect($target.text, $source.text);
+
+};
+
+select_expr 
+  : ('*' | select_subject (',' select_subject) * | '{' select_assign (',' select_assign) * '}');  
+   
+//end select clauses
+
+ql returns [Query query]
+  : ('select'! select_expr!)? ('where'!? expression)? ('order by'! order! (','! order!)*)? {
+
+  if($expression.tree instanceof Operand){
+    query.setRootOperand((Operand)$expression.tree);
+  }
+  
+  retval.query = query;
+
+
+};
+
+
+

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b8c01f3d/stack/core/src/main/antlr3/org/usergrid/persistence/query/tree/QueryFilter.g
----------------------------------------------------------------------
diff --git a/stack/core/src/main/antlr3/org/usergrid/persistence/query/tree/QueryFilter.g b/stack/core/src/main/antlr3/org/usergrid/persistence/query/tree/QueryFilter.g
deleted file mode 100644
index c566ef9..0000000
--- a/stack/core/src/main/antlr3/org/usergrid/persistence/query/tree/QueryFilter.g
+++ /dev/null
@@ -1,311 +0,0 @@
-grammar QueryFilter;
-//NOTES:  '^' denotes operator, all others in the string become operands
-
-options {
-    output=AST;
-//    ASTLabelType=CommonTree;
-}
-
-@rulecatch { }
-
-
-@header {
-package org.apache.usergrid.persistence.query.tree;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.usergrid.persistence.Query;
-import org.apache.usergrid.persistence.Query.SortPredicate;
-
-}
-
-
-@members {
-	Query query = new Query();
-
-  private static final Logger logger = LoggerFactory
-      .getLogger(QueryFilterLexer.class);
-
-	@Override
-	public void emitErrorMessage(String msg) {
-		logger.info(msg);
-	}
-}
-
-
-@lexer::header {
-package org.apache.usergrid.persistence.query.tree;
-
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.usergrid.persistence.exceptions.QueryTokenException;
-
-}
-
-@lexer::members {
-
-
-
-  private static final Logger logger = LoggerFactory
-      .getLogger(QueryFilterLexer.class);
-
-
-
-
-	@Override
-	public void emitErrorMessage(String msg) {
-		logger.info(msg);
-	}
-
-	@Override
-    public void recover(RecognitionException e) {
-         //We don't want to recover, we want to re-throw to the user since they passed us invalid input
-         throw new QueryTokenException(e);
-    }
-
-
-}
-
-//these must come before ID. Otherwise lt, lte, eq, etc will be returned as id tokens
-LT  : '<' | 'lt';
-
-LTE : '<=' |  'lte';
-
-EQ  : '=' | 'eq';
-
-GT  : '>' | 'gt';
-
-GTE : '>=' |  'gte';  
-
-
-//keywords before var ids
-BOOLEAN : (TRUE|FALSE);
-
-AND : ('A'|'a')('N'|'n')('D'|'d') | '&&';
-
-OR  : ('O'|'o')('R'|'r') | '||' ;
-
-NOT : ('N'|'n')('O'|'o')('T'|'t');
-
-ASC : ('A'|'a')('S'|'s')('C'|'c');
-
-DESC : ('D'|'d')('E'|'e')('S'|'s')('C'|'c');
-
-CONTAINS : ('C'|'c')('O'|'o')('N'|'n')('T'|'t')('A'|'a')('I'|'i')('N'|'n')('S'|'s');
-
-WITHIN : ('W'|'w')('I'|'i')('T'|'t')('H'|'h')('I'|'i')('N'|'n');
-
-OF : ('O'|'o')('F'|'f');
-
-UUID :  HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT
-  HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT '-' 
-  HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT '-' 
-  HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT '-' 
-  HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT '-' 
-  HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT
-  HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT
-  HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT
-  ;
-
-//ids and values
-ID  :	('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'0'..'9'|'_'|'.'|'-')*
-    ;
-
-LONG :	('-')? '0'..'9'+
-    ;
-
-FLOAT
-    :  ('-')? ( ('0'..'9')+ '.' ('0'..'9')* EXPONENT?
-    |   '.' ('0'..'9')+ EXPONENT?
-    |   ('0'..'9')+ EXPONENT)
-    ;
-    
-STRING
-    :  '\'' ( ESC_SEQ | ~('\\'|'\'') )* '\''
-    ;
-
-
-    
-WS : (' ' | '\t' | '\n' | '\r' | '\f')+  {$channel=HIDDEN;};
-
-
-
-    
-
-
-
-fragment TRUE : ('T'|'t')('R'|'r')('U'|'u')('E'|'e');
-
-fragment FALSE : ('F'|'f')('A'|'a')('L'|'l')('S'|'s')('E'|'e');
-
-
-fragment
-EXPONENT : ('e'|'E') ('+'|'-')? ('0'..'9')+ ;
-
-fragment
-HEX_DIGIT : ('0'..'9'|'a'..'f'|'A'..'F') ;
-
-fragment
-ESC_SEQ
-    :   '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\')
-    |   UNICODE_ESC
-    |   OCTAL_ESC
-    ;
-
-fragment
-OCTAL_ESC
-    :   '\\' ('0'..'3') ('0'..'7') ('0'..'7')
-    |   '\\' ('0'..'7') ('0'..'7')
-    |   '\\' ('0'..'7')
-    ;
-
-fragment
-UNICODE_ESC
-    :   '\\' 'u' HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT
-    ;
-
-
-
-
-//NE : '!=';
-
-
-
-property :	ID<Property>;
-
-containsproperty : ID<ContainsProperty>;
-
-withinproperty : ID<WithinProperty>;
-	
-booleanliteral: BOOLEAN<BooleanLiteral>;
-
-
-longliteral :
-  LONG<LongLiteral> ;
-
-uuidliteral :
-  UUID<UUIDLiteral>;
-
-stringliteral :
-  STRING<StringLiteral>;
-  
-floatliteral :
-  FLOAT<FloatLiteral> ;
-
-//We delegate to each sub class literal so we can get each type	
-value : 
-  booleanliteral
-  | longliteral
-  | uuidliteral
-  | stringliteral
-  | floatliteral
-  ;
-  
-
-
-//Every operand returns with the name of 'op'.  This is used because all subtrees require operands,
-//this allows us to link the java code easily by using the same name as a converntion
-
-//begin search expressions
-  
-//mathmatical equality operations
-equalityop :
-  property LT<LessThan>^ value
-  |property LTE<LessThanEqual>^ value
-  |property EQ<Equal>^ value
-  |property GT<GreaterThan>^ value
-  |property GTE<GreaterThanEqual>^ value
-  ; 
-
-//geo location search
-locationop :
-  withinproperty WITHIN<WithinOperand>^ (floatliteral|longliteral) OF! (floatliteral|longliteral) ','! (floatliteral|longliteral);
-  
-//string search
-containsop :
-  containsproperty CONTAINS<ContainsOperand>^ stringliteral;
-
-//
-operation :
- '('! expression ')'!
-   | equalityop 
-   | locationop 
-   | containsop 
-   ;
-
-//negations of expressions
-notexp :
-//only link if we have the not
- NOT<NotOperand>^ operation  
- |operation 
- ;
-
-//and expressions contain operands.  These should always be closer to the leaves of a tree, it allows
-//for faster result intersection sooner in the query execution
-andexp :
- notexp (AND<AndOperand>^ notexp )*;
- 
- 
-//or expression should always be after AND expressions.  This will give us a smaller result set to union when evaluating trees
-//also a root level expression
-expression :
- andexp (OR<OrOperand>^ andexp )*;
-
-
-
-//end expressions
-
-//begin order clauses
-
-//direction for ordering
-direction  : (ASC | DESC);
-
-//order clause
-order
-  : (property direction?){
-		String property = $property.text; 
-		String direction = $direction.text;
-		query.addSort(new SortPredicate(property, direction));
-    
-  };
-
-//end order clauses
-  
-//Begin select clauses
-
-select_subject
-  : ID {
-
-  query.addSelect($ID.text);
-
-};
-
- 
-
-select_assign
-  : target=ID ':' source=ID {
-
-  query.addSelect($target.text, $source.text);
-
-};
-
-select_expr 
-  : ('*' | select_subject (',' select_subject) * | '{' select_assign (',' select_assign) * '}');  
-   
-//end select clauses
-
-ql returns [Query query]
-  : ('select'! select_expr!)? ('where'!? expression)? ('order by'! order! (','! order!)*)? {
-
-  if($expression.tree instanceof Operand){
-    query.setRootOperand((Operand)$expression.tree);
-  }
-  
-  retval.query = query;
-
-
-};
-
-
-