Skip to content

Commit abb69d9

Browse files
committed
Bump to latest Parrot version to get natively typed lexical support and update NQPLexInfo/NQPLexPad to cope with that.
1 parent 959bb78 commit abb69d9

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/pmc/nqplexinfo.pmc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ compiler calls this method in response to a ".lex STRING, PREG" directive.
141141
STRING *name = VTABLE_shift_string(interp, iter);
142142
INTVAL slot = VTABLE_get_integer_keyed_str(interp, SELF, name);
143143
PMC *value = VTABLE_get_pmc_keyed_str(interp, svs, name);
144-
VTABLE_push_integer(interp, slots, slot);
144+
VTABLE_push_integer(interp, slots, slot >> 2);
145145
VTABLE_push_pmc(interp, values, value);
146146
}
147147
SET_ATTR_static_slots_cache(INTERP, SELF, slots);

src/pmc/nqplexpad.pmc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ Return the LexInfo PMC, if any or a Null PMC.
148148
return PMCNULL;
149149

150150
GET_ATTR_ctx(INTERP, SELF, ctx);
151-
return CTX_REG_PMC(interp, ctx, (INTVAL)b->value);
151+
return CTX_REG_PMC(interp, ctx, ((INTVAL)b->value) >> 2);
152152
}
153153

154154
VTABLE PMC *get_pmc_keyed(PMC *name) {
@@ -177,7 +177,7 @@ Return the LexInfo PMC, if any or a Null PMC.
177177
"Lexical '%Ss' not found", name);
178178

179179
GET_ATTR_ctx(INTERP, SELF, ctx);
180-
CTX_REG_PMC(interp, ctx, (INTVAL)b->value) = value;
180+
CTX_REG_PMC(interp, ctx, ((INTVAL)b->value) >> 2) = value;
181181
PARROT_GC_WRITE_BARRIER(INTERP, ctx);
182182
}
183183

tools/build/PARROT_REVISION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
RELEASE_3_5_0-20-gf12d120
1+
RELEASE_3_5_0-25-g39218c2

0 commit comments

Comments
 (0)