occam-furtle 2.0.65 → 2.0.67

package/lib/index.js

@@ -28,7 +28,6 @@ var _value = /*#__PURE__*/ _interop_require_default(require("./dom/value"));
 var _values = /*#__PURE__*/ _interop_require_default(require("./dom/values"));
 var _ternary = /*#__PURE__*/ _interop_require_default(require("./dom/ternary"));
 var _variable = /*#__PURE__*/ _interop_require_default(require("./dom/variable"));
-var _condition = /*#__PURE__*/ _interop_require_default(require("./dom/condition"));
 var _reference = /*#__PURE__*/ _interop_require_default(require("./dom/reference"));
 var _procedure = /*#__PURE__*/ _interop_require_default(require("./dom/procedure"));
 var _node = /*#__PURE__*/ _interop_require_default(require("./dom/query/node"));
@@ -38,14 +37,14 @@ var _nodes = /*#__PURE__*/ _interop_require_default(require("./dom/query/nodes")
 var _comparison = /*#__PURE__*/ _interop_require_default(require("./dom/comparison"));
 var _assignment = /*#__PURE__*/ _interop_require_default(require("./dom/assignment"));
 var _return = /*#__PURE__*/ _interop_require_default(require("./dom/block/return"));
+var _negated = /*#__PURE__*/ _interop_require_default(require("./dom/value/negated"));
+var _bitwise = /*#__PURE__*/ _interop_require_default(require("./dom/value/bitwise"));
 var _procedureCall = /*#__PURE__*/ _interop_require_default(require("./dom/procedureCall"));
+var _bracketed = /*#__PURE__*/ _interop_require_default(require("./dom/value/bracketed"));
 var _array = /*#__PURE__*/ _interop_require_default(require("./dom/assignment/array"));
 var _returnStatement = /*#__PURE__*/ _interop_require_default(require("./dom/returnStatement"));
-var _negated = /*#__PURE__*/ _interop_require_default(require("./dom/condition/negated"));
 var _object = /*#__PURE__*/ _interop_require_default(require("./dom/assignment/object"));
-var _bitwise = /*#__PURE__*/ _interop_require_default(require("./dom/condition/bitwise"));
 var _conditionalBlocks = /*#__PURE__*/ _interop_require_default(require("./dom/conditionalBlocks"));
-var _bracketed = /*#__PURE__*/ _interop_require_default(require("./dom/condition/bracketed"));
 var _anonymous = /*#__PURE__*/ _interop_require_default(require("./dom/procedure/anonymous"));
 var _variable1 = /*#__PURE__*/ _interop_require_default(require("./dom/assignment/variable"));
 var _procedure1 = /*#__PURE__*/ _interop_require_default(require("./dom/declaration/procedure"));
@@ -58,4 +57,4 @@ function _interop_require_default(obj) {
     };
 }
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9pbmRleC5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IFN0ZXAgZnJvbSBcIi4vZG9tL3N0ZXBcIjtcbmltcG9ydCBTb21lIGZyb20gXCIuL2RvbS9zb21lXCI7XG5pbXBvcnQgTGFiZWwgZnJvbSBcIi4vZG9tL2xhYmVsXCI7XG5pbXBvcnQgQmxvY2sgZnJvbSBcIi4vZG9tL2Jsb2NrXCI7XG5pbXBvcnQgRXJyb3IgZnJvbSBcIi4vZG9tL2Vycm9yXCI7XG5pbXBvcnQgVmFsdWUgZnJvbSBcIi4vZG9tL3ZhbHVlXCI7XG5pbXBvcnQgVmFsdWVzIGZyb20gXCIuL2RvbS92YWx1ZXNcIjtcbmltcG9ydCBUZXJuYXJ5IGZyb20gXCIuL2RvbS90ZXJuYXJ5XCI7XG5pbXBvcnQgVmFyaWFibGUgZnJvbSBcIi4vZG9tL3ZhcmlhYmxlXCI7XG5pbXBvcnQgQ29uZGl0aW9uIGZyb20gXCIuL2RvbS9jb25kaXRpb25cIjtcbmltcG9ydCBSZWZlcmVuY2UgZnJvbSBcIi4vZG9tL3JlZmVyZW5jZVwiO1xuaW1wb3J0IFByb2NlZHVyZSBmcm9tIFwiLi9kb20vcHJvY2VkdXJlXCI7XG5pbXBvcnQgTm9kZVF1ZXJ5IGZyb20gXCIuL2RvbS9xdWVyeS9ub2RlXCI7XG5pbXBvcnQgUGFyYW1ldGVyIGZyb20gXCIuL2RvbS9wYXJhbWV0ZXJcIjtcbmltcG9ydCBQYXJhbWV0ZXJzIGZyb20gXCIuL2RvbS9wYXJhbWV0ZXJzXCI7XG5pbXBvcnQgTm9kZXNRdWVyeSBmcm9tIFwiLi9kb20vcXVlcnkvbm9kZXNcIjtcbmltcG9ydCBDb21wYXJpc29uIGZyb20gXCIuL2RvbS9jb21wYXJpc29uXCI7XG5pbXBvcnQgQXNzaWdubWVudCBmcm9tIFwiLi9kb20vYXNzaWdubWVudFwiO1xuaW1wb3J0IFJldHVybkJsb2NrIGZyb20gXCIuL2RvbS9ibG9jay9yZXR1cm5cIjtcbmltcG9ydCBQcm9jZWR1cmVDYWxsIGZyb20gXCIuL2RvbS9wcm9jZWR1cmVDYWxsXCI7XG5pbXBvcnQgQXJyYXlBc3NpZ21lbnQgZnJvbSBcIi4vZG9tL2Fzc2lnbm1lbnQvYXJyYXlcIjtcbmltcG9ydCBSZXR1cm5TdGF0ZW1lbnQgZnJvbSBcIi4vZG9tL3JldHVyblN0YXRlbWVudFwiO1xuaW1wb3J0IE5lZ2F0ZWRDb25kaXRpb24gZnJvbSBcIi4vZG9tL2NvbmRpdGlvbi9uZWdhdGVkXCI7XG5pbXBvcnQgT2JqZWN0QXNzaWdubWVudCBmcm9tIFwiLi9kb20vYXNzaWdubWVudC9vYmplY3RcIjtcbmltcG9ydCBCaXR3aXNlQ29uZGl0aW9uIGZyb20gXCIuL2RvbS9jb25kaXRpb24vYml0d2lzZVwiO1xuaW1wb3J0IENvbmRpdGlvbmFsQmxvY2tzIGZyb20gXCIuL2RvbS9jb25kaXRpb25hbEJsb2Nrc1wiO1xuaW1wb3J0IEJyYWNrZXRlZENvbmRpdGlvbiBmcm9tIFwiLi9kb20vY29uZGl0aW9uL2JyYWNrZXRlZFwiO1xuaW1wb3J0IEFub255bW91c1Byb2NlZHVyZSBmcm9tIFwiLi9kb20vcHJvY2VkdXJlL2Fub255bW91c1wiO1xuaW1wb3J0IFZhcmlhYmxlQXNzaWdubWVudCBmcm9tIFwiLi9kb20vYXNzaWdubWVudC92YXJpYWJsZVwiO1xuaW1wb3J0IFByb2NlZHVyZURlY2xhcmF0aW9uIGZyb20gXCIuL2RvbS9kZWNsYXJhdGlvbi9wcm9jZWR1cmVcIjtcbmltcG9ydCBWYXJpYWJsZXNEZWNsYXJhdGlvbiBmcm9tIFwiLi9kb20vZGVjbGFyYXRpb24vdmFyaWFibGVzXCI7XG5cbmV4cG9ydCB7IGRlZmF1bHQgYXMgVmFsdWVzIH0gZnJvbSBcIi4vZG9tL3ZhbHVlc1wiO1xuZXhwb3J0IHsgZGVmYXVsdCBhcyBGaWxlQ29udGV4dCB9IGZyb20gXCIuL2NvbnRleHQvZmlsZVwiO1xuZXhwb3J0IHsgZGVmYXVsdCBhcyBzdHJpbmdVdGlsaXRpZXMgfSBmcm9tIFwiLi91dGlsaXRpZXMvc3RyaW5nXCI7XG5cbiJdLCJuYW1lcyI6WyJGaWxlQ29udGV4dCIsIlZhbHVlcyIsInN0cmluZ1V0aWxpdGllcyJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7Ozs7O0lBbUNvQkEsV0FBVztlQUFYQSxhQUFXOztJQURYQyxNQUFNO2VBQU5BLGVBQU07O0lBRU5DLGVBQWU7ZUFBZkEsZUFBZTs7OzJEQWxDbEI7MkRBQ0E7NERBQ0M7NERBQ0E7NERBQ0E7NERBQ0E7NkRBQ0M7OERBQ0M7K0RBQ0M7Z0VBQ0M7Z0VBQ0E7Z0VBQ0E7MkRBQ0E7Z0VBQ0E7aUVBQ0M7NERBQ0E7aUVBQ0E7aUVBQ0E7NkRBQ0M7b0VBQ0U7NERBQ0M7c0VBQ0M7OERBQ0M7NkRBQ0E7OERBQ0E7d0VBQ0M7Z0VBQ0M7Z0VBQ0E7Z0VBQ0E7aUVBQ0U7Z0VBQ0E7MkRBR007NkRBQ0kifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9pbmRleC5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IFN0ZXAgZnJvbSBcIi4vZG9tL3N0ZXBcIjtcbmltcG9ydCBTb21lIGZyb20gXCIuL2RvbS9zb21lXCI7XG5pbXBvcnQgTGFiZWwgZnJvbSBcIi4vZG9tL2xhYmVsXCI7XG5pbXBvcnQgQmxvY2sgZnJvbSBcIi4vZG9tL2Jsb2NrXCI7XG5pbXBvcnQgRXJyb3IgZnJvbSBcIi4vZG9tL2Vycm9yXCI7XG5pbXBvcnQgVmFsdWUgZnJvbSBcIi4vZG9tL3ZhbHVlXCI7XG5pbXBvcnQgVmFsdWVzIGZyb20gXCIuL2RvbS92YWx1ZXNcIjtcbmltcG9ydCBUZXJuYXJ5IGZyb20gXCIuL2RvbS90ZXJuYXJ5XCI7XG5pbXBvcnQgVmFyaWFibGUgZnJvbSBcIi4vZG9tL3ZhcmlhYmxlXCI7XG5pbXBvcnQgUmVmZXJlbmNlIGZyb20gXCIuL2RvbS9yZWZlcmVuY2VcIjtcbmltcG9ydCBQcm9jZWR1cmUgZnJvbSBcIi4vZG9tL3Byb2NlZHVyZVwiO1xuaW1wb3J0IE5vZGVRdWVyeSBmcm9tIFwiLi9kb20vcXVlcnkvbm9kZVwiO1xuaW1wb3J0IFBhcmFtZXRlciBmcm9tIFwiLi9kb20vcGFyYW1ldGVyXCI7XG5pbXBvcnQgUGFyYW1ldGVycyBmcm9tIFwiLi9kb20vcGFyYW1ldGVyc1wiO1xuaW1wb3J0IE5vZGVzUXVlcnkgZnJvbSBcIi4vZG9tL3F1ZXJ5L25vZGVzXCI7XG5pbXBvcnQgQ29tcGFyaXNvbiBmcm9tIFwiLi9kb20vY29tcGFyaXNvblwiO1xuaW1wb3J0IEFzc2lnbm1lbnQgZnJvbSBcIi4vZG9tL2Fzc2lnbm1lbnRcIjtcbmltcG9ydCBSZXR1cm5CbG9jayBmcm9tIFwiLi9kb20vYmxvY2svcmV0dXJuXCI7XG5pbXBvcnQgTmVnYXRlZFZhbHVlIGZyb20gXCIuL2RvbS92YWx1ZS9uZWdhdGVkXCI7XG5pbXBvcnQgQml0d2lzZVZhbHVlIGZyb20gXCIuL2RvbS92YWx1ZS9iaXR3aXNlXCI7XG5pbXBvcnQgUHJvY2VkdXJlQ2FsbCBmcm9tIFwiLi9kb20vcHJvY2VkdXJlQ2FsbFwiO1xuaW1wb3J0IEJyYWNrZXRlZFZhbHVlIGZyb20gXCIuL2RvbS92YWx1ZS9icmFja2V0ZWRcIjtcbmltcG9ydCBBcnJheUFzc2lnbWVudCBmcm9tIFwiLi9kb20vYXNzaWdubWVudC9hcnJheVwiO1xuaW1wb3J0IFJldHVyblN0YXRlbWVudCBmcm9tIFwiLi9kb20vcmV0dXJuU3RhdGVtZW50XCI7XG5pbXBvcnQgT2JqZWN0QXNzaWdubWVudCBmcm9tIFwiLi9kb20vYXNzaWdubWVudC9vYmplY3RcIjtcbmltcG9ydCBDb25kaXRpb25hbEJsb2NrcyBmcm9tIFwiLi9kb20vY29uZGl0aW9uYWxCbG9ja3NcIjtcbmltcG9ydCBBbm9ueW1vdXNQcm9jZWR1cmUgZnJvbSBcIi4vZG9tL3Byb2NlZHVyZS9hbm9ueW1vdXNcIjtcbmltcG9ydCBWYXJpYWJsZUFzc2lnbm1lbnQgZnJvbSBcIi4vZG9tL2Fzc2lnbm1lbnQvdmFyaWFibGVcIjtcbmltcG9ydCBQcm9jZWR1cmVEZWNsYXJhdGlvbiBmcm9tIFwiLi9kb20vZGVjbGFyYXRpb24vcHJvY2VkdXJlXCI7XG5pbXBvcnQgVmFyaWFibGVzRGVjbGFyYXRpb24gZnJvbSBcIi4vZG9tL2RlY2xhcmF0aW9uL3ZhcmlhYmxlc1wiO1xuXG5leHBvcnQgeyBkZWZhdWx0IGFzIFZhbHVlcyB9IGZyb20gXCIuL2RvbS92YWx1ZXNcIjtcbmV4cG9ydCB7IGRlZmF1bHQgYXMgRmlsZUNvbnRleHQgfSBmcm9tIFwiLi9jb250ZXh0L2ZpbGVcIjtcbmV4cG9ydCB7IGRlZmF1bHQgYXMgc3RyaW5nVXRpbGl0aWVzIH0gZnJvbSBcIi4vdXRpbGl0aWVzL3N0cmluZ1wiO1xuXG4iXSwibmFtZXMiOlsiRmlsZUNvbnRleHQiLCJWYWx1ZXMiLCJzdHJpbmdVdGlsaXRpZXMiXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7Ozs7OztJQWtDb0JBLFdBQVc7ZUFBWEEsYUFBVzs7SUFEWEMsTUFBTTtlQUFOQSxlQUFNOztJQUVOQyxlQUFlO2VBQWZBLGVBQWU7OzsyREFqQ2xCOzJEQUNBOzREQUNDOzREQUNBOzREQUNBOzREQUNBOzZEQUNDOzhEQUNDOytEQUNDO2dFQUNDO2dFQUNBOzJEQUNBO2dFQUNBO2lFQUNDOzREQUNBO2lFQUNBO2lFQUNBOzZEQUNDOzhEQUNDOzhEQUNBO29FQUNDO2dFQUNDOzREQUNBO3NFQUNDOzZEQUNDO3dFQUNDO2dFQUNDO2dFQUNBO2lFQUNFO2dFQUNBOzJEQUdNOzZEQUNJIn0=

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "occam-furtle",
   "author": "James Smith",
