Add support for merging blocks into dicts, and block and dicts into s…

…preadsheet rows
refaktor · Dec 2, 2024 · ba8c6c1 · ba8c6c1
1 parent 3337e57
commit ba8c6c1
Show file tree

Hide file tree

Showing 7 changed files with 102 additions and 12 deletions.
diff --git a/env/idxs.go b/env/idxs.go
@@ -12,7 +12,6 @@ type Idxs struct {
 }
 
 var NativeTypes = [...]string{ // Todo change to BuiltinTypes
-	"INVALID",
 	"Block",
 	"Integer",
 	"Word",

diff --git a/env/object.go b/env/object.go
@@ -1781,6 +1781,42 @@ func NewDict(data map[string]any) *Dict {
 	return &Dict{data, Word{0}}
 }
 
+func MergeTwoDicts(base Dict, toAdd Dict) Dict {
+	data := make(map[string]any)
+	for k, v := range base.Data {
+		data[k] = v
+	}
+	for k, v := range toAdd.Data {
+		data[k] = v
+	}
+	return Dict{data, Word{0}}
+}
+
+func MergeDictAndBlock(base Dict, updatesBlock TSeries, idx *Idxs) Dict {
+	data := make(map[string]any)
+	for k, v := range base.Data {
+		data[k] = v
+	}
+
+	for updatesBlock.Pos() < updatesBlock.Len() {
+		key := updatesBlock.Pop()
+		val := updatesBlock.Pop()
+		// v001 -- only process the typical case of string val
+		switch k := key.(type) {
+		case String:
+			data[k.Value] = val
+		case Tagword:
+			data[idx.GetWord(k.Index)] = val
+		case Word:
+			data[idx.GetWord(k.Index)] = val
+		case Setword:
+			data[idx.GetWord(k.Index)] = val
+		}
+	}
+	return Dict{data, Word{0}}
+
+}
+
 func NewDictFromSeries(block TSeries, idx *Idxs) Dict {
 	data := make(map[string]any)
 	for block.Pos() < block.Len() {

diff --git a/env/spreadsheet.go b/env/spreadsheet.go
@@ -24,6 +24,43 @@ func NewSpreadsheetRow(values []any, uplink *Spreadsheet) *SpreadsheetRow {
 	return &nat
 }
 
+func AddSpreadsheetRowAndBlock(row SpreadsheetRow, updatesBlock TSeries, idx *Idxs) SpreadsheetRow {
+	data := make(map[string]any)
+
+	for updatesBlock.Pos() < updatesBlock.Len() {
+		key := updatesBlock.Pop()
+		val := updatesBlock.Pop()
+		// v001 -- only process the typical case of string val
+		switch k := key.(type) {
+		case String:
+			data[k.Value] = val
+		case Tagword:
+			data[idx.GetWord(k.Index)] = val
+		case Word:
+			data[idx.GetWord(k.Index)] = val
+		case Setword:
+			data[idx.GetWord(k.Index)] = val
+		}
+	}
+
+	return AddSpreadsheetRowAndMap(row, data)
+}
+
+func AddSpreadsheetRowAndDict(row SpreadsheetRow, dict Dict) SpreadsheetRow {
+	return AddSpreadsheetRowAndMap(row, dict.Data)
+}
+
+func AddSpreadsheetRowAndMap(row SpreadsheetRow, dict map[string]any) SpreadsheetRow {
+	newRow := SpreadsheetRow{row.Values, row.Uplink}
+
+	for i, v := range row.Uplink.Cols {
+		if val, ok := dict[v]; ok {
+			newRow.Values[i] = val
+		}
+	}
+	return newRow
+}
+
 func SpreadsheetRowFromDict(dict Dict, uplink *Spreadsheet) (bool, string, *SpreadsheetRow) {
 	row := SpreadsheetRow{make([]any, len(uplink.Cols)), uplink}
 	for i, v := range uplink.Cols {

diff --git a/evaldo/builtins.go b/evaldo/builtins.go
@@ -1371,6 +1371,8 @@ var builtins = map[string]*env.Builtin{
 	// equal { "A" + "b" } "Ab"
 	// equal { "A" + 1 } "A1"
 	// equal { { 1 2 } + { 3 4 } } { 1 2 3 4 }
+	// equal { dict { "a" 1 } |+ { "b" 2 } } dict { "a" 1 "b" 2 }
+	// equal { dict { "a" 1 } |+ dict { "b" 2 } } dict { "a" 1 "b" 2 }
 	"_+": { // **
 		Argsn: 2,
 		Doc:   "Adds or joins two values together (Integers, Strings, Uri-s and Blocks)",
@@ -1455,6 +1457,24 @@ var builtins = map[string]*env.Builtin{
 				default:
 					return MakeBuiltinError(ps, "Value in Block is not block type.", "_+")
 				}
+			case env.Dict:
+				switch b2 := arg1.(type) {
+				case env.Dict:
+					return env.MergeTwoDicts(s1, b2)
+				case env.Block:
+					return env.MergeDictAndBlock(s1, b2.Series, ps.Idx)
+				default:
+					return MakeArgError(ps, 2, []env.Type{env.DictType, env.BlockType}, "_+")
+				}
+			case env.SpreadsheetRow:
+				switch b2 := arg1.(type) {
+				case env.Dict:
+					return env.AddSpreadsheetRowAndDict(s1, b2)
+				case env.Block:
+					return env.AddSpreadsheetRowAndBlock(s1, b2.Series, ps.Idx)
+				default:
+					return MakeArgError(ps, 2, []env.Type{env.DictType, env.BlockType}, "_+")
+				}
 			case env.Time:
 				switch b2 := arg1.(type) {
 				case env.Integer:

diff --git a/evaldo/builtins_spreadsheet.go b/evaldo/builtins_spreadsheet.go
@@ -358,7 +358,7 @@ var Builtins_spreadsheet = map[string]*env.Builtin{
 	//  } 111
 	//  equal {
 	//	 spr1: ref spreadsheet { "a" "b" } { 1 10 2 20 }
-	//	 incrA: fn { row } { print inspect row 30 }
+	//	 incrA: fn { row } { row + [ "a" ( "a" <- row ) + 9 ] }
 	//	   update-row! spr1 1 ?incrA
 	//     spr1 |deref |A1
 	//  } 10
@@ -383,10 +383,6 @@ var Builtins_spreadsheet = map[string]*env.Builtin{
 					case env.Function:
 						CallFunction(updater, ps, spr.Rows[idx.Value-1], false, ps.Ctx)
 						ret := ps.Res
-						fmt.Printf("%#v", ret)
-						if !util.IsTruthy(ret) {
-							return makeError(ps, "Function given to update-row! should have returned a value, but didn't")
-						}
 						if ok, err, row := RyeValueToSpreadsheetRow(spr, ret); ok {
 							spr.Rows[idx.Value-1] = *row
 							return spr
@@ -427,7 +423,7 @@ var Builtins_spreadsheet = map[string]*env.Builtin{
 	},
 	// Tests:
 	//  equal {
-	//   spr1: spreadsheet { "a" "b" } { 1 10 2 20 }
+	//   spr1: ref spreadsheet { "a" "b" } { 1 10 2 20 }
 	//   spr1 .remove-row! 1
 	//   spr1 .deref .A1
 	//  } 2
@@ -1534,7 +1530,7 @@ var Builtins_spreadsheet = map[string]*env.Builtin{
 	},
 
 	// Tests:
-	// equal { spreadsheet { 'a } { 1 2 3 } |col-avg 'a } 2
+	// equal { spreadsheet { 'a } { 1 2 3 } |col-avg 'a } 2.0
 	"col-avg": {
 		Argsn: 2,
 		Doc:   "Accepts a spreadsheet and a column name and returns a sum of a column.", // TODO -- let it accept a block and list also
@@ -1592,7 +1588,7 @@ var Builtins_spreadsheet = map[string]*env.Builtin{
 		Fn: func(ps *env.ProgramState, arg0 env.Object, arg1 env.Object, arg2 env.Object, arg3 env.Object, arg4 env.Object) env.Object {
 			switch s0 := arg0.(type) {
 			case env.Spreadsheet:
-				r := s0.Rows[0].Values[1]
+				r := s0.Rows[1].Values[0]
 				return env.ToRyeValue(r)
 
 			default:

diff --git a/info/base.info.rye b/info/base.info.rye
@@ -426,6 +426,8 @@ section "base" "base text" {
 		equal { "A" + "b" } "Ab"
 		equal { "A" + 1 } "A1"
 		equal { { 1 2 } + { 3 4 } } { 1 2 3 4 }
+		equal { dict { "a" 1 } |+ { "b" 2 } } dict { "a" 1 "b" 2 }
+		equal { dict { "a" 1 } |+ dict { "b" 2 } } dict { "a" 1 "b" 2 }
 	}
 
 	group "_-" 

diff --git a/info/spreadsheet.info.rye b/info/spreadsheet.info.rye
@@ -84,7 +84,7 @@ section "base" "base text" {
 		} 111
 		equal {
 		spr1: ref spreadsheet { "a" "b" } { 1 10 2 20 }
-		incrA: fn { row } { print inspect row 30 }
+		incrA: fn { row } { row + [ "a" ( "a" <- row ) + 9 ] }
 		update-row! spr1 1 ?incrA
 		spr1 |deref |A1
 		} 10
@@ -100,7 +100,7 @@ section "base" "base text" {
 
 	{
 		equal {
-		spr1: spreadsheet { "a" "b" } { 1 10 2 20 }
+		spr1: ref spreadsheet { "a" "b" } { 1 10 2 20 }
 		spr1 .remove-row! 1
 		spr1 .deref .A1
 		} 2
@@ -195,7 +195,7 @@ section "base" "base text" {
 	}
 
 	{
-		equal { spreadsheet { 'a } { 1 2 3 } |col-avg 'a } 2
+		equal { spreadsheet { 'a } { 1 2 3 } |col-avg 'a } 2.0
 	}
 
 	group "B1"