Error When Using Invalid Column With add-col!

Return an error when `add-col!` is called with an invalid column.
refaktor · Aug 2, 2024 · 46e7916 · 46e7916
1 parent 8b70a4f
commit 46e7916
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/evaldo/builtins_spreadsheet.go b/evaldo/builtins_spreadsheet.go
@@ -845,7 +845,7 @@ func GenerateColumn(ps *env.ProgramState, s env.Spreadsheet, name env.Word, extr
  }
  // fmt.Println(val)
  if er != nil {
- return nil
+ return MakeBuiltinError(ps, er.Error(), "add-col!")
  }
  if firstVal == nil {
  var ok bool

diff --git a/tests/structures.rye b/tests/structures.rye
@@ -611,6 +611,13 @@ section "Spreadsheet related functions"
  equal { to-spreadsheet vals { dict { "a" 1 b 2 "c" 3 } dict { "a" 4 "b" 5 } } } spreadsheet { "a" "b" "c" } { 1 2 3 4 5 _ }
  }
 
+ group "add-col"
+ mold\nowrap ?add-col!
+ { { block } }
+ {
+ equal { try { spreadsheet { "n" } [ 1 ] |add-col! 'm { x } { x } } |type? } 'error
+ }
+
  group "index"
  mold\nowrap ?add-indexes!
  { { block } }