Expose context to parent shell. Missed out somehow before

Author: abiosoft

context.go

@@ -2,7 +2,7 @@ package ishell
 
 // Context is an ishell context. It embeds ishell.Actions.
 type Context struct {
-	values      map[string]interface{}
+	contextValues
 	progressBar ProgressBar
 	err         error
 
@@ -24,35 +24,38 @@ func (c *Context) Err(err error) {
 	c.err = err
 }
 
+// ProgressBar returns the progress bar for the current shell context.
+func (c *Context) ProgressBar() ProgressBar {
+	return c.progressBar
+}
+
+// contextValues is the map for values in the context.
+type contextValues map[string]interface{}
+
 // Get returns the value associated with this context for key, or nil
 // if no value is associated with key. Successive calls to Get with
 // the same key returns the same result.
-func (c *Context) Get(key string) interface{} {
-	return c.values[key]
+func (c contextValues) Get(key string) interface{} {
+	return c[key]
 }
 
 // Set sets the key in this context to value.
-func (c *Context) Set(key string, value interface{}) {
-	if c.values == nil {
-		c.values = make(map[string]interface{})
+func (c *contextValues) Set(key string, value interface{}) {
+	if *c == nil {
+		*c = make(map[string]interface{})
 	}
-	c.values[key] = value
+	(*c)[key] = value
 }
 
 // Del deletes key and its value in this context.
-func (c *Context) Del(key string) {
-	delete(c.values, key)
+func (c contextValues) Del(key string) {
+	delete(c, key)
 }
 
 // Keys returns all keys in the context.
-func (c *Context) Keys() (keys []string) {
-	for key := range c.values {
+func (c contextValues) Keys() (keys []string) {
+	for key := range c {
 		keys = append(keys, key)
 	}
 	return
 }
-
-// ProgressBar returns the progress bar for the current shell context.
-func (c *Context) ProgressBar() ProgressBar {
-	return c.progressBar
-}

ishell.go

@@ -47,10 +47,10 @@ type Shell struct {
 	multiChoiceActive bool
 	haltChan          chan struct{}
 	historyFile       string
-	contextValues     map[string]interface{}
 	autoHelp          bool
 	rawArgs           []string
 	progressBar       ProgressBar
+	contextValues
 	Actions
 }
 
@@ -624,11 +624,17 @@ func newContext(s *Shell, cmd *Cmd, args []string) *Context {
 	}
 	return &Context{
 		Actions:     s.Actions,
-		values:      s.contextValues,
 		progressBar: copyShellProgressBar(s),
 		Args:        args,
 		RawArgs:     s.rawArgs,
 		Cmd:         *cmd,
+		contextValues: func() contextValues {
+			values := contextValues{}
+			for k := range s.contextValues {
+				values[k] = s.contextValues[k]
+			}
+			return values
+		}(),
 	}
 }