more in-depth lexical labelling

examples/EdgeDB.Examples.CSharp/Examples/QueryBuilder.cs

@@ -42,10 +42,6 @@ public async Task ExecuteAsync(EdgeDBClient client)
 
         private static async Task QueryBuilderDemo(EdgeDBClient client)
         {
-            var test = QueryBuilder.SelectExpression(() => EdgeQL.Range<int>(5, 10, true, false, false));
-
-            var result = test.Build();
-
             // Selecting a type with autogen shape
             var query = QueryBuilder.Select<Person>().Build().Prettify();
 

src/EdgeDB.Net.QueryBuilder/Grammar/Grammar.cs

@@ -30,7 +30,7 @@ public Operator(ExpressionType[] expressionTypes, string name, int paramCount, M
                 _method = method;
             }
 
-            public void Build(QueryStringWriter writer, params QueryStringWriter.Proxy[] args)
+            public void Build(QueryStringWriter writer, params WriterProxy[] args)
             {
                 var arr = new object?[args.Length + 1];
                 arr[0] = writer;
@@ -62,11 +62,11 @@ static Grammar()
             }
         }
 
-        private static Operator? SearchForBestMatch(ExpressionType type, QueryStringWriter.Proxy[] args)
+        private static Operator? SearchForBestMatch(ExpressionType type, WriterProxy[] args)
             => _operators.FirstOrDefault(x => x.ExpressionTypes.Contains(type) && x.ParameterCount == args.Length);
 
         public static bool TryBuildOperator(ExpressionType type, QueryStringWriter writer,
-            params QueryStringWriter.Proxy[] args)
+            params WriterProxy[] args)
         {
             var op = SearchForBestMatch(type, args);
 
@@ -81,7 +81,7 @@ public static bool TryBuildOperator(ExpressionType type, QueryStringWriter write
             => TryBuildOperator(
                 type,
                 writer,
-                args.Select(x => new QueryStringWriter.Proxy(writer => writer
+                args.Select(x => new WriterProxy(writer => writer
                     .Append(x)
                 )).ToArray()
             );

src/EdgeDB.Net.QueryBuilder/Grammar/Operators/Grammar.Anytype.g.cs

@@ -9,40 +9,40 @@ namespace EdgeDB
     internal partial class Grammar
     {
         [EdgeQLOp("std::DISTINCT")]
-        public static void Op_1807904139(QueryStringWriter writer, QueryStringWriter.Proxy sParam)
+        public static void Op_1633607166(QueryStringWriter writer, WriterProxy sParam)
         {
             writer.Append("DISTINCT").Append(sParam);
         }
         [EdgeQLOp("std::UNION")]
-        public static void Op_1104940874(QueryStringWriter writer, QueryStringWriter.Proxy s1Param, QueryStringWriter.Proxy s2Param)
+        public static void Op_999725343(QueryStringWriter writer, WriterProxy s1Param, WriterProxy s2Param)
         {
             writer.Append(s1Param).Wrapped("UNION", "  ").Append(s2Param);
         }
         [EdgeQLOp("std::EXCEPT")]
-        public static void Op_1159339088(QueryStringWriter writer, QueryStringWriter.Proxy s1Param, QueryStringWriter.Proxy s2Param)
+        public static void Op_474586655(QueryStringWriter writer, WriterProxy s1Param, WriterProxy s2Param)
         {
             writer.Append(s1Param).Wrapped("EXCEPT", "  ").Append(s2Param);
         }
         [EdgeQLOp("std::INTERSECT")]
-        public static void Op_313989350(QueryStringWriter writer, QueryStringWriter.Proxy s1Param, QueryStringWriter.Proxy s2Param)
+        public static void Op_1866682449(QueryStringWriter writer, WriterProxy s1Param, WriterProxy s2Param)
         {
             writer.Append(s1Param).Wrapped("INTERSECT", "  ").Append(s2Param);
         }
         [EquivalentExpression(ExpressionType.Coalesce)]
         [EdgeQLOp("std::??")]
-        public static void Op_844866030(QueryStringWriter writer, QueryStringWriter.Proxy lParam, QueryStringWriter.Proxy rParam)
+        public static void Op_240810131(QueryStringWriter writer, WriterProxy lParam, WriterProxy rParam)
         {
             writer.Append(lParam).Wrapped("??", "  ").Append(rParam);
         }
         [EquivalentExpression(ExpressionType.Conditional)]
         [EdgeQLOp("std::IF")]
-        public static void Op_2099638795(QueryStringWriter writer, QueryStringWriter.Proxy if_trueParam, QueryStringWriter.Proxy conditionParam, QueryStringWriter.Proxy if_falseParam)
+        public static void Op_772749472(QueryStringWriter writer, WriterProxy if_trueParam, WriterProxy conditionParam, WriterProxy if_falseParam)
         {
             writer.Append(if_trueParam).Append(" IF ").Append(conditionParam).Append(" ELSE ").Append(if_falseParam);
         }
         [EquivalentExpression(ExpressionType.ArrayIndex)]
         [EdgeQLOp("std::[]")]
-        public static void Op_1272589386(QueryStringWriter writer, QueryStringWriter.Proxy lParam, QueryStringWriter.Proxy rParam)
+        public static void Op_861836053(QueryStringWriter writer, WriterProxy lParam, WriterProxy rParam)
         {
             writer.Append(lParam).Wrapped(rParam, "[]");
         }

src/EdgeDB.Net.QueryBuilder/Grammar/Operators/Grammar.ArrayAnytype.g.cs

@@ -9,13 +9,13 @@ namespace EdgeDB
     internal partial class Grammar
     {
         [EdgeQLOp("std::++")]
-        public static void Op_1137805645(QueryStringWriter writer, QueryStringWriter.Proxy lParam, QueryStringWriter.Proxy rParam)
+        public static void Op_1229472478(QueryStringWriter writer, WriterProxy lParam, WriterProxy rParam)
         {
             writer.Append(lParam).Wrapped("++", "  ").Append(rParam);
         }
         [EquivalentExpression(ExpressionType.ArrayIndex)]
         [EdgeQLOp("std::[]")]
-        public static void Op_1831455023(QueryStringWriter writer, QueryStringWriter.Proxy lParam, QueryStringWriter.Proxy rParam)
+        public static void Op_1187471622(QueryStringWriter writer, WriterProxy lParam, WriterProxy rParam)
         {
             writer.Append(lParam).Wrapped(rParam, "[]");
         }

src/EdgeDB.Net.QueryBuilder/Grammar/Operators/Grammar.CalDateDuration.g.cs

@@ -10,13 +10,13 @@ internal partial class Grammar
     {
         [EquivalentExpression(ExpressionType.Subtract, ExpressionType.Negate)]
         [EdgeQLOp("std::-")]
-        public static void Op_82295105(QueryStringWriter writer, QueryStringWriter.Proxy lParam, QueryStringWriter.Proxy rParam)
+        public static void Op_1099392975(QueryStringWriter writer, WriterProxy lParam, WriterProxy rParam)
         {
             writer.Append(lParam).Wrapped("-", "  ").Append(rParam);
         }
         [EquivalentExpression(ExpressionType.Add, ExpressionType.AddChecked)]
         [EdgeQLOp("std::+")]
-        public static void Op_667626(QueryStringWriter writer, QueryStringWriter.Proxy lParam, QueryStringWriter.Proxy rParam)
+        public static void Op_1717530918(QueryStringWriter writer, WriterProxy lParam, WriterProxy rParam)
         {
             writer.Append(lParam).Wrapped("+", "  ").Append(rParam);
         }

src/EdgeDB.Net.QueryBuilder/Grammar/Operators/Grammar.CalLocalDate.g.cs

@@ -10,13 +10,13 @@ internal partial class Grammar
     {
         [EquivalentExpression(ExpressionType.Add, ExpressionType.AddChecked)]
         [EdgeQLOp("std::+")]
-        public static void Op_66999224(QueryStringWriter writer, QueryStringWriter.Proxy lParam, QueryStringWriter.Proxy rParam)
+        public static void Op_327561740(QueryStringWriter writer, WriterProxy lParam, WriterProxy rParam)
         {
             writer.Append(lParam).Wrapped("+", "  ").Append(rParam);
         }
         [EquivalentExpression(ExpressionType.Subtract, ExpressionType.Negate)]
         [EdgeQLOp("std::-")]
-        public static void Op_1924679920(QueryStringWriter writer, QueryStringWriter.Proxy lParam, QueryStringWriter.Proxy rParam)
+        public static void Op_955794403(QueryStringWriter writer, WriterProxy lParam, WriterProxy rParam)
         {
             writer.Append(lParam).Wrapped("-", "  ").Append(rParam);
         }

src/EdgeDB.Net.QueryBuilder/Grammar/Operators/Grammar.CalLocalDatetime.g.cs

@@ -10,13 +10,13 @@ internal partial class Grammar
     {
         [EquivalentExpression(ExpressionType.Add, ExpressionType.AddChecked)]
         [EdgeQLOp("std::+")]
-        public static void Op_2122027181(QueryStringWriter writer, QueryStringWriter.Proxy lParam, QueryStringWriter.Proxy rParam)
+        public static void Op_561578624(QueryStringWriter writer, WriterProxy lParam, WriterProxy rParam)
         {
             writer.Append(lParam).Wrapped("+", "  ").Append(rParam);
         }
         [EquivalentExpression(ExpressionType.Subtract, ExpressionType.Negate)]
         [EdgeQLOp("std::-")]
-        public static void Op_76086228(QueryStringWriter writer, QueryStringWriter.Proxy lParam, QueryStringWriter.Proxy rParam)
+        public static void Op_2132676355(QueryStringWriter writer, WriterProxy lParam, WriterProxy rParam)
         {
             writer.Append(lParam).Wrapped("-", "  ").Append(rParam);
         }

src/EdgeDB.Net.QueryBuilder/Grammar/Operators/Grammar.CalLocalTime.g.cs

@@ -10,13 +10,13 @@ internal partial class Grammar
     {
         [EquivalentExpression(ExpressionType.Add, ExpressionType.AddChecked)]
         [EdgeQLOp("std::+")]
-        public static void Op_1286579746(QueryStringWriter writer, QueryStringWriter.Proxy lParam, QueryStringWriter.Proxy rParam)
+        public static void Op_1345962027(QueryStringWriter writer, WriterProxy lParam, WriterProxy rParam)
         {
             writer.Append(lParam).Wrapped("+", "  ").Append(rParam);
         }
         [EquivalentExpression(ExpressionType.Subtract, ExpressionType.Negate)]
         [EdgeQLOp("std::-")]
-        public static void Op_686701897(QueryStringWriter writer, QueryStringWriter.Proxy lParam, QueryStringWriter.Proxy rParam)
+        public static void Op_635264521(QueryStringWriter writer, WriterProxy lParam, WriterProxy rParam)
         {
             writer.Append(lParam).Wrapped("-", "  ").Append(rParam);
         }

src/EdgeDB.Net.QueryBuilder/Grammar/Operators/Grammar.CalRelativeDuration.g.cs

@@ -10,19 +10,19 @@ internal partial class Grammar
     {
         [EquivalentExpression(ExpressionType.Subtract, ExpressionType.Negate)]
         [EdgeQLOp("std::-")]
-        public static void Op_1845835213(QueryStringWriter writer, QueryStringWriter.Proxy lParam, QueryStringWriter.Proxy rParam)
+        public static void Op_1504665417(QueryStringWriter writer, WriterProxy lParam, WriterProxy rParam)
         {
             writer.Append(lParam).Wrapped("-", "  ").Append(rParam);
         }
         [EquivalentExpression(ExpressionType.Add, ExpressionType.AddChecked)]
         [EdgeQLOp("std::+")]
-        public static void Op_1659323368(QueryStringWriter writer, QueryStringWriter.Proxy lParam, QueryStringWriter.Proxy rParam)
+        public static void Op_1609073880(QueryStringWriter writer, WriterProxy lParam, WriterProxy rParam)
         {
             writer.Append(lParam).Wrapped("+", "  ").Append(rParam);
         }
         [EquivalentExpression(ExpressionType.Subtract, ExpressionType.Negate)]
         [EdgeQLOp("std::-")]
-        public static void Op_90117864(QueryStringWriter writer, QueryStringWriter.Proxy vParam)
+        public static void Op_2131327805(QueryStringWriter writer, WriterProxy vParam)
         {
             writer.Append("-").Append(vParam);
         }

src/EdgeDB.Net.QueryBuilder/Grammar/Operators/Grammar.MultirangeStdAnypoint.g.cs

@@ -10,19 +10,19 @@ internal partial class Grammar
     {
         [EquivalentExpression(ExpressionType.Add, ExpressionType.AddChecked)]
         [EdgeQLOp("std::+")]
-        public static void Op_781062263(QueryStringWriter writer, QueryStringWriter.Proxy lParam, QueryStringWriter.Proxy rParam)
+        public static void Op_632890321(QueryStringWriter writer, WriterProxy lParam, WriterProxy rParam)
         {
             writer.Append(lParam).Wrapped("+", "  ").Append(rParam);
         }
         [EquivalentExpression(ExpressionType.Subtract, ExpressionType.Negate)]
         [EdgeQLOp("std::-")]
-        public static void Op_962675901(QueryStringWriter writer, QueryStringWriter.Proxy lParam, QueryStringWriter.Proxy rParam)
+        public static void Op_1071812987(QueryStringWriter writer, WriterProxy lParam, WriterProxy rParam)
         {
             writer.Append(lParam).Wrapped("-", "  ").Append(rParam);
         }
         [EquivalentExpression(ExpressionType.Multiply)]
         [EdgeQLOp("std::*")]
-        public static void Op_808906502(QueryStringWriter writer, QueryStringWriter.Proxy lParam, QueryStringWriter.Proxy rParam)
+        public static void Op_791892788(QueryStringWriter writer, WriterProxy lParam, WriterProxy rParam)
         {
             writer.Append(lParam).Wrapped("*", "  ").Append(rParam);
         }

src/EdgeDB.Net.QueryBuilder/Grammar/Operators/Grammar.RangeStdAnypoint.g.cs

@@ -10,19 +10,19 @@ internal partial class Grammar
     {
         [EquivalentExpression(ExpressionType.Add, ExpressionType.AddChecked)]
         [EdgeQLOp("std::+")]
-        public static void Op_272862904(QueryStringWriter writer, QueryStringWriter.Proxy lParam, QueryStringWriter.Proxy rParam)
+        public static void Op_1950052772(QueryStringWriter writer, WriterProxy lParam, WriterProxy rParam)
         {
             writer.Append(lParam).Wrapped("+", "  ").Append(rParam);
         }
         [EquivalentExpression(ExpressionType.Subtract, ExpressionType.Negate)]
         [EdgeQLOp("std::-")]
-        public static void Op_538016052(QueryStringWriter writer, QueryStringWriter.Proxy lParam, QueryStringWriter.Proxy rParam)
+        public static void Op_1608871926(QueryStringWriter writer, WriterProxy lParam, WriterProxy rParam)
         {
             writer.Append(lParam).Wrapped("-", "  ").Append(rParam);
         }
         [EquivalentExpression(ExpressionType.Multiply)]
         [EdgeQLOp("std::*")]
-        public static void Op_1210769258(QueryStringWriter writer, QueryStringWriter.Proxy lParam, QueryStringWriter.Proxy rParam)
+        public static void Op_570123961(QueryStringWriter writer, WriterProxy lParam, WriterProxy rParam)
         {
             writer.Append(lParam).Wrapped("*", "  ").Append(rParam);
         }

src/EdgeDB.Net.QueryBuilder/Grammar/Operators/Grammar.StdBigint.g.cs

@@ -10,37 +10,37 @@ internal partial class Grammar
     {
         [EquivalentExpression(ExpressionType.Add, ExpressionType.AddChecked)]
         [EdgeQLOp("std::+")]
-        public static void Op_1431279147(QueryStringWriter writer, QueryStringWriter.Proxy lParam, QueryStringWriter.Proxy rParam)
+        public static void Op_1159303302(QueryStringWriter writer, WriterProxy lParam, WriterProxy rParam)
         {
             writer.Append(lParam).Wrapped("+", "  ").Append(rParam);
         }
         [EquivalentExpression(ExpressionType.Add, ExpressionType.AddChecked)]
         [EdgeQLOp("std::+")]
-        public static void Op_387153592(QueryStringWriter writer, QueryStringWriter.Proxy lParam)
+        public static void Op_314897733(QueryStringWriter writer, WriterProxy lParam)
         {
             writer.Append("+").Append(lParam);
         }
         [EquivalentExpression(ExpressionType.Subtract, ExpressionType.Negate)]
         [EdgeQLOp("std::-")]
-        public static void Op_1132258927(QueryStringWriter writer, QueryStringWriter.Proxy lParam, QueryStringWriter.Proxy rParam)
+        public static void Op_89428629(QueryStringWriter writer, WriterProxy lParam, WriterProxy rParam)
         {
             writer.Append(lParam).Wrapped("-", "  ").Append(rParam);
         }
         [EquivalentExpression(ExpressionType.Subtract, ExpressionType.Negate)]
         [EdgeQLOp("std::-")]
-        public static void Op_78207089(QueryStringWriter writer, QueryStringWriter.Proxy lParam)
+        public static void Op_823298531(QueryStringWriter writer, WriterProxy lParam)
         {
             writer.Append("-").Append(lParam);
         }
         [EquivalentExpression(ExpressionType.Multiply)]
         [EdgeQLOp("std::*")]
-        public static void Op_2106829999(QueryStringWriter writer, QueryStringWriter.Proxy lParam, QueryStringWriter.Proxy rParam)
+        public static void Op_1165137993(QueryStringWriter writer, WriterProxy lParam, WriterProxy rParam)
         {
             writer.Append(lParam).Wrapped("*", "  ").Append(rParam);
         }
         [EquivalentExpression(ExpressionType.Modulo)]
         [EdgeQLOp("std::%")]
-        public static void Op_1558712639(QueryStringWriter writer, QueryStringWriter.Proxy nParam, QueryStringWriter.Proxy dParam)
+        public static void Op_1358603801(QueryStringWriter writer, WriterProxy nParam, WriterProxy dParam)
         {
             writer.Append(nParam).Wrapped("%", "  ").Append(dParam);
         }