Work on Language.GLSL.Parser and improvement on tests

guida-lang · Sep 18, 2024 · 9c3c0ad · 9c3c0ad
1 parent b449973
commit 9c3c0ad
Show file tree

Hide file tree

Showing 3 changed files with 991 additions and 616 deletions.
diff --git a/compiler/src/Parse/Shader.elm b/compiler/src/Parse/Shader.elm
@@ -1,11 +1,9 @@
 module Parse.Shader exposing (shader)
 
--- import Language.GLSL.Parser as GLP
-
 import AST.Source as Src
 import AST.Utils.Shader as Shader
 import Data.Map as Dict
-import Data.Name as Name
+import Language.GLSL.Parser as GLP
 import Language.GLSL.Syntax as GLS
 import Parse.Primitives as P exposing (Col, Parser, Row)
 import Reporting.Annotation as A
@@ -118,31 +116,32 @@ eatShader src pos end row col =
 
 parseGlsl : Row -> Col -> String -> Parser E.Expr Shader.Types
 parseGlsl startRow startCol src =
-    -- case GLP.parse src of
-    --     Ok (GLS.TranslationUnit decls) ->
-    --         P.succeed (List.foldr addInput emptyTypes (List.concatMap extractInputs decls))
-    --     Err err ->
-    --         let
-    --             pos =
-    --                 Parsec.errorPos err
-    --             row =
-    --                 fromIntegral (Parsec.sourceLine pos)
-    --             col =
-    --                 fromIntegral (Parsec.sourceColumn pos)
-    --             msg =
-    --                 Parsec.showErrorMessages
-    --                     "or"
-    --                     "unknown parse error"
-    --                     "expecting"
-    --                     "unexpected"
-    --                     "end of input"
-    --                     (Parsec.errorMessages err)
-    --         in
-    --         if row == 1 then
-    --             failure startRow (startCol + 6 + col) msg
-    --         else
-    --             failure (startRow + row - 1) col msg
-    Debug.todo "parseGlsl"
+    case GLP.parse src of
+        Ok (GLS.TranslationUnit decls) ->
+            P.pure (List.foldr addInput emptyTypes (List.concatMap extractInputs decls))
+
+        Err err ->
+            -- let
+            --     pos =
+            --         Parsec.errorPos err
+            --     row =
+            --         fromIntegral (Parsec.sourceLine pos)
+            --     col =
+            --         fromIntegral (Parsec.sourceColumn pos)
+            --     msg =
+            --         Parsec.showErrorMessages
+            --             "or"
+            --             "unknown parse error"
+            --             "expecting"
+            --             "unexpected"
+            --             "end of input"
+            --             (Parsec.errorMessages err)
+            -- in
+            -- if row == 1 then
+            --     failure startRow (startCol + 6 + col) msg
+            -- else
+            --     failure (startRow + row - 1) col msg
+            Debug.todo "parseGlsl"
 
 
 failure : Row -> Col -> String -> Parser E.Expr a