occam-verify-cli 0.0.958 → 0.0.959

package/src/utilities/node.js

@@ -4,13 +4,8 @@ import { parsersUtilities } from "occam-custom-grammars";
 
 import { nodeQuery } from "../utilities/query";
 import { combinedCustomGrammarFromNothing } from "./customGrammar";
-import { METAVARIABLE_RULE_NAME,
-         VARIABLE_DECLARATION_RULE_NAME,
-         UNQUALIFIED_STATEMENT_RULE_NAME,
-         CONSTRUCTOR_DECLARATION_RULE_NAME } from "../ruleNames";
-import { metavariableTokensFromMetavariableString,
-         variableDeclarationTokensFromVariableString,
-         unqualifiedStatementTokensFromStatementString } from "../utilities/tokens";
+import { unqualifiedStatementTokensFromStatementString } from "../utilities/tokens";
+import { UNQUALIFIED_STATEMENT_RULE_NAME, CONSTRUCTOR_DECLARATION_RULE_NAME } from "../ruleNames";
 
 const { florenceParserFromCombinedCustomGrammar } = parsersUtilities;
 
@@ -18,16 +13,8 @@ const combinedCustomGrammar = combinedCustomGrammarFromNothing(),
       florenceParser = florenceParserFromCombinedCustomGrammar(combinedCustomGrammar);
 
 const termNodeQuery = nodeQuery("/constructorDeclaration/term!"),
-      variableNodeQuery = nodeQuery("/variableDeclaration/variable!"),
       statementNodeQuery = nodeQuery("/unqualifiedStatement/statement!");
 
-export function variableNodeFromVariableString(variableString, lexer, parser) {
-  const variableTDeclarationTokens = variableDeclarationTokensFromVariableString(variableString, lexer),
-        variableNode = variableNodeFromVariableVariableTDeclarationTokens(variableTDeclarationTokens, parser);
-
-  return variableNode;
-}
-
 export function statementNodeFromStatementString(statementString, lexer, parser) {
   const unqualifiedStatementTokens = unqualifiedStatementTokensFromStatementString(statementString, lexer),
         statementNode = statementNodeFromUnqualifiedStatementTokens(unqualifiedStatementTokens, parser);
@@ -35,13 +22,6 @@ export function statementNodeFromStatementString(statementString, lexer, parser)
   return statementNode;
 }
 
-export function metavariableNodeFromMetavariableString(metavariableString, lexer, parser) {
-  const metavariableTokens = metavariableTokensFromMetavariableString(metavariableString, lexer),
-        metavariableNode = metavariableNodeFromMetavariableTokens(metavariableTokens, parser);
-
-  return metavariableNode;
-}
-
 export function termNodeFromConstructorDeclarationTokens(constructorDeclarationTokens, parser) {
   let termNode = null;
 
@@ -66,32 +46,6 @@ export function statementNodeFromUnqualifiedStatementTokens(unqualifiedStatement
   return statementNode;
 }
 
-export function variableNodeFromVariableVariableTDeclarationTokens(variableTDeclarationTokens, parser) {
-  let variableNode = null;
-
-  const variableDeclarationNode = variableDeclarationNodeFromVariableTDeclarationTokens(variableTDeclarationTokens, parser);
-
-  if (variableDeclarationNode !== null) {
-    variableNode = variableNodeQuery(variableDeclarationNode);
-  }
-
-  return variableNode;
-}
-
-export function metavariableNodeFromMetavariableTokens(metavariableTokens, parser) {
-  const ruleName = METAVARIABLE_RULE_NAME,
-        metavariableNode = nodeFromTokensRuleNameAndParser(metavariableTokens, ruleName, parser);
-
-  return metavariableNode;
-}
-
-export function variableDeclarationNodeFromVariableTDeclarationTokens(variableTDeclarationTokens, parser) {
-  const ruleName = VARIABLE_DECLARATION_RULE_NAME,
-        variableDeclarationNode = nodeFromTokensRuleNameAndParser(variableTDeclarationTokens, ruleName, parser);
-
-  return variableDeclarationNode;
-}
-
 export function unqualifiedStatementNodeFromUnqualifiedStatementTokens(unqualifiedStatementTokens, parser) {
   const ruleName = UNQUALIFIED_STATEMENT_RULE_NAME,
         unqualifiedStatementNode = nodeFromTokensRuleNameAndParser(unqualifiedStatementTokens, ruleName, parser);

package/src/utilities/tokens.js

@@ -9,13 +9,6 @@ const { florenceLexerFromCombinedCustomGrammar } = lexersUtilities;
 const combinedCustomGrammar = combinedCustomGrammarFromNothing(),
       florenceLexer = florenceLexerFromCombinedCustomGrammar(combinedCustomGrammar);
 
-export function metavariableTokensFromMetavariableString(metavariableString, lexer) {
-  const metavariableContent = `${metavariableString}`,
-        metavariableTokens = tokensFromContentAndLexer(metavariableContent, lexer);
-
-  return metavariableTokens;
-}
-
 export function constructorDeclarationTokensFromTermString(termString, lexer) {
   const constructorDeclarationContent = `Constructor ${termString}
 `,
@@ -24,14 +17,6 @@ export function constructorDeclarationTokensFromTermString(termString, lexer) {
   return constructorDeclarationTokens;
 }
 
-export function variableDeclarationTokensFromVariableString(variableString, lexer) {
-  const variableDeclarationContent = `Variable ${variableString}
-`,
-        variableDeclarationTokens = tokensFromContentAndLexer(variableDeclarationContent, lexer);
-
-  return variableDeclarationTokens;
-}
-
 export function unqualifiedStatementTokensFromStatementString(statementString, lexer) {
   const unqualifiedStatementContent = `${statementString}
 `,

package/src/variable.js

@@ -1,8 +1,6 @@
 "use strict";
 
 import { nodeAsString } from "./utilities/string";
-import { typeFromJSONAndFileContext } from "./type";
-import { variableNodeFromVariableString } from "./utilities/node";
 
 export default class Variable {
   constructor(node, type) {
@@ -58,40 +56,6 @@ export default class Variable {
     return string;
   }
 
-  toJSON(tokens) {
-    const typeJSON = this.type.toJSON(tokens),
-          string = nodeAsString(this.node, tokens),
-          node = string,  //
-          type = typeJSON,  ///
-          json = {
-            node,
-            type
-          };
-
-    return json;
-  }
-
-  static fromJSONAndFileContext(json, fileContext) {
-    let { node } = json;
-
-    const lexer  = fileContext.getLexer(),
-          parser = fileContext.getParser(),
-          variableString = node,  ///
-          variableNode = variableNodeFromVariableString(variableString, lexer, parser);
-
-    node = variableNode;  ///
-
-    let { type } = json;
-
-    json = type;  ///
-
-    type = typeFromJSONAndFileContext(json, fileContext);
-
-    const variable = new Variable(node, type);
-
-    return variable;
-  }
-
   static fromVariableAndType(variable, type) {
     const node = variable.getNode();