occam-furtle 2.0.340 → 3.0.1

package/src/utilities/element.js

@@ -7,10 +7,10 @@ import elements from "../elements";
 import { BOOLEAN_TYPE } from "../types";
 import { ternaryStringFromTerm,
          variableStringFromName,
-         termStringFromPrimitiveAndProperties,
+         termStringFromProperties,
+         expressionStringFromProperties,
          procedureDeclarationStringFromProcedure,
          returnBlockStringFromReturnStatementNode,
-         expressionStringFromPrimitiveAndProperties,
          variableAssignmentStringFromTypeAndVariable,
          someStringFromVariableAndAnonymousProcedure,
          everyStringFromVariableAndAnonymousProcedure,
@@ -25,25 +25,33 @@ export function stepFromStepNode(stepNode, context) {
         string = context.nodeAsString(node),
         arrayAssignment = arrayAssignmentFromStepNode(stepNode, context),
         objectAssigment = objectAssignmentFromStepNode(stepNode, context),
-        variablesDeclaration = variableAssignmentsFromStepNode(stepNode, context),
-        step = new Step(string, arrayAssignment, objectAssigment, variablesDeclaration);
+        variablesDeclaration = variableAssignmentsFromStepNode(stepNode, context);
+
+  context = null;
+
+  const step = new Step(context, string, node, arrayAssignment, objectAssigment, variablesDeclaration);
 
   return step;
 }
 
 export function someFromSomeNode(someNode, context) {
   const { Some } = elements,
+        node = someNode,  ///
         variable = variableFromSomeNode(someNode, context),
         anonymousProcedure = anonymousProcedureFromSomeNode(someNode, context),
         someString = someStringFromVariableAndAnonymousProcedure(variable, anonymousProcedure),
-        string = someString,  ///
-        some = new Some(string, variable, anonymousProcedure);
+        string = someString;  ///
+
+  context = null;
+
+  const some = new Some(context, string, node, variable, anonymousProcedure);
 
   return some;
 }
 
 export function termFromTermNode(termNode, context) {
   const { Term } = elements,
+        node = termNode,  ///
         variable = variableFromTermNode(termNode, context),
         primitive = primitiveFromTermNode(termNode, context),
         negatedTerm = negatedTermFromTermNode(termNode, context),
@@ -52,14 +60,18 @@ export function termFromTermNode(termNode, context) {
         comparisonTerm = comparisonTermFromTermNode(termNode, context),
         properties = [
           variable,
+          primitive,
           negatedTerm,
           logicalTerm,
           bracketedTerm,
           comparisonTerm
         ],
-        termString = termStringFromPrimitiveAndProperties(primitive, properties, context),
-        string = termString,  ///
-        term = new Term(string, variable, primitive, negatedTerm, logicalTerm, bracketedTerm, comparisonTerm);
+        termString = termStringFromProperties(properties, context),
+        string = termString;  ///
+
+  context = null;
+
+  const term = new Term(context, string, node, variable, primitive, negatedTerm, logicalTerm, bracketedTerm, comparisonTerm);
 
   return term;
 }
@@ -70,8 +82,11 @@ export function termsFromTermsNode(termsNode, context) {
         string = context.nodeAsString(node),
         termNodes = termsNode.getTermNodes(),
         termsArray = termsArrayFromTermNodes(termNodes, context),
-        array = termsArray, ///
-        terms = new Terms(string, array);
+        array = termsArray; ///
+
+  context = null;
+
+  const terms = new Terms(context, string, node, array);
 
   return terms;
 }
@@ -79,19 +94,26 @@ export function termsFromTermsNode(termsNode, context) {
 export function errorFromErrorNode(errorNode, context) {
   const { Error } = elements,
         node = errorNode, ///
-        string = context.nodeAsString(node),
-        error = new Error(string);
+        string = context.nodeAsString(node);
+
+  context = null;
+
+  const error = new Error(context, string, node);
 
   return error;
 }
 
 export function everyFromEveryNode(everyNode, context) {
   const { Every } = elements,
+        node = everyNode, ///
         variable = variableFromEveryNode(everyNode, context),
         anonymousProcedure = anonymousProcedureFromEveryNode(everyNode, context),
         everyString = everyStringFromVariableAndAnonymousProcedure(variable, anonymousProcedure),
-        string = everyString, ///
-        every = new Every(string, variable, anonymousProcedure);
+        string = everyString; ///
+
+  context = null;
+
+  const every = new Every(context, string, node, variable, anonymousProcedure);
 
   return every;
 }
@@ -100,32 +122,43 @@ export function labelFromLabelNode(labelNode, context) {
   const { Label } = elements,
         node = labelNode,
         string = context.nodeAsString(node),
-        name = nameFromLabelNode(labelNode, context),
-        label = new Label(string, name);
+        name = nameFromLabelNode(labelNode, context);
+
+  context = null;
+
+  const label = new Label(context, string, node, name);
 
   return label;
 }
 
 export function reduceFromReduceNode(reduceNode, context) {
   const { Reduce } = elements,
+        node = reduceNode,  ///
         variable = variableFromReduceNode(reduceNode, context),
         initialExpression = initialExpressionFromReduceNode(reduceNode, context),
         anonymousProcedure = anonymousProcedureFromReduceNode(reduceNode, context),
         reduceString = reduceStringFromVariableInitialExpressionAndAnonymousProcedure(variable, initialExpression, anonymousProcedure),
-        string = reduceString,  ///
-        reduce = new Reduce(string, variable, initialExpression, anonymousProcedure);
+        string = reduceString;  ///
+
+  context = null;
+
+  const reduce = new Reduce(context, string, node, variable, initialExpression, anonymousProcedure);
 
   return reduce;
 }
 
 export function ternaryFromTernaryNode(ternaryNode, context) {
   const { Ternary } = elements,
+        node = ternaryNode, ///
         term = termFromTernaryNode(ternaryNode, context),
         ifExpression = ifExpressionFromTernaryNode(ternaryNode, context),
         elseExpression = elseExpressionFromTernaryNode(ternaryNode, context),
         ternaryString = ternaryStringFromTerm(term),
-        string = ternaryString, ///
-        ternary = new Ternary(string, term, ifExpression, elseExpression);
+        string = ternaryString; ///
+
+  context = null;
+
+  const ternary = new Ternary(context, string, node, term, ifExpression, elseExpression);
 
   return ternary;
 }
@@ -136,8 +169,11 @@ export function variableFromVariableNode(variableNode, context) {
         string = context.nodeAsString(node),
         type = typeFromVariableNode(variableNode, context),
         name = nameFromVariableNode(variableNode, context),
-        expression = expressionFromVariableNode(variableNode, context),
-        variable = new Variable(string, type, name, expression);
+        expression = expressionFromVariableNode(variableNode, context);
+
+  context = null;
+
+  const variable = new Variable(context, string, node, type, name, expression);
 
   return variable;
 }
@@ -146,8 +182,11 @@ export function referenceFromReferenceNode(referenceNode, context) {
   const { Reference } = elements,
         node = referenceNode, ///
         string = context.nodeAsString(node),
-        name = nameFromReferenceNode(referenceNode, context),
-        reference = new Reference(string, name);
+        name = nameFromReferenceNode(referenceNode, context);
+
+  context = null;
+
+  const reference = new Reference(context, string, node, name);
 
   return reference;
 }
@@ -163,7 +202,9 @@ export function parameterFromParameterNode(parameterNode, context) {
           string = context.nodeAsString(node),
           name = nameFromParaneterNode(parameterNode, context);
 
-    parameter = new Parameter(string, type, name);
+    context = null;
+
+    parameter = new Parameter(context, string, node, type, name);
   }
 
   return parameter;
@@ -174,19 +215,25 @@ export function nodeQueryFromNodeQueryNode(nodeQueryNode, context) {
         node = nodeQueryNode, ///
         string = context.nodeAsString(node),
         variable = variableFromNodeQueryNode(nodeQueryNode, context),
-        query = queryFromNodeQueryNode(nodeQueryNode, context),
-        nodeQuery = new NodeQuery(string, variable, query);
+        query = queryFromNodeQueryNode(nodeQueryNode, context);
+
+  context = null;
+
+  const nodeQuery = new NodeQuery(context, string, node, variable, query);
 
   return nodeQuery;
 }
 
 export function primitiveFromPrimitiveNode(primitiveNode, context) {
   const { Primitive } = elements,
-        primitiveString = context.nodeAsString(primitiveNode),
-        string = primitiveString, ///
+        node = primitiveNode, ///
+        string = context.nodeAsString(node),
         type = typeFromPrimitiveNode(primitiveNode, context),
-        value = valueFromPrimitiveNode(primitiveNode, context),
-        primitive = new Primitive(string, type, value);
+        value = valueFromPrimitiveNode(primitiveNode, context);
+
+  context = null;
+
+  const primitive = new Primitive(context, string, node, type, value);
 
   return primitive;
 }
@@ -196,8 +243,11 @@ export function nodesQueryFromNodesQueryNode(nodesQueryNode, context) {
         node = nodesQueryNode,  ///
         string = context.nodeAsString(node),
         variable = variableFromNodesQueryNode(nodesQueryNode, context),
-        query = queryFromNodesQueryNode(nodesQueryNode, context),
-        nodesQuery = new NodesQuery(string, variable, query);
+        query = queryFromNodesQueryNode(nodesQueryNode, context);
+
+  context = null;
+
+  const nodesQuery = new NodesQuery(context, string, node, variable, query);
 
   return nodesQuery;
 }
@@ -207,16 +257,19 @@ export function parametersFromParametersNode(parametersNode, context) {
         node = parametersNode,  ///
         string = context.nodeAsString(node),
         paramtersArray = paramtersArrayFromParametersNode(parametersNode, context),
-        array = paramtersArray, ///
-        parameters = new Parameters(string, array);
+        array = paramtersArray; ///
+
+  context = null;
+
+  const parameters = new Parameters(context, string, node, array);
 
   return parameters;
 }
 
 export function expressionFromExpressionNode(expressionNode, context) {
   const { Expression } = elements,
-        variable = variableFromExpressionNode(expressionNode, context),
-        primitive = primitiveFromExpressionNode(expressionNode, context),
+        node = expressionNode,  ///
+        term = termFromExpressionNode(expressionNode, context),
         some = someFromExpressionNode(expressionNode, context),
         every = everyFromExpressionNode(expressionNode, context),
         reduce = reduceFromExpressionNode(expressionNode, context),
@@ -226,31 +279,38 @@ export function expressionFromExpressionNode(expressionNode, context) {
         returnBlock = returnBlockFromExpressionNode(expressionNode, context),
         procedureCall = procedureCallFromExpressionNode(expressionNode, context),
         properties = [
+          term,
           some,
           every,
           reduce,
           ternary,
-          variable,
           nodeQuery,
           nodesQuery,
           returnBlock,
           procedureCall
         ],
-        expressionString = expressionStringFromPrimitiveAndProperties(primitive, properties, context),
-        string = expressionString,  ///
-        expression = new Expression(string, variable, primitive, some, every, reduce, ternary, nodeQuery, nodesQuery, returnBlock, procedureCall);
+        expressionString = expressionStringFromProperties(properties, context),
+        string = expressionString;  ///
+
+  context = null;
+
+  const expression = new Expression(context, string, node, term, some, every, reduce, ternary, nodeQuery, nodesQuery, returnBlock, procedureCall);
 
   return expression;
 }
 
 export function returnBlockFromReturnBlockNode(returnBlockNode, context) {
   const { ReturnBlock } = elements,
+        node = returnBlockNode, ///
         steps = stepsFromReturnBlockNode(returnBlockNode, context),
         nonsensical = nonsensicalFromReturnBlockNode(returnBlockNode, context),
         returnStatement = returnStatementFromReturnBlockNode(returnBlockNode, context),
         returnBlockString = returnBlockStringFromReturnStatementNode(returnStatement),
-        string = returnBlockString, ///
-        returnBlock = new ReturnBlock(string, steps, nonsensical, returnStatement);
+        string = returnBlockString;  ///
+
+  context = null;
+
+  const returnBlock = new ReturnBlock(context, string, node, steps, nonsensical, returnStatement);
 
   return returnBlock;
 }
@@ -260,8 +320,11 @@ export function procedureCallFromProcedureCallNode(procedureCallNode, context) {
         node = procedureCallNode, ///
         string = context.nodeAsString(node),
         reference = referenceFromProcedureCallNode(procedureCallNode, context),
-        terms = termsFromProcedureCallNode(procedureCallNode, context),
-        procedureCall = new ProcedureCall(string, reference, terms);
+        terms = termsFromProcedureCallNode(procedureCallNode, context);
+
+  context = null;
+
+  const procedureCall = new ProcedureCall(context, string, node, reference, terms);
 
   return procedureCall;
 }
@@ -272,8 +335,11 @@ export function namedParameterFromNamedParameterNode(namedParameterNode, context
         string = context.nodeAsString(node),
         type = typeFromNamedParameterNode(namedParameterNode, context),
         name = nameFromNamedParameterNode(namedParameterNode, context),
-        alias = aliasFromNamedParameterNode(namedParameterNode, context),
-        namedParameter = new NamedParameter(string, type, name, alias);
+        alias = aliasFromNamedParameterNode(namedParameterNode, context);
+
+  context = null;
+
+  const namedParameter = new NamedParameter(context, string, node, type, name, alias);
 
   return namedParameter;
 }
@@ -284,8 +350,11 @@ export function namedParametersFromNamedParametersNode(namedParametersNode, cont
         string = context.nodeAsString(node),
         namedParameterNodes = namedParametersNode.getNamedParameterNodes(),
         namedParametersArray = namedParamtersArrayFromNamedParameterNodes(namedParameterNodes, context),
-        array = namedParametersArray, ///
-        namedParameters = new NamedParameters(string, array);
+        array = namedParametersArray; ///
+
+  context = null;
+
+  const namedParameters = new NamedParameters(context, string, node, array);
 
   return namedParameters;
 }
@@ -295,8 +364,11 @@ export function arrayAssignmentFromArrayAssignmentNode(arrayAssignmentNode, cont
         node = arrayAssignmentNode, ///
         string = context.nodeAsString(node),
         variable = variableFromArrayAssignmentNode(arrayAssignmentNode, context),
-        parameters = parametersFromArrayAssignmentNode(arrayAssignmentNode, context),
-        arrayAssignment = new ArrayAssignment(string, variable, parameters);
+        parameters = parametersFromArrayAssignmentNode(arrayAssignmentNode, context);
+
+  context = null;
+
+  const arrayAssignment = new ArrayAssignment(context, string, node, variable, parameters);
 
   return arrayAssignment;
 }
@@ -305,8 +377,11 @@ export function returnStatementFromReturnStatementNode(returnStatementNode, cont
   const { ReturnStatement } = elements,
         node = returnStatementNode, ///
         string = context.nodeAsString(node),
-        term = termFromReturnStatementNode(returnStatementNode, context),
-        returnStatement = new ReturnStatement(string, term);
+        term = termFromReturnStatementNode(returnStatementNode, context);
+
+  context = null;
+
+  const returnStatement = new ReturnStatement(context, string, node, term);
 
   return returnStatement;
 }
@@ -323,42 +398,57 @@ export function objectAssignmentFromObjectAssignmentNode(objectAssignmentNode, c
         node = objectAssignmentNode,  ///
         string = context.nodeAsString(node),
         variable = variableFromObjectAssignmentNode(objectAssignmentNode, context),
-        namedParameters = namedParametersFromObjectAssignmentNode(objectAssignmentNode, context),
-        objectAssignment = new ObjectAssigment(string, variable, namedParameters);
+        namedParameters = namedParametersFromObjectAssignmentNode(objectAssignmentNode, context);
+
+  context = null;
+
+  const objectAssignment = new ObjectAssigment(context, string, node, variable, namedParameters);
 
   return objectAssignment;
 }
 
 export function anonymousProcedureFromAnonymousProcedureNode(anonymousProcedureNode, context) {
   const { AnonymousProcedure } = elements,
+        node = anonymousProcedureNode,  ///
         type = typeFromProcedureAnonymousProcedureNode(anonymousProcedureNode, context),
         parameters = parametersFromAnonymousProcedureNode(anonymousProcedureNode, context),
         returnBlock = returnBlockFromAnonymousProcedureNode(anonymousProcedureNode, context),
         nonymousProcedureString = anonymousProcedureStringFromTypeParametersAndReturnBlock(type, parameters, returnBlock),
-        string = nonymousProcedureString, ///
-        anonymousProcedure = new AnonymousProcedure(string, type, parameters, returnBlock);
+        string = nonymousProcedureString; ///
+
+  context = null;
+
+  const anonymousProcedure = new AnonymousProcedure(context, string, node, type, parameters, returnBlock);
 
   return anonymousProcedure;
 }
 
 export function variableAssignmentsFromVariableAssignmentsNode(variableAssignmentsNode, context) {
   const { VariableAssignments } = elements,
+        node = variableAssignmentsNode, ///
         type = typeFromVariableAssignmentsNode(variableAssignmentsNode, context),
         variableAssignmentsArray = variableAssignmentsArrayFromTypeAndVariableAssignmentsNode(type, variableAssignmentsNode, context),
         variableAssignmentString = variableAssignmentStringFromTypeAndVariableAssignmentsArray(type, variableAssignmentsArray),
         array = variableAssignmentsArray, ///
-        string = variableAssignmentString,  ///
-        variableAssignments = new VariableAssignments(string, array);
+        string = variableAssignmentString;  ///
+
+  context = null;
+
+  const variableAssignments = new VariableAssignments(context, string, node, array);
 
   return variableAssignments;
 }
 
 export function procedureDeclarationFromProcedureDeclarationNode(procedureDeclarationNode, context) {
   const { ProcedureDeclaration } = elements,
+        node = procedureDeclarationNode,  ///
         procedure = procedureFromProcedureDeclarationNode(procedureDeclarationNode, context),
         procedureDeclarationString = procedureDeclarationStringFromProcedure(procedure),
-        string = procedureDeclarationString,  ///
-        procedureDeclaration = new ProcedureDeclaration(string, procedure);
+        string = procedureDeclarationString;  ///
+
+  context = null;
+
+  const procedureDeclaration = new ProcedureDeclaration(context, string, node, procedure);
 
   return procedureDeclaration;
 }
@@ -457,6 +547,18 @@ export function variableFromReduceNode(reduceNode, context) {
   return variable;
 }
 
+export function termFromExpressionNode(expressionNode, context) {
+  let term = null;
+
+  const termNode = expressionNode.getTermNode();
+
+  if (termNode !== null) {
+    term = termFromTermNode(termNode, context);
+  }
+
+  return term;
+}
+
 export function someFromExpressionNode(expressionNode, context) {
   let some = null;
 
@@ -533,9 +635,15 @@ export function typeFromLogicalTermNode(logicalTermNode, context) {
   return type;
 }
 
+export function typeFromNegatedTermNode(logicalTermNode, context) {
+  const type = BOOLEAN_TYPE;
+
+  return type;
+}
+
 export function termFromNegatedTermNode(negatedTermNode, context) {
   const termNode = negatedTermNode.getTermNode(),
-    term = termFromTermNode(termNode, context);
+        term = termFromTermNode(termNode, context);
 
   return term;
 }
@@ -633,18 +741,6 @@ export function variableFromNodesQueryNode(nodesQueryNode, context) {
   return variable;
 }
 
-export function variableFromExpressionNode(expressionNode, context) {
-  let variable = null;
-
-  const variableNode = expressionNode.getVariableNode();
-
-  if (variableNode !== null) {
-    variable = variableFromVariableNode(variableNode, context);
-  }
-
-  return variable;
-}
-
 export function termsFromProcedureCallNode(procedureCallNode, context) {
   const termsNode = procedureCallNode.getTermsNode(),
         terms = termsFromTermsNode(termsNode, context);
@@ -690,18 +786,6 @@ export function ifExpressionFromTernaryNode(ternaryNode, context) {
   return ifExpression;
 }
 
-export function primitiveFromExpressionNode(expressionNode, context) {
-  let primitive = null;
-
-  const primitiveNode = expressionNode.getPrimitiveNode();
-
-  if (primitiveNode !== null) {
-    primitive = primitiveFromPrimitiveNode(primitiveNode, context);
-  }
-
-  return primitive;
-}
-
 export function nodeQueryFromExpressionNode(expressionNode, context) {
   let nodeQuery = null;
 
@@ -823,7 +907,7 @@ export function negatedTermFromNegatedTermNode(negatedTermNode, context) {
         termNode = negatedTermNode.getTermNode(),
         type = typeFromNegatedTermNode(termNode, context),
         term = termFromNegatedTermNode(negatedTermNode, context),
-        negatedTerm = new NegatedTerm(string, type, term);
+        negatedTerm = new NegatedTerm(context, string, node, type, term);
 
   return negatedTerm;
 }
@@ -836,18 +920,19 @@ export function logicalTermFromLogicalTermNode(logicalTermNode, context) {
         disjunction = disjunctionFromLogicalTermNode(logicalTermNode, context),
         leftTerm = leftTermFromLogicalTermNode(logicalTermNode, context),
         rightTerm = rightTermFromLogicalTermNode(logicalTermNode, context),
-        logicalTerm = new LogicalTerm(string, type, disjunction, leftTerm, rightTerm);
+        logicalTerm = new LogicalTerm(context, string, node, type, disjunction, leftTerm, rightTerm);
 
   return logicalTerm;
 }
 
 export function variableFromTypeAndVariableNode(type, variableNode, context) {
   const { Variable } = elements,
+        node = variableNode,  ///
         name = nameFromVariableNode(variableNode),
         expression = expressionFromTypeAndVariableNode(type, variableNode, context),
         variableString = variableStringFromName(name),
         string = variableString,  ///
-        variable = new Variable(string, type, name, expression);
+        variable = new Variable(context, string, node, type, name, expression);
 
   return variable;
 }
@@ -962,7 +1047,7 @@ export function bracketedTermFromBracketedTermNode(bracketedTermNode, context) {
         node = bracketedTermNode, ///
         string = context.nodeAsString(node),  ///
         term = termFromBracketedTermNode(bracketedTermNode, context),
-        bracketedTerm = new BracketedTerm(string, term);
+        bracketedTerm = new BracketedTerm(context, string, node, term);
 
   return bracketedTerm;
 }
@@ -988,7 +1073,7 @@ export function comparisonTermFromComparisonTermNode(comparisonTermNode, context
         negated = negatedFromComparisonTermNode(comparisonTermNode, context),
         leftTerm = leftTermFromCompzrisonTermNode(comparisonTermNode, context),
         rightTerm = rightTermFromCompzrisonTermNode(comparisonTermNode, context),
-        comparisonTerm = new ComparisonTerm(string, negated, leftTerm, rightTerm);
+        comparisonTerm = new ComparisonTerm(context, string, node, negated, leftTerm, rightTerm);
 
   return comparisonTerm;
 }
@@ -1002,13 +1087,14 @@ export function returnBlockFromAnonymousProcedureNode(anonymousProcedureNode, co
 
 export function procedureFromProcedureDeclarationNode(procedureDeclarationNode, context) {
   const { Procedure } = elements,
+        node = procedureDeclarationNode,  ///
         type = typeFromProcedureDeclarationNode(procedureDeclarationNode, context),
         label = labelFromProcedureDeclarationNode(procedureDeclarationNode, context),
         parameters = parametersFromProcedureDeclarationNode(procedureDeclarationNode, context),
         returnBlock = returnBlockFromProcedureDeclarationNode(procedureDeclarationNode, context),
         procedureString = procedureStringFromTypeLabelParametersAndReturnBlock(type, label, parameters, returnBlock),
         string = procedureString, ///
-        procedure = new Procedure(string, type, label, parameters, returnBlock);
+        procedure = new Procedure(context, string, node, type, label, parameters, returnBlock);
 
   return procedure;
 }
@@ -1042,11 +1128,12 @@ export function variableFromTypeAndVariableAssignmentNode(type, variableAssignme
 
 export function variableAssignmentFromTypeAndVariableAssignmentNode(type, variableAssignmentNode, context) {
   const { VariableAssignment } = elements,
+        node = variableAssignmentNode,  ///
         variable = variableFromTypeAndVariableAssignmentNode(type, variableAssignmentNode, context),
         expression = expressionFromVariableAssignmentNode(variableAssignmentNode, context),
         variableAssignmentString = variableAssignmentStringFromTypeAndVariable(type, variable, context),
         string = variableAssignmentString,  ///
-        assignment = new VariableAssignment(string, variable, expression);
+        assignment = new VariableAssignment(context, string, node, variable, expression);
 
   return assignment;
 }

package/src/utilities/lineIndex.js

@@ -0,0 +1,21 @@
+"use strict";
+
+export function lineIndexFromNodeAndTokens(node, tokens) {
+  let lineIndex = 0;
+
+  const firstSignificantTokenIndex = node.getFirstSignificantTokenIndex(tokens);
+
+  tokens.some((token, tokenIndex) => {
+    const tokenEndOfLineToken = token.isEndOfLineToken();
+
+    if (tokenEndOfLineToken) {
+      lineIndex += 1;
+    }
+
+    if (tokenIndex === firstSignificantTokenIndex) {
+      return true;
+    }
+  });
+
+  return lineIndex;
+}

package/src/utilities/primitive.js

@@ -10,8 +10,13 @@ export function primitiveFromNode(node, context) {
         primitiveString = primtiveStringFromNode(node, context),
         string = primitiveString,  ///
         type = NODE_TYPE,
-        value = node, ///
-        primitive = new Primitive(string, type, value);
+        value = node; ///
+
+  node = null;
+
+  context = null;
+
+  const primitive = new Primitive(context, string, node, type, value);
 
   return primitive;
 }
@@ -22,7 +27,11 @@ export function primitiveFromNodes(nodes, context) {
         string = primitiveString,  ///
         type = NODES_TYPE,
         value = nodes,  ///
-        primitive = new Primitive(string, type, value);
+        node = null;
+
+  context = null;
+
+  const primitive = new Primitive(context, string, node, type, value);
 
   return primitive;
 }
@@ -33,7 +42,11 @@ export function primitiveFromBoolean(boolean, context) {
         string = primitiveString,  ///
         type = BOOLEAN_TYPE,
         value = boolean,  ///
-        primitive = new Primitive(string, type, value);
+        node = null;
+
+  context = null;
+
+  const primitive = new Primitive(context, string, node, type, value);
 
   return primitive;
 }
@@ -44,7 +57,11 @@ export function primitiveFromStringLiteral(stringLiteral, context) {
         string = primitiveString,  ///
         type = STRING_TYPE,
         value = stringLiteral,  ///
-        primitive = new Primitive(string, type, value);
+        node = null;
+
+  context = null;
+
+  const primitive = new Primitive(context, string, node, type, value);
 
   return primitive;
 }