Move context type to its own file in python library

Author: RainingComputers

pkg/runtimes/dython/deepslate/context.py

@@ -0,0 +1,21 @@
+from typing import Any
+from dataclasses import dataclass, field
+import uuid
+import time
+
+
+@dataclass
+class Context:
+    vars: dict[str, Any] = field(default_factory=dict)
+
+    def set_var(self, name: str, value: Any) -> None:
+        self.vars[name] = value
+
+    def get_var(self, name: str) -> Any:
+        return self.vars.get(name)
+
+    def gen_key(self) -> str:
+        return str(uuid.uuid4())
+
+    def millis_now(self) -> int:
+        return int(time.time() * 1000)

pkg/runtimes/dython/deepslate/types.py

@@ -1,31 +1,13 @@
 from enum import IntEnum
 from typing import Protocol, Any, Optional
 from dataclasses import dataclass, field
-import uuid
-import time
 
 import msgpack
 
+from deepslate.context import Context
 from deepslate.errors import DSError
 
 
-@dataclass
-class Context:
-    vars: dict[str, Any] = field(default_factory=dict)
-
-    def set_var(self, name: str, value: Any) -> None:
-        self.vars[name] = value
-
-    def get_var(self, name: str) -> Any:
-        return self.vars.get(name)
-
-    def gen_key(self) -> str:
-        return str(uuid.uuid4())
-
-    def millis_now(self) -> int:
-        return int(time.time() * 1000)
-
-
 class Event(Protocol):
     def key(self) -> str: ...
 

pkg/transpilers/dupher/constructors.go

@@ -4,8 +4,6 @@ import (
 	"fmt"
 	"strconv"
 	"strings"
-
-	"github.com/RainingComputers/deepslate/pkg/transpilers"
 )
 
 func bodyWrap(stmts []string, depth int, label string, line int) string {
@@ -254,38 +252,3 @@ func emptyBody(line int) string {
 func gotoWrap(name string, line int) string {
 	return fmt.Sprintf("ds.Goto(%d, \"%s\")", line, name)
 }
-
-func isNilable(typ string) bool {
-	return typ == "*string" ||
-		strings.HasPrefix(typ, "[]") ||
-		strings.HasPrefix(typ, "map[")
-}
-
-func rangeElemType(node ForStmtNode, type_ string) (string, error) {
-	switch {
-	case strings.HasPrefix(type_, "[]"):
-		return type_[2:], nil
-
-	case strings.HasPrefix(type_, "map["):
-		inner := type_[4:]
-		depth := 1
-
-		for i, c := range inner {
-			switch c {
-			case '[':
-				depth++
-			case ']':
-				depth--
-
-				if depth == 0 {
-					return inner[i+1:], nil
-				}
-			}
-		}
-	}
-
-	return "", &transpilers.TranspileError{
-		Message: fmt.Sprintf("type %s cannot be used for range", type_),
-		Node:    &node,
-	}
-}

pkg/transpilers/dupher/transpiler.go

@@ -786,6 +786,35 @@ func forRangeStmt(ctx *transpileContext, node ForStmtNode, depth int) error {
 	return nil
 }
 
+func rangeElemType(node ForStmtNode, type_ string) (string, error) {
+	switch {
+	case strings.HasPrefix(type_, "[]"):
+		return type_[2:], nil
+
+	case strings.HasPrefix(type_, "map["):
+		inner := type_[4:]
+		depth := 1
+
+		for i, c := range inner {
+			switch c {
+			case '[':
+				depth++
+			case ']':
+				depth--
+
+				if depth == 0 {
+					return inner[i+1:], nil
+				}
+			}
+		}
+	}
+
+	return "", &transpilers.TranspileError{
+		Message: fmt.Sprintf("type %s cannot be used for range", type_),
+		Node:    &node,
+	}
+}
+
 func expr(ctx *transpileContext, node ExprNode) (string, string, error) {
 	switch exprNode := node.(type) {
 	case *IdentNode:
@@ -1358,3 +1387,9 @@ func notSameType(lhs, rhs string) bool {
 
 	return true
 }
+
+func isNilable(typ string) bool {
+	return typ == "*string" ||
+		strings.HasPrefix(typ, "[]") ||
+		strings.HasPrefix(typ, "map[")
+}

pkg/transpilers/dython/constructors.go

@@ -4,8 +4,6 @@ import (
 	"fmt"
 	"strconv"
 	"strings"
-
-	"github.com/RainingComputers/deepslate/pkg/transpilers"
 )
 
 func indent(depth int) string {
@@ -209,24 +207,3 @@ func emptyBody(line int) string {
 func gotoWrap(name string, line int) string {
 	return fmt.Sprintf("ds.goto(%d, \"%s\")", line, name)
 }
-
-func rangeElemType(node ForStmtNode, type_ string) (string, error) {
-	switch {
-	case isList(type_):
-		return type_[5 : len(type_)-1], nil
-
-	case isDict(type_):
-		inner := type_[5 : len(type_)-1]
-		key, _, found := strings.Cut(inner, ",")
-		if !found {
-			return inner, nil
-		}
-
-		return key, nil
-	}
-
-	return "", &transpilers.TranspileError{
-		Message: fmt.Sprintf("type %s cannot be used for range", type_),
-		Node:    &node,
-	}
-}

pkg/transpilers/dython/transpiler.go

@@ -2,6 +2,7 @@ package dython
 
 import (
 	"fmt"
+	"strings"
 
 	"github.com/RainingComputers/deepslate/pkg/transpilers"
 )
@@ -577,6 +578,27 @@ func whileStmt(ctx *transpileContext, node WhileStmtNode, depth int) error {
 	return nil
 }
 
+func rangeElemType(node ForStmtNode, type_ string) (string, error) {
+	switch {
+	case isList(type_):
+		return type_[5 : len(type_)-1], nil
+
+	case isDict(type_):
+		inner := type_[5 : len(type_)-1]
+		key, _, found := strings.Cut(inner, ",")
+		if !found {
+			return inner, nil
+		}
+
+		return key, nil
+	}
+
+	return "", &transpilers.TranspileError{
+		Message: fmt.Sprintf("type %s cannot be used for range", type_),
+		Node:    &node,
+	}
+}
+
 func expr(ctx *transpileContext, node ExprNode) (string, string, error) {
 	switch n := node.(type) {
 	case *IdentNode: