Clean features

Author: dy

.gitignore

@@ -107,3 +107,4 @@ dist
 .tern-port
 .DS_Store
 test-results/
+/.claude

feature/async.js

@@ -1,6 +1,5 @@
 // Async/await/yield: async function, async arrow, await, yield expressions
-import { unary, expr, skip, space, cur, idx, word, operator, compile } from '../parse.js';
-import { keyword } from './block.js';
+import { unary, expr, skip, space, keyword, cur, idx, word, operator, compile } from '../parse.js';
 
 const PREFIX = 140, ASSIGN = 20;
 

feature/block.js

@@ -1,7 +1,7 @@
 // Class declarations and expressions
 // class A extends B { ... }
-import { binary, unary, token, expr, space, next, parse, literal, word, operator, compile, skip, cur, idx } from '../parse.js';
-import { keyword, block } from './block.js';
+import { binary, unary, token, expr, space, next, parse, keyword, literal, word, operator, compile, skip, cur, idx } from '../parse.js';
+import { block } from './if.js';
 
 const TOKEN = 200, PREFIX = 140, COMP = 90;
 const STATIC = Symbol('static');

feature/class.js

@@ -12,11 +12,14 @@
  *   ['{}', 'a']            → ['{}', 'a']     object shorthand {a}
  *   ['{}', [':', k, v]]    → ['{}', ...]     object literal
  */
-import { group, binary, operator, compile } from '../parse.js';
+import { group, binary, operator, compile, parse, peek } from '../parse.js';
 import { ACC } from './accessor.js';
 
 const ASSIGN = 20, TOKEN = 200;
 
+// Allow {keyword: value} - prevent keyword match before colon
+parse.prop = pos => peek(pos) !== 58;
+
 // Object inner: null, string, or array starting with : , ... get set
 const isObject = a => a == null || typeof a === 'string' || [':', ',', '...', 'get', 'set'].includes(a[0]);
 

feature/collection.js

@@ -1,7 +1,7 @@
 // Function declarations and expressions
-import { space, next, parse, parens, expr, operator, compile, cur, idx, skip } from '../parse.js';
-import { RETURN } from './control.js';
-import { keyword, block } from './block.js';
+import { space, next, parse, keyword, parens, expr, operator, compile, cur, idx, skip } from '../parse.js';
+import { block } from './if.js';
+import { RETURN } from './op/arrow.js';
 
 const TOKEN = 200;
 

feature/control.js

@@ -1,9 +1,16 @@
 // If/else statement - else consumed internally
-import { space, skip, parens, word, idx, seek, operator, compile } from '../parse.js';
-import { body, keyword } from './block.js';
+import { space, skip, expr, err, keyword, parens, word, idx, seek, operator, compile } from '../parse.js';
 
 const STATEMENT = 5, SEMI = 59;
 
+// block() - parse required { body }
+export const block = () =>
+  (space() === 123 || err('Expected {'), skip(), expr(STATEMENT - .5, 125) || null);
+
+// body() - parse { body } or single statement
+export const body = () =>
+  space() !== 123 ? expr(STATEMENT + .5) : (skip(), expr(STATEMENT - .5, 125) || null);
+
 // Check for `else` after optional semicolon
 const checkElse = () => {
   const from = idx;

feature/destruct.js

@@ -7,8 +7,7 @@
  * [, undefined] serializes to [null, null] which would compile to null.
  * [] serializes to [] and compiles back to undefined.
  */
-import { literal } from '../parse.js';
-import { keyword } from './block.js';
+import { literal, keyword } from '../parse.js';
 
 literal('true', true);
 literal('false', false);