Index Range Access (#271)

* Index Range Access

* removing WIP test

* add newline

* fix snap

Co-authored-by: mattia richetto <mattia.richetto@gmail.com>

Author: Janther

__tests__/nodes/__snapshots__/index.test.js.snap

@@ -38,6 +38,7 @@ Array [
   "IfStatement",
   "ImportDirective",
   "IndexAccess",
+  "IndexRangeAccess",
   "InheritanceSpecifier",
   "InlineAssemblyStatement",
   "LabelDefinition",

scripts/__snapshots__/makeData.test.js.snap

@@ -13,5 +13,5 @@ exports[`makeData to match snapshot for nodes 1`] = `
 
   /* eslint-disable global-require */
 
-  module.exports = {ArrayTypeName:require('./ArrayTypeName.js'),AssemblyAssignment:require('./AssemblyAssignment.js'),AssemblyBlock:require('./AssemblyBlock.js'),AssemblyCall:require('./AssemblyCall.js'),AssemblyCase:require('./AssemblyCase.js'),AssemblyFor:require('./AssemblyFor.js'),AssemblyFunctionDefinition:require('./AssemblyFunctionDefinition.js'),AssemblyIf:require('./AssemblyIf.js'),AssemblyLocalDefinition:require('./AssemblyLocalDefinition.js'),AssemblySwitch:require('./AssemblySwitch.js'),BinaryOperation:require('./BinaryOperation.js'),Block:require('./Block.js'),BooleanLiteral:require('./BooleanLiteral.js'),BreakStatement:require('./BreakStatement.js'),CatchClause:require('./CatchClause.js'),Conditional:require('./Conditional.js'),ContinueStatement:require('./ContinueStatement.js'),ContractDefinition:require('./ContractDefinition.js'),DecimalNumber:require('./DecimalNumber.js'),DoWhileStatement:require('./DoWhileStatement.js'),ElementaryTypeName:require('./ElementaryTypeName.js'),EmitStatement:require('./EmitStatement.js'),EnumDefinition:require('./EnumDefinition.js'),EnumValue:require('./EnumValue.js'),EventDefinition:require('./EventDefinition.js'),ExpressionStatement:require('./ExpressionStatement.js'),ForStatement:require('./ForStatement.js'),FunctionCall:require('./FunctionCall.js'),FunctionDefinition:require('./FunctionDefinition.js'),FunctionTypeName:require('./FunctionTypeName.js'),HexLiteral:require('./HexLiteral.js'),HexNumber:require('./HexNumber.js'),Identifier:require('./Identifier.js'),IfStatement:require('./IfStatement.js'),ImportDirective:require('./ImportDirective.js'),IndexAccess:require('./IndexAccess.js'),InheritanceSpecifier:require('./InheritanceSpecifier.js'),InlineAssemblyStatement:require('./InlineAssemblyStatement.js'),LabelDefinition:require('./LabelDefinition.js'),Mapping:require('./Mapping.js'),MemberAccess:require('./MemberAccess.js'),ModifierDefinition:require('./ModifierDefinition.js'),ModifierInvocation:require('./ModifierInvocation.js'),NewExpression:require('./NewExpression.js'),NumberLiteral:require('./NumberLiteral.js'),PragmaDirective:require('./PragmaDirective.js'),ReturnStatement:require('./ReturnStatement.js'),SourceUnit:require('./SourceUnit.js'),StateVariableDeclaration:require('./StateVariableDeclaration.js'),StringLiteral:require('./StringLiteral.js'),StructDefinition:require('./StructDefinition.js'),ThrowStatement:require('./ThrowStatement.js'),TryStatement:require('./TryStatement.js'),TupleExpression:require('./TupleExpression.js'),TypeNameExpression:require('./TypeNameExpression.js'),UnaryOperation:require('./UnaryOperation.js'),UserDefinedTypeName:require('./UserDefinedTypeName.js'),UsingForDeclaration:require('./UsingForDeclaration.js'),VariableDeclaration:require('./VariableDeclaration.js'),VariableDeclarationStatement:require('./VariableDeclarationStatement.js'),WhileStatement:require('./WhileStatement.js')};"
+  module.exports = {ArrayTypeName:require('./ArrayTypeName.js'),AssemblyAssignment:require('./AssemblyAssignment.js'),AssemblyBlock:require('./AssemblyBlock.js'),AssemblyCall:require('./AssemblyCall.js'),AssemblyCase:require('./AssemblyCase.js'),AssemblyFor:require('./AssemblyFor.js'),AssemblyFunctionDefinition:require('./AssemblyFunctionDefinition.js'),AssemblyIf:require('./AssemblyIf.js'),AssemblyLocalDefinition:require('./AssemblyLocalDefinition.js'),AssemblySwitch:require('./AssemblySwitch.js'),BinaryOperation:require('./BinaryOperation.js'),Block:require('./Block.js'),BooleanLiteral:require('./BooleanLiteral.js'),BreakStatement:require('./BreakStatement.js'),CatchClause:require('./CatchClause.js'),Conditional:require('./Conditional.js'),ContinueStatement:require('./ContinueStatement.js'),ContractDefinition:require('./ContractDefinition.js'),DecimalNumber:require('./DecimalNumber.js'),DoWhileStatement:require('./DoWhileStatement.js'),ElementaryTypeName:require('./ElementaryTypeName.js'),EmitStatement:require('./EmitStatement.js'),EnumDefinition:require('./EnumDefinition.js'),EnumValue:require('./EnumValue.js'),EventDefinition:require('./EventDefinition.js'),ExpressionStatement:require('./ExpressionStatement.js'),ForStatement:require('./ForStatement.js'),FunctionCall:require('./FunctionCall.js'),FunctionDefinition:require('./FunctionDefinition.js'),FunctionTypeName:require('./FunctionTypeName.js'),HexLiteral:require('./HexLiteral.js'),HexNumber:require('./HexNumber.js'),Identifier:require('./Identifier.js'),IfStatement:require('./IfStatement.js'),ImportDirective:require('./ImportDirective.js'),IndexAccess:require('./IndexAccess.js'),IndexRangeAccess:require('./IndexRangeAccess.js'),InheritanceSpecifier:require('./InheritanceSpecifier.js'),InlineAssemblyStatement:require('./InlineAssemblyStatement.js'),LabelDefinition:require('./LabelDefinition.js'),Mapping:require('./Mapping.js'),MemberAccess:require('./MemberAccess.js'),ModifierDefinition:require('./ModifierDefinition.js'),ModifierInvocation:require('./ModifierInvocation.js'),NewExpression:require('./NewExpression.js'),NumberLiteral:require('./NumberLiteral.js'),PragmaDirective:require('./PragmaDirective.js'),ReturnStatement:require('./ReturnStatement.js'),SourceUnit:require('./SourceUnit.js'),StateVariableDeclaration:require('./StateVariableDeclaration.js'),StringLiteral:require('./StringLiteral.js'),StructDefinition:require('./StructDefinition.js'),ThrowStatement:require('./ThrowStatement.js'),TryStatement:require('./TryStatement.js'),TupleExpression:require('./TupleExpression.js'),TypeNameExpression:require('./TypeNameExpression.js'),UnaryOperation:require('./UnaryOperation.js'),UserDefinedTypeName:require('./UserDefinedTypeName.js'),UsingForDeclaration:require('./UsingForDeclaration.js'),VariableDeclaration:require('./VariableDeclaration.js'),VariableDeclarationStatement:require('./VariableDeclarationStatement.js'),WhileStatement:require('./WhileStatement.js')};"
 `;

scripts/generateIndexes.js

@@ -3,10 +3,10 @@ const prettier = require('prettier');
 const makeData = require('./makeData');
 
 if (process.env.SCRIPT === 'true') {
-  prettier.resolveConfig(`${__dirname}../.prettierrc`).then(options => {
+  prettier.resolveConfig(`${__dirname}../.prettierrc`).then((options) => {
     // eslint-disable-next-line no-param-reassign
     options.parser = 'babel';
-    ['../src/nodes', '../src/binary-operator-printers'].forEach(dir => {
+    ['../src/nodes', '../src/binary-operator-printers'].forEach((dir) => {
       fs.writeFileSync(
         `${__dirname}/${dir}/index.js`,
         prettier.format(makeData(dir), options)

scripts/makeData.js

@@ -2,14 +2,15 @@ const dirToObject = require('dir-to-object');
 
 function makeData(dir) {
   const nodes = Object.keys(
-    dirToObject(`${__dirname}/${dir}`, { canAdd: data => data.print })
+    dirToObject(`${__dirname}/${dir}`, { canAdd: (data) => data.print })
   ).reduce((accumulator, current) => {
     accumulator[current] = `require('./${current}.js')`;
     return accumulator;
   }, {});
 
-  const data = `/* This file was automatically generated on ${Date.now() /
-    1000} */
+  const data = `/* This file was automatically generated on ${
+    Date.now() / 1000
+  } */
 
   /* eslint-disable global-require */
 

src/binary-operator-printers/index.js

@@ -1,4 +1,4 @@
-/* This file was automatically generated on 1581775642.955 */
+/* This file was automatically generated on 1588903580.368 */
 
 /* eslint-disable global-require */
 

src/nodes/IndexRangeAccess.js

@@ -0,0 +1,19 @@
+const {
+  doc: {
+    builders: { concat }
+  }
+} = require('prettier/standalone');
+
+const IndexRangeAccess = {
+  print: ({ path, print }) =>
+    concat([
+      path.call(print, 'base'),
+      '[',
+      path.call(print, 'indexStart'),
+      ':',
+      path.call(print, 'indexEnd'),
+      ']'
+    ])
+};
+
+module.exports = IndexRangeAccess;

src/nodes/index.js

@@ -1,4 +1,4 @@
-/* This file was automatically generated on 1581775642.911 */
+/* This file was automatically generated on 1588903580.303 */
 
 /* eslint-disable global-require */
 
@@ -39,6 +39,7 @@ module.exports = {
   IfStatement: require('./IfStatement.js'),
   ImportDirective: require('./ImportDirective.js'),
   IndexAccess: require('./IndexAccess.js'),
+  IndexRangeAccess: require('./IndexRangeAccess.js'),
   InheritanceSpecifier: require('./InheritanceSpecifier.js'),
   InlineAssemblyStatement: require('./InlineAssemblyStatement.js'),
   LabelDefinition: require('./LabelDefinition.js'),

tests/IndexRangeAccess/IndexRangeAccess.sol

@@ -0,0 +1,9 @@
+pragma solidity ^0.6.4;
+
+contract Demo {
+    event Log(bytes value);
+
+    function log(bytes calldata value) external {
+        emit Log(bytes(value[0:10]));
+    }
+}

tests/IndexRangeAccess/__snapshots__/jsfmt.spec.js.snap

@@ -0,0 +1,25 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`IndexRangeAccess.sol 1`] = `
+pragma solidity ^0.6.4;
+
+contract Demo {
+    event Log(bytes value);
+
+    function log(bytes calldata value) external {
+        emit Log(bytes(value[0:10]));
+    }
+}
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+pragma solidity ^0.6.4;
+
+
+contract Demo {
+    event Log(bytes value);
+
+    function log(bytes calldata value) external {
+        emit Log(bytes(value[0:10]));
+    }
+}
+
+`;

tests/IndexRangeAccess/jsfmt.spec.js

@@ -0,0 +1 @@
+run_spec(__dirname);