@agoric/xsnap 0.14.3-dev-b047af2.0 → 0.14.3-dev-3eb4230.0

package/moddable/xs/sources/xsScope.c

@@ -1,1293 +0,0 @@
-/*
- * Copyright (c) 2016-2017  Moddable Tech, Inc.
- *
- *   This file is part of the Moddable SDK Runtime.
- * 
- *   The Moddable SDK Runtime is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Lesser General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- * 
- *   The Moddable SDK Runtime is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU Lesser General Public License for more details.
- * 
- *   You should have received a copy of the GNU Lesser General Public License
- *   along with the Moddable SDK Runtime.  If not, see <http://www.gnu.org/licenses/>.
- *
- * This file incorporates work covered by the following copyright and  
- * permission notice:  
- *
- *       Copyright (C) 2010-2016 Marvell International Ltd.
- *       Copyright (C) 2002-2010 Kinoma, Inc.
- *
- *       Licensed under the Apache License, Version 2.0 (the "License");
- *       you may not use this file except in compliance with the License.
- *       You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *       Unless required by applicable law or agreed to in writing, software
- *       distributed under the License is distributed on an "AS IS" BASIS,
- *       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *       See the License for the specific language governing permissions and
- *       limitations under the License.
- */
-
-#include "xsScript.h"
-
-#define mxBindHoistPart\
-	txParser* parser;\
-	txScope* scope
-
-typedef struct sxExportlink txExportLink;
-
-typedef struct {
-	mxBindHoistPart;
-	txInteger scopeLevel;
-	txInteger scopeMaximum;
-	txClassNode* classNode;
-} txBinder;
-
-typedef struct {
-	mxBindHoistPart;
-	txScope* functionScope;
-	txScope* bodyScope;
-	txNode* environmentNode;
-	txExportLink* firstExportLink;
-	txClassNode* classNode;
-} txHoister;
-
-struct sxExportlink {
-	txExportLink* next;
-	txSymbol* symbol;
-};
-
-static void fxHoisterAddExportLink(txHoister* self, txSpecifierNode* specifier);
-static void fxBinderPopVariables(txBinder* self, txInteger count);
-static void fxBinderPushVariables(txBinder* self, txInteger count);
-static txScope* fxScopeNew(txHoister* hoister, txNode* node, txToken token);
-static void fxScopeAddDeclareNode(txScope* self, txDeclareNode* node);
-static void fxScopeAddDefineNode(txScope* self, txDefineNode* node);
-static void fxScopeBindDefineNodes(txScope* self, void* param);
-static void fxScopeBinding(txScope* self, txBinder* binder);
-static void fxScopeBound(txScope* self, txBinder* binder);
-static void fxScopeEval(txScope* self);
-static txDeclareNode* fxScopeGetDeclareNode(txScope* self, txSymbol* symbol);
-static void fxScopeHoisted(txScope* self, txHoister* hoister);
-static void fxScopeLookup(txScope* self, txAccessNode* access, txBoolean closureFlag);
-
-static void fxNodeDispatchBind(void* it, void* param);
-static void fxNodeDispatchHoist(void* it, void* param);
-static void fxFunctionNodeRename(void* it, txSymbol* symbol);
-
-void fxParserBind(txParser* parser)
-{
-	txBinder binder;
-	c_memset(&binder, 0, sizeof(txBinder));
-	binder.parser = parser;
-	if (parser->errorCount == 0) {
-		mxTryParser(parser) {
-			fxNodeDispatchBind(parser->root, &binder);
-		}
-		mxCatchParser(parser) {
-		}
-	}
-}
-
-void fxParserHoist(txParser* parser)
-{
-	txHoister hoister;
-	c_memset(&hoister, 0, sizeof(txHoister));
-	hoister.parser = parser;
-	if (parser->errorCount == 0) {
-		mxTryParser(parser) {
-			fxNodeDispatchHoist(parser->root, &hoister);
-		}
-		mxCatchParser(parser) {
-		}
-	}
-}
-
-void fxHoisterAddExportLink(txHoister* self, txSpecifierNode* specifier)
-{
-	txExportLink* link = self->firstExportLink;
-	txSymbol* symbol = specifier->asSymbol ? specifier->asSymbol : specifier->symbol;
-    if (symbol) {
-        while (link) {
-            if (link->symbol == symbol) {
-                fxReportParserError(self->parser, specifier->line, "duplicate export %s", symbol->string);
-                return;
-            }
-            link = link->next;
-        }
-        link = fxNewParserChunk(self->parser, sizeof(txExportLink));
-        link->next = self->firstExportLink;
-        link->symbol = symbol;
-        self->firstExportLink = link;
-    }
-}
-
-void fxBinderPopVariables(txBinder* self, txInteger count)
-{
-	self->scopeLevel -= count;
-}
-
-void fxBinderPushVariables(txBinder* self, txInteger count)
-{
-	self->scopeLevel += count;
-	if (self->scopeMaximum < self->scopeLevel)
-		self->scopeMaximum = self->scopeLevel;
-}
-
-txScope* fxScopeNew(txHoister* hoister, txNode* node, txToken token) 
-{
-	txScope* scope = fxNewParserChunkClear(hoister->parser, sizeof(txScope));
-	scope->parser = hoister->parser;
-	scope->scope = hoister->scope;
-	scope->token = token;
-	scope->flags = node->flags & mxStrictFlag;
-	scope->node = node;
-	hoister->scope = scope;
-	return scope;
-}
-
-void fxScopeAddDeclareNode(txScope* self, txDeclareNode* node) 
-{
-	self->declareNodeCount++;
-	if (self->token == XS_TOKEN_EVAL) {
-		if (self->lastDeclareNode)
-			node->nextDeclareNode = self->firstDeclareNode;
-		else
-			self->lastDeclareNode = node;
-		self->firstDeclareNode = node;
-	}
-	else {
-		if (self->lastDeclareNode)
-			self->lastDeclareNode->nextDeclareNode = node;
-		else
-			self->firstDeclareNode = node;
-		self->lastDeclareNode = node;
-	}
-}
-
-void fxScopeAddDefineNode(txScope* self, txDefineNode* node) 
-{
-	self->defineNodeCount++;
-	if (self->lastDefineNode)
-		self->lastDefineNode->nextDefineNode = node;
-	else
-		self->firstDefineNode = node;
-	self->lastDefineNode = node;
-}
-
-void fxScopeBindDefineNodes(txScope* self, void* param) 
-{
-	txDefineNode* node = self->firstDefineNode;
-	while (node) {
-		fxNodeDispatchBind(node, param);
-		node = node->nextDefineNode;
-	}
-}
-
-void fxScopeBinding(txScope* self, txBinder* binder) 
-{
-	self->scope = binder->scope;
-	binder->scope = self;
-	fxBinderPushVariables(binder, self->declareNodeCount);
-}
-
-void fxScopeBound(txScope* self, txBinder* binder) 
-{
-	if (self->flags & mxEvalFlag) {
-		txDeclareNode* node = self->firstDeclareNode;
-		while (node) {
-			node->flags |= mxDeclareNodeClosureFlag;
-			node = node->nextDeclareNode;
-		}
-	}
-	if (self->token == XS_TOKEN_MODULE) {
-		txDeclareNode* node = self->firstDeclareNode;
-		while (node) {
-			node->flags |= mxDeclareNodeClosureFlag |  mxDeclareNodeUseClosureFlag;
-			node = node->nextDeclareNode;
-		}
-	}
-	else if (self->token == XS_TOKEN_PROGRAM) {
-		txDeclareNode* node = self->firstDeclareNode;
-		while (node) {
-			node->flags |= mxDeclareNodeClosureFlag |  mxDeclareNodeUseClosureFlag;
-			node = node->nextDeclareNode;
-		}
-	}
-	binder->scopeLevel += self->closureNodeCount;
-	binder->scopeMaximum += self->closureNodeCount;
-	fxBinderPopVariables(binder, self->declareNodeCount);
-	binder->scope = self->scope;
-}
-
-void fxScopeEval(txScope* self) 
-{
-	while (self) {
-		self->flags |= mxEvalFlag;
-		self = self->scope;
-	}
-}
-
-txDeclareNode* fxScopeGetDeclareNode(txScope* self, txSymbol* symbol) 
-{
-	txDeclareNode* node = self->firstDeclareNode;
-	while (node) {
-		if (node->symbol == symbol)
-			return node;
-		node = node->nextDeclareNode;
-	}
-	return NULL;
-}
-
-void fxScopeHoisted(txScope* self, txHoister* hoister) 
-{
-	if (self->token == XS_TOKEN_BLOCK) {
-		txDeclareNode** address = &self->firstDeclareNode;
-		txDeclareNode* node;
-		txDeclareNode* last = C_NULL;
-		while ((node = *address)) {
-			if (node->description->token == XS_NO_TOKEN) {
-				self->declareNodeCount--;
-				*address = node->nextDeclareNode;
-			}
-			else {
-				address = &node->nextDeclareNode;
-				last = node;
-			}
-		}
-		self->lastDeclareNode = last;
-	}
-	else if (self->token == XS_TOKEN_PROGRAM) {
-		txDeclareNode* node = self->firstDeclareNode;
-		while (node) {
-			if ((node->description->token == XS_TOKEN_DEFINE) || (node->description->token == XS_TOKEN_VAR))
-				self->declareNodeCount--;
-			node = node->nextDeclareNode;
-		}
-	}
-	else if (self->token == XS_TOKEN_EVAL) {
-		if (!(self->flags & mxStrictFlag)) {
-			txDeclareNode* node = self->firstDeclareNode;
-			while (node) {
-				if ((node->description->token == XS_TOKEN_DEFINE) || (node->description->token == XS_TOKEN_VAR))
-					self->declareNodeCount--;
-				node = node->nextDeclareNode;
-			}
-		}
-	}
-	hoister->scope = self->scope;
-}
-
-void fxScopeLookup(txScope* self, txAccessNode* access, txBoolean closureFlag) 
-{
-	txDeclareNode* declaration;
-	if (self->token == XS_TOKEN_EVAL) {
-		declaration = fxScopeGetDeclareNode(self, access->symbol);
-		if (declaration) {
-			if ((!(self->flags & mxStrictFlag)) && ((declaration->description->token == XS_TOKEN_VAR) || (declaration->description->token == XS_TOKEN_DEFINE))) {
-				declaration = C_NULL;
-			}
-			else if (closureFlag)
-				declaration->flags |= mxDeclareNodeClosureFlag;
-		}
-		else if ((self->flags & mxStrictFlag) && (access->description->token == XS_TOKEN_PRIVATE_MEMBER)) {
-			declaration = fxDeclareNodeNew(self->parser, XS_TOKEN_PRIVATE, access->symbol);
-			declaration->flags |= mxDeclareNodeClosureFlag;
-			declaration->line = access->line;
-			fxScopeAddDeclareNode(self, declaration);
-			self->closureNodeCount++;
-		}
-		access->declaration = declaration;
-	}
-	else if (self->token == XS_TOKEN_FUNCTION) {
-		declaration = fxScopeGetDeclareNode(self, access->symbol);
-		if (declaration) {
-			if (closureFlag)
-				declaration->flags |= mxDeclareNodeClosureFlag;
-			access->declaration = declaration;
-		}
-		else if ((self->node->flags & mxEvalFlag) && !(self->node->flags & mxStrictFlag)) {
-			// eval can create variables that override closures 
-			access->declaration = C_NULL;
-		}
-		else if (self->scope) {
-			fxScopeLookup(self->scope, access, 1);
-			if (access->declaration) {
-				txDeclareNode* closureNode = fxDeclareNodeNew(self->parser, XS_NO_TOKEN, access->symbol);
-				closureNode->flags |= mxDeclareNodeClosureFlag | mxDeclareNodeUseClosureFlag;
-				closureNode->line = access->declaration->line;
-				closureNode->declaration = access->declaration;
-				fxScopeAddDeclareNode(self, closureNode);
-				self->closureNodeCount++;
-				access->declaration = closureNode;
-			}
-		}
-	}
-	else if (self->token == XS_TOKEN_PROGRAM) {
-		declaration = fxScopeGetDeclareNode(self, access->symbol);
-		if (declaration && ((declaration->description->token == XS_TOKEN_VAR) || (declaration->description->token == XS_TOKEN_DEFINE))) {
-			declaration = C_NULL;
-		}
-		access->declaration = declaration;
-	}
-	else if (self->token == XS_TOKEN_WITH) {
-		// with object can have properties that override variables 
-		access->declaration = C_NULL;
-	}
-	else {
-		declaration = fxScopeGetDeclareNode(self, access->symbol);
-		if (declaration) {
-			if (closureFlag)
-				declaration->flags |= mxDeclareNodeClosureFlag;
-			access->declaration = declaration;
-		}
-		else if (self->scope) {
-			fxScopeLookup(self->scope, access, closureFlag);
-		}
-		else {
-			access->declaration = C_NULL;
-		}
-	}
-}
-
-void fxNodeHoist(void* it, void* param) 
-{
-	txNode* node = it;
-	(*node->description->dispatch->distribute)(node, fxNodeDispatchHoist, param);
-}
-
-void fxNodeDispatchHoist(void* it, void* param)
-{
-	txNode* node = it;
-	fxCheckParserStack(((txHoister*)param)->parser, node->line);
-	(*node->description->dispatch->hoist)(it, param);
-}
-
-void fxBlockNodeHoist(void* it, void* param) 
-{
-	txBlockNode* self = it;
-	self->scope = fxScopeNew(param, it, XS_TOKEN_BLOCK);
-	fxNodeDispatchHoist(self->statement, param);
-	fxScopeHoisted(self->scope, param);
-}
-
-void fxBodyNodeHoist(void* it, void* param) 
-{
-	txBlockNode* self = it;
-	txHoister* hoister = param;
-	txNode* environmentNode = hoister->environmentNode;
-	hoister->bodyScope = self->scope = fxScopeNew(param, it, XS_TOKEN_BLOCK);
-	hoister->environmentNode = it;
-	fxNodeDispatchHoist(self->statement, param);
-	hoister->environmentNode = environmentNode;
-	fxScopeHoisted(self->scope, param);
-}
-
-void fxCallNodeHoist(void* it, void* param) 
-{
-	txCallNewNode* self = it;
-	txHoister* hoister = param;
-	txParser* parser = hoister->parser;
-	if (self->reference->description->token == XS_TOKEN_ACCESS) {
-		txAccessNode* access = (txAccessNode*)self->reference;
-		if (access->symbol == parser->evalSymbol) {
-			fxScopeEval(hoister->scope);
-			hoister->functionScope->node->flags |= mxArgumentsFlag | mxEvalFlag;
-			hoister->environmentNode->flags |= mxEvalFlag;
-			self->params->flags |= mxEvalParametersFlag;
-		}
-	}
-	fxNodeDispatchHoist(self->reference, param);
-	fxNodeDispatchHoist(self->params, param);
-}
-
-void fxCatchNodeHoist(void* it, void* param) 
-{
-	txCatchNode* self = it;
-	txHoister* hoister = param;
-	txDeclareNode* node;
-	if (self->parameter) {
-		self->scope = fxScopeNew(param, it, XS_TOKEN_BLOCK);
-		fxNodeDispatchHoist(self->parameter, param);
-		self->statementScope = fxScopeNew(param, it, XS_TOKEN_BLOCK);
-		fxNodeDispatchHoist(self->statement, param);
-		fxScopeHoisted(self->statementScope, param);
-		fxScopeHoisted(self->scope, param);
-		node = self->statementScope->firstDeclareNode;
-		while (node) {
-		   if (fxScopeGetDeclareNode(self->scope, node->symbol))
-			   fxReportParserError(hoister->parser, node->line, "duplicate variable %s", node->symbol->string);
-		   node = node->nextDeclareNode;
-		}
-	}
-	else {
-		self->statementScope = fxScopeNew(param, it, XS_TOKEN_BLOCK);
-		fxNodeDispatchHoist(self->statement, param);
-		fxScopeHoisted(self->statementScope, param);
-	}
-}
-
-void fxClassNodeHoist(void* it, void* param) 
-{
-	txClassNode* self = it;
-	txHoister* hoister = param;
-	txClassNode* former = hoister->classNode;
-	txNode* item = self->items->first;
-	if (self->symbol) {
-		txDeclareNode* node = fxDeclareNodeNew(hoister->parser, XS_TOKEN_CONST, self->symbol);
-		node->flags |= mxDeclareNodeClosureFlag;
-		self->symbolScope = fxScopeNew(hoister, it, XS_TOKEN_BLOCK);
-		fxScopeAddDeclareNode(self->symbolScope, node);
-	}
-	if (self->heritage)
-		fxNodeDispatchHoist(self->heritage, param);
-	self->scope = fxScopeNew(hoister, it, XS_TOKEN_BLOCK);
-	while (item) {
-		if (item->description->token == XS_TOKEN_PROPERTY) {
-		}
-		else if (item->description->token == XS_TOKEN_PROPERTY_AT) {
-			if (item->flags & (mxMethodFlag | mxGetterFlag | mxSetterFlag)) {
-			}
-			else {
-				txSymbol* symbol = fxNewParserChunkClear(hoister->parser, sizeof(txSymbol));
-				txDeclareNode* node = fxDeclareNodeNew(hoister->parser, XS_TOKEN_CONST, symbol);
-				symbol->ID = -1;
-				node->flags |= mxDeclareNodeClosureFlag;
-				fxScopeAddDeclareNode(self->scope, node);
-				((txPropertyAtNode*)item)->atAccess = fxAccessNodeNew(hoister->parser, XS_TOKEN_ACCESS, symbol);
-			}
-		}
-		else {
-			txSymbol* symbol = ((txPrivatePropertyNode*)item)->symbol;
-			txDeclareNode* node = fxScopeGetDeclareNode(self->scope, symbol);
-			if (node) {
-                txUnsigned flags = (node->flags & (mxStaticFlag | mxGetterFlag | mxSetterFlag)) ^ (item->flags & (mxStaticFlag | mxGetterFlag | mxSetterFlag));
-				if ((flags != (mxGetterFlag | mxSetterFlag)))
-					fxReportParserError(hoister->parser, item->line, "duplicate %s", symbol->string);
-			}
-			node = fxDeclareNodeNew(hoister->parser, XS_TOKEN_CONST, symbol);
-			node->flags |= mxDeclareNodeClosureFlag | (item->flags & (mxStaticFlag | mxGetterFlag | mxSetterFlag));
-			fxScopeAddDeclareNode(self->scope, node);
-			((txPrivatePropertyNode*)item)->symbolAccess = fxAccessNodeNew(hoister->parser, XS_TOKEN_ACCESS, symbol);
-			if (item->flags & (mxMethodFlag | mxGetterFlag | mxSetterFlag)) {
-				txSymbol* symbol = fxNewParserChunkClear(hoister->parser, sizeof(txSymbol));
-				txDeclareNode* node = fxDeclareNodeNew(hoister->parser, XS_TOKEN_CONST, symbol);
-				symbol->ID = -1;
-				node->flags |= mxDeclareNodeClosureFlag;
-				fxScopeAddDeclareNode(self->scope, node);
-				((txPrivatePropertyNode*)item)->valueAccess = fxAccessNodeNew(hoister->parser, XS_TOKEN_ACCESS, symbol);
-			}
-		}
-		item = item->next;
-	}
-	if (self->instanceInit) {
-		txSymbol* symbol = fxNewParserChunkClear(hoister->parser, sizeof(txSymbol));
-		txDeclareNode* node = fxDeclareNodeNew(hoister->parser, XS_TOKEN_CONST, symbol);
-		symbol->ID = -1;
-		node->flags |= mxDeclareNodeClosureFlag;
-		fxScopeAddDeclareNode(self->scope, node);
-		self->instanceInitAccess = fxAccessNodeNew(hoister->parser, XS_TOKEN_ACCESS, symbol);
-	}
-	hoister->classNode = self;
-	fxNodeDispatchHoist(self->constructor, param);
-	fxNodeListDistribute(self->items, fxNodeDispatchHoist, param);
-	if (self->constructorInit)
-		fxNodeDispatchHoist(self->constructorInit, param);
-	if (self->instanceInit)
-		fxNodeDispatchHoist(self->instanceInit, param);
-	hoister->classNode = former;
-	fxScopeHoisted(self->scope, param);
-	if (self->symbol)
-		fxScopeHoisted(self->symbolScope, param);
-}
-
-void fxCoalesceExpressionNodeHoist(void* it, void* param) 
-{
-	txBinaryExpressionNode* self = it;
-	txHoister* hoister = param;
-	txToken leftToken = self->left->description->token;
-	txToken rightToken = self->right->description->token;
-	if ((leftToken == XS_TOKEN_AND) || (rightToken == XS_TOKEN_AND))
-		fxReportParserError(hoister->parser, self->line, "missing () around &&");
-	else if ((leftToken == XS_TOKEN_OR) || (rightToken == XS_TOKEN_OR))
-		fxReportParserError(hoister->parser, self->line, "missing () around ||");
-	fxNodeDispatchHoist(self->left, param);
-	fxNodeDispatchHoist(self->right, param);
-}
-
-void fxDeclareNodeHoist(void* it, void* param) 
-{
-	txDeclareNode* self = it;
-	txHoister* hoister = param;
-	txDeclareNode* node;
-	txScope* scope;
-	if (self->description->token == XS_TOKEN_ARG) {
-		node = fxScopeGetDeclareNode(hoister->functionScope, self->symbol);
-		if (node) {
-			if ((node->description->token == XS_TOKEN_ARG) && (hoister->functionScope->node->flags & (mxArrowFlag | mxAsyncFlag | mxMethodFlag | mxNotSimpleParametersFlag | mxStrictFlag)))
-				fxReportParserError(hoister->parser, self->line, "duplicate argument %s", self->symbol->string);
-		}
-		else {
-			fxScopeAddDeclareNode(hoister->functionScope, self);
-		}
-	}
-	else if ((self->description->token == XS_TOKEN_CONST) || (self->description->token == XS_TOKEN_LET)) {
-		node = fxScopeGetDeclareNode(hoister->scope, self->symbol);
-		if (!node && (hoister->scope == hoister->bodyScope)) {
-			node = fxScopeGetDeclareNode(hoister->functionScope, self->symbol);
-			if (node && (node->description->token != XS_TOKEN_ARG))
-				node = C_NULL;
-		}
-		if (node)
-			fxReportParserError(hoister->parser, self->line, "duplicate variable %s", self->symbol->string);
-		else
-			fxScopeAddDeclareNode(hoister->scope, self);
-	}
-	else {
-		scope = hoister->scope;
-		node = C_NULL;
-		while (scope != hoister->bodyScope) {
-			node = fxScopeGetDeclareNode(scope, self->symbol);
-			if (node) {
-				if ((node->description->token == XS_TOKEN_CONST) || (node->description->token == XS_TOKEN_LET) || (node->description->token == XS_TOKEN_DEFINE))
-					break;
-				node = C_NULL;
-			}
-			scope = scope->scope;
-		}
-		if (!node) {
-			node = fxScopeGetDeclareNode(scope, self->symbol);
-			if (node) {
-				if ((node->description->token != XS_TOKEN_CONST) && (node->description->token != XS_TOKEN_LET))
-					node = C_NULL;
-			}
-		}
-		if (node)
-			fxReportParserError(hoister->parser, self->line, "duplicate variable %s", self->symbol->string);
-		else {
-			node = fxScopeGetDeclareNode(hoister->functionScope, self->symbol);
-			if (!node || ((node->description->token != XS_TOKEN_ARG) && (node->description->token != XS_TOKEN_VAR)))
-				fxScopeAddDeclareNode(hoister->bodyScope, self);
-			scope = hoister->scope;
-			while (scope != hoister->bodyScope) {
-				fxScopeAddDeclareNode(scope, fxDeclareNodeNew(hoister->parser, XS_NO_TOKEN, self->symbol));
-				scope = scope->scope;
-			}
-		}
-	}
-}
-
-void fxDefineNodeHoist(void* it, void* param) 
-{
-	txDefineNode* self = it;
-	txHoister* hoister = param;
-	txDeclareNode* node;
-	if (self->flags & mxStrictFlag) {
-		if ((self->symbol == hoister->parser->argumentsSymbol) || (self->symbol == hoister->parser->evalSymbol) || (self->symbol == hoister->parser->yieldSymbol))
-			fxReportParserError(hoister->parser, self->line, "invalid definition %s", self->symbol->string);
-	}
-	if ((hoister->scope == hoister->bodyScope) && (hoister->scope->token != XS_TOKEN_MODULE)) {
-		node = fxScopeGetDeclareNode(hoister->bodyScope, self->symbol);
-		if (node) {
-			if ((node->description->token == XS_TOKEN_CONST) || (node->description->token == XS_TOKEN_LET))
-				fxReportParserError(hoister->parser, self->line, "duplicate variable %s", self->symbol->string);
-		}
-		else {
-			if (hoister->functionScope != hoister->bodyScope)
-				node = fxScopeGetDeclareNode(hoister->functionScope, self->symbol);
-			if (!node)
-				fxScopeAddDeclareNode(hoister->bodyScope, (txDeclareNode*)self);
-		}
-		fxScopeAddDefineNode(hoister->bodyScope, self);
-	}
-	else {
-		node = fxScopeGetDeclareNode(hoister->scope, self->symbol);
-		if (node)
-			fxReportParserError(hoister->parser, self->line, "duplicate variable %s", self->symbol->string);
-		else
-			fxScopeAddDeclareNode(hoister->scope, (txDeclareNode*)self);
-		fxScopeAddDefineNode(hoister->scope, self);
-	}
-	((txFunctionNode*)(self->initializer))->symbol = C_NULL;
-	fxNodeDispatchHoist(self->initializer, param);
-	((txFunctionNode*)(self->initializer))->symbol = self->symbol;
-}
-
-void fxExportNodeHoist(void* it, void* param)
-{
-	txExportNode* self = it;
-	txHoister* hoister = param;
-	if (self->from) {
-		if (self->specifiers && self->specifiers->length) {
-			txSpecifierNode* specifier = (txSpecifierNode*)self->specifiers->first;
-			while (specifier) {
-				txDeclareNode* node = fxDeclareNodeNew(hoister->parser, XS_TOKEN_LET, C_NULL);
-				specifier->from = self->from;
-				node->flags |= mxDeclareNodeClosureFlag | mxDeclareNodeUseClosureFlag;
-				node->line = self->line;
-				node->importSpecifier = specifier;
-				node->firstExportSpecifier = specifier;
-				fxScopeAddDeclareNode(hoister->scope, node);
-				specifier = (txSpecifierNode*)specifier->next;
-			}
-		}
-		else {
-			txSpecifierNode* specifier = fxSpecifierNodeNew(hoister->parser, XS_TOKEN_SPECIFIER);
-			txDeclareNode* node = fxDeclareNodeNew(hoister->parser, XS_TOKEN_LET, C_NULL);
-			specifier->from = self->from;
-			node->flags |= mxDeclareNodeClosureFlag | mxDeclareNodeUseClosureFlag;
-			node->line = self->line;
-			node->importSpecifier = specifier;
-			fxScopeAddDeclareNode(hoister->scope, node);
-		}
-	}
-	if (self->specifiers && self->specifiers->length) {
-		txSpecifierNode* specifier = (txSpecifierNode*)self->specifiers->first;
-		while (specifier) {
-			fxHoisterAddExportLink(hoister, specifier);
-			fxNodeDispatchHoist(specifier, param);
-			specifier = (txSpecifierNode*)specifier->next;
-		}
-	}
-}
-
-void fxForNodeHoist(void* it, void* param) 
-{
-	txForNode* self = it;
-	self->scope = fxScopeNew(param, it, XS_TOKEN_BLOCK);
-	if (self->initialization)
-		fxNodeDispatchHoist(self->initialization, param);
-	if (self->expression)
-		fxNodeDispatchHoist(self->expression, param);
-	if (self->iteration)
-		fxNodeDispatchHoist(self->iteration, param);
-	fxNodeDispatchHoist(self->statement, param);
-	fxScopeHoisted(self->scope, param);
-}
-
-void fxForInForOfNodeHoist(void* it, void* param) 
-{
-	txForInForOfNode* self = it;
-	self->scope = fxScopeNew(param, it, XS_TOKEN_BLOCK);
-	fxNodeDispatchHoist(self->reference, param);
-	fxNodeDispatchHoist(self->expression, param);
-	fxNodeDispatchHoist(self->statement, param);
-	fxScopeHoisted(self->scope, param);
-}
-
-void fxFunctionNodeHoist(void* it, void* param) 
-{
-	txFunctionNode* self = it;
-	txHoister* hoister = param;
-	txScope* functionScope = hoister->functionScope;
-	txScope* bodyScope = hoister->bodyScope;
-	hoister->functionScope = self->scope = fxScopeNew(param, it, XS_TOKEN_FUNCTION);
-	hoister->bodyScope = C_NULL;
-	if (self->symbol) {
-		txDefineNode* node = fxDefineNodeNew(hoister->parser, XS_TOKEN_CONST, self->symbol);
-		node->initializer = fxValueNodeNew(hoister->parser, XS_TOKEN_CURRENT);
-		fxScopeAddDeclareNode(hoister->functionScope, (txDeclareNode*)node);
-		fxScopeAddDefineNode(hoister->functionScope, node);
-	}
-	fxNodeDispatchHoist(self->params, param);
-	if ((self->flags & (mxArgumentsFlag | mxEvalFlag)) && !(self->flags & mxArrowFlag)) {
-		txDeclareNode* declaration = fxDeclareNodeNew(hoister->parser, XS_TOKEN_VAR, hoister->parser->argumentsSymbol);
-		fxScopeAddDeclareNode(hoister->functionScope, declaration);
-	}	
-	fxNodeDispatchHoist(self->body, param);
-	fxScopeHoisted(self->scope, param);
-	hoister->bodyScope = bodyScope;
-	hoister->functionScope = functionScope;
-}
-
-void fxHostNodeHoist(void* it, void* param) 
-{
-	txHostNode* self = it;
-	txHoister* hoister = param;
-	txScope* scope = hoister->bodyScope;
-	if ((scope->token != XS_TOKEN_MODULE) && (scope->token != XS_TOKEN_PROGRAM))
-		fxReportParserError(hoister->parser, self->line, "invalid host");
-	else {
-		// @@ check simple parameters
-	}
-}
-
-void fxImportNodeHoist(void* it, void* param) 
-{
-	txImportNode* self = it;
-	txHoister* hoister = param;
-	if (self->specifiers && self->specifiers->length) {
-		txSpecifierNode* specifier = (txSpecifierNode*)self->specifiers->first;
-		while (specifier) {
-			txDeclareNode* node;
-			txSymbol* symbol = specifier->asSymbol ? specifier->asSymbol : specifier->symbol;
-			if (self->flags & mxStrictFlag) {
-				if ((symbol == hoister->parser->argumentsSymbol) || (symbol == hoister->parser->evalSymbol))
-					fxReportParserError(hoister->parser, self->line, "invalid import %s", symbol->string);
-			}
-			node = fxScopeGetDeclareNode(hoister->scope, symbol);
-			if (node)
-				fxReportParserError(hoister->parser, self->line, "duplicate variable %s", symbol->string);
-			else {
-				specifier->declaration = node = fxDeclareNodeNew(hoister->parser, XS_TOKEN_LET, symbol);
-				specifier->from = self->from;
-				node->flags |= mxDeclareNodeClosureFlag | mxDeclareNodeUseClosureFlag;
-				node->line = self->line;
-				node->importSpecifier = specifier;
-				fxScopeAddDeclareNode(hoister->scope, node);
-			}
-			specifier = (txSpecifierNode*)specifier->next;
-		}
-	}
-	else {
-		txSpecifierNode* specifier = fxSpecifierNodeNew(hoister->parser, XS_TOKEN_SPECIFIER);
-		txDeclareNode* node = fxDeclareNodeNew(hoister->parser, XS_TOKEN_LET, C_NULL);
-		specifier->from = self->from;
-		node->flags |= mxDeclareNodeClosureFlag | mxDeclareNodeUseClosureFlag;
-		node->line = self->line;
-		node->importSpecifier = specifier;
-		fxScopeAddDeclareNode(hoister->scope, node);
-	}
-}
-
-void fxModuleNodeHoist(void* it, void* param) 
-{
-	txModuleNode* self = it;
-	txHoister* hoister = param;
-	hoister->functionScope = hoister->bodyScope = self->scope = fxScopeNew(param, it, XS_TOKEN_MODULE); // @@
-	hoister->environmentNode = it;
-	fxNodeDispatchHoist(self->body, param);
-	hoister->environmentNode = C_NULL;
-	fxScopeHoisted(self->scope, param);
-}
-
-void fxParamsBindingNodeHoist(void* it, void* param)
-{
-	txParamsNode* self = it;
-	txNode* item = self->items->first;
-	while (item) {
-		fxNodeDispatchHoist(item, param);
-		item = item->next;
-	}
-}
-
-void fxProgramNodeHoist(void* it, void* param) 
-{
-	txProgramNode* self = it;
-	txHoister* hoister = param;
-	hoister->functionScope = hoister->bodyScope = self->scope = fxScopeNew(param, it, (hoister->parser->flags & mxEvalFlag) ? XS_TOKEN_EVAL : XS_TOKEN_PROGRAM);
-	hoister->environmentNode = it;
-	fxNodeDispatchHoist(self->body, param);
-	hoister->environmentNode = C_NULL;
-	self->variableCount = hoister->functionScope->declareNodeCount;
-	fxScopeHoisted(self->scope, param);
-}
-
-void fxStatementNodeHoist(void* it, void* param) 
-{
-	txStatementNode* self = it;
-	fxNodeDispatchHoist(self->expression, param);
-}
-
-void fxPropertyNodeHoist(void* it, void* param) 
-{
-	txPropertyNode* self = it;
-	if (self->value) {
-		if (self->value->description->token == XS_TOKEN_HOST)
-			((txHostNode*)(self->value))->symbol = self->symbol;
-		fxNodeDispatchHoist(self->value, param);
-	}
-}
-
-void fxStringNodeHoist(void* it, void* param)
-{
-	txStringNode* self = it;
-	txHoister* hoister = param;
-	if ((self->flags & mxStringLegacyFlag) && (hoister->scope->flags & mxStrictFlag))
-		self->flags |= mxStringErrorFlag;
-}
-
-void fxSwitchNodeHoist(void* it, void* param) 
-{
-	txSwitchNode* self = it;
-	fxNodeDispatchHoist(self->expression, param);
-	self->scope = fxScopeNew(param, it, XS_TOKEN_BLOCK);
-	fxNodeListDistribute(self->items, fxNodeDispatchHoist, param);
-	fxScopeHoisted(self->scope, param);
-}
-
-void fxWithNodeHoist(void* it, void* param) 
-{
-	txWithNode* self = it;
-	txHoister* hoister = param;
-	fxNodeDispatchHoist(self->expression, param);
-	self->scope = fxScopeNew(param, it, XS_TOKEN_WITH);
-	fxScopeEval(hoister->scope);
-	fxNodeDispatchHoist(self->statement, param);
-	fxScopeHoisted(self->scope, param);
-}
-
-void fxNodeDispatchBind(void* it, void* param)
-{
-	txNode* node = it;
-	fxCheckParserStack(((txBinder*)param)->parser, node->line);
-	(*node->description->dispatch->bind)(it, param);
-}
-
-void fxNodeBind(void* it, void* param) 
-{
-	txNode* node = it;
-	(*node->description->dispatch->distribute)(node, fxNodeDispatchBind, param);
-}
-
-void fxAccessNodeBind(void* it, void* param) 
-{
-	txAccessNode* self = it;
-	txBinder* binder = param;
-	fxScopeLookup(binder->scope, (txAccessNode*)self, 0);
-}
-
-void fxArrayNodeBind(void* it, void* param) 
-{
-	txArrayNode* self = it;
-	fxBinderPushVariables(param, 1);
-	if (self->flags & mxSpreadFlag) {
-		fxBinderPushVariables(param, 2);
-		fxNodeListDistribute(self->items, fxNodeDispatchBind, param);
-		fxBinderPopVariables(param, 2);
-	}
-	else
-		fxNodeListDistribute(self->items, fxNodeDispatchBind, param);
-	fxBinderPopVariables(param, 1);
-}
-
-void fxArrayBindingNodeBind(void* it, void* param) 
-{
-	txArrayBindingNode* self = it;
-	fxBinderPushVariables(param, 6);
-	fxNodeListDistribute(self->items, fxNodeDispatchBind, param);
-	fxBinderPopVariables(param, 6);
-}
-
-void fxAssignNodeBind(void* it, void* param) 
-{
-	txAssignNode* self = it;
-	txToken token = self->reference->description->token;
-	fxNodeDispatchBind(self->reference, param);
-	if ((token == XS_TOKEN_ACCESS) || (token == XS_TOKEN_ARG) || (token == XS_TOKEN_CONST) || (token == XS_TOKEN_LET) || (token == XS_TOKEN_VAR))
-		fxFunctionNodeRename(self->value, ((txAccessNode*)self->reference)->symbol);
-	fxNodeDispatchBind(self->value, param);
-}
-
-void fxBindingNodeBind(void* it, void* param) 
-{
-	txBindingNode* self = it;
-	txToken token = self->target->description->token;
-	fxNodeDispatchBind(self->target, param);
-	if ((token == XS_TOKEN_ACCESS) || (token == XS_TOKEN_ARG) || (token == XS_TOKEN_CONST) || (token == XS_TOKEN_LET) || (token == XS_TOKEN_VAR))
-		fxFunctionNodeRename(self->initializer, ((txAccessNode*)self->target)->symbol);
-	fxNodeDispatchBind(self->initializer, param);
-}
-
-void fxBlockNodeBind(void* it, void* param) 
-{
-	txBlockNode* self = it;
-	fxScopeBinding(self->scope, param);
-	fxScopeBindDefineNodes(self->scope, param);
-	fxNodeDispatchBind(self->statement, param);
-	fxScopeBound(self->scope, param);
-}
-
-void fxCatchNodeBind(void* it, void* param) 
-{
-	txCatchNode* self = it;
-	if (self->parameter) {
-		fxScopeBinding(self->scope, param);
-		fxNodeDispatchBind(self->parameter, param);
-		fxScopeBinding(self->statementScope, param);
-		fxScopeBindDefineNodes(self->statementScope, param);
-		fxNodeDispatchBind(self->statement, param);
-		fxScopeBound(self->statementScope, param);
-		fxScopeBound(self->scope, param);
-	}
-	else {
-		fxScopeBinding(self->statementScope, param);
-		fxScopeBindDefineNodes(self->statementScope, param);
-		fxNodeDispatchBind(self->statement, param);
-		fxScopeBound(self->statementScope, param);
-	}
-}
-
-void fxClassNodeBind(void* it, void* param) 
-{
-	txClassNode* self = it;
-	txBinder* binder = param;
-	txClassNode* former = binder->classNode;
-	fxBinderPushVariables(param, 2);
-	if (self->symbol)
-		fxScopeBinding(self->symbolScope, param);
-	if (self->heritage)
-		fxNodeDispatchBind(self->heritage, param);
-	fxScopeBinding(self->scope, param);
-	binder->classNode = self;
-	fxNodeDispatchBind(self->constructor, param);
-	fxNodeListDistribute(self->items, fxNodeDispatchBind, param);
-	if (self->constructorInit)
-		fxNodeDispatchBind(self->constructorInit, param);
-	if (self->instanceInit)
-		fxNodeDispatchBind(self->instanceInit, param);
-	binder->classNode = former;
-	fxScopeBound(self->scope, param);
-	if (self->symbol)
-		fxScopeBound(self->symbolScope, param);
-	fxBinderPopVariables(param, 2);
-}
-
-void fxDeclareNodeBind(void* it, void* param) 
-{
-	txBindingNode* self = it;
-	txBinder* binder = param;
-	fxScopeLookup(binder->scope, (txAccessNode*)self, 0);
-}
-
-void fxDefineNodeBind(void* it, void* param) 
-{
-	txDefineNode* self = it;
-	txBinder* binder = param;
-	if (self->flags & mxDefineNodeBoundFlag)
-		return;
-	self->flags |= mxDefineNodeBoundFlag;
-	fxScopeLookup(binder->scope, (txAccessNode*)self, 0);
-	fxNodeDispatchBind(self->initializer, param);
-}
-
-void fxDelegateNodeBind(void* it, void* param) 
-{
-	txStatementNode* self = it;
-	fxBinderPushVariables(param, 5);
-	fxNodeDispatchBind(self->expression, param);
-	fxBinderPopVariables(param, 5);
-}
-
-void fxExportNodeBind(void* it, void* param) 
-{
-	txExportNode* self = it;
-	txBinder* binder = param;
-	if (self->from)
-		return;
-	if (self->specifiers) {
-		txSpecifierNode* specifier = (txSpecifierNode*)self->specifiers->first;
-		while (specifier) {
-			txAccessNode* node = fxAccessNodeNew(binder->parser, XS_TOKEN_ACCESS, specifier->symbol);
-			fxScopeLookup(binder->scope, node, 0);
-			if (node->declaration) {
-				specifier->declaration = node->declaration;
-				specifier->declaration->flags |= mxDeclareNodeClosureFlag | mxDeclareNodeUseClosureFlag;
-				specifier->nextSpecifier = specifier->declaration->firstExportSpecifier;
-				specifier->declaration->firstExportSpecifier = specifier;
-			}
-			else
-				fxReportParserError(binder->parser, specifier->line, "unknown variable %s", specifier->symbol->string);
-			specifier = (txSpecifierNode*)specifier->next;
-		}
-	}
-}
-
-void fxFieldNodeBind(void* it, void* param) 
-{
-	txFieldNode* self = it;
-	txBinder* binder = param;
-	txNode* item = self->item;
-	if (item->description->token == XS_TOKEN_PROPERTY_AT)
-		fxScopeLookup(binder->scope, ((txPropertyAtNode*)item)->atAccess, 0);
-	else if (item->description->token == XS_TOKEN_PRIVATE_PROPERTY) {
-		if (item->flags & (mxMethodFlag | mxGetterFlag | mxSetterFlag))
-			fxScopeLookup(binder->scope, ((txPrivatePropertyNode*)item)->valueAccess, 0);
-		fxScopeLookup(binder->scope, ((txPrivatePropertyNode*)item)->symbolAccess, 0);
-	}
-	if (self->value)
-		fxNodeDispatchBind(self->value, param);
-}
-
-void fxForNodeBind(void* it, void* param) 
-{
-	txForNode* self = it;
-	fxScopeBinding(self->scope, param);
-	fxScopeBindDefineNodes(self->scope, param);
-	if (self->initialization)
-		fxNodeDispatchBind(self->initialization, param);
-	if (self->expression)
-		fxNodeDispatchBind(self->expression, param);
-	if (self->iteration)
-		fxNodeDispatchBind(self->iteration, param);
-	fxNodeDispatchBind(self->statement, param);
-	fxScopeBound(self->scope, param);
-}
-
-void fxForInForOfNodeBind(void* it, void* param) 
-{
-	txForInForOfNode* self = it;
-	fxBinderPushVariables(param, 5);
-	fxScopeBinding(self->scope, param);
-	fxScopeBindDefineNodes(self->scope, param);
-	fxNodeDispatchBind(self->reference, param);
-	fxNodeDispatchBind(self->expression, param);
-	fxNodeDispatchBind(self->statement, param);
-	fxScopeBound(self->scope, param);
-	fxBinderPopVariables(param, 5);
-}
-
-void fxFunctionNodeBind(void* it, void* param) 
-{
-	txFunctionNode* self = it;
-	txBinder* binder = param;
-	txInteger scopeLevel = binder->scopeLevel;
-	txInteger scopeMaximum = binder->scopeMaximum;
-	scopeLevel = binder->scopeLevel;
-	scopeMaximum = binder->scopeMaximum;
-	binder->scopeLevel = 0;
-	binder->scopeMaximum = 0;
-	fxScopeBinding(self->scope, param);
-	fxNodeDispatchBind(self->params, param);
-	if (self->flags & mxBaseFlag) {
-		if (binder->classNode->instanceInitAccess) {
-			fxScopeLookup(binder->scope, binder->classNode->instanceInitAccess, 0);
-		}
-	}
-	fxScopeBindDefineNodes(self->scope, param);
-	fxNodeDispatchBind(self->body, param);
-	fxScopeBound(self->scope, param);
-	self->scopeCount = binder->scopeMaximum;
-	binder->scopeMaximum = scopeMaximum;
-	binder->scopeLevel = scopeLevel;
-}
-
-void fxFunctionNodeRename(void* it, txSymbol* symbol)
-{
-	txNode* self = it;
-	txToken token = self->description->token;
-	if (token == XS_TOKEN_EXPRESSIONS) {
-		self = ((txExpressionsNode*)self)->items->first;
-		if (self->next)
-			return;
-		token = self->description->token;
-	}
-	if (token == XS_TOKEN_CLASS) {
-		txClassNode* node = (txClassNode*)self;
-		if (!node->symbol)
-			((txFunctionNode*)(node->constructor))->symbol = symbol;
-	}
-	else if ((token == XS_TOKEN_FUNCTION) || (token == XS_TOKEN_GENERATOR) || (token == XS_TOKEN_HOST)) {
-		txFunctionNode* node = (txFunctionNode*)self;
-		if (!node->symbol)
-			node->symbol = symbol;
-	}
-}
-
-void fxHostNodeBind(void* it, void* param) 
-{
-}
-
-void fxModuleNodeBind(void* it, void* param) 
-{
-	txModuleNode* self = it;
-	txBinder* binder = param;
-	fxScopeBinding(self->scope, param);
-	fxScopeBindDefineNodes(self->scope, param);
-	fxNodeDispatchBind(self->body, param);
-	fxScopeBound(self->scope, param);
-	self->scopeCount = binder->scopeMaximum;
-}
-
-void fxObjectNodeBind(void* it, void* param) 
-{
-	txObjectNode* self = it;
-	txNode* item = self->items->first;
-	fxBinderPushVariables(param, 1);
-	while (item) {
-		txNode* value;
-		if (item->description->token == XS_TOKEN_SPREAD) {
-		}
-		else {
-			if (item->description->token == XS_TOKEN_PROPERTY) {
-				value = ((txPropertyNode*)item)->value;
-			}
-			else {
-				value = ((txPropertyAtNode*)item)->value;
-			}
-			if ((value->description->token == XS_TOKEN_FUNCTION) || (value->description->token == XS_TOKEN_GENERATOR) || (value->description->token == XS_TOKEN_HOST)) {
-				txFunctionNode* node = (txFunctionNode*)value;
-				node->flags |= item->flags & (mxMethodFlag | mxGetterFlag | mxSetterFlag);
-			}
-			else if (value->description->token == XS_TOKEN_CLASS) {
-//				txFunctionNode* node = (txFunctionNode*)(((txClassNode*)value)->constructor);
-			}
-		}
-		fxNodeDispatchBind(item, param);
-		item = item->next;
-	}
-	fxBinderPopVariables(param, 1);
-}
-
-void fxObjectBindingNodeBind(void* it, void* param) 
-{
-	txObjectBindingNode* self = it;
-	fxBinderPushVariables(param, 2);
-	fxNodeListDistribute(self->items, fxNodeDispatchBind, param);
-	fxBinderPopVariables(param, 2);
-}
-
-void fxParamsNodeBind(void* it, void* param) 
-{
-	txParamsNode* self = it;
-	if (self->flags & mxSpreadFlag) {
-		fxBinderPushVariables(param, 1);
-		fxNodeListDistribute(self->items, fxNodeDispatchBind, param);
-		fxBinderPopVariables(param, 1);
-	}
-	else
-		fxNodeListDistribute(self->items, fxNodeDispatchBind, param);
-}
-
-void fxParamsBindingNodeBind(void* it, void* param) 
-{
-	txParamsBindingNode* self = it;
-	txBinder* binder = param;
-	txScope* functionScope = binder->scope;
-	txFunctionNode* functionNode = (txFunctionNode*)(functionScope->node);
-	txInteger count = self->items->length;
-	if (functionNode->flags & mxGetterFlag) {
-		if (count != 0)
-			fxReportParserError(binder->parser, self->line, "invalid getter arguments");
-	}
-	else if (functionNode->flags & mxSetterFlag) {
-		if ((count != 1) || (self->items->first->description->token == XS_TOKEN_REST_BINDING))
-			fxReportParserError(binder->parser, self->line, "invalid setter arguments");
-	}
-	else {
-		if (count > 255)
-			fxReportParserError(binder->parser, self->line, "too many arguments");
-	}
-	if (functionNode->flags & mxArgumentsFlag) {
-		txNode* item;
-		self->declaration = fxScopeGetDeclareNode(functionScope, binder->parser->argumentsSymbol);
-		if (functionNode->flags & mxStrictFlag)
-			goto bail;
-		item = self->items->first;
-		while (item) {
-			if (item->description->token != XS_TOKEN_ARG)
-				goto bail;
-			item = item->next;
-		}
-		item = self->items->first;
-		while (item) {
-			((txDeclareNode*)item)->flags |= mxDeclareNodeClosureFlag;
-			item = item->next;
-		}
-		self->mapped = 1;
-	}
-bail:
-	fxNodeListDistribute(self->items, fxNodeDispatchBind, param);
-}
-
-void fxPostfixExpressionNodeBind(void* it, void* param) 
-{
-	txPostfixExpressionNode* self = it;
-	fxNodeDispatchBind(self->left, param);
-	fxBinderPushVariables(param, 1);
-	fxBinderPopVariables(param, 1);
-}
-
-void fxPrivateMemberNodeBind(void* it, void* param) 
-{
-	txBinder* binder = param;
-	txPrivateMemberNode* self = it;
-	fxScopeLookup(binder->scope, (txAccessNode*)self, 0);
-	if (!self->declaration)
-		fxReportParserError(binder->parser, self->line, "invalid private identifier");
-	fxNodeDispatchBind(self->reference, param);
-}
-
-void fxProgramNodeBind(void* it, void* param) 
-{
-	txProgramNode* self = it;
-	txBinder* binder = param;
-	fxScopeBinding(self->scope, param);
-	fxScopeBindDefineNodes(self->scope, param);
-	fxNodeDispatchBind(self->body, param);
-	fxScopeBound(self->scope, param);
-	self->scopeCount = binder->scopeMaximum;
-}
-
-void fxSpreadNodeBind(void* it, void* param) 
-{
-	txSpreadNode* self = it;
-	fxBinderPushVariables(param, 1);
-	fxNodeDispatchBind(self->expression, param);
-	fxBinderPopVariables(param, 1);
-}
-
-void fxSuperNodeBind(void* it, void* param)
-{
-	txSuperNode* self = it;
-	txBinder* binder = param;
-	fxNodeDispatchBind(self->params, param);
-	if (binder->classNode->instanceInitAccess) {
-		fxScopeLookup(binder->scope, binder->classNode->instanceInitAccess, 0);
-	}
-}
-
-void fxSwitchNodeBind(void* it, void* param) 
-{
-	txSwitchNode* self = it;
-	fxNodeDispatchBind(self->expression, param);
-	fxScopeBinding(self->scope, param);
-	fxScopeBindDefineNodes(self->scope, param);
-	fxNodeListDistribute(self->items, fxNodeDispatchBind, param);
-	fxScopeBound(self->scope, param);
-}
-
-void fxTemplateNodeBind(void* it, void* param) 
-{
-	txTemplateNode* self = it;
-	if (self->reference) {
-		fxBinderPushVariables(param, 2);
-		fxNodeDispatchBind(self->reference, param);
-		fxNodeListDistribute(self->items, fxNodeDispatchBind, param);
-		fxBinderPopVariables(param, 2);
-	}
-	else {
-		fxNodeListDistribute(self->items, fxNodeDispatchBind, param);
-	}
-}
-
-void fxTryNodeBind(void* it, void* param) 
-{
-	txTryNode* self = it;
-	fxBinderPushVariables(param, 3);
-	fxNodeDispatchBind(self->tryBlock, param);
-	if (self->catchBlock)
-		fxNodeDispatchBind(self->catchBlock, param);
-	if (self->finallyBlock)
-		fxNodeDispatchBind(self->finallyBlock, param);
-	fxBinderPopVariables(param, 3);
-}
-
-void fxWithNodeBind(void* it, void* param) 
-{
-	txWithNode* self = it;
-	fxNodeDispatchBind(self->expression, param);
-	fxScopeBinding(self->scope, param);
-	fxNodeDispatchBind(self->statement, param);
-	fxScopeBound(self->scope, param);
-}
-
-
-