Clean up after moving inference to use safer names

Author: apaszke

.github/workflows/haskell-ci.yaml

@@ -4,7 +4,7 @@ on:
   push:
     branches: [ main ]
   pull_request:
-    branches: [ main ]
+    branches: [ main, safe-names-dev ]
 
 jobs:
   build:

dex.cabal

@@ -47,8 +47,8 @@ library dex-resources
   default-extensions:  CPP
 
 library
-  exposed-modules:     Env, Syntax, Type, Inference,
-                       Parser, Util, Imp, Imp.Builder, Imp.Optimize,
+  exposed-modules:     Env, Syntax, Type,
+                       Util, Imp, Imp.Builder, Imp.Optimize,
                        PPrint, Algebra, Parallelize, Optimize, Serialize
                        Builder, Cat,
                        Simplify, TopLevel,

src/dex.hs

@@ -25,7 +25,6 @@ import PPrint
 import Serialize
 import Resources
 import TopLevel
-import Parser  hiding (Parser)
 import Env (envNames)
 import Err
 import Export
@@ -114,7 +113,7 @@ dexCompletions (line, _) = do
   let (word, rest) = break (== ' ') line
   let startoflineKeywords = ["%bench \"", ":p", ":t", ":html", ":export"]
   let candidates = (if null rest then startoflineKeywords else []) ++
-                   keyWordStrs ++ varNames
+                   S.keyWordStrs ++ varNames
   let completions = map simpleCompletion $ filter (reverse word `isPrefixOf`) candidates
   return (rest, completions)
 

src/lib/Autodiff.hs

@@ -185,6 +185,7 @@ linearizeOp op = case op of
   ThrowException _       -> notImplemented
   SumToVariant _         -> notImplemented
   OutputStreamPtr        -> emitDiscrete
+  SynthesizeDict _ _     -> error "Unexpected SynthesizeDict op"
   where
     emitDiscrete = if isTrivialForAD (Op op)
       then LinA $ withZeroTangent <$> emitOp op
@@ -635,6 +636,7 @@ transposeOp op ct = case op of
   ToEnum _ _            -> notLinear
   ThrowException _      -> notLinear
   OutputStreamPtr       -> notLinear
+  SynthesizeDict _ _    -> notLinear
   where
     -- Both nonlinear operations and operations on discrete types, where linearity doesn't make sense
     notLinear = error $ "Can't transpose a non-linear operation: " ++ pprint op