spreadsheet constructor accepts lists for values too, \word for pipew…

…ord option, factor-of renamed to multiple-of, tests and examples updated, securesave improved

env/object.go

@@ -505,7 +505,7 @@ func (i Word) Equal(o Object) bool {
 }
 
 func (i Word) Dump(e Idxs) string {
-	return "'" + e.GetWord(i.Index)
+	return e.GetWord(i.Index)
 }
 
 //
@@ -1720,7 +1720,7 @@ func NewList(data []any) *List {
 	return &List{data, Word{0}}
 }
 
-func RyeToRaw(res Object) any { // TODO -- MOVE TO UTIL ... provide reverse named symetrically
+func RyeToRaw(res Object) any { // TODO -- MOVE TO UTIL ... provide reverse named symmetrically
 	// fmt.Printf("Type: %T", res)
 	switch v := res.(type) {
 	case nil:

evaldo/builtins.go

@@ -23,8 +23,8 @@ import (
 
 	"github.com/refaktor/rye/util"
 
-	"golang.org/x/crypto/ssh/terminal"
 	"golang.org/x/sync/errgroup"
+	goterm "golang.org/x/term"
 	"golang.org/x/text/cases"
 	"golang.org/x/text/language"
 )
@@ -747,7 +747,7 @@ var builtins = map[string]*env.Builtin{
 			fileName := fmt.Sprintf("console_%s.rye.enc", time.Now().Format("060102_150405"))
 
 			fmt.Print("Enter Password: ")
-			bytePassword, err := terminal.ReadPassword(int(os.Stdin.Fd()))
+			bytePassword, err := goterm.ReadPassword(int(os.Stdin.Fd()))
 			if err != nil {
 				panic(err)
 			}
@@ -933,7 +933,7 @@ var builtins = map[string]*env.Builtin{
 
 	// BASIC FUNCTIONS WITH NUMBERS
 
-	"factor-of": { // ***
+	"multiple-of": { // ***
 		Argsn: 2,
 		Doc:   "Checks if a first argument is a factor of second.",
 		Pure:  true,
@@ -948,10 +948,10 @@ var builtins = map[string]*env.Builtin{
 						return *env.NewInteger(0)
 					}
 				default:
-					return MakeArgError(ps, 2, []env.Type{env.IntegerType}, "factor-of")
+					return MakeArgError(ps, 2, []env.Type{env.IntegerType}, "multiple-of")
 				}
 			default:
-				return MakeArgError(ps, 1, []env.Type{env.IntegerType}, "factor-of")
+				return MakeArgError(ps, 1, []env.Type{env.IntegerType}, "multiple-of")
 			}
 		},
 	},

evaldo/builtins_spreadsheet.go

@@ -25,33 +25,36 @@ var Builtins_spreadsheet = map[string]*env.Builtin{
 			switch header1 := arg0.(type) {
 			case env.Block:
 				header := header1.Series
-				cols := make([]string, header.Len())
-				for header.Pos() < header.Len() {
+				hlen := header.Len()
+				cols := make([]string, hlen)
+				for header.Pos() < hlen {
 					i := header.Pos()
 					k1 := header.Pop()
 					switch k := k1.(type) {
 					case env.String:
 						cols[i] = k.Value
 					}
 				}
+				fmt.Println(cols)
 				spr := env.NewSpreadsheet(cols)
 				switch data1 := arg1.(type) {
 				case env.Block:
 					rdata := data1.Series.S
-					for _, v := range rdata {
-						rowd := make([]any, header.Len())
-						for ii := 0; ii < header.Len(); ii++ {
-							rowd[ii] = v
+
+					for i := 0; i < len(rdata)/hlen; i++ {
+						rowd := make([]any, hlen)
+						for ii := 0; ii < hlen; ii++ {
+							rowd[ii] = rdata[i*hlen+ii]
 						}
 						spr.AddRow(*env.NewSpreadsheetRow(rowd, spr))
 					}
 					return *spr
 				case env.List:
 					rdata := data1.Data
-					for _, v := range rdata {
-						rowd := make([]any, header.Len())
-						for ii := 0; ii < header.Len(); ii++ {
-							rowd[ii] = v
+					for i := 0; i < len(rdata)/hlen; i++ {
+						rowd := make([]any, hlen)
+						for ii := 0; ii < hlen; ii++ {
+							rowd[ii] = rdata[i*hlen+ii]
 						}
 						spr.AddRow(*env.NewSpreadsheetRow(rowd, spr))
 					}

examples/fizzbuzz.rye

@@ -2,8 +2,8 @@
 
 for range 1 100 { :n
 	cases " " {
-		{ n .factor-of 3 } { "Fizz" }
-		{ n .factor-of 5 } { + "Buzz" }
+		{ n .multiple-of 3 } { "Fizz" }
+		{ n .multiple-of 5 } { + "Buzz" }
 		_ { n }
 	} |prns
 }

examples/project-euler/prob001.rye

@@ -2,7 +2,7 @@
 ; sum all factors of 3 and 5 smaller than 1000
 
 range 0 1000
-|filter { :x all { x .factor-of 3  x .factor-of 5 } }
+|filter { :x all { x .multiple-of 3  x .multiple-of 5 } }
 |sum .print
 
 ; result 33165

examples/rosettacode/100doors.rye

@@ -8,7 +8,7 @@ rye .needs { xhofs }
 produce 100 { } { + [ 0 ] } :doors
 
 toggle: fn { doors step } {
-	.map\pos 'i { :v either i .factor-of step { not v } { v } } :ds
+	.map\pos 'i { :v either i .multiple-of step { not v } { v } } :ds
 	^if step = 100 { ds }
 	toggle ds step + 1
 }

loader/loader.go

@@ -404,7 +404,7 @@ func newParser() *Parser { // TODO -- add string eaddress path url time
 	SETWORD    		<-  LETTER LETTERORNUM* ":"
 	LSETWORD    	<-  ":" LETTER LETTERORNUM*
 	GETWORD   		<-  "?" LETTER LETTERORNUM*
-	PIPEWORD   		<-  "|" LETTER LETTERORNUM* / PIPEARROWS / "|" NORMOPWORDS  
+	PIPEWORD   		<-  "\\" LETTER LETTERORNUM* / "|" LETTER LETTERORNUM* / PIPEARROWS / "|" NORMOPWORDS  
 	ONECHARPIPE    	<-  "|" ONECHARWORDS
 	OPWORD    		<-  "." LETTER LETTERORNUM* / "." NORMOPWORDS / OPARROWS / ONECHARWORDS / "[*" LETTERORNUM*
 	TAGWORD    		<-  "'" LETTER LETTERORNUM*

main.go

@@ -8,8 +8,7 @@ import (
 	"regexp"
 	"sort"
 
-	"github.com/refaktor/rye/contrib"
-	"golang.org/x/crypto/ssh/terminal"
+	"golang.org/x/term"
 
 	"bufio"
 	"errors"
@@ -21,6 +20,7 @@ import (
 
 	"net/http"
 
+	"github.com/refaktor/rye/contrib"
 	"github.com/refaktor/rye/env"
 	"github.com/refaktor/rye/evaldo"
 	"github.com/refaktor/rye/loader"
@@ -368,7 +368,7 @@ func main_rye_file(file string, sig bool, subc bool, interactive bool, code stri
 
 	if file[len(file)-4:] == ".enc" {
 		fmt.Print("Enter Password: ")
-		bytePassword, err := terminal.ReadPassword(int(os.Stdin.Fd()))
+		bytePassword, err := term.ReadPassword(int(os.Stdin.Fd()))
 		if err != nil {
 			panic(err)
 		}

tests/basics.rye

@@ -166,12 +166,12 @@ section "Working with numbers"
 		equal { is-zero 0.1 } 0
 	}
 
-	group "factor-of"
-	mold\nowrap ?factor-of
+	group "multiple-of"
+	mold\nowrap ?multiple-of
 	{ { integer } { integer } }
 	{
-		equal { factor-of 10 2 } 1
-		equal { 10 .factor-of 3 } 0		
+		equal { multiple-of 10 2 } 1
+		equal { 10 .multiple-of 3 } 0		
 	}
 
 	group "odd"

tests/misc.rye

@@ -284,7 +284,7 @@ section "Date and time functions"
 
 }
 
-;	TODO	equal { list { 3 4 5 6 } |map { .factor-of 3 } } list { 1 0 0 1 } 
+;	TODO	equal { list { 3 4 5 6 } |map { .multiple-of 3 } } list { 1 0 0 1 } 
 
 section "Math functions"
 ""

tests/structures.rye

@@ -314,7 +314,7 @@ section "Higher order like functions"
 		equal { map { } { + 1 } } { }
 		equal { map { "aaa" "bb" "c" } { .length? } } { 3 2 1 }
 		equal { map list { "aaa" "bb" "c" } { .length? } } list { 3 2 1 }
-		equal { map list { 3 4 5 6 } { .factor-of 3 } } list { 1 0 0 1 }
+		equal { map list { 3 4 5 6 } { .multiple-of 3 } } list { 1 0 0 1 }
 		equal { map list { } { + 1 } } list { }
 		; equal { map "abc" { + "-" } .join } "a-b-c-" ; TODO doesn't work, fix join
 		equal { map "123" { .to-integer } } { 1 2 3 }

util/securesave.go

@@ -23,11 +23,10 @@ func SaveSecure(textToEncrypt string, filename string, password string) {
 	}
 
 	// Write encrypted data to a file
-	err = os.WriteFile(filename, encryptedData, 0644)
+	err = os.WriteFile(filename, encryptedData, 0600)
 	if err != nil {
 		panic(err)
 	}
-
 }
 
 func ReadSecure(filename string, password string) string {