-  "version": "2.0.65",
+  "version": "2.0.67",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/occam-furtle",
   "description": "Occam's Furtle language.",
@@ -11,12 +11,12 @@
   },
   "dependencies": {
     "necessary": "^14.3.2",
-    "occam-grammars": "^1.3.153"
+    "occam-grammars": "^1.3.157"
   },
   "devDependencies": {
     "@swc/core": "^1.5.6",
-    "occam-custom-grammars": "^5.0.1081",
-    "occam-entities": "^1.0.291",
+    "occam-custom-grammars": "^5.0.1083",
+    "occam-entities": "^1.0.293",
     "occam-grammar-utilities": "^8.0.258",
     "occam-lexers": "^23.0.45",
     "occam-parsers": "^23.0.50",

package/src/_occam-grammars/furtle/bnf.js

@@ -16,7 +16,7 @@ variablesDeclaration   ::=  [type] variable assignment ( "," variable assignment
 
 variableAssignment     ::=  variable assignment ";" ;
 
-conditionalBlocks      ::=  "If" "(" condition ")" block ( "Else" block )? ;                                            
+conditionalBlocks      ::=  "If" "(" value ")" block ( "Else" block )? ;                                            
 
 objectAssignment       ::=  "{" parameters "}" "=" variable ";" ;
 
@@ -28,29 +28,6 @@ anonymousProcedure     ::=  "(" parameters? ")" returnBlock ;
 
 
 
-condition              ::=  bracketedCondition 
-
-                         |  bitwiseCondition 
-
-                         |  negatedCondition 
-
-                         |  comparison 
-
-                         |  value 
-                        
-                         ;
-                        
-bracketedCondition     ::=  "(" condition ")" ; 
-
-bitwiseCondition       ::=  condition ( "||" | "&&" ) condition ; 
-
-negatedCondition       ::=  "!"<NO_WHITESPACE>condition ; 
-
-comparison             ::=  value ( "!=" | "==" ) value ; 
-
-
-
-
 block..                ::=  "{" ( step | nonsense )* "}" ;
 
 returnBlock..          ::=  "{" ( step | nonsense )* returnStatement "}" ;
@@ -77,9 +54,23 @@ assignment             ::=  "=" value ;
 
 
 
+parameter              ::=  [type] [name]
+
+                         |  "_" 
+
+                         ;
+
+
+
 value                  ::=  procedureCall
  
-                         |  comparison
+                         |  bracketedValue 
+
+                         |  bitwiseValue 
+
+                         |  negatedValue 
+
+                         |  comparison 
 
                          |  nodesQuery
                           
@@ -103,17 +94,25 @@ value                  ::=  procedureCall
 
 
 
+bracketedValue         ::=  "(" value ")" ; 
+
 procedureCall          ::=  reference<NO_WHITESPACE>"(" values? ")" ;
 
+bitwiseValue           ::=  value ( "||" | "&&" ) value ; 
+
+negatedValue           ::=  "!"<NO_WHITESPACE>value ; 
+
+comparison             ::=  value ( "!=" | "==" ) value ; 
+
 nodesQuery             ::=  "nodesQuery"<NO_WHITESPACE>"(" variable "," expression ")" ;
 
 nodeQuery              ::=  "nodeQuery"<NO_WHITESPACE>"(" variable "," expression ")" ;
 
 variable               ::=  [name] ;
 
-ternary                ::=  "If" "(" condition ")" value "Else" value ;
+ternary                ::=  "If" "(" value ")" value "Else" value ;
 
-some                   ::=  "Some"<NO_WHITESPACE>"(" variable "," anonymousProcedure ")" ";" ;
+some                   ::=  "Some"<NO_WHITESPACE>"(" variable "," anonymousProcedure ")" ;
 
 
 
@@ -123,14 +122,6 @@ values                 ::=  value ( "," value )* ;
 
 
 
-parameter              ::=  [type] [name]
-
-                         |  "_" 
-
-                         ;
-
-
-
 label.                 ::=  [name] ;
 
 reference.             ::=  [name] ;

package/src/dom/conditionalBlocks.js

@@ -1,19 +1,21 @@
 "use strict";
 
 import dom from "../dom";
+import Exception from "../exception";
 
 import { nodeQuery } from "../utilities/query";
 import { domAssigned } from "../dom";
+import { BOOLEAN_TYPE } from "../types";
 
-const ifBlockNodeQuery = nodeQuery("/conditionalBlocks/block[0]"),
-      conditionNodeQuery = nodeQuery("/conditionalBlocks/condition"),
+const valueNodeQuery = nodeQuery("/conditionalBlocks/value"),
+      ifBlockNodeQuery = nodeQuery("/conditionalBlocks/block[0]"),
       elseBlockNodeQuery = nodeQuery("/conditionalBlocks/block[1]"),
       conditionalBlocksNodeQuery = nodeQuery("/step/conditionalBlocks");
 
 export default domAssigned(class ConditionalBlocks {
-  constructor(string, condition, ifBlock, elseBlock) {
+  constructor(string, value, ifBlock, elseBlock) {
     this.string = string;
-    this.condition = condition;
+    this.value = value;
     this.ifBlock = ifBlock;
     this.elseBlock = elseBlock;
   }
@@ -22,8 +24,8 @@ export default domAssigned(class ConditionalBlocks {
     return this.string;
   }
 
-  getCondition() {
-    return this.condition;
+  getValue() {
+    return this.value;
   }
 
   getConditionBlock() {
@@ -39,8 +41,18 @@ export default domAssigned(class ConditionalBlocks {
 
     context.trace(`Evaluating the '${conditionalBlocksString}' conditional blocks...`);
 
-    const value = this.condition.evaluate(context),
-          boolean = value.getBoolean();
+    const value = this.value.evaluate(context),
+          valueType = value.getType();
+
+    if (valueType !== BOOLEAN_TYPE) {
+      const valueString = value.asString(context),
+            message = `The ${valueString} value's type is '${valueType}' when it should be of type '${BOOLEAN_TYPE}'.`,
+            exception = Exception.fromMessage(message);
+
+      throw exception;
+    }
+
+    const boolean = value.getBoolean();
 
     if (boolean) {
       this.ifBlock.evaluate(context);
@@ -61,15 +73,15 @@ export default domAssigned(class ConditionalBlocks {
     const conditionalBlocksNode = conditionalBlocksNodeQuery(stepNode);
 
     if (conditionalBlocksNode !== null) {
-      const { Block, Condition } = dom,
+      const { Block, Value } = dom,
             string = stringFromConditionalBlocksNode(conditionalBlocksNode, context),
             ifBlockNode = ifBlockNodeQuery(conditionalBlocksNode),
             elseBlockNode = elseBlockNodeQuery(conditionalBlocksNode),
-            condition = Condition.fromConditionalBlocksNode(conditionalBlocksNode, context),
+            value = Value.fromConditionalBlocksNode(conditionalBlocksNode, context),
             ifBlock = Block.fromBlockNode(ifBlockNode, context),
             elseBlock = Block.fromBlockNode(elseBlockNode, context);
 
-      conditionalBlocks = new ConditionalBlocks(string, condition, ifBlock, elseBlock);
+      conditionalBlocks = new ConditionalBlocks(string, value, ifBlock, elseBlock);
     }
 
     return conditionalBlocks;
@@ -79,8 +91,8 @@ export default domAssigned(class ConditionalBlocks {
 function stringFromConditionalBlocksNode(conditionalBlocksNode, context) {
   let string;
 
-  const conditionNode = conditionNodeQuery(conditionalBlocksNode),
-        conditionString = context.nodeAsString(conditionNode);
+  const valueNode = valueNodeQuery(conditionalBlocksNode),
+        conditionString = context.nodeAsString(valueNode);
 
   string = `If (${conditionString}) { ... }`;
 

package/src/dom/procedureCall.js

@@ -1,10 +1,10 @@
 "use strict";
 
 import dom from "../dom";
+import Exception from "../exception";
 
 import { domAssigned } from "../dom";
-import { nodeQuery, nodesQuery } from "../utilities/query";
-import Exception from "../exception";
+import { nodeQuery } from "../utilities/query";
 
 const procedureCallNodeQuery = nodeQuery("/value/procedureCall");
 

package/src/dom/ternary.js

@@ -1,19 +1,21 @@
 "use strict";
 
 import dom from "../dom";
+import Exception from "../exception";
 
 import { nodeQuery } from "../utilities/query";
 import { domAssigned } from "../dom";
+import { BOOLEAN_TYPE } from "../types";
 
-const ifValueNodeQuery = nodeQuery("/ternary/value[0]"),
+const valueNodeQuery = nodeQuery("/ternary/value[0]"),
+      ifValueNodeQuery = nodeQuery("/ternary/value[1]"),
       ternaryNodeQuery = nodeQuery("/value/ternary"),
-      conditionNodeQuery = nodeQuery("/ternary/condition"),
-      elseValueNodeQuery = nodeQuery("/ternary/value[1]");
+      elseValueNodeQuery = nodeQuery("/ternary/value[2]");
 
 export default domAssigned(class Ternary {
-  constructor(string, condition, ifValue, elseValue) {
+  constructor(string, value, ifValue, elseValue) {
     this.string = string;
-    this.condition = condition;
+    this.value = value;
     this.ifValue = ifValue;
     this.elseValue = elseValue;
   }
@@ -22,11 +24,11 @@ export default domAssigned(class Ternary {
     return this.string;
   }
 
-  getCondition() {
-    return this.condition;
+  getValue() {
+    return this.value;
   }
 
-  getConditionBlock() {
+  getIfBlock() {
     return this.ifValue;
   }
 
@@ -41,7 +43,17 @@ export default domAssigned(class Ternary {
 
     context.trace(`Evaluating the '${ternaryString}' ternary...`);
 
-    value = this.condition.evaluate(context);
+    value = this.value.evaluate(context);
+
+    const valueType = value.getType();
+
+    if (valueType !== BOOLEAN_TYPE) {
+      const valueString = value.asString(context),
+            message = `The ${valueString} value's type is '${valueType}' when it should be of type '${BOOLEAN_TYPE}'.`,
+            exception = Exception.fromMessage(message);
+
+      throw exception;
+    }
 
     const boolean = value.getBoolean();
 
@@ -62,15 +74,15 @@ export default domAssigned(class Ternary {
     const ternaryNode = ternaryNodeQuery(valueNode);
 
     if (ternaryNode !== null) {
-      const { Value, Condition } = dom,
+      const { Value } = dom,
             string = stringFromTernaryNode(ternaryNode, context),
             ifValueNode = ifValueNodeQuery(ternaryNode),
             elseValueNode = elseValueNodeQuery(ternaryNode),
-            condition = Condition.fromTernaryNode(ternaryNode, context),
+            value = Value.fromTernaryNode(ternaryNode, context),
             ifValue = Value.fromValueNode(ifValueNode, context),
             elseValue = Value.fromValueNode(elseValueNode, context);
 
-      ternary = new Ternary(string, condition, ifValue, elseValue);
+      ternary = new Ternary(string, value, ifValue, elseValue);
     }
 
     return ternary;
@@ -80,14 +92,14 @@ export default domAssigned(class Ternary {
 function stringFromTernaryNode(ternaryNode, context) {
   let string;
 
-  const ifValueNode = ifValueNodeQuery(ternaryNode),
+  const valueNode = valueNodeQuery(ternaryNode),
+        ifValueNode = ifValueNodeQuery(ternaryNode),
         elseValueNode = elseValueNodeQuery(ternaryNode),
-        conditionNode = conditionNodeQuery(ternaryNode),
         ifValueString = context.nodeAsString(ifValueNode),
         elseValueString = context.nodeAsString(elseValueNode),
-        conditionString = context.nodeAsString(conditionNode);
+        valueString = context.nodeAsString(valueNode);
 
-  string = `If (${conditionString}) ${ifValueString} ${elseValueString}`;
+  string = `If (${valueString}) ${ifValueString} ${elseValueString}`;
 
   return string;
 }

package/src/dom/value/bitwise.js

@@ -0,0 +1,118 @@
+"use strict";
+
+import dom from "../../dom";
+import Exception from "../../exception";
+
+import { nodeQuery } from "../../utilities/query";
+import { domAssigned } from "../../dom";
+import { DISJUNCTION } from "../../constants";
+import { BOOLEAN_TYPE } from "../../types";
+
+const terminalNodeQuery = nodeQuery("/bitwiseValue/@*"),
+      leftValueNodeQuery = nodeQuery("/bitwiseValue/value[0]"),
+      rightValueNodeQuery = nodeQuery("/bitwiseValue/value[1]"),
+      bitwiseValueNodeQuery = nodeQuery("/value/bitwiseValue");
+
+export default domAssigned(class BitwiseValue {
+  constructor(string, type, disjoint, leftValue, rightValue) {
+    this.string = string;
+    this.type = type;
+    this.disjoint = disjoint;
+    this.leftValue = leftValue;
+    this.rightValue = rightValue;
+  }
+
+  getString() {
+    return this.string;
+  }
+
+  getType() {
+    return this.type;
+  }
+
+  isDisjoint() {
+    return this.disjoint;
+  }
+
+  getLeftValue() {
+    return this.leftValue;
+  }
+
+  getRightValue() {
+    return this.rightValue;
+  }
+
+  evaluate(context) {
+    let value;
+
+    const bitwiseValueString = this.string; ///
+
+    context.trace(`Evaluating the '${bitwiseValueString}' bitwise value...`);
+
+    const { Value } = dom,
+          leftValue = this.leftValue.evaluate(context),
+          rightValue = this.rightValue.evaluate(context),
+          leftValueType = leftValue.getType(),
+          rightValueType = rightValue.getType();
+
+    if (leftValueType !== BOOLEAN_TYPE) {
+      const leftValueString = leftValue.asString(context),
+            message = `The ${leftValueString} left value's type is '${leftValueType}' when it should be of type '${BOOLEAN_TYPE}'.`,
+            exception = Exception.fromMessage(message);
+
+      throw exception;
+    }
+
+    if (rightValueType !== BOOLEAN_TYPE) {
+      const rightValueString = rightValue.asString(context),
+            message = `The ${rightValueString} right value's type is '${rightValueType}' when it should be of type '${BOOLEAN_TYPE}'.`,
+            exception = Exception.fromMessage(message);
+
+      throw exception;
+    }
+
+    const leftValueBoolean = leftValue.getBoolean(),
+          rightValueBoolean = rightValue.getBoolean(),
+          boolean = this.disjoint ?
+                      (leftValueBoolean || rightValueBoolean) :
+                        (leftValueBoolean && rightValueBoolean);
+
+    value = Value.fromBoolean(boolean, context);  ///
+
+    context.debug(`...evaluated the '${bitwiseValueString}' bitwise value.`);
+
+    return value;
+  }
+
+  static name = "BitwiseValue";
+
+  static fromValueNode(valueNode, context) {
+    let bitwiseValue = null;
+
+    const bitwiseValueNode = bitwiseValueNodeQuery(valueNode);
+
+    if (bitwiseValueNode !== null) {
+      const { Value } = dom,
+            node = bitwiseValueNode,  //
+            string = context.nodeAsString(node),
+            type = BOOLEAN_TYPE,
+            leftValueNode = leftValueNodeQuery(bitwiseValueNode),
+            rightValueNode = rightValueNodeQuery(bitwiseValueNode),
+            disjoint = disjointFromBitwiseValueNode(bitwiseValueNode, context),
+            leftValue = Value.fromValueNode(leftValueNode, context),
+            rightValue = Value.fromValueNode(rightValueNode, context);
+
+      bitwiseValue = new BitwiseValue(string, type, disjoint, leftValue, rightValue);
+    }
+
+    return bitwiseValue;
+  }
+});
+
+function disjointFromBitwiseValueNode(bitwiseValueNode, context) {
+  const terminalNode = terminalNodeQuery(bitwiseValueNode),
+        terminalNodeContent = terminalNode.getContent(),
+        disjoint = (terminalNodeContent === DISJUNCTION);
+
+  return disjoint;
+}

package/src/dom/value/bracketed.js

@@ -0,0 +1,61 @@
+"use strict";
+
+import dom from "../../dom";
+
+import { nodeQuery } from "../../utilities/query";
+import { domAssigned } from "../../dom";
+
+const valueNodeQuery = nodeQuery("/bracketedValue/value"),
+      valueBracketedValueNodeQuery = nodeQuery("/value/bracketedValue");
+
+export default domAssigned(class BracketedValue {
+  constructor(string, value) {
+    this.string = string;
+    this.value = value;
+  }
+
+  getString() {
+    return this.string;
+  }
+
+  getValue() {
+    return this.value;
+  }
+
+  getType() { return this.value.getType(); }
+
+  evaluate(context) {
+    let value;
+
+    const bracketedValueString = this.string; ///
+
+    context.trace(`Evaluating the '${bracketedValueString}' bracketed value...`);
+
+    value = this.value.evaluate(context);
+
+    context.debug(`...evaluated the '${bracketedValueString}' bracketed value.`);
+
+    return value;
+  }
+
+  static name = "BracketedValue";
+
+  static fromValueNode(valueNode, context) {
+    let bracketedValue = null;
+
+    const valueBracketedValueNode = valueBracketedValueNodeQuery(valueNode);
+
+    if (valueBracketedValueNode !== null) {
+      const { Value } = dom,
+            bracketedValueNode = valueBracketedValueNode, ///
+            node = bracketedValueNode,  ///
+            string = context.nodeAsString(node),
+            valueNode = valueNodeQuery(bracketedValueNode),
+            value = Value.fromValueNode(valueNode, context);
+
+      bracketedValue = new BracketedValue(string, value);
+    }
+
+    return bracketedValue;
+  }
+});

package/src/dom/value/negated.js

@@ -0,0 +1,84 @@
+"use strict";
+
+import dom from "../../dom";
+import Exception from "../../exception";
+
+import { nodeQuery } from "../../utilities/query";
+import { domAssigned } from "../../dom";
+import { BOOLEAN_TYPE } from "../../types";
+
+const valueNodeQuery = nodeQuery("/negatedValue/value"),
+      negatedValueNodeQuery = nodeQuery("/value/negatedValue");
+
+export default domAssigned(class NegatedValue {
+  constructor(string, type, value) {
+    this.string = string;
+    this.type = type;
+    this.value = value;
+  }
+
+  getString() {
+    return this.string;
+  }
+
+  getType() {
+    return this.type;
+  }
+
+  getValue() {
+    return this.value;
+  }
+
+  evaluate(context) {
+    let value;
+
+    const negatedValueString = this.string; ///
+
+    context.trace(`Evaluating the '${negatedValueString}' negated value...`);
+
+    value = this.value.evaluate(context);
+
+    const valueType = value.getType;
+
+    if (valueType !== BOOLEAN_TYPE) {
+      const valueString = value.asString(context),
+            message = `The ${valueString} left value's type is '${valueType}' when it should be of type '${BOOLEAN_TYPE}'.`,
+            exception = Exception.fromMessage(message);
+
+      throw exception;
+    }
+
+    let boolean = value.getBoolean();
+
+    boolean = !boolean;
+
+    const { Value } = dom;
+
+    value = Value.fromBoolean(boolean, context);  ///
+
+    context.debug(`...evaluated the '${negatedValueString}' negated value.`);
+
+    return value;
+  }
+
+  static name = "NegatedValue";
+
+  static fromValueNode(valueNode, context) {
+    let negatedValue = null;
+
+    const negatedValueNode = negatedValueNodeQuery(valueNode);
+
+    if (negatedValueNode !== null) {
+      const { Value } = dom,
+            node = negatedValueNode,  //
+            string = context.nodeAsString(node),
+            type = BOOLEAN_TYPE,
+            valueNode = valueNodeQuery(negatedValueNode),
+            value = Value.fromValueNode(valueNode, context);
+
+      negatedValue = new NegatedValue(string, type, value);
+    }
+
+    return negatedValue;
+  }
+});