fcb3865 | plum | pyrossh

git clone https://git.pyrossh.dev/plum

A statically typed, imperative programming language inspired by rust, python

fcb3865 — Peter John 2026-11-01T21:01:26+05:30

T9: drop Json legacy exemption

Files changed (1) hide show

plum-core/src/loader.rs +26 -29

plum-core/src/loader.rs CHANGED Viewed

@@ -254,35 +254,32 @@ fn mergeItems(
     prims: &mut Vec<PrimitiveDecl>,
 ) -> Result<(), String> {
     // Removed forms (inline variant payloads, lone self-named variant).
-    // TODO(T9): remove Json exemption
-    if !file.to_string_lossy().ends_with("plum-std/Json.plum") {
-        // A payload-less self-named single variant (`enum Array[T] = | Array`)
+    // A payload-less self-named single variant (`enum Array[T] = | Array`)
-        // is an opaque builtin handle and stays legal.
+    // is an opaque builtin handle and stays legal.
-        let opaque: Vec<String> = source
+    let opaque: Vec<String> = source
-            .items
+        .items
-            .iter()
+        .iter()
-            .filter_map(|i| match i {
+        .filter_map(|i| match i {
-                Item::Enum(e)
+            Item::Enum(e)
-                    if e.variants.len() == 1
+                if e.variants.len() == 1
-                        && e.variants[0].name == e.name
+                    && e.variants[0].name == e.name
-                        && e.variants[0].fields.is_empty()
+                    && e.variants[0].fields.is_empty()
-                        && e.variants[0].values.is_empty() =>
+                    && e.variants[0].values.is_empty() =>
-                {
+            {
-                    Some(format!(
+                Some(format!(
-                        "enum {0} has a single variant named {0} — write record {0}(...)",
+                    "enum {0} has a single variant named {0} — write record {0}(...)",
-                        e.name
+                    e.name
-                    ))
+                ))
-                }
+            }
-                _ => None,
+            _ => None,
-            })
+        })
-            .collect();
+        .collect();
-        let legacy: Vec<String> = crate::unions::legacyErrors(source)
+    let legacy: Vec<String> = crate::unions::legacyErrors(source)
-            .into_iter()
+        .into_iter()
-            .filter(|m| !opaque.contains(m))
+        .filter(|m| !opaque.contains(m))
-            .collect();
+        .collect();
-        if !legacy.is_empty() {
+    if !legacy.is_empty() {
-            return Err(legacy.join("\n"));
+        return Err(legacy.join("\n"));
-        }
     }
     // Parse-time literal errors (out-of-range integers) of every merged file.
     MERGED_LIT_ERRORS.with(|e| e.borrow_mut().extend(source.formErrors.iter().cloned()));