From 2a3d0f4b390457174ed09347dd29e97ff9a783e4 Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Wed, 15 Dec 2021 20:27:41 +0100
Subject: Set Rules Episode VII: The Set Awakens

---
 src/eval/scope.rs | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

(limited to 'src/eval/scope.rs')

diff --git a/src/eval/scope.rs b/src/eval/scope.rs
index ffe2d63e..5178c819 100644
--- a/src/eval/scope.rs
+++ b/src/eval/scope.rs
@@ -4,7 +4,7 @@ use std::fmt::{self, Debug, Formatter};
 use std::iter;
 use std::rc::Rc;
 
-use super::{Args, EvalContext, Function, Value};
+use super::{Args, Class, Construct, EvalContext, Function, Set, Value};
 use crate::diag::TypResult;
 use crate::util::EcoString;
 
@@ -88,15 +88,6 @@ impl Scope {
         self.values.insert(var.into(), Rc::new(cell));
     }
 
-    /// Define a constant function.
-    pub fn def_func<F>(&mut self, name: impl Into<EcoString>, f: F)
-    where
-        F: Fn(&mut EvalContext, &mut Args) -> TypResult<Value> + 'static,
-    {
-        let name = name.into();
-        self.def_const(name.clone(), Function::new(Some(name), f));
-    }
-
     /// Define a mutable variable with a value.
     pub fn def_mut(&mut self, var: impl Into<EcoString>, value: impl Into<Value>) {
         self.values.insert(var.into(), Rc::new(RefCell::new(value.into())));
@@ -107,6 +98,24 @@ impl Scope {
         self.values.insert(var.into(), slot);
     }
 
+    /// Define a constant function.
+    pub fn def_func<F>(&mut self, name: &str, f: F)
+    where
+        F: Fn(&mut EvalContext, &mut Args) -> TypResult<Value> + 'static,
+    {
+        let name = EcoString::from(name);
+        self.def_const(name.clone(), Function::new(Some(name), f));
+    }
+
+    /// Define a constant class.
+    pub fn def_class<T>(&mut self, name: &str)
+    where
+        T: Construct + Set + 'static,
+    {
+        let name = EcoString::from(name);
+        self.def_const(name.clone(), Class::new::<T>(name));
+    }
+
     /// Look up the value of a variable.
     pub fn get(&self, var: &str) -> Option<&Slot> {
         self.values.get(var)
-- 
cgit v1.2.3