Merge pull request #24 from samthakur587/translater_fix

fix: small fix in translate class

Author: vaatsalya123

crosstl/_crosstl.py

@@ -5,18 +5,17 @@
 from .src.translator.ast import ASTNode
 from .src.backend.DirectX import *
 from .src.backend.Metal import *
-#from .src.backend.Opengl import *
+from .src.backend.Opengl import *
 
-def translate(file_path: str, backend: str = "cgl") -> str:
+
+def translate(file_path: str, backend: str = "crossgl") -> str:
     backend = backend.lower()
 
-    with open(file_path, 'r') as file:
+    with open(file_path, "r") as file:
         shader_code = file.read()
 
     # Determine the input shader type based on the file extension
     if file_path.endswith(".cgl"):
-        from .src.translator.lexer import Lexer
-        from .src.translator.parser import Parser
         lexer = Lexer(shader_code)
         parser = Parser(lexer.tokens)
     elif file_path.endswith(".hlsl"):
@@ -26,9 +25,8 @@ def translate(file_path: str, backend: str = "cgl") -> str:
         lexer = MetalLexer(shader_code)
         parser = MetalParser(lexer.tokens)
     elif file_path.endswith(".glsl"):
-        from .src.backend.Opengl import Lexer , Parser
-        lexer =  Lexer(shader_code)
-        parser = Parser(lexer.tokens)
+        lexer = GLSLLexer(shader_code)
+        parser = GLSLParser(lexer.tokens)
     else:
         raise ValueError(f"Unsupported shader file type: {file_path}")
 
@@ -53,10 +51,11 @@ def translate(file_path: str, backend: str = "cgl") -> str:
             elif file_path.endswith(".metal"):
                 codegen = MetalToCrossGLConverter()
             elif file_path.endswith(".glsl"):
-                from .src.backend.Opengl import CrossglCodeGen as GLSLToCrossGLConverter
                 codegen = GLSLToCrossGLConverter()
             else:
                 raise ValueError(f"Reverse translation not supported for: {file_path}")
             return codegen.generate(ast)
         else:
-            raise ValueError(f"Unsupported translation scenario: {file_path} to {backend}")
+            raise ValueError(
+                f"Unsupported translation scenario: {file_path} to {backend}"
+            )

crosstl/src/backend/DirectX/DirectxCrossGLCodeGen.py

@@ -17,7 +17,7 @@ def __init__(self):
             "int": "int",
         }
 
-    def convert(self, ast):
+    def generate(self, ast):
         self.process_structs(ast)
 
         code = "shader main {\n"

crosstl/src/backend/Opengl/OpenglLexer.py

@@ -78,7 +78,7 @@
 }
 
 
-class Lexer:
+class GLSLLexer:
     def __init__(self, code):
         self.code = code
         self.tokens = []

crosstl/src/backend/Opengl/OpenglParser.py

@@ -17,10 +17,10 @@
     FRAGMENTShaderNode,
     VersionDirectiveNode,
 )
-from .OpenglLexer import Lexer
+from .OpenglLexer import *
 
 
-class Parser:
+class GLSLParser:
     def __init__(self, tokens):
         self.tokens = tokens
         self.pos = 0

crosstl/src/backend/Opengl/__init__.py

@@ -1,3 +1,3 @@
-from .OpenglLexer import Lexer
-from .OpenglParser import Parser
-from .openglCrossglCodegen import CrossglCodeGen
+from .OpenglLexer import *
+from .OpenglParser import *
+from .openglCrossglCodegen import *

crosstl/src/backend/Opengl/openglCrossglCodegen.py

@@ -3,7 +3,7 @@
 from .OpenglLexer import *
 
 
-class CrossglCodeGen:
+class GLSLToCrossGLConverter:
     def __init__(self):
         self.current_shader = None
         self.vertex_item = None