refactoring

2 files changed, 13 insertions, 7 deletions

diff --git a/src/LambdaCube/Compiler/DesugaredSource.hs b/src/LambdaCube/Compiler/DesugaredSource.hs
index 6dc35f95..608d669f 100644
--- a/src/LambdaCube/Compiler/DesugaredSource.hs
+++ b/src/LambdaCube/Compiler/DesugaredSource.hs
@@ -198,10 +198,12 @@ data FNameTag
     | F'Ordering    | FLT | FGT | FEQ
     | F'List        | FNil | FCons
     | F'HList       | FHCons | FHNil
+    | F'VecS        | FV2 | FV3 | FV4
                     | FRecordCons
                     | FRecItem
+                    | FSx | FSy | FSz | FSw
     -- type constructors
-    | F'Int | F'Word | F'Float | F'String | F'Char | F'VecS | F'Output
+    | F'Int | F'Word | F'Float | F'String | F'Char | F'Output
     -- functions
     | Fcoe | FparEval | Ft2C | FprimFix
     | F'T2 | F'EqCT | F'CW | F'Split | F'VecScalar
@@ -314,9 +316,6 @@ pattern SAppV2 f a b = f `SAppV` a `SAppV` b
 
 infixl 2 `SAppV`, `SAppH`
 
-pattern SBuiltin' s <- SGlobal (SIName _ s)
-  where SBuiltin' s =  SGlobal (SIName (debugSI $ "builtin " ++ s) s)
-
 pattern SBuiltin s = SGlobal (Tag s)
 
 pattern ConsName <- SIName _ ":"
diff --git a/src/LambdaCube/Compiler/Parser.hs b/src/LambdaCube/Compiler/Parser.hs
index e7c6e541..154f5c7a 100644
--- a/src/LambdaCube/Compiler/Parser.hs
+++ b/src/LambdaCube/Compiler/Parser.hs
@@ -227,13 +227,20 @@ parseTermApp =
 parseTermSwiz = level parseTermProj $ \t ->
     mkSwizzling t <$> lexeme (try_ "swizzling" $ char '%' *> count' 1 4 (satisfy (`elem` ("xyzwrgba" :: String))))
   where
-    mkSwizzling term = swizzcall . map (sc . synonym)
+    mkSwizzling term = swizzcall . map (SBuiltin . sc . synonym)
       where
         swizzcall []  = error "impossible: swizzling parsing returned empty pattern"
         swizzcall [x] = SBuiltin Fswizzscalar `SAppV` term `SAppV` x
-        swizzcall xs  = SBuiltin Fswizzvector `SAppV` term `SAppV` foldl SAppV (SBuiltin' $ "V" ++ show (length xs)) xs
+        swizzcall xs  = SBuiltin Fswizzvector `SAppV` term `SAppV` foldl SAppV (SBuiltin $ f (length xs)) xs
 
-        sc c = SBuiltin' ['S', c]
+        sc 'x' = FSx
+        sc 'y' = FSy
+        sc 'z' = FSz
+        sc 'w' = FSw
+
+        f 2 = FV2
+        f 3 = FV3
+        f 4 = FV4
 
         synonym 'r' = 'x'
         synonym 'g' = 'y'