Fixing bugs in scope serialization

lib/Scope/Expression.php

@@ -42,15 +42,15 @@ class Expression extends Node {
 
     public function __toString(): string {
         switch ($this->_operator) {
-            case OPERATOR_NONE: $operator = '';
+            case self::OPERATOR_NONE: $operator = '';
             break;
-            case OPERATOR_AND: $operator = '& ';
+            case self::OPERATOR_AND: $operator = '& ';
             break;
-            case OPERATOR_OR: $operator = '| ';
+            case self::OPERATOR_OR: $operator = '| ';
             break;
-            case OPERATOR_NOT: $operator = '- ';
+            case self::OPERATOR_NOT: $operator = '- ';
         }
 
-        return "$operator${$this->_child}";
+        return "$operator{$this->_child}";
     }
 }

lib/Scope/Filter.php

@@ -36,6 +36,6 @@ class Filter extends Node {
 
 
     public function __toString(): string {
-        return "${$this->side}: ${$this->_child}";
+        return "{$this->_side}:{$this->_child}";
     }
 }

lib/Scope/Path.php

@@ -14,7 +14,7 @@ class Path extends Node {
         'anchor' => false
     ];
 
-    protected array $scopes = [];
+    protected array $_scopes = [];
 
     const ANCHOR_NONE = 0;
     const ANCHOR_START = 1;
@@ -32,7 +32,7 @@ class Path extends Node {
             return false;
         }
 
-        $this->scopes = $scopes;
+        $this->_scopes = $scopes;
         $this->frozen['add'] = true;
         return true;
     }
@@ -56,7 +56,7 @@ class Path extends Node {
 
     public function __toString(): string {
         $result = '';
-        
+
         if ($this->_anchor === self::ANCHOR_START || $this->_anchor === self::ANCHOR_BOTH) {
             $result .= '^';
         }

lib/Scope/Scope.php

@@ -8,7 +8,7 @@ namespace dW\Lit\Scope;
 
 class Scope extends Node {
     protected bool $_anchorToPrevious;
-    protected array $atoms = [];
+    protected array $_atoms = [];
     protected bool $frozen = false;
 
 
@@ -23,7 +23,7 @@ class Scope extends Node {
             return false;
         }
 
-        $this->atoms = $atoms;
+        $this->_atoms = $atoms;
         $this->frozen = true;
         return true;
     }