refactor how blocks are stored

kazuho · kazuho · commit c62f500357c2 · 2012-03-30T17:54:34.000+09:00
diff --git a/lib/Parser.js b/lib/Parser.js
@@ -56,7 +56,7 @@ var Parser = module.exports = Class.extend({
 		this._classDefs = [];
 		// use for function parsing
 		this._locals = [];
-		this._statements = null;
+		this._statements = [];
 	},
 
 	parse: function () {
@@ -331,38 +331,18 @@ var Parser = module.exports = Class.extend({
 			return null;
 		// take care of abstract function
 		if ((flags & ClassDefinition.IS_ABSTRACT) != 0) {
-			if (this._expectkeyword(";", " for abstract function definition") == null)
+			if (this._expectKeyword(";", " for abstract function definition") == null)
 				return null;
 			return new MemberFunctionDefinition(name, flags, returnType, args, null);
 		}
 		// body
+		if (this._expectKeyword("{") == null)
+			return null;
 		this._locals = [];
-		var statements = this._parseBlock(false);
+		this._statements = [];
+		this._block();
 		// done
-		return new MemberFunctionDefinition(name, flags, returnType, args, this._locals, statements);
-	},
-
-	_parseBlock: function (allowStatement) {
-		var isBlock;
-		if (allowStatement && this._expectKeywordOpt("{") == null)
-			isBlock = false;
-		else {
-			if (this._expectKeyword("{") == null)
-				return null;
-			isBlock = true;
-		}
-		var outerStatements = this._statements;
-		var statements = this._statements = [];
-		if (isBlock) {
-			while (this._expectKeywordOpt("}") == null)
-				if (! this._statement())
-					this._skipStatement();
-		} else {
-			if (! this._statement())
-				this._skipStatement();
-		}
-		this._statements = outerStatements;
-		return statements;
+		return new MemberFunctionDefinition(name, flags, returnType, args, this._locals, this._statements);
 	},
 
 	_typeDeclaration: function () {
@@ -373,6 +353,12 @@ var Parser = module.exports = Class.extend({
 		return new TypeDeclaration(type);
 	},
 
+	_block: function () {
+		while (this._expectKeywordOpt("}") == null)
+			if (! this._statement())
+				this._skipStatement();
+	},
+
 	_statement: function () {
 		if (this._expectKeywordOpt("{") != null)
 			return this._block();
@@ -405,8 +391,9 @@ var Parser = module.exports = Class.extend({
 		// labelled or expression statement
 		var identifier = this._expectIdentifierOpt();
 		if (identifier != null && this._expectKeywordOpt(":") != null) {
+			// label is treated as a separate statement (FIXME should label be an attribute of a statement?)
 			this._statements.push(new LabelStatement(identifier));
-			return this._statement();
+			return true;
 		}
 		this._ungetToken();
 		// expression statement
@@ -433,10 +420,16 @@ var Parser = module.exports = Class.extend({
 			return false;
 		if (this._expectKeyword(")") == null)
 			return false;
-		var onTrueStatements = this._parseBlock(true);
+		var statementIndex = this._statements.length;
+		if (! this._statement())
+			this._skipStatement();
+		var onTrueStatements = this._statements.splice(statementIndex);
 		var onFalseStatements = null;
-		if (this._expectKeywordOpt("else"))
-			onFalseStatements = this._parseBlock(true);
+		if (this._expectKeywordOpt("else")) {
+			if (! this._statement())
+				this._skipStatement();
+			onFalseStatements = this._statements.splice(statementIndex);
+		}
 		this._statements.push(new IfStatement(expr, onTrueStatements, onFalseStatements));
 		return true;
 	},
