Miscellaneous fixes #294
Miscellaneous fixes #294
Conversation
bril-ts/builder.ts
Outdated
| * Checks whether the last emitted instruction in the current function is the specified op code. | ||
| * Useful for checking for terminating instructions. | ||
| */ | ||
| isLastEmittedEffectOp(op: bril.EffectOpCode): boolean { |
There was a problem hiding this comment.
Seems like useful behavior! But the name is a little odd, in two ways:
Emitted: Maybe it would be a little more straightforward to just say it's the last op currently in the function? It seems less material that it's the last thing we emitted.Effect: I think this would look for both effect and value ops, right?
Another alternative, FWIW, would be to just get the last (non-label) instruction. So the return type would be bril.Instruction?, and callers could get this behavior by doing stuff like lastInstr()?.op === "add".
There was a problem hiding this comment.
Sure, works for me.
I'll just note that I don't think the the ? sugar works on return types? microsoft/TypeScript#51332 Maybe I missed something obvious.
Instead I'm using bril.Instruction | undefined which the rest of the code base seems to do.
There was a problem hiding this comment.
Oops; you're absolutely right. I forgot that T? was a special argument thing rather than an actual type.
| // Number accepts empty/whitespace only strings and rejects numbers with seperators | ||
| // Use both and only accept the intersection of the results? | ||
| let f2 = Number(s); | ||
| if (!isNaN(f) && f === f2) { |
ts2bril.ts
Outdated
| @@ -215,12 +215,18 @@ function emitBril(prog: ts.Node, checker: ts.TypeChecker): bril.Program { | |||
| // Statement chunks. | |||
| builder.buildLabel(thenLab); | |||
| emit(if_.thenStatement); | |||
| builder.buildEffect("jmp", [], undefined, [endLab]); | |||
| const then_branch_terminated = builder.isLastEmittedEffectOp("ret"); | |||
There was a problem hiding this comment.
A little tricky, but makes sense!
bril2jsonpositions for the first rowbrilito be a little more strict on the cli input it expects (related to mod_inv)ts2briltool to not unconditionally output the final endif label and corresponding jump when it isn't needed(related to bitshift and fact)--checkThe typescript stuff could use a double check, I'm not super familiar with this language. I also don't use
ts2brilto know all of the edge cases.