fix: Slightly improving error reporting for #35

tokay-lang · Dec 23, 2023 · e00c6d8 · e00c6d8
1 parent a08e12f
commit e00c6d8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/src/compiler/ast.rs b/src/compiler/ast.rs
@@ -1352,6 +1352,7 @@ fn traverse_node(compiler: &mut Compiler, node: &Dict) -> ImlOp {
                     let children = children.object::<Dict>().unwrap();
 
                     let res = traverse_node_static(compiler, None, children);
+                    let offset = traverse_node_offset(node);
 
                     /*
                     if !res.is_consuming() {
@@ -1396,12 +1397,12 @@ fn traverse_node(compiler: &mut Compiler, node: &Dict) -> ImlOp {
                                         // mod_kle on Token::Char becomes optional Token::Chars
                                         if parts[2] == "kle" {
                                             chars = chars
-                                                .into_generic("Opt", None)
+                                                .into_generic("Opt", None, offset.clone())
                                                 .try_resolve(compiler);
                                         }
 
                                         return ImlOp::Call {
-                                            offset: traverse_node_offset(node),
+                                            offset,
                                             target: chars,
                                             args: None,
                                         };
@@ -1429,11 +1430,11 @@ fn traverse_node(compiler: &mut Compiler, node: &Dict) -> ImlOp {
 
                     ImlOp::call(
                         compiler,
-                        traverse_node_offset(node),
+                        offset.clone(),
                         match parts[2] {
-                            "pos" => res.into_generic("Pos", assume_severity),
-                            "kle" => res.into_generic("Kle", assume_severity),
-                            "opt" => res.into_generic("Opt", assume_severity),
+                            "pos" => res.into_generic("Pos", assume_severity, offset),
+                            "kle" => res.into_generic("Kle", assume_severity, offset),
+                            "opt" => res.into_generic("Opt", assume_severity, offset),
                             _ => unreachable!(),
                         },
                         None,

diff --git a/src/compiler/compiler.rs b/src/compiler/compiler.rs
@@ -469,11 +469,11 @@ impl Compiler {
 
         if name == "_" || name == "__" {
             // `__` becomes `Value+`
-            value = value.into_generic("Pos", Some(0)).try_resolve(self);
+            value = value.into_generic("Pos", Some(0), None).try_resolve(self);
             secondary = Some(("__", value.clone()));
 
             // ...and then in-place "_" is defined as `_ : __?`
-            value = value.into_generic("Opt", Some(0)).try_resolve(self);
+            value = value.into_generic("Opt", Some(0), None).try_resolve(self);
         }
 
         // Insert constant into next constant-holding scope

diff --git a/src/compiler/iml/imlvalue.rs b/src/compiler/iml/imlvalue.rs
@@ -62,14 +62,14 @@ impl ImlValue {
     This is used internally to implement `Kle<P>` from `P*` syntax
     during the AST traversal.
     */
-    pub fn into_generic(self, name: &str, severity: Option<u8>) -> Self {
+    pub fn into_generic(self, name: &str, severity: Option<u8>, offset: Option<Offset>) -> Self {
         Self::Instance {
             offset: None,
             target: Box::new(ImlValue::Name {
                 offset: None,
                 name: name.to_string(),
             }),
-            args: vec![(None, self)],
+            args: vec![(offset, self)],
             nargs: IndexMap::new(),
             severity,
             generated: true,
@@ -173,8 +173,8 @@ impl ImlValue {
                                     compiler.errors.push(Error::new(
                                         arg.0,
                                         format!(
-                                            "Cannot assign non-consumable {} to consumable generic '{}'",
-                                            arg.1, name
+                                            "Cannot assign non-consumable {} to consumable generic {} of {}",
+                                            arg.1, name, parselet
                                         )
                                     ));
                                 }