Skip to content

Commit 4e16fd4

Browse files
committed
[js] Make nqp::bindcurhllsym/nqp::getcurhllsym use the hll language of the compilation unit.
1 parent fea5f99 commit 4e16fd4

File tree

2 files changed

+6
-12
lines changed

2 files changed

+6
-12
lines changed

src/vm/js/Operations.nqp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -838,8 +838,12 @@ class QAST::OperationsJS {
838838

839839
add_simple_op('sethllconfig', $T_OBJ, [$T_STR, $T_OBJ], :sideffects);
840840

841-
add_simple_op('bindcurhllsym', $T_OBJ, [$T_STR, $T_OBJ], :sideffects);
842-
add_simple_op('getcurhllsym', $T_OBJ, [$T_STR]);
841+
add_simple_op('bindcurhllsym', $T_OBJ, [$T_STR, $T_OBJ], :sideffects, sub ($sym, $value) {
842+
"nqp.op.bindhllsym({quote_string($*HLL)}, $sym, $value)"
843+
});
844+
add_simple_op('getcurhllsym', $T_OBJ, [$T_STR], sub ($sym) {
845+
"nqp.op.gethllsym({quote_string($*HLL)}, $sym)"
846+
});
843847

844848
add_simple_op('bindhllsym', $T_OBJ, [$T_STR, $T_STR, $T_OBJ], :sideffects);
845849
add_simple_op('gethllsym', $T_OBJ, [$T_STR, $T_STR]);

src/vm/js/nqp-runtime/hll.js

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,6 @@ op.bindhllsym = function(hllName, name, value) {
2424
return value;
2525
};
2626

27-
// HACK - language shouldn't be hardcoded to nqp
28-
29-
op.bindcurhllsym = function(name, value) {
30-
return op.bindhllsym('nqp', name, value);
31-
};
32-
33-
op.getcurhllsym = function(name) {
34-
return op.gethllsym('nqp', name);
35-
};
36-
3727
op.hllizefor = function(ctx, obj, language) {
3828
var languageHash = hllConfigs[language];
3929
var config = languageHash.content;

0 commit comments

Comments
 (0)