pytrilogy 0.0.2.11__py3-none-any.whl → 0.0.2.13__py3-none-any.whl

trilogy/parsing/parse_engine.py

@@ -16,7 +16,6 @@ from trilogy.core.internal import INTERNAL_NAMESPACE, ALL_ROWS_CONCEPT
 from trilogy.constants import (
     DEFAULT_NAMESPACE,
     NULL_VALUE,
-    VIRTUAL_CONCEPT_PREFIX,
     MagicConstants,
 )
 from trilogy.core.enums import (
@@ -24,7 +23,6 @@ from trilogy.core.enums import (
     ComparisonOperator,
     FunctionType,
     InfiniteFunctionArgs,
-    FunctionClass,
     Modifier,
     Ordering,
     Purpose,
@@ -104,14 +102,12 @@ from trilogy.core.models import (
     ConceptDeclarationStatement,
     ConceptDerivation,
     RowsetDerivationStatement,
-    LooseConceptList,
     list_to_wrapper,
     dict_to_map_wrapper,
     NumericType,
     HavingClause,
 )
 from trilogy.parsing.exceptions import ParseError
-from trilogy.utility import string_to_hash
 from trilogy.parsing.common import (
     agg_wrapper_to_concept,
     window_item_to_concept,
@@ -119,6 +115,7 @@ from trilogy.parsing.common import (
     filter_item_to_concept,
     constant_to_concept,
     arbitrary_to_concept,
+    process_function_args,
 )
 
 CONSTANT_TYPES = (int, float, str, bool, list, ListWrapper, MapWrapper)
@@ -230,50 +227,6 @@ class ParseToObjects(Transformer):
         self.environment.concepts.undefined = {}
         return reparsed
 
-    def process_function_args(
-        self, args, meta: Meta, concept_arguments: Optional[LooseConceptList] = None
-    ):
-        final: List[Concept | Function] = []
-        for arg in args:
-            # if a function has an anonymous function argument
-            # create an implicit concept
-            while isinstance(arg, Parenthetical):
-                arg = arg.content
-            if isinstance(arg, Function):
-                # if it's not an aggregate function, we can skip the virtual concepts
-                # to simplify anonymous function handling
-                if arg.operator not in FunctionClass.AGGREGATE_FUNCTIONS.value:
-                    final.append(arg)
-                    continue
-                id_hash = string_to_hash(str(arg))
-                concept = function_to_concept(
-                    arg,
-                    name=f"{VIRTUAL_CONCEPT_PREFIX}_{id_hash}",
-                    namespace=self.environment.namespace,
-                )
-                # to satisfy mypy, concept will always have metadata
-                if concept.metadata:
-                    concept.metadata.line_number = meta.line
-                self.environment.add_concept(concept, meta=meta)
-                final.append(concept)
-            elif isinstance(
-                arg, (FilterItem, WindowItem, AggregateWrapper, ListWrapper, MapWrapper)
-            ):
-                id_hash = string_to_hash(str(arg))
-                concept = arbitrary_to_concept(
-                    arg,
-                    name=f"{VIRTUAL_CONCEPT_PREFIX}_{id_hash}",
-                    namespace=self.environment.namespace,
-                )
-                if concept.metadata:
-                    concept.metadata.line_number = meta.line
-                self.environment.add_concept(concept, meta=meta)
-                final.append(concept)
-
-            else:
-                final.append(arg)
-        return final
-
     def start(self, args):
         return args
 
@@ -319,17 +272,18 @@ class ParseToObjects(Transformer):
     @v_args(meta=True)
     def struct_type(self, meta: Meta, args) -> StructType:
         final: list[
-            DataType | MapType | ListType | StructType | NumericType | Concept
+            DataType | MapType | ListType | NumericType | StructType | Concept
         ] = []
         for arg in args:
-            if not isinstance(arg, (DataType, ListType, StructType)):
-                new = self.environment.concepts.__getitem__(  # type: ignore
-                    key=arg, line_no=meta.line
-                )
-                final.append(new)
-            else:
-                final.append(arg)
-        return StructType(fields=final)
+            new = self.environment.concepts.__getitem__(  # type: ignore
+                key=arg, line_no=meta.line
+            )
+            final.append(new)
+
+        return StructType(
+            fields=final,
+            fields_map={x.name: x for x in final if isinstance(x, Concept)},
+        )
 
     def list_type(self, args) -> ListType:
         return ListType(type=args[0])
@@ -520,18 +474,6 @@ class ParseToObjects(Transformer):
             if concept.metadata:
                 concept.metadata.line_number = meta.line
             self.environment.add_concept(concept, meta=meta)
-            assert isinstance(concept.datatype, StructType)
-            for key, value in concept.datatype.fields_map.items():
-                args = self.process_function_args([concept, key], meta=meta)
-                self.environment.add_concept(
-                    Concept(
-                        name=key,
-                        datatype=arg_to_datatype(value),
-                        purpose=Purpose.PROPERTY,
-                        namespace=self.environment.namespace + "." + name,
-                        lineage=AttrAccess(args),
-                    )
-                )
             return ConceptDerivation(concept=concept)
         elif (
             isinstance(source_value, Function)
@@ -795,8 +737,8 @@ class ParseToObjects(Transformer):
                 x = arbitrary_to_concept(
                     x,
                     namespace=namespace,
-                    name=f"{VIRTUAL_CONCEPT_PREFIX}_{string_to_hash(str(x))}",
                 )
+                self.environment.add_concept(x)
             return x
 
         return [
@@ -837,6 +779,11 @@ class ParseToObjects(Transformer):
     def rawsql_statement(self, meta: Meta, args) -> RawSQLStatement:
         return RawSQLStatement(meta=Metadata(line_number=meta.line), text=args[0])
 
+    def resolve_import_address(self, address) -> str:
+        with open(address, "r", encoding="utf-8") as f:
+            text = f.read()
+        return text
+
     def import_statement(self, args: list[str]) -> ImportStatement:
         alias = args[-1]
         path = args[0].split(".")
@@ -846,8 +793,7 @@ class ParseToObjects(Transformer):
             nparser = self.parsed[target]
         else:
             try:
-                with open(target, "r", encoding="utf-8") as f:
-                    text = f.read()
+                text = self.resolve_import_address(target)
                 nparser = ParseToObjects(
                     visit_tokens=True,
                     text=text,
@@ -1001,6 +947,12 @@ class ParseToObjects(Transformer):
                 )
                 self.environment.add_concept(new_concept, meta=meta)
                 item.content.output = new_concept
+            elif isinstance(item.content, Concept):
+                # Sometimes cached values here don't have the latest info
+                # bug we can't just use environment, as it might not have the right grain.
+                item.content = self.environment.concepts[
+                    item.content.address
+                ].with_grain(item.content.grain)
             # TODO: revisit if we can push down every filter
             # else:
             #     item.content = (
@@ -1143,7 +1095,6 @@ class ParseToObjects(Transformer):
             left = arbitrary_to_concept(
                 args[0],
                 namespace=self.environment.namespace,
-                name=f"{VIRTUAL_CONCEPT_PREFIX}_{string_to_hash(str(args[0]))}",
             )
             self.environment.add_concept(left)
         else:
@@ -1152,7 +1103,6 @@ class ParseToObjects(Transformer):
             right = arbitrary_to_concept(
                 args[2],
                 namespace=self.environment.namespace,
-                name=f"{VIRTUAL_CONCEPT_PREFIX}_{string_to_hash(str(args[2]))}",
             )
             self.environment.add_concept(right)
         else:
@@ -1187,7 +1137,6 @@ class ParseToObjects(Transformer):
             right = arbitrary_to_concept(
                 right,
                 namespace=self.environment.namespace,
-                name=f"{VIRTUAL_CONCEPT_PREFIX}_{string_to_hash(str(right))}",
             )
             self.environment.add_concept(right, meta=meta)
         return SubselectComparison(
@@ -1236,8 +1185,9 @@ class ParseToObjects(Transformer):
     def window_item_order(self, args):
         return WindowItemOrder(contents=args[0])
 
-    def window_item(self, args) -> WindowItem:
-        type = args[0]
+    @v_args(meta=True)
+    def window_item(self, meta, args) -> WindowItem:
+        type: WindowType = args[0]
         order_by = []
         over = []
         index = None
@@ -1253,6 +1203,14 @@ class ParseToObjects(Transformer):
                 concept = self.environment.concepts[item]
             elif isinstance(item, Concept):
                 concept = item
+            elif isinstance(item, WindowType):
+                type = item
+            else:
+                concept = arbitrary_to_concept(
+                    item,
+                    namespace=self.environment.namespace,
+                )
+                self.environment.add_concept(concept, meta=meta)
         assert concept
         return WindowItem(
             type=type, content=concept, over=over, order_by=order_by, index=index
@@ -1291,57 +1249,58 @@ class ParseToObjects(Transformer):
 
     @v_args(meta=True)
     def index_access(self, meta, args):
-        args = self.process_function_args(args, meta=meta)
+        args = process_function_args(args, meta=meta, environment=self.environment)
         if args[0].datatype == DataType.MAP or isinstance(args[0].datatype, MapType):
             return MapAccess(args)
         return IndexAccess(args)
 
     @v_args(meta=True)
     def map_key_access(self, meta, args):
-        args = self.process_function_args(args, meta=meta)
+        args = process_function_args(args, meta=meta, environment=self.environment)
         return MapAccess(args)
 
     @v_args(meta=True)
     def attr_access(self, meta, args):
-        args = self.process_function_args(args, meta=meta)
+        args = process_function_args(args, meta=meta, environment=self.environment)
         return AttrAccess(args)
 
     @v_args(meta=True)
     def fcoalesce(self, meta, args):
-        args = self.process_function_args(args, meta=meta)
+        args = process_function_args(args, meta=meta, environment=self.environment)
         return Coalesce(args)
 
     @v_args(meta=True)
     def unnest(self, meta, args):
-        args = self.process_function_args(args, meta=meta)
+        args = process_function_args(args, meta=meta, environment=self.environment)
         return Unnest(args)
 
     @v_args(meta=True)
     def count(self, meta, args):
-        args = self.process_function_args(args, meta=meta)
+        args = process_function_args(args, meta=meta, environment=self.environment)
         return Count(args)
 
     @v_args(meta=True)
     def fgroup(self, meta, args):
         if len(args) == 2:
-            args = self.process_function_args([args[0]] + args[1], meta=meta)
+            fargs = [args[0]] + args[1]
         else:
-            args = self.process_function_args([args[0]], meta=meta)
+            fargs = [args[0]]
+        args = process_function_args(fargs, meta=meta, environment=self.environment)
         return Group(args)
 
     @v_args(meta=True)
     def fabs(self, meta, args):
-        args = self.process_function_args(args, meta=meta)
+        args = process_function_args(args, meta=meta, environment=self.environment)
         return Abs(args)
 
     @v_args(meta=True)
     def count_distinct(self, meta, args):
-        args = self.process_function_args(args, meta=meta)
+        args = process_function_args(args, meta=meta, environment=self.environment)
         return CountDistinct(args)
 
     @v_args(meta=True)
     def sum(self, meta, args):
-        args = self.process_function_args(args, meta=meta)
+        args = process_function_args(args, meta=meta, environment=self.environment)
         return Function(
             operator=FunctionType.SUM,
             arguments=args,
@@ -1352,7 +1311,7 @@ class ParseToObjects(Transformer):
 
     @v_args(meta=True)
     def avg(self, meta, args):
-        args = self.process_function_args(args, meta=meta)
+        args = process_function_args(args, meta=meta, environment=self.environment)
         arg = args[0]
 
         return Function(
@@ -1366,17 +1325,17 @@ class ParseToObjects(Transformer):
 
     @v_args(meta=True)
     def max(self, meta, args):
-        args = self.process_function_args(args, meta=meta)
+        args = process_function_args(args, meta=meta, environment=self.environment)
         return Max(args)
 
     @v_args(meta=True)
     def min(self, meta, args):
-        args = self.process_function_args(args, meta=meta)
+        args = process_function_args(args, meta=meta, environment=self.environment)
         return Min(args)
 
     @v_args(meta=True)
     def len(self, meta, args):
-        args = self.process_function_args(args, meta=meta)
+        args = process_function_args(args, meta=meta, environment=self.environment)
         return Function(
             operator=FunctionType.LENGTH,
             arguments=args,
@@ -1388,12 +1347,12 @@ class ParseToObjects(Transformer):
 
     @v_args(meta=True)
     def fsplit(self, meta, args):
-        args = self.process_function_args(args, meta=meta)
+        args = process_function_args(args, meta=meta, environment=self.environment)
         return Split(args)
 
     @v_args(meta=True)
     def concat(self, meta, args):
-        args = self.process_function_args(args, meta=meta)
+        args = process_function_args(args, meta=meta, environment=self.environment)
         return Function(
             operator=FunctionType.CONCAT,
             arguments=args,
@@ -1406,7 +1365,7 @@ class ParseToObjects(Transformer):
 
     @v_args(meta=True)
     def like(self, meta, args):
-        args = self.process_function_args(args, meta=meta)
+        args = process_function_args(args, meta=meta, environment=self.environment)
         return Function(
             operator=FunctionType.LIKE,
             arguments=args,
@@ -1418,7 +1377,7 @@ class ParseToObjects(Transformer):
 
     @v_args(meta=True)
     def alt_like(self, meta, args):
-        args = self.process_function_args(args, meta=meta)
+        args = process_function_args(args, meta=meta, environment=self.environment)
         return Function(
             operator=FunctionType.LIKE,
             arguments=args,
@@ -1430,7 +1389,7 @@ class ParseToObjects(Transformer):
 
     @v_args(meta=True)
     def ilike(self, meta, args):
-        args = self.process_function_args(args, meta=meta)
+        args = process_function_args(args, meta=meta, environment=self.environment)
         return Function(
             operator=FunctionType.ILIKE,
             arguments=args,
@@ -1442,7 +1401,7 @@ class ParseToObjects(Transformer):
 
     @v_args(meta=True)
     def upper(self, meta, args):
-        args = self.process_function_args(args, meta=meta)
+        args = process_function_args(args, meta=meta, environment=self.environment)
         return Function(
             operator=FunctionType.UPPER,
             arguments=args,
@@ -1454,15 +1413,12 @@ class ParseToObjects(Transformer):
 
     @v_args(meta=True)
     def fstrpos(self, meta, args):
-        args = self.process_function_args(args, meta=meta)
+        args = process_function_args(args, meta=meta, environment=self.environment)
         return StrPos(args)
 
     @v_args(meta=True)
     def fsubstring(self, meta, args):
-        args = self.process_function_args(
-            args,
-            meta=meta,
-        )
+        args = process_function_args(args, meta=meta, environment=self.environment)
         return SubString(args)
 
     def logical_operator(self, args):
@@ -1470,7 +1426,7 @@ class ParseToObjects(Transformer):
 
     @v_args(meta=True)
     def lower(self, meta, args):
-        args = self.process_function_args(args, meta=meta)
+        args = process_function_args(args, meta=meta, environment=self.environment)
         return Function(
             operator=FunctionType.LOWER,
             arguments=args,
@@ -1483,7 +1439,7 @@ class ParseToObjects(Transformer):
     # date functions
     @v_args(meta=True)
     def fdate(self, meta, args):
-        args = self.process_function_args(args, meta=meta)
+        args = process_function_args(args, meta=meta, environment=self.environment)
         return Function(
             operator=FunctionType.DATE,
             arguments=args,
@@ -1503,7 +1459,7 @@ class ParseToObjects(Transformer):
 
     @v_args(meta=True)
     def fdate_trunc(self, meta, args):
-        args = self.process_function_args(args, meta=meta)
+        args = process_function_args(args, meta=meta, environment=self.environment)
         return Function(
             operator=FunctionType.DATE_TRUNCATE,
             arguments=args,
@@ -1523,7 +1479,7 @@ class ParseToObjects(Transformer):
 
     @v_args(meta=True)
     def fdate_part(self, meta, args):
-        args = self.process_function_args(args, meta=meta)
+        args = process_function_args(args, meta=meta, environment=self.environment)
         return Function(
             operator=FunctionType.DATE_PART,
             arguments=args,
@@ -1543,7 +1499,7 @@ class ParseToObjects(Transformer):
 
     @v_args(meta=True)
     def fdate_add(self, meta, args):
-        args = self.process_function_args(args, meta=meta)
+        args = process_function_args(args, meta=meta, environment=self.environment)
         return Function(
             operator=FunctionType.DATE_ADD,
             arguments=args,
@@ -1564,7 +1520,7 @@ class ParseToObjects(Transformer):
 
     @v_args(meta=True)
     def fdate_diff(self, meta, args):
-        args = self.process_function_args(args, meta=meta)
+        args = process_function_args(args, meta=meta, environment=self.environment)
         purpose = function_args_to_output_purpose(args)
         return Function(
             operator=FunctionType.DATE_DIFF,
@@ -1589,7 +1545,7 @@ class ParseToObjects(Transformer):
 
     @v_args(meta=True)
     def fdatetime(self, meta, args):
-        args = self.process_function_args(args, meta=meta)
+        args = process_function_args(args, meta=meta, environment=self.environment)
         return Function(
             operator=FunctionType.DATETIME,
             arguments=args,
@@ -1606,7 +1562,7 @@ class ParseToObjects(Transformer):
 
     @v_args(meta=True)
     def ftimestamp(self, meta, args):
-        args = self.process_function_args(args, meta=meta)
+        args = process_function_args(args, meta=meta, environment=self.environment)
         return Function(
             operator=FunctionType.TIMESTAMP,
             arguments=args,
@@ -1618,7 +1574,7 @@ class ParseToObjects(Transformer):
 
     @v_args(meta=True)
     def fsecond(self, meta, args):
-        args = self.process_function_args(args, meta=meta)
+        args = process_function_args(args, meta=meta, environment=self.environment)
         return Function(
             operator=FunctionType.SECOND,
             arguments=args,
@@ -1630,7 +1586,7 @@ class ParseToObjects(Transformer):
 
     @v_args(meta=True)
     def fminute(self, meta, args):
-        args = self.process_function_args(args, meta=meta)
+        args = process_function_args(args, meta=meta, environment=self.environment)
         return Function(
             operator=FunctionType.MINUTE,
             arguments=args,
@@ -1642,7 +1598,7 @@ class ParseToObjects(Transformer):
 
     @v_args(meta=True)
     def fhour(self, meta, args):
-        args = self.process_function_args(args, meta=meta)
+        args = process_function_args(args, meta=meta, environment=self.environment)
         return Function(
             operator=FunctionType.HOUR,
             arguments=args,
@@ -1654,7 +1610,7 @@ class ParseToObjects(Transformer):
 
     @v_args(meta=True)
     def fday(self, meta, args):
-        args = self.process_function_args(args, meta=meta)
+        args = process_function_args(args, meta=meta, environment=self.environment)
         return Function(
             operator=FunctionType.DAY,
             arguments=args,
@@ -1666,7 +1622,7 @@ class ParseToObjects(Transformer):
 
     @v_args(meta=True)
     def fday_of_week(self, meta, args):
-        args = self.process_function_args(args, meta=meta)
+        args = process_function_args(args, meta=meta, environment=self.environment)
         return Function(
             operator=FunctionType.DAY_OF_WEEK,
             arguments=args,
@@ -1678,7 +1634,7 @@ class ParseToObjects(Transformer):
 
     @v_args(meta=True)
     def fweek(self, meta, args):
-        args = self.process_function_args(args, meta=meta)
+        args = process_function_args(args, meta=meta, environment=self.environment)
         return Function(
             operator=FunctionType.WEEK,
             arguments=args,
@@ -1690,7 +1646,7 @@ class ParseToObjects(Transformer):
 
     @v_args(meta=True)
     def fmonth(self, meta, args):
-        args = self.process_function_args(args, meta=meta)
+        args = process_function_args(args, meta=meta, environment=self.environment)
         return Function(
             operator=FunctionType.MONTH,
             arguments=args,
@@ -1702,7 +1658,7 @@ class ParseToObjects(Transformer):
 
     @v_args(meta=True)
     def fquarter(self, meta, args):
-        args = self.process_function_args(args, meta=meta)
+        args = process_function_args(args, meta=meta, environment=self.environment)
         return Function(
             operator=FunctionType.QUARTER,
             arguments=args,
@@ -1714,7 +1670,7 @@ class ParseToObjects(Transformer):
 
     @v_args(meta=True)
     def fyear(self, meta, args):
-        args = self.process_function_args(args, meta=meta)
+        args = process_function_args(args, meta=meta, environment=self.environment)
         return Function(
             operator=FunctionType.YEAR,
             arguments=args,
@@ -1727,7 +1683,7 @@ class ParseToObjects(Transformer):
     # utility functions
     @v_args(meta=True)
     def fcast(self, meta, args) -> Function:
-        args = self.process_function_args(args, meta=meta)
+        args = process_function_args(args, meta=meta, environment=self.environment)
         output_datatype = args[1]
         return Function(
             operator=FunctionType.CAST,
@@ -1748,7 +1704,7 @@ class ParseToObjects(Transformer):
     # math functions
     @v_args(meta=True)
     def fadd(self, meta, args) -> Function:
-        args = self.process_function_args(args, meta=meta)
+        args = process_function_args(args, meta=meta, environment=self.environment)
         output_datatype = arg_to_datatype(args[0])
         # TODO: check for valid transforms?
         return Function(
@@ -1762,7 +1718,7 @@ class ParseToObjects(Transformer):
 
     @v_args(meta=True)
     def fsub(self, meta, args) -> Function:
-        args = self.process_function_args(args, meta=meta)
+        args = process_function_args(args, meta=meta, environment=self.environment)
         output_datatype = arg_to_datatype(args[0])
         return Function(
             operator=FunctionType.SUBTRACT,
@@ -1775,7 +1731,7 @@ class ParseToObjects(Transformer):
 
     @v_args(meta=True)
     def fmul(self, meta, args) -> Function:
-        args = self.process_function_args(args, meta=meta)
+        args = process_function_args(args, meta=meta, environment=self.environment)
         output_datatype = arg_to_datatype(args[0])
         return Function(
             operator=FunctionType.MULTIPLY,
@@ -1789,7 +1745,7 @@ class ParseToObjects(Transformer):
     @v_args(meta=True)
     def fdiv(self, meta: Meta, args):
         output_datatype = arg_to_datatype(args[0])
-        args = self.process_function_args(args, meta=meta)
+        args = process_function_args(args, meta=meta, environment=self.environment)
         return Function(
             operator=FunctionType.DIVIDE,
             arguments=args,
@@ -1802,7 +1758,7 @@ class ParseToObjects(Transformer):
     @v_args(meta=True)
     def fmod(self, meta: Meta, args):
         output_datatype = arg_to_datatype(args[0])
-        args = self.process_function_args(args, meta=meta)
+        args = process_function_args(args, meta=meta, environment=self.environment)
         return Function(
             operator=FunctionType.MOD,
             arguments=args,
@@ -1817,7 +1773,7 @@ class ParseToObjects(Transformer):
 
     @v_args(meta=True)
     def fround(self, meta, args) -> Function:
-        args = self.process_function_args(args, meta=meta)
+        args = process_function_args(args, meta=meta, environment=self.environment)
         output_datatype = arg_to_datatype(args[0])
         return Function(
             operator=FunctionType.ROUND,
@@ -1851,27 +1807,27 @@ class ParseToObjects(Transformer):
 
     @v_args(meta=True)
     def fcase_when(self, meta, args) -> CaseWhen:
-        args = self.process_function_args(args, meta=meta)
+        args = process_function_args(args, meta=meta, environment=self.environment)
         return CaseWhen(comparison=args[0], expr=args[1])
 
     @v_args(meta=True)
     def fcase_else(self, meta, args) -> CaseElse:
-        args = self.process_function_args(args, meta=meta)
+        args = process_function_args(args, meta=meta, environment=self.environment)
         return CaseElse(expr=args[0])
 
     @v_args(meta=True)
     def fcurrent_date(self, meta, args):
-        args = self.process_function_args(args, meta=meta)
+        args = process_function_args(args, meta=meta, environment=self.environment)
         return CurrentDate([])
 
     @v_args(meta=True)
     def fcurrent_datetime(self, meta, args):
-        args = self.process_function_args(args, meta=meta)
+        args = process_function_args(args, meta=meta, environment=self.environment)
         return CurrentDatetime([])
 
     @v_args(meta=True)
     def fnot(self, meta, args):
-        args = self.process_function_args(args, meta=meta)
+        args = process_function_args(args, meta=meta, environment=self.environment)
         return IsNull(args)
 
 

trilogy/parsing/trilogy.lark

@@ -90,9 +90,9 @@
 
 
     // rank/lag/lead
-    WINDOW_TYPE: ("row_number"i|"rank"i|"lag"i|"lead"i | "sum"i)  /[\s]+/
+    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? concept_lit  window_item_over? window_item_order?
+    window_item: WINDOW_TYPE int_lit? expr  window_item_over? window_item_order?
     
     window_item_over: ("OVER"i over_list)
     
@@ -296,7 +296,7 @@
 
     MODIFIER: "Optional"i | "Partial"i | "Nullable"i
 
-    SHORTHAND_MODIFIER: "~"
+    SHORTHAND_MODIFIER: "~" | "?"
 
     struct_type: "struct"i "<" ((data_type | IDENTIFIER) ",")* (data_type | IDENTIFIER) ","? ">"