zuzu-js 0.1.2 → 0.2.0

package/lib/cli.js

@@ -254,7 +254,7 @@ function stripShebang( source ) {
 }
 
 function printVersion( runtime, verbose ) {
-	process.stdout.write( 'zuzu-js version 0.1.2\n' );
+	process.stdout.write( 'zuzu-js version 0.2.0\n' );
 	if ( verbose ) {
 		process.stdout.write( '\nlib search paths:\n' );
 		for ( const p of runtime.getModuleSearchRoots() ) {

package/lib/runtime-helpers.js

@@ -251,6 +251,8 @@ function collectTopLevelDeclarations( source, stripPod ) {
 	let inSingle = false;
 	let inDouble = false;
 	let inBacktick = false;
+	let inRegex = false;
+	let inRegexClass = false;
 	let inLineComment = false;
 	let inBlockComment = false;
 	let escape = false;
@@ -280,6 +282,35 @@ function collectTopLevelDeclarations( source, stripPod ) {
 			masked.push( ch === '\n' ? '\n' : ' ' );
 			continue;
 		}
+		if ( inRegex ) {
+			if ( escape ) {
+				escape = false;
+				masked.push( ' ' );
+				continue;
+			}
+			if ( ch === '\\' ) {
+				escape = true;
+				masked.push( ' ' );
+				continue;
+			}
+			if ( ch === '[' ) {
+				inRegexClass = true;
+				masked.push( ' ' );
+				continue;
+			}
+			if ( ch === ']' ) {
+				inRegexClass = false;
+				masked.push( ' ' );
+				continue;
+			}
+			if ( ch === '/' && !inRegexClass ) {
+				inRegex = false;
+				masked.push( ' ' );
+				continue;
+			}
+			masked.push( ch === '\n' ? '\n' : ' ' );
+			continue;
+		}
 		if ( inSingle || inDouble || inBacktick ) {
 			if ( escape ) {
 				escape = false;
@@ -318,6 +349,12 @@ function collectTopLevelDeclarations( source, stripPod ) {
 			masked.push( ' ' );
 			continue;
 		}
+		if ( ch === '/' && looksLikeRegexLiteralStart( stripped, i ) ) {
+			inRegex = true;
+			inRegexClass = false;
+			masked.push( ' ' );
+			continue;
+		}
 		if ( ch === '\'' ) {
 			inSingle = true;
 			masked.push( ' ' );
@@ -391,6 +428,18 @@ function collectTopLevelDeclarations( source, stripPod ) {
 	return [ ...names ];
 }
 
+function looksLikeRegexLiteralStart( source, index ) {
+	let pos = index - 1;
+	while ( pos >= 0 && /\s/u.test( source[pos] ) ) {
+		pos--;
+	}
+	if ( pos < 0 ) {
+		return true;
+	}
+	const previous = source[pos];
+	return /[({[=,:;!~?&|+\-*%^<>]/u.test( previous );
+}
+
 function collectTopLevelUnpackDeclarationNames( source, topLevelMask ) {
 	const names = [];
 	const rx = /(?:^|[;\n])\s*(?:export\s+)?(?:let|const)\b/gm;

package/lib/transpiler-new/codegen.js

@@ -729,7 +729,7 @@ function emitFunctionPreamble( params, signature = null ) {
 	for ( const param of params ) {
 		if ( param.type === 'SpecialParameter' ) {
 			if ( param.special === 'lead_rest' ) {
-				lines.push( `let ${param.leadName} = arguments[${argIndex}];` );
+				lines.push( `const ${param.leadName} = arguments[${argIndex}];` );
 				argIndex++;
 				lines.push( `const ${param.name} = Array.prototype.slice.call( arguments, ${argIndex} );` );
 				continue;
@@ -757,13 +757,13 @@ function emitFunctionPreamble( params, signature = null ) {
 			continue;
 		}
 		if ( param.defaultValue ) {
-			lines.push( `let ${paramName} = __argc__ > ${argIndex} ? arguments[${argIndex}] : ${emitExpression( param.defaultValue )};` );
+			lines.push( `const ${paramName} = __argc__ > ${argIndex} ? arguments[${argIndex}] : ${emitExpression( param.defaultValue )};` );
 		}
 		else if ( param.optional ) {
-			lines.push( `let ${paramName} = __argc__ > ${argIndex} ? arguments[${argIndex}] : null;` );
+			lines.push( `const ${paramName} = __argc__ > ${argIndex} ? arguments[${argIndex}] : null;` );
 		}
 		else {
-			lines.push( `let ${paramName} = arguments[${argIndex}];` );
+			lines.push( `const ${paramName} = arguments[${argIndex}];` );
 		}
 		if ( param.typeName ) {
 			lines.push(
@@ -780,62 +780,71 @@ function emitSpecialFunctionPreamble( signature ) {
 		case 'pairlist_only':
 			return [
 				`const __zuzu_call_args = Array.prototype.slice.call( arguments );`,
-				`let ${signature.namedName} = __zuzu_pairlist_literal( [] );`,
+				'let __zuzu_named_args = __zuzu_pairlist_literal( [] );',
 				'for ( const __a of __zuzu_call_args ) {',
-				`if ( __zuzu_is_pairlist( __a ) ) { ${signature.namedName} = __a; } else { throw new Exception( "named PairList parameter only accepts named arguments" ); }`,
+				'if ( __zuzu_is_pairlist( __a ) ) { __zuzu_named_args = __a; } else { throw new Exception( "named PairList parameter only accepts named arguments" ); }',
 				'}',
+				`const ${signature.namedName} = __zuzu_named_args;`,
 			].join( '\n' );
 		case 'pairlist_rest_array':
 		case 'rest_array_pairlist':
 			return [
 				`const __zuzu_call_args = Array.prototype.slice.call( arguments );`,
-				`let ${signature.namedName} = __zuzu_pairlist_literal( [] );`,
-				`let ${signature.restName} = [];`,
+				'let __zuzu_named_args = __zuzu_pairlist_literal( [] );',
+				'const __zuzu_rest_args = [];',
 				'for ( const __a of __zuzu_call_args ) {',
-				`if ( __zuzu_is_pairlist( __a ) ) { ${signature.namedName} = __a; } else { ${signature.restName}.push( __a ); }`,
+				'if ( __zuzu_is_pairlist( __a ) ) { __zuzu_named_args = __a; } else { __zuzu_rest_args.push( __a ); }',
 				'}',
+				`const ${signature.namedName} = __zuzu_named_args;`,
+				`const ${signature.restName} = __zuzu_rest_args;`,
 			].join( '\n' );
 		case 'lead_pairlist':
 			return [
 				'const __zuzu_call_args = Array.prototype.slice.call( arguments );',
-				`let ${signature.headName} = __zuzu_call_args[0];`,
-				`let ${signature.namedName} = __zuzu_pairlist_literal( [] );`,
-				`let ${signature.restName} = [];`,
+				`const ${signature.headName} = __zuzu_call_args[0];`,
+				'let __zuzu_named_args = __zuzu_pairlist_literal( [] );',
+				'const __zuzu_rest_args = [];',
 				'for ( let __i = 1; __i < __zuzu_call_args.length; __i++ ) {',
 				'const __a = __zuzu_call_args[__i];',
-				`if ( __zuzu_is_pairlist( __a ) ) { ${signature.namedName} = __a; } else { ${signature.restName}.push( __a ); }`,
+				'if ( __zuzu_is_pairlist( __a ) ) { __zuzu_named_args = __a; } else { __zuzu_rest_args.push( __a ); }',
 				'}',
+				`const ${signature.namedName} = __zuzu_named_args;`,
+				`const ${signature.restName} = __zuzu_rest_args;`,
 			].join( '\n' );
 		case 'trail_pairlist':
 			return [
 				'const __zuzu_call_args = Array.prototype.slice.call( arguments );',
-				`let ${signature.headName} = __zuzu_call_args[0];`,
-				`let ${signature.restName} = [];`,
-				`let ${signature.namedName} = __zuzu_pairlist_literal( [] );`,
+				`const ${signature.headName} = __zuzu_call_args[0];`,
+				'const __zuzu_rest_args = [];',
+				'let __zuzu_named_args = __zuzu_pairlist_literal( [] );',
 				'for ( let __i = 1; __i < __zuzu_call_args.length; __i++ ) {',
 				'const __a = __zuzu_call_args[__i];',
-				`if ( __zuzu_is_pairlist( __a ) ) { ${signature.namedName} = __a; } else { ${signature.restName}.push( __a ); }`,
+				'if ( __zuzu_is_pairlist( __a ) ) { __zuzu_named_args = __a; } else { __zuzu_rest_args.push( __a ); }',
 				'}',
+				`const ${signature.restName} = __zuzu_rest_args;`,
+				`const ${signature.namedName} = __zuzu_named_args;`,
 			].join( '\n' );
 		case 'scalar_pairlist':
 			return [
 				'const __zuzu_call_args = Array.prototype.slice.call( arguments );',
-				`let ${signature.headName} = __zuzu_call_args[0];`,
-				`let ${signature.namedName} = __zuzu_pairlist_literal( [] );`,
+				`const ${signature.headName} = __zuzu_call_args[0];`,
+				'let __zuzu_named_args = __zuzu_pairlist_literal( [] );',
 				'for ( let __i = 1; __i < __zuzu_call_args.length; __i++ ) {',
 				'const __a = __zuzu_call_args[__i];',
-				`if ( __zuzu_is_pairlist( __a ) ) { ${signature.namedName} = __a; } else { throw new Exception( "named arguments not allowed for this function" ); }`,
+				'if ( __zuzu_is_pairlist( __a ) ) { __zuzu_named_args = __a; } else { throw new Exception( "named arguments not allowed for this function" ); }',
 				'}',
+				`const ${signature.namedName} = __zuzu_named_args;`,
 			].join( '\n' );
 		case 'variadic':
 			return [
 				'const __zuzu_call_args = Array.prototype.slice.call( arguments );',
-				`let ${signature.headName} = __zuzu_call_args[0];`,
-				`let ${signature.restName} = [];`,
+				`const ${signature.headName} = __zuzu_call_args[0];`,
+				'const __zuzu_rest_args = [];',
 				'for ( let __i = 1; __i < __zuzu_call_args.length; __i++ ) {',
 				'const __a = __zuzu_call_args[__i];',
-				`if ( __zuzu_is_pairlist( __a ) ) { throw new Exception( "named arguments not allowed for this function" ); } ${signature.restName}.push( __a );`,
+				'if ( __zuzu_is_pairlist( __a ) ) { throw new Exception( "named arguments not allowed for this function" ); } __zuzu_rest_args.push( __a );',
 				'}',
+				`const ${signature.restName} = __zuzu_rest_args;`,
 			].join( '\n' );
 		default:
 			return '';

package/lib/transpiler-new/parser.js

@@ -55,26 +55,22 @@ function parse( tokens, options = {} ) {
 		return tokens[index - 1];
 	}
 
-	function canTerminateStatement() {
+	function canTerminateSimpleStatement() {
 		const token = current();
-		const prev = previous();
-		if ( !prev ) {
-			return false;
-		}
 		if ( token.type === 'punctuation' && token.value === '}' ) {
 			return true;
 		}
 		if ( token.type === 'eof' ) {
 			return true;
 		}
-		return token.line > prev.endLine;
+		return false;
 	}
 
 	function consumeStatementTerminator(message) {
 		if ( match( 'punctuation', ';' ) ) {
 			return;
 		}
-		if ( canTerminateStatement() ) {
+		if ( canTerminateSimpleStatement() ) {
 			return;
 		}
 		throw new TranspilerSyntaxError( message || 'Expected statement terminator', current() );
@@ -1313,7 +1309,7 @@ function parse( tokens, options = {} ) {
 					prefix: true,
 				}, keyword, endLocFromNode( test ) );
 			}
-			expect( 'punctuation', ';', semicolonMessage );
+			consumeStatementTerminator( semicolonMessage );
 			const consequent = withLoc( {
 				type: 'BlockStatement',
 				body: [ stmt ],
@@ -1330,7 +1326,7 @@ function parse( tokens, options = {} ) {
 			const keyword = current();
 			index++;
 			const iterable = parseExpression();
-			expect( 'punctuation', ';', semicolonMessage );
+			consumeStatementTerminator( semicolonMessage );
 			const body = withLoc( {
 				type: 'BlockStatement',
 				body: [ stmt ],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zuzu-js",
-  "version": "0.1.2",
+  "version": "0.2.0",
   "description": "JavaScript runtime, compiler, and browser bundle for ZuzuScript.",
   "main": "lib/zuzu.js",
   "bin": {

package/stdlib/modules/test/parser.zzm

@@ -158,6 +158,7 @@ function parse_lines ( Array lines ) {
 	let top_level := _new_counts();
 	let assertions := _new_counts();
 	let planned := null;
+	let plan_directive := "";
 	let tests := [];
 
 	for ( let line in lines ) {
@@ -170,8 +171,11 @@ function parse_lines ( Array lines ) {
 
 		if ( body ~ /^\d+\.\.\d+\b/ ) {
 			if ( is_top_level ) {
-				let parts := split( body, "..", 2 );
-				planned := parts.get( 1, "" ) + 0;
+				let plan_parts := split( body, "#", 2 );
+				let range_parts := split( trim( plan_parts[0] ), "..", 2 );
+				planned := trim( range_parts.get( 1, "" ) ) + 0;
+				plan_directive := trim( plan_parts.get( 1, "" ) )
+					if plan_parts.length() > 1;
 			}
 			next;
 		}
@@ -186,10 +190,17 @@ function parse_lines ( Array lines ) {
 		}
 	}
 
+	let skip_all_plan := false;
+	if ( planned ≡ 0 and plan_directive ~ /^skip\b/i ) {
+		skip_all_plan := true;
+	}
+
 	return {
 		top_level: top_level,
 		assertions: assertions,
 		planned: planned,
+		plan_directive: plan_directive,
+		skip_all: skip_all_plan,
 		tests: tests,
 	};
 }