Update to CCL 1.12.2

cmd/env.go

@@ -23,8 +23,7 @@ const (
 	ACTR_VERSION = "7.27.7"
 
 	// Clozure Common Lisp release version from https://github.com/Clozure/ccl
-	CCL_VERSION     = "1.12.1"
-	CCL_VERSION_WIN = "1.12" // CCL version 1.12.1 is not compressed properly, so try an older version
+	CCL_VERSION = "1.12.2"
 )
 
 var (
@@ -204,7 +203,6 @@ func setupLisp() (err error) {
 
 	if system == "windows" {
 		extension = "zip"
-		version = CCL_VERSION_WIN
 	}
 
 	dirName := fmt.Sprintf("ccl-%s-%sx86", version, system)

framework/vanilla_actr/vanilla_actr.go

@@ -5,6 +5,7 @@ package vanilla_actr
 import (
 	"fmt"
 	"os"
+	"path/filepath"
 	"regexp"
 	"runtime"
 	"strings"
@@ -716,16 +717,17 @@ func (v VanillaACTR) createRunFile(modelFile string) (outputFile string, err err
 		return
 	}
 
-	v.Writeln(`(load "%s/actr/load-single-threaded-act-r.lisp")`, v.envPath)
-	v.Writeln(`(load "%s")`, modelFile)
+	path := filepath.Join(v.envPath, "actr", "load-single-threaded-act-r.lisp")
+	v.Writeln(`(load "%s")`, filepath.ToSlash(path))
+	v.Writeln(`(load "%s")`, filepath.ToSlash(modelFile))
 
 	// TODO: We should be able to set this somewhere.
 	// 10.0 is an arbitrary length of time.
 	v.Writeln(`(run 10.0)`)
 
 	outputFile = fmt.Sprintf("%s_run.lisp", v.modelName)
 	if v.tmpPath != "" {
-		outputFile = fmt.Sprintf("%s/%s", v.tmpPath, outputFile)
+		outputFile = filepath.Join(v.tmpPath, outputFile)
 	}
 
 	err = v.WriteFile(outputFile)