issue-with-assembly (#61)

* add contract

* assembly all the things

* fix issue w/ for statement

* fix Parameter

Author: mattiaerre

src/printer.js

@@ -133,9 +133,10 @@ function genericPrint(path, options, print) {
       );
     case 'Parameter':
       doc = path.call(print, 'typeName');
-      if (node.name) {
-        doc = join(' ', [doc, node.name]);
-      }
+      doc = join(
+        ' ',
+        [doc, node.storageLocation, node.name].filter(element => element)
+      );
       return doc;
     case 'ModifierInvocation':
       doc = node.name;
@@ -217,7 +218,7 @@ function genericPrint(path, options, print) {
       return concat([
         'for (',
         node.initExpression ? path.call(print, 'initExpression') : '',
-        ' ',
+        '; ',
         node.conditionExpression ? path.call(print, 'conditionExpression') : '',
         '; ',
         path.call(print, 'loopExpression'),
@@ -226,7 +227,7 @@ function genericPrint(path, options, print) {
       ]);
     case 'EmitStatement':
       return concat(['emit ', path.call(print, 'eventCall'), ';']);
-    case 'VariableDeclarationStatement':
+    case 'VariableDeclarationStatement': {
       doc = join(
         ', ',
         path.map(statementPath => {
@@ -244,7 +245,9 @@ function genericPrint(path, options, print) {
       if (node.initialValue) {
         doc = concat([doc, ' = ', path.call(print, 'initialValue')]);
       }
-      return concat([doc, ';']);
+      const addSemicolon = path.getParentNode().type !== 'ForStatement';
+      return concat([doc, addSemicolon ? ';' : '']);
+    }
     case 'StateVariableDeclaration':
       doc = concat(
         path.map(statementPath => {
@@ -431,13 +434,17 @@ function genericPrint(path, options, print) {
     case 'AssemblyBlock':
       return concat([
         '{',
+        indent(hardline),
+        indent(join(line, path.map(print, 'operations'))),
         hardline,
-        join(line, path.map(print, 'operations')),
         '}'
       ]);
     case 'LabelDefinition':
       return concat([node.name, ':', line]);
     case 'AssemblyCall':
+      if (node.arguments.length === 0) {
+        return node.functionName;
+      }
       // @TODO: add call args
       return concat([
         node.functionName,
@@ -459,9 +466,19 @@ function genericPrint(path, options, print) {
         doc = concat(['case ', path.call(print, 'value')]);
       }
       return join(' ', [doc, '{}']);
-    case 'AssemblyFunctionDefinition':
-      // @TODO
-      return '';
+    case 'AssemblyLocalDefinition':
+      return join(' ', [
+        'let',
+        join(', ', path.map(print, 'names')),
+        ':=',
+        path.call(print, 'expression')
+      ]);
+    case 'AssemblyAssignment':
+      return join(' ', [
+        join(', ', path.map(print, 'names')),
+        ':=',
+        path.call(print, 'expression')
+      ]);
     default:
       throw new Error(`Unknown type: ${JSON.stringify(node.type)}`);
   }