Rename DisableSC to ShortCircuit for better clarity and consistency

Author: antonmedv

compiler/compiler.go

@@ -448,7 +448,7 @@ func (c *compiler) BinaryNode(node *ast.BinaryNode) {
 		c.emit(OpNot)
 
 	case "or", "||":
-		if c.config != nil && c.config.DisableSC {
+		if c.config != nil && !c.config.ShortCircuit {
 			c.compile(node.Left)
 			c.derefInNeeded(node.Left)
 			c.compile(node.Right)
@@ -465,7 +465,7 @@ func (c *compiler) BinaryNode(node *ast.BinaryNode) {
 		c.patchJump(end)
 
 	case "and", "&&":
-		if c.config != nil && c.config.DisableSC {
+		if c.config != nil && !c.config.ShortCircuit {
 			c.compile(node.Left)
 			c.derefInNeeded(node.Left)
 			c.compile(node.Right)

conf/config.go

@@ -21,33 +21,33 @@ var (
 type FunctionsTable map[string]*builtin.Function
 
 type Config struct {
-	EnvObject any
-	Env       nature.Nature
-	Expect    reflect.Kind
-	ExpectAny bool
-	Optimize  bool
-	Strict    bool
-	Profile   bool
-	MaxNodes  uint
-	ConstFns  map[string]reflect.Value
-	Visitors  []ast.Visitor
-	Functions FunctionsTable
-	Builtins  FunctionsTable
-	Disabled  map[string]bool // disabled builtins
-	NtCache   nature.Cache
-	DisableSC bool
+	EnvObject    any
+	Env          nature.Nature
+	Expect       reflect.Kind
+	ExpectAny    bool
+	Optimize     bool
+	Strict       bool
+	ShortCircuit bool
+	Profile      bool
+	MaxNodes     uint
+	ConstFns     map[string]reflect.Value
+	Visitors     []ast.Visitor
+	Functions    FunctionsTable
+	Builtins     FunctionsTable
+	Disabled     map[string]bool // disabled builtins
+	NtCache      nature.Cache
 }
 
 // CreateNew creates new config with default values.
 func CreateNew() *Config {
 	c := &Config{
-		Optimize:  true,
-		MaxNodes:  DefaultMaxNodes,
-		ConstFns:  make(map[string]reflect.Value),
-		Functions: make(map[string]*builtin.Function),
-		Builtins:  make(map[string]*builtin.Function),
-		Disabled:  make(map[string]bool),
-		DisableSC: false,
+		Optimize:     true,
+		ShortCircuit: true,
+		MaxNodes:     DefaultMaxNodes,
+		ConstFns:     make(map[string]reflect.Value),
+		Functions:    make(map[string]*builtin.Function),
+		Builtins:     make(map[string]*builtin.Function),
+		Disabled:     make(map[string]bool),
 	}
 	for _, f := range builtin.Builtins {
 		c.Builtins[f.Name] = f

expr.go

@@ -129,7 +129,7 @@ func Optimize(b bool) Option {
 // DisableShortCircuit turns short circuit off.
 func DisableShortCircuit() Option {
 	return func(c *conf.Config) {
-		c.DisableSC = true
+		c.ShortCircuit = false
 	}
 }