Remove blocks

Author: dy

feature/block.js

@@ -35,7 +35,4 @@ export const block = () =>
 
 // body() - parse { body } or single statement
 export const body = () =>
-  space() !== OBRACE ? expr(STATEMENT + .5) : (skip(), ['block', expr(STATEMENT - .5, CBRACE) || null]);
-
-// Compile
-operator('block', body => body === undefined ? () => {} : (body = compile(body), ctx => body(ctx)));
+  space() !== OBRACE ? expr(STATEMENT + .5) : (skip(), expr(STATEMENT - .5, CBRACE) || null);

index.html

@@ -394,10 +394,10 @@ <h1><a href="https://github.com/dy/subscript" class="logo-link" target="_blank"
   ternary: '?:', arrow: '=>', optional: '?.', spread: '...',
   unary: 'typeof void', identity: '=== !==', nullish: '??',
   // Literals
-  literal: 'true/false/null', collection: '[], {}', template: '`${}`',
+  literal: 'true/false/null', collection: '[1,2], {a:1}', template: '`${}`',
   regex: '/re/', unit: '5px', comment: '//',
   // Control
-  block: '{ }', 'if': 'if/else', loop: 'for/while', 'switch': 'switch',
+  block: '{...}', 'if': 'if/else', loop: 'for/while', 'switch': 'switch,
   'var': 'let/const', destruct: '{a,b}=', 'try': 'try/catch',
   // Functions
   'function': 'fn(){}', async: 'async/await', 'class': 'class X {}',
@@ -431,7 +431,7 @@ <h1><a href="https://github.com/dy/subscript" class="logo-link" target="_blank"
   regex: 'Regular expressions<br><code>/pattern/</code> <code>/\\d+/g</code>',
   unit: 'Unit suffixes<br><code>5px</code> <code>10rem</code> <code>2s</code>',
   comment: 'Comments (ignored)<br><code>// line</code> <code>/* block */</code>',
-  block: 'Block statements<br><code>{ stmt1; stmt2 }</code>',
+  block: 'Statement block<br><code>if (x) { a; b }</code>',
   'if': 'Conditionals<br><code>if (c) x</code> <code>if (c) x else y</code>',
   loop: 'Loops<br><code>while (c) body</code> <code>for (;;) body</code> <code>for (x of arr)</code>',
   'switch': 'Switch statement<br><code>switch (x) { case 1: ... }</code>',

test/feature/async-class.js

@@ -69,7 +69,7 @@ test('async/class: private fields', async () => {
 
 test('async/class: for await', async () => {
   const { parse } = await import('../../jessie.js');
-  assert.deepEqual(parse('for await (x of y) {}'), ['for await', ['of', 'x', 'y'], ['block', null]]);
+  assert.deepEqual(parse('for await (x of y) {}'), ['for await', ['of', 'x', 'y'], null]);
 });
 
 test('operators: range', async () => {

test/feature/control.js

@@ -67,10 +67,10 @@ test('control: return', t => {
 })
 
 test('control: block', t => {
-  // blocks only work inside control structures, not standalone (to avoid conflict with object literal)
-  is(parse('if (1) { a }'), ['if', [, 1], ['block', 'a']])
-  is(parse('if (1) { a; b }'), ['if', [, 1], ['block', [';', 'a', 'b']]])
-  is(parse('while (x) { y }'), ['while', 'x', ['block', 'y']])
+  // blocks are just sequences, no wrapper node
+  is(parse('if (1) { a }'), ['if', [, 1], 'a'])
+  is(parse('if (1) { a; b }'), ['if', [, 1], [';', 'a', 'b']])
+  is(parse('while (x) { y }'), ['while', 'x', 'y'])
   // blocks allow access to outer scope (like JS)
   let ctx = { x: 1 }
   run('if (1) { x = 2 }', ctx)

util/stringify.js

@@ -67,16 +67,14 @@ export const codegen = node => {
 
 // --- Statement generators (need structure) ---
 
-generator('block', body => body === undefined ? '{}' : '{ ' + codegen(body) + ' }');
-
 // Variables: ['let', decl] or ['let', decl1, decl2, ...]
 const varGen = kw => (...args) => kw + ' ' + args.map(codegen).join(', ');
 generator('let', varGen('let'));
 generator('const', varGen('const'));
 generator('var', varGen('var'));
 
 // Control flow
-const wrap = s => s?.[0] === 'block' ? codegen(s) : '{ ' + (s ? codegen(s) : '') + ' }';
+const wrap = s => '{ ' + (s ? codegen(s) : '') + ' }';
 generator('if', (cond, then, els) => 'if (' + codegen(cond) + ') ' + wrap(then) + (els ? ' else ' + wrap(els) : ''));
 generator('while', (cond, body) => 'while (' + codegen(cond) + ') ' + wrap(body));
 generator('do', (body, cond) => 'do ' + wrap(body) + ' while (' + codegen(cond) + ')');
@@ -101,8 +99,7 @@ generator('finally', (expr, body) => codegen(expr) + ' finally { ' + codegen(bod
 // Functions
 generator('function', (name, params, body) => {
   const args = !params ? '' : params[0] === ',' ? params.slice(1).map(codegen).join(', ') : codegen(params);
-  const b = body?.[0] === 'block' ? codegen(body) : '{ ' + (body ? codegen(body) : '') + ' }';
-  return 'function' + (name ? ' ' + name : '') + '(' + args + ') ' + b;
+  return 'function' + (name ? ' ' + name : '') + '(' + args + ') ' + wrap(body);
 });
 
 generator('=>', (params, body) => {