c_meyer/pxt-calliope
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert division to idiv (#1072)

Browse Source 
* Convert division to idiv

* Reflect changes in pxt-core to the idiv XML
This commit is contained in:
Richard Knoll 2018-08-13 12:51:26 -07:00 committed by GitHub
parent 7537c7561f
commit a95d871e97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 80 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
editor/extension.ts
View File

@ -598,24 +598,60 @@ namespace pxt.editor {
// device_random now refers to randomRange() so we need to add the missing lower bound argument // device_random now refers to randomRange() so we need to add the missing lower bound argument
U.toArray(dom.querySelectorAll("block[type=device_random]")) U.toArray(dom.querySelectorAll("block[type=device_random]"))
.forEach(node => { .forEach(node => {
for (let i = 0; i < node.children.length; i++) { if (getValue(node, "min")) return;
const child = node.children.item(i);
if (child.tagName === "value" && child.getAttribute("name") === "min") {
return;
}
}
const v = node.ownerDocument.createElement("value"); const v = node.ownerDocument.createElement("value");
const s = node.ownerDocument.createElement("shadow");
const f = node.ownerDocument.createElement("field");
v.setAttribute("name", "min"); v.setAttribute("name", "min");
v.appendChild(s); addNumberShadow(v);
s.setAttribute("type", "math_number");
s.appendChild(f);
f.setAttribute("name", "NUM");
f.textContent = "0";
node.appendChild(v); node.appendChild(v);
}); });
/*
<block type="math_arithmetic">
<field name="OP">DIVIDE</field>
<value name="A">
<shadow type="math_number"><field name="NUM">0</field></shadow>
<block type="math_number"><field name="NUM">2</field></block>
</value>
<value name="B">
<shadow type="math_number"><field name="NUM">1</field></shadow>
<block type="math_number"><field name="NUM">3</field></block>
</value>
</block>
*/
U.toArray(dom.querySelectorAll("block[type=math_arithmetic]"))
.forEach(node => {
const op = getField(node, "OP");
if (!op || op.textContent.trim() !== "DIVIDE") return;
// Convert to integer division
/*
<block type="math_js_op">
<mutation op-type="infix"></mutation>
<field name="OP">idiv</field>
<value name="ARG0">
<shadow type="math_number"><field name="NUM">0</field></shadow>
</value>
<value name="ARG1">
<shadow type="math_number"><field name="NUM">0</field></shadow>
</value>
</block>
*/
node.setAttribute("type", "math_js_op");
op.textContent = "idiv";
const mutation = node.ownerDocument.createElement("mutation");
mutation.setAttribute("op-type", "infix");
// mutation has to be first or Blockly will drop the second argument
node.insertBefore(mutation, node.firstChild);
const a = getValue(node, "A");
if (a) a.setAttribute("name", "ARG0");
const b = getValue(node, "B");
if (b) b.setAttribute("name", "ARG1");
})
} }
initExtensionsAsync = function (opts: pxt.editor.ExtensionOptions): Promise<pxt.editor.ExtensionResult> { initExtensionsAsync = function (opts: pxt.editor.ExtensionOptions): Promise<pxt.editor.ExtensionResult> {
@ -679,4 +715,34 @@ namespace pxt.editor {
return Promise.resolve<pxt.editor.ExtensionResult>(res); return Promise.resolve<pxt.editor.ExtensionResult>(res);
} }
function getField(parent: Element, name: string) {
return getFieldOrValue(parent, name, true);
}
function getValue(parent: Element, name: string) {
return getFieldOrValue(parent, name, false);
}
function getFieldOrValue(parent: Element, name: string, isField: boolean) {
const nodeType = isField ? "field" : "value";
for (let i = 0; i < parent.children.length; i++) {
const child = parent.children.item(i);
if (child.tagName === nodeType && child.getAttribute("name") === name) {
return child;
}
}
return undefined;
}
function addNumberShadow(valueNode: Element) {
const s = valueNode.ownerDocument.createElement("shadow");
s.setAttribute("type", "math_number");
const f = valueNode.ownerDocument.createElement("field");
f.setAttribute("name", "NUM");
f.textContent = "0";
s.appendChild(f);
valueNode.appendChild(s);
}
} }