Remove old help; fix new help dyad

Author: semperos

cmd/ari/input.go

@@ -20,10 +20,8 @@ import (
 type AutoCompleter struct {
 	ariContext         *ari.Context
 	sqlKeywords        []string
-	goalKeywordsHelp   map[string]string
 	goalKeywordsKeys   []string
 	goalSyntaxAliases  map[string]string
-	goalSyntaxHelp     map[string]string
 	goalSyntaxKeys     []string
 	systemCommandsHelp map[string]string
 	systemCommandsKeys []string
@@ -393,10 +391,8 @@ func (autoCompleter *AutoCompleter) sqlAutoCompleteFn() func(v [][]rune, line, c
 
 func (autoCompleter *AutoCompleter) cacheGoalKeywords(goalContext *goal.Context) {
 	goalKeywords := goalContext.Keywords(nil)
-	goalKeywordsHelp := ari.GoalKeywordsHelp()
 	sort.Strings(goalKeywords)
 	autoCompleter.goalKeywordsKeys = goalKeywords
-	autoCompleter.goalKeywordsHelp = goalKeywordsHelp
 }
 
 func (autoCompleter *AutoCompleter) cacheGoalSyntax() {
@@ -408,7 +404,6 @@ func (autoCompleter *AutoCompleter) cacheGoalSyntax() {
 	sort.Strings(keys)
 	autoCompleter.goalSyntaxKeys = keys
 	autoCompleter.goalSyntaxAliases = goalSyntax
-	autoCompleter.goalSyntaxHelp = ari.GoalSyntaxHelp()
 }
 
 func (autoCompleter *AutoCompleter) cacheSQL() {

context.go

@@ -47,20 +47,7 @@ func NewSQLDatabase(dataSourceName string) (*SQLDatabase, error) {
 
 func NewHelp() map[string]map[string]string {
 	defaultSQLHelp := "A SQL keyword"
-	// defaultGoalHelp := "A Goal keyword"
-	goalGlobalsHelp := GoalGlobalsHelp()
-	goalKeywordsHelp := GoalKeywordsHelp()
-	goalSyntaxHelp := GoalSyntaxHelp()
-	goalHelp := make(map[string]string, len(goalGlobalsHelp)+len(goalKeywordsHelp)+len(goalSyntaxHelp))
-	for k, v := range goalGlobalsHelp {
-		goalHelp[k] = v
-	}
-	for k, v := range goalKeywordsHelp {
-		goalHelp[k] = v
-	}
-	for k, v := range goalSyntaxHelp {
-		goalHelp[k] = v
-	}
+	goalHelp := GoalKeywordsHelp()
 	sqlKeywords := SQLKeywords()
 	sqlHelp := make(map[string]string, len(sqlKeywords))
 	for _, x := range sqlKeywords {
@@ -76,8 +63,19 @@ func NewHelp() map[string]map[string]string {
 func NewContext(dataSourceName string) (*Context, error) {
 	ctx := Context{}
 	helpDictionary := NewHelp()
-	// TODO HERE IS WHERE WE Wrap() a function that closes over helpDictionary to provide lookups for user-added help strings
-	help := Help{Dictionary: helpDictionary, Func: help.HelpFunc()}
+	ariHelpFunc := func(s string) string {
+		goalHelp, ok := helpDictionary["goal"]
+		if !ok {
+			panic(`Developer Error: Dictionary in Help must have a \"goal\" entry.`)
+		}
+		help, found := goalHelp[s]
+		if found {
+			return help
+		}
+		return ""
+	}
+	helpFunc := help.Wrap(ariHelpFunc, help.HelpFunc())
+	help := Help{Dictionary: helpDictionary, Func: helpFunc}
 	sqlDatabase, err := NewSQLDatabase(dataSourceName)
 	if err != nil {
 		return nil, err