fix printing cleanup

Author: dwhitena

Dockerfile

@@ -1,22 +1,23 @@
-FROM continuumio/anaconda
+FROM golang
 
 # dependencies
 RUN apt-get update
-RUN apt-get install -y pkg-config libzmq-dev build-essential
+RUN apt-get install -y pkg-config libzmq3-dev build-essential python3-pip
 
 # set up golang
-RUN wget https://storage.googleapis.com/golang/go1.5.linux-amd64.tar.gz
-RUN tar -C /usr/local -xzf go1.5.linux-amd64.tar.gz
 ENV PATH /usr/local/go/bin:$PATH
 ENV GOPATH /go
 ENV PATH $GOPATH/bin:$PATH
 RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH"
 
 # install gophernotes
 RUN go get golang.org/x/tools/cmd/goimports
-RUN go get github.com/gopherds/gophernotes
+RUN go get -tags zmq_3_x github.com/gopherds/gophernotes
 RUN mkdir -p ~/.ipython/kernels/gophernotes
 RUN cp -r $GOPATH/src/github.com/gopherds/gophernotes/kernel/* ~/.ipython/kernels/gophernotes
 
+# install jupyter
+RUN pip3 install jupyter
+
 EXPOSE 8888
 CMD ["jupyter", "notebook"]

internal/repl/quickfix.go

@@ -204,11 +204,11 @@ func (s *Session) isPureExpr(expr ast.Expr) bool {
 	case *ast.CallExpr:
 		tv := s.TypeInfo.Types[expr.Fun]
 
-		for _, arg := range expr.Args {
-			if s.isPureExpr(arg) == false {
-				return false
-			}
-		}
+		//for _, arg := range expr.Args {
+		//	if s.isPureExpr(arg) == false {
+		//		return false
+		//	}
+		//}
 
 		if tv.IsType() {
 			return true

internal/repl/repl.go

@@ -384,6 +384,7 @@ func (s *Session) Eval(in string) (string, bytes.Buffer, error) {
 	}
 
 	// Extract statements.
+	priorListLength := len(s.mainBody.List)
 	if err := s.separateEvalStmt(in); err != nil {
 		return "", bytes.Buffer{}, err
 	}
@@ -404,39 +405,77 @@ func (s *Session) Eval(in string) (string, bytes.Buffer, error) {
 		errorf("%s", err)
 	}
 
+	// Cleanup the session file.
+	s.mainBody.List = s.mainBody.List[0:priorListLength]
+	if err := s.cleanEvalStmt(in); err != nil {
+		return "", bytes.Buffer{}, err
+	}
+	f, err := os.Create(s.FilePath)
+	if err != nil {
+		return "", bytes.Buffer{}, err
+	}
+	err = printer.Fprint(f, s.Fset, s.File)
+	if err != nil {
+		return "", bytes.Buffer{}, err
+	}
+
 	return string(output), strerr, err
 }
 
 // separateEvalStmt separates what can be evaluated via evalExpr from what cannot.
 func (s *Session) separateEvalStmt(in string) error {
 	var stmtLines []string
 	var exprCount int
+	var bracketCount int
 
 	inLines := strings.Split(in, "\n")
 
 	for _, line := range inLines {
 
-		priorLen := len(s.mainBody.List)
-
-		if _, err := s.evalExpr(line); err != nil {
-			stmtLines = append(stmtLines, line)
+		if bracketCount == 0 {
+			if _, err := s.evalExpr(line); err != nil {
+				if strings.LastIndex(line, "{") == len(line)-1 {
+					bracketCount++
+				}
+				stmtLines = append(stmtLines, line)
+				continue
+			}
 			continue
 		}
 
-		if len(stmtLines) != 0 {
+		if strings.LastIndex(line, "}") == len(line)-1 {
+			bracketCount--
+		}
+		stmtLines = append(stmtLines, line)
 
-			currentLen := len(s.mainBody.List)
-			trimNum := currentLen - priorLen
-			s.mainBody.List = s.mainBody.List[0 : currentLen-trimNum]
+		exprCount++
+	}
 
-			if err := s.evalStmt(strings.Join(stmtLines, "\n"), true); err != nil {
-				return err
-			}
-			stmtLines = []string{}
+	if len(stmtLines) != 0 {
+		var noPrint bool
+		if exprCount > 0 {
+			noPrint = true
+		}
+		if err := s.evalStmt(strings.Join(stmtLines, "\n"), noPrint); err != nil {
+			return err
+		}
+	}
 
-			if _, err := s.evalExpr(line); err != nil {
-				return err
-			}
+	return nil
+}
+
+// cleanEvalStmt cleans up prior print statements etc.
+func (s *Session) cleanEvalStmt(in string) error {
+	var stmtLines []string
+	var exprCount int
+
+	inLines := strings.Split(in, "\n")
+
+	for _, line := range inLines {
+
+		if _, err := s.evalExpr(line); err != nil {
+			stmtLines = append(stmtLines, line)
+			continue
 		}
 
 		exprCount++