obsidian-plugin/dwolfe884_obsidian-x86-flow-graph
1
0
Fork 0
mirror of https://github.com/dwolfe884/obsidian-x86-flow-graph.git synced 2026-07-22 07:30:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added error handling for missing location

Browse source
This commit is contained in:
david 2023-02-05 19:09:16 -06:00
parent 8b35f1fef3
commit f62f6fe376
2 changed files with 31 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
main.js
View file

@ -104,7 +104,18 @@ function generatenodes(linenum, text, fromnode2, edgelabel) {
if (whereto.length != 1) {
edgelabel = "true";
}
generatenodes(locations[whereto[0]], text, fromnode2, edgelabel);
if (!locations[whereto[0]]) {
newnode = { "id": nodeid, "x": workingx, "y": workingy, "width": 550, "height": 25 * ("```\nERROR: Jumping to non-existant\nlocation " + whereto[0].trim() + "\n```").split("\n").length, "type": "text", "text": "```\nERROR: Jumping to non-existant\nlocation " + whereto[0].trim() + "\n```", "startline": -1, "endline": -1 };
workingy = workingy + 300;
workingx = workingx + 50 * nodeid;
var newedge = { "id": edgeid, "fromNode": nodeid - 1, "fromSide": "bottom", "toNode": nodeid, "toSide": "top", "label": "" };
edges.push(newedge);
nodes.push(newnode);
edgeid = edgeid + 1;
nodeid = nodeid + 1;
} else {
generatenodes(locations[whereto[0]], text, fromnode2, edgelabel);
}
if (whereto.length == 2) {
generatenodes(whereto[1], text, fromnode2, "false");
}

26
src/index.ts
View file

@ -100,10 +100,24 @@ function generatenodes(linenum: any, text: any, fromnode: any, edgelabel: string
if(whereto.length != 1){
edgelabel = "true"
}
generatenodes(locations[whereto[0]], text, fromnode, edgelabel)
if(whereto.length == 2){
generatenodes(whereto[1], text, fromnode, "false")
}
//Error Handling for trying to jump to a non-existant location
if(!locations[whereto[0]]){
//Make the error node
newnode = {"id":nodeid, "x": workingx, "y": workingy, "width": 550,"height": 25*("```\nERROR: Jumping to non-existant\nlocation " + whereto[0].trim() + "\n```").split("\n").length, "type": "text", "text": "```\nERROR: Jumping to non-existant\nlocation " + whereto[0].trim() + "\n```", "startline": -1,"endline": -1}
workingy = workingy + 300
workingx = workingx + (50*nodeid)
var newedge = {"id":edgeid,"fromNode":nodeid-1,"fromSide":"bottom","toNode":nodeid,"toSide":"top","label":""}
edges.push(newedge)
nodes.push(newnode)
edgeid = edgeid + 1
nodeid = nodeid + 1
}
else{
generatenodes(locations[whereto[0]], text, fromnode, edgelabel)
}
if(whereto.length == 2){
generatenodes(whereto[1], text, fromnode, "false")
}
return
}
@ -144,6 +158,7 @@ function MakeNodeFromLineToNextJump(linenum: any, text: any, fromnode: any, edge
var line = text[i]
//If the current line is an instruction and not a location
if(line[0] == '\t' || line[0] == " "){
//If the current instruction is a jump
if(line.trim()[0] == 'j'){
currnode = currnode + line + "\n```"
newnode = {"id":nodeid, "x": workingx*side, "y": workingy, "width": 550,"height": 25*currnode.split("\n").length, "type": "text", "text": currnode, "startline": linenum,"endline": i}
@ -190,9 +205,6 @@ function MakeNodeFromLineToNextJump(linenum: any, text: any, fromnode: any, edge
edges.push(newedge)
edgeid = edgeid + 1
}
//Otherwise just leave
//currnode = currnode + line + "\n"
//visitslocs[line.trim()] = nodeid
i = text.length+20
}
//Have we visited this location before and is this the first line of a node?