pytrilogy 0.0.3.37__py3-none-any.whl → 0.0.3.39__py3-none-any.whl

trilogy/parsing/trilogy.lark

@@ -108,12 +108,12 @@
 
     // rank/lag/lead
     WINDOW_TYPE: ("row_number"i|"rank"i|"lag"i|"lead"i | "sum"i | "avg"i | "max"i | "min"i )  /[\s]+/
-    
-    window_item: WINDOW_TYPE int_lit? expr  window_item_over? window_item_order?
-    
+
     window_item_over: ("OVER"i over_list)
-    
+   
     window_item_order: ("ORDER"i? "BY"i order_list)
+
+    window_item: WINDOW_TYPE int_lit? expr window_item_over? window_item_order?
     
     select_hide_modifier: "--"
     select_partial_modifier: "~"
@@ -129,7 +129,7 @@
     
     limit: "LIMIT"i /[0-9]+/
     
-    !window_order: ("TOP"i | "BOTTOM"i)
+    !window_order: /TOP|BOTTOM/i
     
     window: window_order /[0-9]+/
     
@@ -139,19 +139,26 @@
     
     over_list: concept_lit (","  concept_lit )* ","?
     
-    !ordering: ("ASC"i | "DESC"i ) ("NULLS"i ("FIRST"i | "LAST"i | "AUTO"i) )?
+    !ordering: /ASC|DESC/i  ("NULLS"i /FIRST|LAST|AUTO/i )?
     
     order_by: "ORDER"i "BY"i order_list
     
     //WHERE STATEMENT
+    LOGICAL_OR: "or"i
+    LOGICAL_AND: "and"i
     
-    !logical_operator: "and"i | "or"i
-    
-    condition_parenthetical: "(" conditional ")"
+    conditional: _or_condition
 
-    _condition_unit: (expr | condition_parenthetical)
+    _or_condition: _and_condition
+               | (_or_condition LOGICAL_OR _and_condition)
 
-    conditional: _condition_unit (logical_operator _condition_unit)*
+    _and_condition: _condition_unit
+               | (_and_condition LOGICAL_AND _condition_unit)
+
+    condition_parenthetical: "(" conditional ")"
+
+    _condition_unit: expr
+                  | condition_parenthetical
     
     where: "WHERE"i conditional
     
@@ -159,7 +166,7 @@
 
     !array_comparison: ( ("NOT"i "IN"i) | "IN"i)
 
-    COMPARISON_OPERATOR: (/is[\s]+not/ | "is" |"=" | ">" | "<" | ">=" | "<=" | "!=")
+    COMPARISON_OPERATOR: /(is\s+not|is|=|>=|<=|!=|>|<)/i
     
     comparison: expr COMPARISON_OPERATOR expr
 
@@ -185,16 +192,28 @@
     attr_access: expr  "." string_lit 
 
 
-    expr:  _constant_functions | window_item | filter_item | subselect_comparison | between_comparison |  fgroup |  aggregate_functions | unnest | union | _static_functions |  literal |  concept_lit  | index_access |  map_key_access | attr_access | parenthetical | expr_tuple | comparison |  alt_like | custom_function 
-    
+    expr: _basic_expr | _functional_expr | _operation_expr |  _access_expr
+
+   # Most common/basic expressions
+   _basic_expr: literal | concept_lit | parenthetical | expr_tuple
+
+   # Operations and comparisons 
+   _operation_expr: comparison | alt_like | between_comparison | subselect_comparison
+
+   # Function-like expressions
+   _functional_expr:  _constant_functions | _static_functions  | filter_item | aggregate_functions | window_item | custom_function | fgroup | unnest | union |  aggregate_by
+
+   # Access patterns
+   _access_expr: index_access | map_key_access | attr_access
     // functions
     
-    fadd: ("add"i "(" expr "," expr ")" ) | ( expr "+" expr )
+    fadd: (/add\(/ expr "," expr ")" ) | ( expr "+" expr )
     fsub: ("subtract"i "(" expr "," expr ")" ) | ( expr "-" expr )
     fmul: ("multiply"i "(" expr "," expr ")" ) | ( expr "*" expr )
     fdiv: ( "divide"i "(" expr "," expr ")") | ( expr "/" expr )
     fmod: ( "mod"i "(" expr "," (int_lit | concept_lit ) ")") | ( expr "%" (int_lit | concept_lit ) )
-    fround: "round"i "(" expr "," expr ")"
+    _ROUND.1: "round"i "("
+    fround: _ROUND expr "," expr ")"
     fabs: "abs"i "(" expr ")"
     _SQRT.1: "sqrt("
     fsqrt:  _SQRT expr ")"
@@ -250,6 +269,10 @@
     // special aggregate
     _GROUP.1: "group("i
     fgroup: _GROUP expr ")" aggregate_over?
+
+    //by:
+    aggregate_by: "group" IDENTIFIER "BY"i (IDENTIFIER ",")* IDENTIFIER
+
     //aggregates
     _COUNT.1: "count("i
     count:   _COUNT  expr ")"
@@ -351,9 +374,9 @@
     
     literal: null_lit | string_lit | int_lit | float_lit | bool_lit | array_lit | map_lit | struct_lit | tuple_lit
 
-    MODIFIER: "Optional"i | "Partial"i | "Nullable"i
+    MODIFIER: /OPTIONAL|PARTIAL|NULLABLE/i
 
-    SHORTHAND_MODIFIER: "~" | "?"
+    SHORTHAND_MODIFIER: /~|\?/
 
     struct_type: "struct"i "<" ((data_type | IDENTIFIER) ",")* (data_type | IDENTIFIER) ","? ">" 
 
@@ -369,7 +392,6 @@
     PROPERTY: "property"i
     CONST: "const"i | "constant"i
     AUTO: "AUTO"i 
-
     // meta functions
     CONCEPTS: "CONCEPTS"i
     DATASOURCES: "DATASOURCES"i