occam-verify-cli 1.0.317 → 1.0.320

package/src/ruleNames.js

@@ -37,6 +37,7 @@ export const DERIVATION_RULE_NAME = "derivation";
 export const HYPOTHESIS_RULE_NAME = "hypothesis";
 export const AXIOM_BODY_RULE_NAME = "axiomBody";
 export const LEMMA_BODY_RULE_NAME = "lemmaBody";
+export const TYPE_PREFIX_RULE_NAME = "typePrefix";
 export const SUPPOSITION_RULE_NAME = "supposition";
 export const CONSTRUCTOR_RULE_NAME = "constructor";
 export const DECLARATION_RULE_NAME = "declaration";
@@ -52,14 +53,14 @@ export const PROCEDURE_CALL_RULE_NAME = "procedureCall";
 export const SUB_DERIVATION_RULE_NAME = "subDerivation";
 export const TYPE_ASSERTION_RULE_NAME = "typeAssertion";
 export const THEOREM_HEADER_RULE_NAME = "theoremHeader";
-export const CONJECTURE_BODY_RULE_NAME = "conjectureBody";
 export const META_LEMMA_BODY_RULE_NAME = "metaLemmaBody";
+export const CONJECTURE_BODY_RULE_NAME = "conjectureBody";
 export const METATHEOREM_BODY_RULE_NAME = "metatheoremBody";
+export const META_LEMMA_HEADER_RULE_NAME = "metaLemmaHeader";
 export const PROPERTY_RELATION_RULE_NAME = "propertyRelation";
 export const DEFINED_ASSERTION_RULE_NAME = "definedAssertion";
 export const TERM_SUBSTITUTION_RULE_NAME = "termSubstitution";
 export const CONJECTURE_HEADER_RULE_NAME = "conjectureHeader";
-export const META_LEMMA_HEADER_RULE_NAME = "metaLemmaHeader";
 export const METATHEOREM_HEADER_RULE_NAME = "metatheoremHeader";
 export const PROPERTY_ASSERTION_RULE_NAME = "propertyAssertion";
 export const SUBPROOF_ASSERTION_RULE_NAME = "subproofAssertion";
@@ -72,6 +73,7 @@ export const PROPERTY_DECLARATION_RULE_NAME = "propertyDeclaration";
 export const VARIABLE_DECLARATION_RULE_NAME = "variableDeclaration";
 export const STATEMENT_SUBSTITUTION_RULE_NAME = "statementSubstitution";
 export const COMBINATOR_DECLARATION_RULE_NAME = "combinatorDeclaration";
+export const TYPE_PREFIX_DECLARATION_RULE_NAME = "typePrefixDeclaration";
 export const SIMPLE_TYPE_DECLARATION_RULE_NAME = "simpleTypeDeclaration";
 export const CONSTRUCTOR_DECLARATION_RULE_NAME = "constructorDeclaration";
 export const COMPLEX_TYPE_DECLARATION_RULE_NAME = "complexTypeDeclaration";

package/src/utilities/json.js

@@ -373,7 +373,7 @@ export function combinatorsFromJSON(json, context) {
 }
 
 export function typePrefixesFromJSON(json, context) {
-  let { typePrefixes } = json;
+  let { typePrefixes = [] } = json;
 
   const { TypePrefix } = dom,
         typePrefixesJSON = typePrefixes; ///

package/src/utilities/node.js

@@ -4,7 +4,7 @@ import dom from "../dom";
 
 import { objectType } from "../dom/type";
 
-export function typeFromTypeNode(typeNode) {
+export function typeFromTypeNode(typeNode, context) {
   let type;
 
   if (typeNode === null) {
@@ -12,13 +12,22 @@ export function typeFromTypeNode(typeNode) {
   } else {
     const { Type } = dom,
           typeName = typeNode.getTypeName(),
-          name = typeName,  ///
-          string = name,  ///
+          typePrefixName = typeNode.getTypePrefixName();
+
+    let string;
+
+    string = typeName;  ///
+
+    if (typePrefixName !== null) {
+      string = `${typePrefixName}${string}`;
+    }
+
+    const name = typeName,  ///
           superTypes = null,
           properties = null,
           provisional = null;
 
-    type = new Type(string, name, superTypes, properties, provisional);
+    type = new Type(context, string, name, superTypes, properties, provisional);
   }
 
   return type;

package/src/utilities/type.js

@@ -2,11 +2,18 @@
 
 import { objectType } from "../dom/type";
 
-export function stringFromTypeNameNameAndSuperTypes(typeName, superTypes) {
-  const superTypesString = superTypesStringFromSuperTypes(superTypes),
-        string = (superTypesString !== null) ?
-                   `'${typeName}':${superTypesString}` :
-                     typeName; ///
+export function stringFromTypeNameTypePrefixNameAndSuperTypes(typeName, typePrefixName, superTypes) {
+  let string;
+
+  string = (typePrefixName !== null) ?
+             `${typePrefixName}${typeName}`:
+               typeName;
+
+  const superTypesString = superTypesStringFromSuperTypes(superTypes);
+
+  if (superTypesString !== null) {
+    string = `${string}:${superTypesString}`;
+  }
 
   return string;
 }

package/src/verifier/topLevel.js

@@ -17,6 +17,7 @@ const errorNodeQuery = nodeQuery("/error"),
       variableDeclarationNodeQuery = nodeQuery("/variableDeclaration"),
       combinatorDeclarationNodeQuery = nodeQuery("/combinatorDeclaration"),
       simpleTypeDeclarationNodeQuery = nodeQuery("/simpleTypeDeclaration"),
+      typePrefixDeclarationNodeQuery = nodeQuery("/typePrefixDeclaration"),
       constructorDeclarationNodeQuery = nodeQuery("/constructorDeclaration"),
       complexTypeDeclarationNodeQuery = nodeQuery("/complexTypeDeclaration"),
       metavariableDeclarationNodeQuery = nodeQuery("/metavariableDeclaration");
@@ -145,6 +146,16 @@ class TopLevelVerifier extends Verifier {
         return simpleTypeDeclarationVerifies;
       }
     },
+    {
+      nodeQuery: typePrefixDeclarationNodeQuery,
+      verify: (typePrefixDeclarationNode, context) => {
+        const { TypePrefixDeclaration } = dom,
+              typePrefixDeclaration = TypePrefixDeclaration.fromTypePrefixDeclarationNode(typePrefixDeclarationNode, context),
+              typePrefixDeclarationVerifies = typePrefixDeclaration.verify();
+
+        return typePrefixDeclarationVerifies;
+      }
+    },
     {
       nodeQuery: combinatorDeclarationNodeQuery,
       verify: (combinatorDeclarationNode, context) => {