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

allow import strings to use string interpolation

Browse Source 
Note that this has some major caveats around stuff like code completion being able to resolve modules at compile time, but I think the PR is interesting for others to see/discuss either way.
This commit is contained in:
underscorediscovery
2020-07-10 20:59:39 -07:00
parent d432b03d62
commit edb1f9d37b
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/vm/wren_compiler.c
View File

@ -2721,6 +2721,7 @@ static int getByteCountForArguments(const uint8_t* bytecode,
case CODE_FOREIGN_CONSTRUCT:
case CODE_FOREIGN_CLASS:
case CODE_END_MODULE:
case CODE_IMPORT_MODULE:
return 0;
case CODE_LOAD_LOCAL:
@ -2761,7 +2762,6 @@ static int getByteCountForArguments(const uint8_t* bytecode,
case CODE_OR:
case CODE_METHOD_INSTANCE:
case CODE_METHOD_STATIC:
case CODE_IMPORT_MODULE:
case CODE_IMPORT_VARIABLE:
return 2;
@ -3343,11 +3343,18 @@ static void classDefinition(Compiler* compiler, bool isForeign)
static void import(Compiler* compiler)
{
ignoreNewlines(compiler);
consume(compiler, TOKEN_STRING, "Expect a string after 'import'.");
int moduleConstant = addConstant(compiler, compiler->parser->previous.value);
if(match(compiler, TOKEN_STRING)) {
int constant = addConstant(compiler, compiler->parser->previous.value);
emitShortArg(compiler, CODE_CONSTANT, constant);
} else if(match(compiler, TOKEN_INTERPOLATION)) {
stringInterpolation(compiler, false);
} else {
error(compiler, "Expect a string after 'import'");
}
// Load the module.
emitShortArg(compiler, CODE_IMPORT_MODULE, moduleConstant);
emitOp(compiler, CODE_IMPORT_MODULE);
// Discard the unused result value from calling the module body's closure.
emitOp(compiler, CODE_POP);

2
src/vm/wren_vm.c
View File

@ -1281,7 +1281,7 @@ static WrenInterpretResult runInterpreter(WrenVM* vm, register ObjFiber* fiber)
// value. It will be popped after this fiber is resumed. Store the
// imported module's closure in the slot in case a GC happens when
// invoking the closure.
PUSH(importModule(vm, fn->constants.data[READ_SHORT()]));
PUSH(importModule(vm, POP()));
if (wrenHasError(fiber)) RUNTIME_ERROR();
// If we get a closure, call it to execute the module body.