Upgrade to latest Goal

Author: semperos

go.mod

@@ -5,7 +5,7 @@ go 1.22
 toolchain go1.22.7
 
 require (
-	codeberg.org/anaseto/goal v1.0.1-0.20241114160548-5eac4722d28c
+	codeberg.org/anaseto/goal v1.0.1-0.20241125145825-3da11673cf0e
 	github.com/charmbracelet/lipgloss v1.0.0
 	github.com/go-resty/resty/v2 v2.16.2
 	github.com/jarcoal/httpmock v1.3.1

go.sum

@@ -1,5 +1,5 @@
-codeberg.org/anaseto/goal v1.0.1-0.20241114160548-5eac4722d28c h1:MgB58uhM0W9JmddTsrh9N2txarnBD6rLhVycPiOlBF8=
-codeberg.org/anaseto/goal v1.0.1-0.20241114160548-5eac4722d28c/go.mod h1:uSilOn+ZWioD+gG+3OopP090Fth5H47V/TU9ziI++CM=
+codeberg.org/anaseto/goal v1.0.1-0.20241125145825-3da11673cf0e h1:seuRg19vilyiLBhnxN/qYC75csi+paeCPrY+C3sFxPI=
+codeberg.org/anaseto/goal v1.0.1-0.20241125145825-3da11673cf0e/go.mod h1:uSilOn+ZWioD+gG+3OopP090Fth5H47V/TU9ziI++CM=
 github.com/apache/arrow/go/v17 v17.0.0 h1:RRR2bdqKcdbss9Gxy2NS/hK8i4LDMh23L6BbkN5+F54=
 github.com/apache/arrow/go/v17 v17.0.0/go.mod h1:jR7QHkODl15PfYyjM2nU+yTLScZ/qfj7OSUZmJ8putc=
 github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4=

vendor-goal/README.md

@@ -1,3 +1,3 @@
 # Vendored Goal Code from Goal Project
 
-Pulled from Goal at Git commit: `5eac4722d28cf036984580e2d956b12fdbc66ffa`
+Pulled from Goal at Git commit: `3da11673cf0e578d6aaa4b35c9a8d1615f3ff6af`

vendored/README.md

@@ -1,3 +1,3 @@
 # Vendored Go Code from Goal Project
 
-Pulled from Goal at Git commit: `5eac4722d28cf036984580e2d956b12fdbc66ffa`
+Pulled from Goal at Git commit: `3da11673cf0e578d6aaa4b35c9a8d1615f3ff6af`

vendored/help/get.go

@@ -4,6 +4,9 @@ package help
 import (
 	"bufio"
 	"strings"
+	"unicode/utf8"
+
+	"codeberg.org/anaseto/goal/scan"
 )
 
 // Wrap produces a help function suitable for use in cmd.Config by combining
@@ -50,67 +53,88 @@ func initHelp() map[string]string {
 	help["time"] = helpTime // for the builtin name
 	help["rt"] = helpRuntime
 	help["io"] = helpIO
-	const scols = 12  // syntax
-	const vcols = 4   // verbs
-	const acols = 5   // adverbs
-	const nvcols = 10 // named verbs
-	help[":"] = getBuiltin(helpSyntax, "assign", scols) + getBuiltin(helpVerbs, ":", vcols)
-	help["::"] = getBuiltin(helpSyntax, "assign", scols) + getBuiltin(helpVerbs, "::", vcols)
-	help["rx"] = getBuiltin(helpSyntax, "regexp", scols) + getBuiltin(helpNamedVerbs, "rx", nvcols)
-	help["qq"] = getBuiltin(helpSyntax, "strings", scols)
-	help["rq"] = getBuiltin(helpSyntax, "raw strings", scols)
-	help["»"] = getBuiltin(helpVerbs, "»", vcols)
+	parseBuiltins(help, getSyntaxKey, helpSyntax, 16)
+	help["::"] = help[":"] // for syntax assign entry
+	parseBuiltins(help, getVerb, helpVerbs, 4)
 	help["rshift"] = help["»"]
-	help["«"] = getBuiltin(helpVerbs, "«", vcols)
 	help["shift"] = help["«"]
-	for _, v := range []string{"+", "-", "*", "%", "!", "&", "|", "<", ">", "=", "~", ",", "^",
-		"#", "_", "$", "?", "@", "."} {
-		help[v] = getBuiltin(helpVerbs, v, vcols)
-	}
-	for _, v := range []string{"'", "/", "\\"} {
-		help[v] = getBuiltin(helpAdverbs, v, acols)
-	}
-	for _, v := range []string{"abs", "bytes", "uc", "error", "eval", "firsts", "json", "ocount", "panic",
-		"sign", "csv", "in", "mod", "nan", "rotate", "sub", "utf8",
-		"atan", "cos", "exp", "log", "round", "sin", "sqrt"} {
-		help[v] = getBuiltin(helpNamedVerbs, v, nvcols)
-	}
+	parseBuiltins(help, getVerb, helpAdverbs, 7)
+	parseBuiltins(help, getNamedVerb, helpNamedVerbs, 11)
 	help["¿"] = help["firsts"] + help["in"]
-	for _, v := range []string{"rt.get", "rt.log", "rt.seed", "rt.time", "rt.try"} {
-		help[v] = getBuiltin(helpRuntime, v, nvcols)
-	}
-	for _, v := range []string{"abspath", "chdir", "close", "dirfs", "env", "flush", "glob", "import", "mkdir", "open", "print",
-		"read", "remove", "rename", "run", "say", "shell", "stat", "ARGS", "STDIN", "STDOUT", "STDERR"} {
-		help[v] = getBuiltin(helpIO, v, nvcols)
-	}
+	parseBuiltins(help, getNamedVerb, helpRuntime, 16)
+	parseBuiltins(help, getNamedVerb, helpIO, 12)
 	help["subfs"] = help["dirfs"]
 	return help
 }
 
-func getBuiltin(s string, v string, n int) string {
-	var sb strings.Builder
-	r := strings.NewReader(s)
-	sc := bufio.NewScanner(r)
-	match := false
+func parseBuiltins(help map[string]string, f func(string) string, s string, n int) {
+	sc := bufio.NewScanner(strings.NewReader(s))
+	var verb string // current verb
 	blanks := strings.Repeat(" ", n)
 	for sc.Scan() {
 		ln := sc.Text()
-		if len(ln) < n {
-			match = false
+		if len(ln) < n || strings.HasSuffix(ln, " HELP") {
+			verb = ""
 			continue
 		}
-		if strings.Contains(ln[:n], v) || ln[:n] == blanks && match {
-			// NOTE: currently no builtin name is a substring of
-			// another. Otherwise, this could match more names than
-			// wanted.
-			match = true
-			sb.WriteString(ln)
-			sb.WriteByte('\n')
+		v := f(ln[:n])
+		if v != "" {
+			verb = v
+		}
+		if v != "" || ln[:n] == blanks && verb != "" {
+			help[verb] += ln + "\n"
 			continue
 		}
-		match = false
+		verb = ""
+	}
+}
+
+// getNamedVerb returns the first multi-letter word in the string.
+func getNamedVerb(s string) string {
+	from, to := 0, len(s)
+	for i, r := range s {
+		if !scan.IsLetter(r) && r != '.' {
+			if i-from > 1 {
+				// multi-letter word
+				to = i
+				break
+			}
+			from = i + utf8.RuneLen(r)
+		}
+	}
+	return s[from:to]
+}
+
+// getVerb returns the first non-letter non-space symbol in the string
+// (possibly a digraph, for ::).
+func getVerb(s string) string {
+	from, to := 0, len(s)
+	for i, r := range s {
+		if scan.IsLetter(r) || r == ' ' || r == '[' || r == ';' || r == ']' {
+			if i-from > 0 {
+				to = i
+				break
+			}
+			from = i + utf8.RuneLen(r)
+		}
+	}
+	return s[from:to]
+}
+
+// getSyntaxKey returns a help key for a few syntax entries.
+func getSyntaxKey(s string) string {
+	switch {
+	case strings.Contains(s, "assign"):
+		return ":"
+	case strings.Contains(s, "regexp"):
+		return "rx"
+	case strings.Contains(s, "raw strings"):
+		return "rq"
+	case strings.Contains(s, "strings"):
+		return "qq"
+	default:
+		return ""
 	}
-	return sb.String()
 }
 
 func Map() map[string]string {