Mirror/wren
1
0
Fork 1
mirror of https://github.com/wren-lang/wren.git synced 2026-01-11 22:28:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix compiling break statements.

Browse Source 
Had the wrong instruction size, which caused later code walking to wander into arguments.
This commit is contained in:
Bob Nystrom
2014-11-26 18:33:54 -08:00
parent 83c2013dfb
commit d1a07460c9
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/wren_compiler.c
View File

@ -1731,12 +1731,19 @@ static void name(Compiler* compiler, bool allowAssignment)
variable(compiler, allowAssignment, index, loadInstruction);
return;
}
// TODO: The fact that we return here if the variable is known and parse an
// optional argument list below if not means that the grammar is not
// context-free. A line of code in a method like "someName(foo)" is a parse
// error if "someName" is a defined variable in the surrounding scope and not
// if it isn't. Fix this. One option is to have "someName(foo)" always
// resolve to a self-call if there is an argument list, but that makes
// getters a little confusing.
// TODO: The fact that we walk the entire scope chain up to global before
// interpreting a name as an implicit "this" call means that surrounding
// names shadow ones in the class. This is good for things like globals.
// (You wouldn't want `new Fiber` translating to `new this.Fiber`, but may
// not be what we want for other names.) One option is to make capitalized
// (You wouldn't want `new Fiber` translating to `new this.Fiber`.) But it
// may not be what we want for other names. One option is to make capitalized
// names *always* global, and then a lowercase name will become on an
// implicit this if it's not a local in the nearest enclosing class.
@ -2299,7 +2306,7 @@ static void endLoop(Compiler* compiler)
{
compiler->bytecode.data[i] = CODE_JUMP;
patchJump(compiler, i + 1);
i += 2;
i += 3;
}
else
{

4
wren.xcodeproj/project.pbxproj
View File

@ -136,7 +136,7 @@
29AB1EFE1816E3AD004B501E /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0500;
LastUpgradeCheck = 0610;
ORGANIZATIONNAME = "Bob Nystrom";
};
buildConfigurationList = 29AB1F011816E3AD004B501E /* Build configuration list for PBXProject "wren" */;
@ -179,7 +179,6 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD)";
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_OBJC_ARC = YES;
@ -219,7 +218,6 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD)";
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_OBJC_ARC = YES;