Fix up parts of Evaluatable Class; not sure about the klass declaration

src/Data/Syntax/Declaration.hs

@@ -210,22 +210,21 @@ instance Evaluatable Class where
 
     supers <- for classSuperclasses $ \superclass -> do
       name <- maybeM (throwEvalError NoNameError) (declaredName (subterm superclass))
-      scope <- associatedScope (Declaration name)
+      associatedScope (Declaration name)
-      (scope,) <$> subtermAddress superclass
 
-    let imports = (Import,) <$> (fmap pure . catMaybes $ fst <$> supers)
+    let imports = (Import,) <$> (fmap pure . catMaybes $ supers)
         current = maybe mempty (fmap (Lexical, ) . pure . pure) currentScope'
         edges = Map.fromList (imports <> current)
     childScope <- newScope edges
     declare (Declaration name) span (Just childScope)
 
-    withScope childScope $ do
+    -- withScope childScope $ do
-      (_, addr) <- letrec name $ do
+    --   (_, addr) <- letrec name $ do
-        void $ subtermValue classBody
+    --     void $ subtermValue classBody
-        classBinds <- Env.head <$> getEnv
+    --     classBinds <- Env.head <$> getEnv
-        klass name (snd <$> supers) classBinds
+    --     klass (Declaration name) (catMaybes supers) classBinds -- TODO: Update klass definition
-      bind name addr
+    -- pure (Rval addr)
-      pure (Rval addr)
+    rvalBox unit
 
 -- | A decorator in Python
 data Decorator a = Decorator { decoratorIdentifier :: !a, decoratorParamaters :: ![a], decoratorBody :: !a }