diff options
| -rw-r--r-- | .github/workflows/gen.yml | 4 | ||||
| -rw-r--r-- | docs/code.js | 59 | ||||
| -rwxr-xr-x | std/generate_map.py | 48 | ||||
| -rwxr-xr-x | std/generate_map.sh | 20 |
4 files changed, 87 insertions, 44 deletions
diff --git a/.github/workflows/gen.yml b/.github/workflows/gen.yml index d93dea9..5c20fff 100644 --- a/.github/workflows/gen.yml +++ b/.github/workflows/gen.yml @@ -31,8 +31,8 @@ jobs: run: cd docs/ && ./gen.sh - name: Generate std map run: | - sudo apt install jq - cd std/ && ./generate_map.sh >../docs/std_map.json + sudo apt install python + cd std/ && ./generate_map.py >../docs/std_map.json - name: Upload artifact uses: actions/upload-pages-artifact@v1 with: diff --git a/docs/code.js b/docs/code.js index 6093a9e..7572c0b 100644 --- a/docs/code.js +++ b/docs/code.js @@ -188,7 +188,9 @@ const bruijnParse = (stdMap) => { } else if (token.classList[0] === "pp") { // preprocessor const instr = inner.trim(); - if (instr.startsWith(":import") || instr.startsWith(":input")) { + const isImport = instr.startsWith(":import"); + const isInput = instr.startsWith(":input"); + if (isImport || isInput) { const parts = instr.split(" "); const path = parts[1].replace("std/", "") + ".bruijn"; if (!(path in stdMap)) { @@ -196,27 +198,28 @@ const bruijnParse = (stdMap) => { continue; } - // TODO: inputs currently don't respect its imports stdMap[path].forEach((d) => { - const name = parts[0].startsWith(":input") + const name = isInput ? d.name : parts[2] == "." ? d.name : parts[2] + "." + d.name; const link = d.source.replace("/", "_"); - root.children.push({ - kind: "import", - elem: token, - indent: 0, - action: (f) => - window.open( - `https://bruijn.marvinborner.de/std/${link}.html#${f}`, - "_blank", - ), - children: [], - nodes: [], - name, - }); + const original = path.replace("/", "_"); + if (isInput || (isImport && d.kind !== "import")) + root.children.push({ + kind: "import", + elem: token, + indent: 0, + action: (f) => + window.open( + `https://bruijn.marvinborner.de/std/${f == "" ? original : link}.html#${f}`, + "_blank", + ), + children: [], + nodes: [], + name, + }); }); } else if (instr.startsWith(":test") || instr.startsWith(":time")) { root.children.push(fresh); @@ -241,12 +244,14 @@ const bruijnParse = (stdMap) => { ) { // namespaced prefix const decoded = decodeHTML(tokens[j].innerHTML.trim()); + const prefixed = + decoded[decoded.length - 1] === "‣" ? decoded : decoded + "‣"; fresh.nodes.push({ kind: "prefix", elem: tokens[j], - name: tokens[j - 1].innerHTML.trim() + decoded + "‣", + name: tokens[j - 1].innerHTML.trim() + prefixed, bruijnStack: [...bruijnStack], // for subs - canonical: decoded.slice(1) + "‣", + canonical: prefixed.slice(1), }); } else if ( tokens[j].classList[0] === "special" && @@ -254,21 +259,26 @@ const bruijnParse = (stdMap) => { ) { // normal prefix const decoded = decodeHTML(tokens[j].innerHTML.trim()); + const prefixed = + decoded[decoded.length - 1] === "‣" ? decoded : decoded + "‣"; fresh.nodes.push({ kind: "prefix", elem: tokens[j], - name: decoded + "‣", + name: prefixed, bruijnStack: [...bruijnStack], // for subs - canonical: decoded + "‣", + canonical: prefixed, }); // normal mixfix TODO: this is a ugly hack and only works if lucky and binary + const mixfixed = decoded[decoded.length - 1].includes("…") + ? decoded + : "…" + decoded + "…"; fresh.nodes.push({ kind: "mixfix", elem: tokens[j], - name: "…" + decoded + "…", + name: mixfixed, bruijnStack: [...bruijnStack], // for subs - canonical: "…" + decoded + "…", + canonical: mixfixed, }); } else if ( j > 1 && @@ -362,6 +372,11 @@ const bruijnParse = (stdMap) => { metaStacks[sup.name] = metaStack; }); } + + // TODO: case is missing: + // foo [bar] + // baz [0 1 2] # won't get highlighted + // bar [baz] } } } diff --git a/std/generate_map.py b/std/generate_map.py new file mode 100755 index 0000000..62c9920 --- /dev/null +++ b/std/generate_map.py @@ -0,0 +1,48 @@ +#!/bin/env python + +from pathlib import Path +import json + + +def list_defs(path, kind, prefix): + res = [] + for line in open(path).readlines(): + if line.startswith(":input"): + parts = line.split(" ") + input_path = parts[1].strip().split("std/")[1] + ".bruijn" + # not using kind="input" is important, "import"s should be inherited + res = res + list_defs(input_path, kind, prefix) + elif line.startswith(":import") and kind == "input": + parts = line.split(" ") + import_path = parts[1].strip().split("std/")[1] + ".bruijn" + new_prefix = ( + "" if parts[2].strip() == "." else parts[2].strip() + "." + ) + new_prefix = prefix + new_prefix if prefix else new_prefix + res = res + list_defs(import_path, "import", new_prefix) + elif ( + line.startswith(":") + or line.startswith("#") + or line.strip() == "" + or line[0].isspace() + ): + continue + else: + parts = line.strip().split(" ") + res.append( + { + "name": prefix + parts[0], + "source": path, + "kind": kind, + } + ) + return res + + +res = {} +files = Path(".").glob("**/*.bruijn") +for file in files: + path = str(file) + if path != "All.bruijn" and "Generic" not in path: + res[path] = list_defs(path, "input", "") +print(json.dumps(res)) diff --git a/std/generate_map.sh b/std/generate_map.sh deleted file mode 100755 index 193a62b..0000000 --- a/std/generate_map.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -FILES="$(find * -type f -name "*.bruijn" ! -name "All.bruijn" ! -path "*Generic*")" - -# TODO: also handle imports for :input intelligence -list_defs() { - grep -Po "^[^:# \t][^ \t]*" "$1" | sed -e "s#\\(.*\\)#{\"name\": \"\\1\", \"source\": \"$1\"}#g" - inputs="$(awk '/^:input/ {print $2}' "$1")" - for i in $inputs; do - list_defs "${i#std/}.bruijn" - done -} - -{ - for f in $FILES; do - echo "{\"$f\":" - list_defs "$f" | sed 's/\\/\\\\/g' | jq -s . - echo "}" - done -} | jq -s add |