* tlo now contains constructors in original order (#11)

VKCOM · Nov 10, 2023 · 5fd8e25 · 5fd8e25
1 parent 906000f
commit 5fd8e25
Show file tree

Hide file tree

Showing 25 changed files with 167 additions and 319 deletions.
diff --git a/cmd/tlo2json/tlo2json.go b/cmd/tlo2json/tlo2json.go
@@ -11,10 +11,10 @@ import (
 	"os"
 	"strings"
 
-	tls "github.com/vkcom/tl/internal/tlcodegen/gentlo/tltls"
-	"github.com/vkcom/tl/internal/utils"
-
 	"golang.org/x/exp/slices"
+
+	tls "github.com/vkcom/tl/internal/tlast/gentlo/tltls"
+	"github.com/vkcom/tl/internal/utils"
 )
 
 func main() {
@@ -41,17 +41,6 @@ func main() {
 		}
 		return strings.Compare(valAV4.Id, valBV4.Id)
 	})
-	slices.SortFunc(v4.Functions, func(a, b tls.CombinatorUnion) int {
-		valAV4, okA := a.AsV4()
-		if !okA {
-			panic("invalid union interpretation for tls.combinator_v4: " + valAV4.String())
-		}
-		valBV4, okB := b.AsV4()
-		if !okB {
-			panic("invalid union interpretation for tls.combinator_v4: " + valAV4.String())
-		}
-		return strings.Compare(valAV4.Id, valBV4.Id)
-	})
 	out, err := v4.WriteJSON(nil)
 	if err != nil {
 		_, _ = fmt.Fprintf(os.Stderr, "error on creating json: %v", err)

diff --git a/internal/tlcodegen/gentlo/basictl/basictl.go → internal/tlast/gentlo/basictl/basictl.go b/internal/tlcodegen/gentlo/basictl/basictl.go → internal/tlast/gentlo/basictl/basictl.go
diff --git a/...l/tlcodegen/gentlo/constants/constants.go → internal/tlast/gentlo/constants/constants.go b/...l/tlcodegen/gentlo/constants/constants.go → internal/tlast/gentlo/constants/constants.go
diff --git a/internal/tlcodegen/gentlo/factory/factory.go → internal/tlast/gentlo/factory/factory.go b/internal/tlcodegen/gentlo/factory/factory.go → internal/tlast/gentlo/factory/factory.go
diff --git a/...n/gentlo/internal/a_tlgen_helpers_code.go → ...t/gentlo/internal/a_tlgen_helpers_code.go b/...n/gentlo/internal/a_tlgen_helpers_code.go → ...t/gentlo/internal/a_tlgen_helpers_code.go
diff --git a/...codegen/gentlo/internal/tls.Combinator.go → ...l/tlast/gentlo/internal/tls.Combinator.go b/...codegen/gentlo/internal/tls.Combinator.go → ...l/tlast/gentlo/internal/tls.Combinator.go
diff --git a/...gen/gentlo/internal/tls.CombinatorLeft.go → ...ast/gentlo/internal/tls.CombinatorLeft.go b/...gen/gentlo/internal/tls.CombinatorLeft.go → ...ast/gentlo/internal/tls.CombinatorLeft.go
diff --git a/...nal/tlcodegen/gentlo/internal/tls.Expr.go → internal/tlast/gentlo/internal/tls.Expr.go b/...nal/tlcodegen/gentlo/internal/tls.Expr.go → internal/tlast/gentlo/internal/tls.Expr.go
diff --git a/.../tlcodegen/gentlo/internal/tls.NatExpr.go → ...rnal/tlast/gentlo/internal/tls.NatExpr.go b/.../tlcodegen/gentlo/internal/tls.NatExpr.go → ...rnal/tlast/gentlo/internal/tls.NatExpr.go
diff --git a/...l/tlcodegen/gentlo/internal/tls.Schema.go → internal/tlast/gentlo/internal/tls.Schema.go b/...l/tlcodegen/gentlo/internal/tls.Schema.go → internal/tlast/gentlo/internal/tls.Schema.go
diff --git a/...tlcodegen/gentlo/internal/tls.TypeExpr.go → ...nal/tlast/gentlo/internal/tls.TypeExpr.go b/...tlcodegen/gentlo/internal/tls.TypeExpr.go → ...nal/tlast/gentlo/internal/tls.TypeExpr.go
diff --git a/...rnal/tlcodegen/gentlo/internal/tls.arg.go → internal/tlast/gentlo/internal/tls.arg.go b/...rnal/tlcodegen/gentlo/internal/tls.arg.go → internal/tlast/gentlo/internal/tls.arg.go
diff --git a/...en/gentlo/internal/tls.combinatorRight.go → ...st/gentlo/internal/tls.combinatorRight.go b/...en/gentlo/internal/tls.combinatorRight.go → ...st/gentlo/internal/tls.combinatorRight.go
diff --git a/...nal/tlcodegen/gentlo/internal/tls.type.go → internal/tlast/gentlo/internal/tls.type.go b/...nal/tlcodegen/gentlo/internal/tls.type.go → internal/tlast/gentlo/internal/tls.type.go
diff --git a/internal/tlcodegen/gentlo/meta/meta.go → internal/tlast/gentlo/meta/meta.go b/internal/tlcodegen/gentlo/meta/meta.go → internal/tlast/gentlo/meta/meta.go
diff --git a/internal/tlast/gentlo/tlgen2_version.txt b/internal/tlast/gentlo/tlgen2_version.txt
@@ -0,0 +1 @@
+tlgen2 version 2022.06.30, hash of source code - 02f843f247465e376a64c154a2c95807b2dfd6e766c1a71b024dfa87f5a75449
diff --git a/internal/tlcodegen/gentlo/tltls/tltls.go → internal/tlast/gentlo/tltls/tltls.go b/internal/tlcodegen/gentlo/tltls/tltls.go → internal/tlast/gentlo/tltls/tltls.go
diff --git a/internal/tlast/qt_combined2tl.qtpl b/internal/tlast/qt_combined2tl.qtpl
@@ -1,23 +1,8 @@
 {% import "fmt" %}
 {% import "sort" %}
 {%- code
-func modifierToFlag(m Modifier) int32 {
-	switch m.Name {
-	case "@any":
-		return 0
-	case "@read":
-		return 1
-	case "@write":
-		return 2
-	case "@readwrite":
-		return 1 | 2
-	case "@internal":
-		return 4
-	case "@kphp":
-		return 8
-	default:
-	    return 0
-	}
+func compareModifiers(a, b Modifier) bool {
+    return modifierToFlag([]Modifier{a}) < modifierToFlag([]Modifier{b})
 }
 -%}
 
@@ -26,7 +11,7 @@ func modifierToFlag(m Modifier) int32 {
   {%- code
     modifiers := append([]Modifier(nil), descriptor.Modifiers...)
     sort.Slice(modifiers, func(i, j int) bool {
-    	return modifierToFlag(modifiers[i]) < modifierToFlag(modifiers[j])
+    	return compareModifiers(modifiers[i], modifiers[j])
     })
     haveKphp := false
     for _, m := range modifiers {

diff --git a/internal/tlast/qt_combined2tl.qtpl.go b/internal/tlast/qt_combined2tl.qtpl.go
diff --git a/internal/tlast/tldot.go b/internal/tlast/tldot.go
@@ -24,7 +24,7 @@ func createNode(s *strings.Builder, parent, child, nodeName string, color string
 	_, _ = fmt.Fprintf(s, "%s -> %s;\n", parent, child)
 }
 
-func (tl *TL) ToDot() string {
+func (tl TL) ToDot() string {
 	var s, t, f strings.Builder
 	s.WriteString("digraph TL { splines=\"ortho\";\nordering=in;\ngraph[ordering=in];\n")
 	tlID := fmt.Sprintf("\"%pTL\"", tl)
@@ -35,9 +35,9 @@ func (tl *TL) ToDot() string {
 	createNode(&f, tlID, functionsID, "Functions", "white")
 	t.WriteString("subgraph types { ordering=in;\ngraph[ordering=in];\n")
 	f.WriteString("subgraph functions { ordering=in;\ngraph[ordering=in];\n")
-	for i := 0; i < len(*tl); i++ {
-		x := (*tl)[i]
-		id := fmt.Sprintf("\"%pCombinator\"", x)
+	for i := 0; i < len(tl); i++ {
+		x := tl[i]
+		id := fmt.Sprintf("\"%pCombinator\"", &x)
 		if x.IsFunction {
 			createNode(&f, functionsID, id, "Function", "white")
 			x.toDot(&f)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		tlgen2 version 2022.06.30, hash of source code - 02f843f247465e376a64c154a2c95807b2dfd6e766c1a71b024dfa87f5a75449