Move typing messages into submodule

Author: brendanzab

pikelet/src/lang/core/typing.rs

@@ -13,6 +13,10 @@ use crate::lang::core::{
     Constant, Globals, LocalLevel, Locals, Term, UniverseLevel, UniverseOffset,
 };
 
+pub mod reporting;
+
+pub use self::reporting::*;
+
 /// The state of the type checker.
 pub struct State<'me> {
     /// Global definition environment.
@@ -108,57 +112,6 @@ impl<'me> State<'me> {
     }
 }
 
-#[derive(Clone, Debug)]
-pub enum Message {
-    MaximumUniverseLevelReached,
-    UnboundGlobal {
-        name: String,
-    },
-    UnboundLocal,
-    InvalidRecordType {
-        duplicate_labels: Vec<String>,
-    },
-    InvalidRecordTerm {
-        missing_labels: Vec<String>,
-        unexpected_labels: Vec<String>,
-    },
-    LabelNotFound {
-        expected_label: String,
-        head_type: Arc<Value>,
-    },
-    TooManyParameters,
-    TooManyArguments {
-        head_type: Arc<Value>,
-    },
-    MismatchedSequenceLength {
-        found_len: usize,
-        expected_len: Arc<Value>,
-    },
-    NoSequenceConversion {
-        expected_type: Arc<Value>,
-    },
-    AmbiguousTerm {
-        term: AmbiguousTerm,
-    },
-    MismatchedTypes {
-        found_type: Arc<Value>,
-        expected_type: ExpectedType,
-    },
-}
-
-#[derive(Clone, Debug)]
-pub enum AmbiguousTerm {
-    Sequence,
-    FunctionTerm,
-    RecordTerm,
-}
-
-#[derive(Clone, Debug)]
-pub enum ExpectedType {
-    Universe,
-    Type(Arc<Value>),
-}
-
 /// Check that a term is a type and return the universe level it inhabits.
 pub fn is_type(state: &mut State<'_>, term: &Term) -> Option<UniverseLevel> {
     let r#type = synth_type(state, term);

pikelet/src/lang/core/typing/reporting.rs

@@ -0,0 +1,54 @@
+use std::sync::Arc;
+
+use crate::lang::core::semantics::Value;
+
+#[derive(Clone, Debug)]
+pub enum Message {
+    MaximumUniverseLevelReached,
+    UnboundGlobal {
+        name: String,
+    },
+    UnboundLocal,
+    InvalidRecordType {
+        duplicate_labels: Vec<String>,
+    },
+    InvalidRecordTerm {
+        missing_labels: Vec<String>,
+        unexpected_labels: Vec<String>,
+    },
+    LabelNotFound {
+        expected_label: String,
+        head_type: Arc<Value>,
+    },
+    TooManyParameters,
+    TooManyArguments {
+        head_type: Arc<Value>,
+    },
+    MismatchedSequenceLength {
+        found_len: usize,
+        expected_len: Arc<Value>,
+    },
+    NoSequenceConversion {
+        expected_type: Arc<Value>,
+    },
+    AmbiguousTerm {
+        term: AmbiguousTerm,
+    },
+    MismatchedTypes {
+        found_type: Arc<Value>,
+        expected_type: ExpectedType,
+    },
+}
+
+#[derive(Clone, Debug)]
+pub enum AmbiguousTerm {
+    Sequence,
+    FunctionTerm,
+    RecordTerm,
+}
+
+#[derive(Clone, Debug)]
+pub enum ExpectedType {
+    Universe,
+    Type(Arc<Value>),
+}