inline and error message

JacquesCarette · Jun 18, 2024 · 30a4e88 · 30a4e88
1 parent 96103f8
commit 30a4e88
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/code/drasil-lang/lib/Language/Drasil/Expr/Lang.hs b/code/drasil-lang/lib/Language/Drasil/Expr/Lang.hs
@@ -238,22 +238,14 @@ instance Typed Expr Space where
           -- If the inferred type of e is a valid Space, call allOfType with spaceValue
           allOfType cxt exs spaceValue spaceValue 
               "Associative arithmetic operation expects all operands to be of the same expected type."
-      Left _ ->
+      Left l ->
           -- Handle the case when sp is a Left value but spaceValue is invalid
-          Right "Invalid spaceValue encountered."
+          Right ("Expected all operands in addition/multiplication to be numeric, but found " ++ show l)
       Right r ->
           -- If sp is a Right value containing a TypeError
           Right r
-
-  infer _ (AssocA op exs) = 
-    case (op, exs) of
-      (Add, []) -> 
-        -- Return a default value or an error for empty addition
-        Right "Associative addition requires at least one operand."
-      (Mul, []) -> 
-        -- Return a default value or an error for empty multiplication
-        Right "Associative multiplication requires at least one operand."
-      -- Other cases...
+  infer _ (AssocA Add _) = Right "Associative addition requires at least one operand."
+  infer _ (AssocA Mul _) = Right "Associative multiplication requires at least one operand."
 
   infer cxt (AssocB _ exs) = allOfType cxt exs S.Boolean S.Boolean
     $ "Associative boolean operation expects all operands to be of the same type (" ++ show S.Boolean ++ ")."

diff --git a/code/drasil-printers/lib/Language/Drasil/Printing/Import/ModelExpr.hs b/code/drasil-printers/lib/Language/Drasil/Printing/Import/ModelExpr.hs
@@ -212,8 +212,8 @@ withParens prI a b = P.Row [parens (modelExpr a prI), P.Sup (modelExpr b prI)]
 
 -- | Helper for properly rendering exponents.
 pow :: PrintingInformation -> ModelExpr -> ModelExpr -> P.Expr
-pow prI a@(AssocA Add _)          b = withParens prI a b
-pow prI a@(AssocA Mul _)         b = withParens prI a b
+pow prI a@(AssocA Add _)           b = withParens prI a b
+pow prI a@(AssocA Mul _)           b = withParens prI a b
 pow prI a@(ArithBinaryOp Subt _ _) b = withParens prI a b
 pow prI a@(ArithBinaryOp Frac _ _) b = withParens prI a b
 pow prI a@(ArithBinaryOp Pow _ _)  b = withParens prI a b