cl-ast: Remove Option-like "*Kind"s

compiler/cl-interpret/src/convalue.rs

@@ -3,6 +3,8 @@
 //! The most permanent fix is a temporary one.
 use cl_ast::{format::FmtAdapter, Expr, Sym};
 
+use crate::env::Place;
+
 use super::{
     builtin::Builtin,
     error::{Error, IResult},
@@ -52,9 +54,9 @@ pub enum ConValue {
     /// A string
     String(Sym),
     /// A reference
-    Ref(usize),
+    Ref(Place),
     /// A reference to an array
-    Slice(usize, usize),
+    Slice(Place, usize),
     /// An Array
     Array(Box<[ConValue]>),
     /// A tuple

compiler/cl-interpret/src/interpret.rs

@@ -91,8 +91,8 @@ impl Interpret for Module {
         let Self { name, kind } = self;
         env.push_frame(Interned::to_ref(name), Default::default());
         let out = match kind {
-            ModuleKind::Inline(file) => file.interpret(env),
-            ModuleKind::Outline => {
+            Some(file) => file.interpret(env),
+            None => {
                 eprintln!("Module {name} specified, but not imported.");
                 Ok(ConValue::Empty)
             }
@@ -152,8 +152,8 @@ impl Interpret for Struct {
 }
 impl Interpret for Enum {
     fn interpret(&self, env: &mut Environment) -> IResult<ConValue> {
-        let Self { name, kind } = self;
-        if let EnumKind::Variants(variants) = kind {
+        let Self { name, variants: kind } = self;
+        if let Some(variants) = kind {
             env.push_frame(Sym::to_ref(name), Default::default());
             for (idx, Variant { name, kind }) in variants.iter().enumerate() {
                 match kind {