From a54a7ba7c95965268d7a2a3c64a6a6c599fdb9da Mon Sep 17 00:00:00 2001 From: Elizabeth Hunt Date: Fri, 17 Nov 2023 12:09:44 -0700 Subject: [PATCH] finish compiler! --- godel/css/styles.css | 11 +++ godel/grammar.peg | 50 ++++++++----- godel/index.html | 23 ++++-- godel/js/compiler.js | 47 ++++++++---- godel/js/godelWorker.js | 27 +++++++ godel/js/main.js | 64 ++++++++++++++--- godel/js/parser.js | 156 ++++++++++++++++++++-------------------- 7 files changed, 251 insertions(+), 127 deletions(-) create mode 100644 godel/js/godelWorker.js diff --git a/godel/css/styles.css b/godel/css/styles.css index b9c5c10..799e183 100644 --- a/godel/css/styles.css +++ b/godel/css/styles.css @@ -69,3 +69,14 @@ hr { border-top: 2px solid black; border-bottom: none; } + +pre { + white-space: pre-wrap; + word-wrap: break-word; +} + +@media only screen and (max-width: 1000px) { + .source-container { + flex-direction: column; + } +} diff --git a/godel/grammar.peg b/godel/grammar.peg index 73ba08e..a66d5a5 100644 --- a/godel/grammar.peg +++ b/godel/grammar.peg @@ -1,9 +1,17 @@ -Program = lines: (Line / (_/[\n]))* { +Program = lines: (ProgramInstruction / (_/[\n]))* { return { instructions: lines.filter((line) => typeof line !== "string" || line.trim() != "") }; } -Line = _? instruction: (LabeledInstruction / Instruction) _? [\n]? { - return instruction; +ProgramInstruction = _? instruction: (LabeledInstruction / Instruction) _? [\n]? { + let x = 0; + let y = 0; + if (instruction.label) { + x = instruction.label.godel; + y = instruction.instruction.godel; + } else { + y = instruction.godel; + } + return { instruction, godel: ((2 ** x) * ((2 * y) + 1) - 1) }; } LabeledInstruction = label:Label _ instruction:Instruction { @@ -14,33 +22,41 @@ Label = "[" _? label:LABEL_V _? "]" { return label; } -Instruction = conditional: Conditional { return { conditional }; } - / assignment: Assignment { return { assignment }; } - / goto: Goto { return { goto }; } +Instruction = conditional: Conditional { return { conditional, godel: conditional.godel }; } + / assignment: Assignment { return { assignment, godel: assignment.godel }; } + / goto: Goto { return { goto, godel: goto.godel }; } Goto = GOTO _ label: LABEL_V { - return { label }; + return { label, godel: label.godel + 2 }; } Conditional = "IF" _ variable: VAR _? "!=" _? "0" _ goto: Goto { - return { variable, goto }; + const y = variable.godel - 1; + const x = goto.godel; + return { variable, goto, godel: ((2 ** x) * ((2 * y) + 1) - 1) }; } Assignment = variable: VAR _ "<-" _ expr: Expression { - if (expr.left != variable) { + if (expr.left.symbol != variable.symbol) { error("left hand variable must match right hand"); } - return { variable, expr }; + const x = expr.instructionNumber; + const y = variable.godel - 1; + return { variable, expr, godel: ((2 ** x) * ((2 * y) + 1) - 1) }; } Expression = left: VAR _ opr: OPERATION _ "1" { - return { left, opr }; + const instructionNumber = { "+" : 1, "-" : 2 }[opr]; + return { left, opr, instructionNumber }; } / left: VAR { - return { left }; + return { left, instructionNumber: 0 }; } -VAR = symbol:"Y" { return symbol } / symbol:("X" / "Z") ind:Integer+ { - return symbol + ind; +VAR = symbol:"Y" { return { symbol, godel: 1 }; } / symbol:("X" / "Z") ind:Integer+ { + const index = parseInt(ind); + const order = ["X", "Z"]; + const godel = index * order.length + order.indexOf(symbol); + return { symbol: symbol + ind, godel }; } GOTO = "GOTO" @@ -48,10 +64,12 @@ GOTO = "GOTO" OPERATION = "+" / "-" LABEL_V = symbol:END_LABEL { return symbol } / symbol:[A-E] ind:Integer+ { - return symbol + ind; + const index = parseInt(ind); + const godel = (symbol.charCodeAt(0) - "A".charCodeAt(0) + 1) + 5*(index-1); + return { symbol: symbol + ind, godel }; } -END_LABEL = "E" +END_LABEL = "E1" Integer "integer" = [0-9]+ { return parseInt(text(), 10); } diff --git a/godel/index.html b/godel/index.html index 1769959..f8e8dad 100644 --- a/godel/index.html +++ b/godel/index.html @@ -17,20 +17,22 @@ @@ -71,6 +73,17 @@ +
+

Godel

+

Sequence:

+

+      
+

Number:

+
+

+    
diff --git a/godel/js/compiler.js b/godel/js/compiler.js index e63f5b0..e978244 100644 --- a/godel/js/compiler.js +++ b/godel/js/compiler.js @@ -11,11 +11,14 @@ class StringBuilder { } const compileGoto = (gotoNode, stringBuilder) => { - stringBuilder.add(`this.followGoto("${gotoNode.label}");\nreturn;\n`); + stringBuilder.add(`this.followGoto("${gotoNode.label.symbol}");\nreturn;\n`); }; const compileConditional = (conditionalNode, stringBuilder) => { - const { variable, goto: gotoNode } = conditionalNode; + const { + variable: { symbol: variable }, + goto: gotoNode, + } = conditionalNode; stringBuilder.add(`if (this.get("${variable}") != 0) {\n`); compileGoto(gotoNode, stringBuilder); @@ -23,7 +26,10 @@ const compileConditional = (conditionalNode, stringBuilder) => { }; const compileAssignment = (assignmentNode, stringBuilder) => { - const { variable, expr } = assignmentNode; + const { + variable: { symbol: variable }, + expr, + } = assignmentNode; if (expr.opr) { if (expr.opr == "+") stringBuilder.add(`this.addOne("${variable}");\n`); else if (expr.opr == "-") @@ -49,6 +55,8 @@ const compileInstruction = (instruction, stringBuilder) => { }; const compile = (ast) => { + const godelSequence = []; + const stringBuilder = new StringBuilder(); stringBuilder.add(` class Program { @@ -65,8 +73,8 @@ const compile = (ast) => { this.finalInstruction = ${ ast.instructions.length + 1 }; // instruction of the implied "exit" label - // "E" is the exit label - this.labelInstructions.set("E", this.finalInstruction); + // "E1" is the exit label + this.labelInstructions.set("E1", this.finalInstruction); } get(variable) { @@ -122,25 +130,31 @@ const compile = (ast) => { stringBuilder.add("// -- build label -> instruction map --\n"); for (let i = 0; i < ast.instructions.length; i++) { - const line = ast.instructions[i]; + const instruction = ast.instructions[i]; + godelSequence.push(instruction.godel); + + const line = instruction.instruction; const instructionIdx = i + 1; if (line.label) { + const symbol = line.label.symbol; stringBuilder.add( - `this.instructions.set(${instructionIdx}, () => this.${line.label}());\n` + `this.instructions.set(${instructionIdx}, () => this.${symbol}());\n` ); stringBuilder.add( - `this.labelInstructions.set("${line.label}", ${instructionIdx});\n` + `this.labelInstructions.set("${symbol}", ${instructionIdx});\n` ); } } stringBuilder.add("// -- compiled instructions --\n"); for (let i = 0; i < ast.instructions.length; i++) { - let instruction = ast.instructions[i]; + let instruction = ast.instructions[i].instruction; const instructionIdx = i + 1; if (instruction.label) { + const symbol = instruction.label.symbol; + stringBuilder.add( - ` this.followGoto("${instruction.label}");\n}\n\n${instruction.label}() {\n` + ` this.followGoto("${symbol}");\n}\n\n${symbol}() {\n` ); stringBuilder.add(`this.instructionPointer = ${instructionIdx};\n`); instruction = instruction.instruction; @@ -152,14 +166,17 @@ const compile = (ast) => { stringBuilder.add(` }\n}\n`); stringBuilder.add("// -- \n"); stringBuilder.add("const program = new Program();\n\n"); - stringBuilder.add("// set the initial Snapshot here\n"); + stringBuilder.add("// !! set the initial Snapshot here !!\n"); stringBuilder.add('// program.variables.set("X1", 2);\n\n'); stringBuilder.add("program.run();\n"); stringBuilder.add("console.log(program.variables);\n"); stringBuilder.add("program.getResult();\n"); - return js_beautify(stringBuilder.build(), { - indent_size: 2, - wrap_line_length: 100, - }); + return { + js: js_beautify(stringBuilder.build(), { + indent_size: 2, + wrap_line_length: 100, + }), + godelSequence, + }; }; diff --git a/godel/js/godelWorker.js b/godel/js/godelWorker.js new file mode 100644 index 0000000..594a4ad --- /dev/null +++ b/godel/js/godelWorker.js @@ -0,0 +1,27 @@ +const isPrime = (n) => + !Array(Math.ceil(Math.sqrt(n))) + .fill(0) + .map((_, i) => i + 2) // first prime is 2 + .some((i) => n !== i && n % i === 0); + +const primesCache = [2]; +const p = (i) => { + if (primesCache.length <= i) { + let x = primesCache.at(-1); + while (primesCache.length <= i) { + if (isPrime(++x)) primesCache.push(x); + } + } + return primesCache.at(i - 1); +}; + +const computeGodelNumber = (godelSequence) => + godelSequence.reduce((acc, num, i) => { + const prime = p(i + 1); + return BigInt(acc) * BigInt(prime) ** BigInt(num); + }, 1) - BigInt(1); + +self.addEventListener("message", (e) => { + const godelNumber = computeGodelNumber(e.data); + postMessage(godelNumber); +}); diff --git a/godel/js/main.js b/godel/js/main.js index bd36ef9..898c558 100644 --- a/godel/js/main.js +++ b/godel/js/main.js @@ -18,15 +18,19 @@ const main = () => { if (msg.type == MESSAGES.COMPILE) { const { value } = msg; const source = prepareSource(value); + try { const ast = parser.parse(source); - const program = compile(ast); + const { js, godelSequence } = compile(ast); state.notify({ type: MESSAGES.COMPILE_RESULT, - value: program, + success: true, + js, + godelSequence, }); } catch (e) { + console.error(e); state.notify({ type: MESSAGES.COMPILE_RESULT, error: e.toString(), @@ -39,6 +43,7 @@ const main = () => { const result = eval(source); state.notify({ type: MESSAGES.EVAL_RESULT, + success: true, value: result, }); } catch (e) { @@ -54,33 +59,46 @@ main(); // -- a bit of some hacky ui code -- -const instructionsEl = document.getElementById("instructions"); -const instructionsEditorEl = CodeMirror.fromTextArea(instructionsEl, { +const codeMirrorConfig = { lineNumbers: true, -}); +}; +const instructionsEl = document.getElementById("instructions"); +const instructionsEditorEl = CodeMirror.fromTextArea( + instructionsEl, + codeMirrorConfig +); const compileButton = document.getElementById("compile"); const evalButton = document.getElementById("eval"); const evalStatusEl = document.getElementById("eval_status"); const compileStatusEl = document.getElementById("compile_status"); const compiledEl = document.getElementById("compiled"); -const compiledEditorEl = CodeMirror.fromTextArea(compiledEl, { - lineNumbers: true, -}); +const compiledEditorEl = CodeMirror.fromTextArea(compiledEl, codeMirrorConfig); +const godelSequenceEl = document.getElementById("godel_sequence"); +const godelNumberEl = document.getElementById("godel_number"); +const godelNumberComputeBtn = document.getElementById("godel_number_comp"); + state.subscribe((msg) => { if (msg.type == MESSAGES.COMPILE_RESULT) { evalStatusEl.classList.remove("error"); evalStatusEl.classList.remove("success"); evalStatusEl.innerHTML = ""; - if (typeof msg.value !== "undefined") { - compiledEditorEl.setValue(msg.value); + if (msg.success) { + const { js, godelSequence } = msg; + compiledEditorEl.setValue(js); + + godelSequenceEl.innerHTML = `[${godelSequence.join(", ")}]`; + godelNumberComputeBtn.style.display = "inline"; compileStatusEl.classList.add("success"); compileStatusEl.classList.remove("error"); compileStatusEl.innerHTML = `Successful compile at ${new Date().toLocaleString()}!`; } else if (msg.error) { compiledEditorEl.setValue(""); + godelSequenceEl.innerHTML = ""; + godelNumberEl.innerHTML = ""; + godelNumberComputeBtn.style.display = "none"; compileStatusEl.classList.remove("success"); compileStatusEl.classList.add("error"); @@ -88,9 +106,33 @@ state.subscribe((msg) => { } } }); + +state.subscribe((msg) => { + if (msg.type == MESSAGES.COMPILE_RESULT) { + if (msg.success) { + const { godelSequence } = msg; + + godelNumberComputeBtn.onclick = () => { + godelNumberEl.innerHTML = "working..."; + + const worker = new Worker("js/godelWorker.js"); + + worker.addEventListener("message", (e) => { + const godelNumber = e.data; + godelNumberEl.innerHTML = godelNumber.toString(); + }); + + worker.postMessage(godelSequence); + }; + } else if (msg.error) { + godelNumberComputeBtn.onclick = () => {}; + } + } +}); + state.subscribe((msg) => { if (msg.type == MESSAGES.EVAL_RESULT) { - if (typeof msg.value !== "undefined") { + if (msg.success) { evalStatusEl.classList.add("success"); evalStatusEl.classList.remove("error"); evalStatusEl.innerHTML = `Result: ${msg.value}`; diff --git a/godel/js/parser.js b/godel/js/parser.js index c582a28..808132e 100644 --- a/godel/js/parser.js +++ b/godel/js/parser.js @@ -147,7 +147,15 @@ parser = /* return { instructions: lines.filter((line) => typeof line !== "string" || line.trim() != "") }; }, peg$c3 = function(instruction) { - return instruction; + let x = 0; + let y = 0; + if (instruction.label) { + x = instruction.label.godel; + y = instruction.instruction.godel; + } else { + y = instruction.godel; + } + return { instruction, godel: ((2 ** x) * ((2 * y) + 1) - 1) }; }, peg$c4 = function(label, instruction) { return { label, instruction }; @@ -159,11 +167,11 @@ parser = /* peg$c9 = function(label) { return label; }, - peg$c10 = function(conditional) { return { conditional }; }, - peg$c11 = function(assignment) { return { assignment }; }, - peg$c12 = function(goto) { return { goto }; }, + peg$c10 = function(conditional) { return { conditional, godel: conditional.godel }; }, + peg$c11 = function(assignment) { return { assignment, godel: assignment.godel }; }, + peg$c12 = function(goto) { return { goto, godel: goto.godel }; }, peg$c13 = function(label) { - return { label }; + return { label, godel: label.godel + 2 }; }, peg$c14 = "IF", peg$c15 = peg$literalExpectation("IF", false), @@ -172,33 +180,41 @@ parser = /* peg$c18 = "0", peg$c19 = peg$literalExpectation("0", false), peg$c20 = function(variable, goto) { - return { variable, goto }; + const y = variable.godel - 1; + const x = goto.godel; + return { variable, goto, godel: ((2 ** x) * ((2 * y) + 1) - 1) }; }, peg$c21 = "<-", peg$c22 = peg$literalExpectation("<-", false), peg$c23 = function(variable, expr) { - if (expr.left != variable) { + if (expr.left.symbol != variable.symbol) { error("left hand variable must match right hand"); } - return { variable, expr }; + const x = expr.instructionNumber; + const y = variable.godel - 1; + return { variable, expr, godel: ((2 ** x) * ((2 * y) + 1) - 1) }; }, peg$c24 = "1", peg$c25 = peg$literalExpectation("1", false), peg$c26 = function(left, opr) { - return { left, opr }; + const instructionNumber = { "+" : 1, "-" : 2 }[opr]; + return { left, opr, instructionNumber }; }, peg$c27 = function(left) { - return { left }; + return { left, instructionNumber: 0 }; }, peg$c28 = "Y", peg$c29 = peg$literalExpectation("Y", false), - peg$c30 = function(symbol) { return symbol }, + peg$c30 = function(symbol) { return { symbol, godel: 1 }; }, peg$c31 = "X", peg$c32 = peg$literalExpectation("X", false), peg$c33 = "Z", peg$c34 = peg$literalExpectation("Z", false), peg$c35 = function(symbol, ind) { - return symbol + ind; + const index = parseInt(ind); + const order = ["X", "Z"]; + const godel = index * order.length + order.indexOf(symbol); + return { symbol: symbol + ind, godel }; }, peg$c36 = "GOTO", peg$c37 = peg$literalExpectation("GOTO", false), @@ -208,16 +224,19 @@ parser = /* peg$c41 = peg$literalExpectation("-", false), peg$c42 = /^[A-E]/, peg$c43 = peg$classExpectation([["A", "E"]], false, false), - peg$c44 = "E", - peg$c45 = peg$literalExpectation("E", false), - peg$c46 = peg$otherExpectation("integer"), - peg$c47 = /^[0-9]/, - peg$c48 = peg$classExpectation([["0", "9"]], false, false), - peg$c49 = function() { return parseInt(text(), 10); }, - peg$c50 = peg$otherExpectation("whitespace"), - peg$c51 = /^[ \t]/, - peg$c52 = peg$classExpectation([" ", "\t"], false, false), - peg$c53 = function() { }, + peg$c44 = function(symbol, ind) { + const index = parseInt(ind); + const godel = (symbol.charCodeAt(0) - "A".charCodeAt(0) + 1) + 5*(index-1); + return { symbol: symbol + ind, godel }; + }, + peg$c45 = peg$otherExpectation("integer"), + peg$c46 = /^[0-9]/, + peg$c47 = peg$classExpectation([["0", "9"]], false, false), + peg$c48 = function() { return parseInt(text(), 10); }, + peg$c49 = peg$otherExpectation("whitespace"), + peg$c50 = /^[ \t]/, + peg$c51 = peg$classExpectation([" ", "\t"], false, false), + peg$c52 = function() { }, peg$currPos = 0, peg$savedPos = 0, @@ -360,7 +379,7 @@ parser = /* s0 = peg$currPos; s1 = []; - s2 = peg$parseLine(); + s2 = peg$parseProgramInstruction(); if (s2 === peg$FAILED) { s2 = peg$parse_(); if (s2 === peg$FAILED) { @@ -375,7 +394,7 @@ parser = /* } while (s2 !== peg$FAILED) { s1.push(s2); - s2 = peg$parseLine(); + s2 = peg$parseProgramInstruction(); if (s2 === peg$FAILED) { s2 = peg$parse_(); if (s2 === peg$FAILED) { @@ -398,7 +417,7 @@ parser = /* return s0; } - function peg$parseLine() { + function peg$parseProgramInstruction() { var s0, s1, s2, s3, s4; s0 = peg$currPos; @@ -895,58 +914,35 @@ parser = /* var s0, s1, s2, s3; s0 = peg$currPos; - s1 = peg$parseEND_LABEL(); - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$c30(s1); + if (peg$c42.test(input.charAt(peg$currPos))) { + s1 = input.charAt(peg$currPos); + peg$currPos++; + } else { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$c43); } } - s0 = s1; - if (s0 === peg$FAILED) { - s0 = peg$currPos; - if (peg$c42.test(input.charAt(peg$currPos))) { - s1 = input.charAt(peg$currPos); - peg$currPos++; + if (s1 !== peg$FAILED) { + s2 = []; + s3 = peg$parseInteger(); + if (s3 !== peg$FAILED) { + while (s3 !== peg$FAILED) { + s2.push(s3); + s3 = peg$parseInteger(); + } } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c43); } + s2 = peg$FAILED; } - if (s1 !== peg$FAILED) { - s2 = []; - s3 = peg$parseInteger(); - if (s3 !== peg$FAILED) { - while (s3 !== peg$FAILED) { - s2.push(s3); - s3 = peg$parseInteger(); - } - } else { - s2 = peg$FAILED; - } - if (s2 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$c35(s1, s2); - s0 = s1; - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } + if (s2 !== peg$FAILED) { + peg$savedPos = s0; + s1 = peg$c44(s1, s2); + s0 = s1; } else { peg$currPos = s0; s0 = peg$FAILED; } - } - - return s0; - } - - function peg$parseEND_LABEL() { - var s0; - - if (input.charCodeAt(peg$currPos) === 69) { - s0 = peg$c44; - peg$currPos++; } else { + peg$currPos = s0; s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c45); } } return s0; @@ -958,22 +954,22 @@ parser = /* peg$silentFails++; s0 = peg$currPos; s1 = []; - if (peg$c47.test(input.charAt(peg$currPos))) { + if (peg$c46.test(input.charAt(peg$currPos))) { s2 = input.charAt(peg$currPos); peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c48); } + if (peg$silentFails === 0) { peg$fail(peg$c47); } } if (s2 !== peg$FAILED) { while (s2 !== peg$FAILED) { s1.push(s2); - if (peg$c47.test(input.charAt(peg$currPos))) { + if (peg$c46.test(input.charAt(peg$currPos))) { s2 = input.charAt(peg$currPos); peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c48); } + if (peg$silentFails === 0) { peg$fail(peg$c47); } } } } else { @@ -981,13 +977,13 @@ parser = /* } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c49(); + s1 = peg$c48(); } s0 = s1; peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c46); } + if (peg$silentFails === 0) { peg$fail(peg$c45); } } return s0; @@ -999,22 +995,22 @@ parser = /* peg$silentFails++; s0 = peg$currPos; s1 = []; - if (peg$c51.test(input.charAt(peg$currPos))) { + if (peg$c50.test(input.charAt(peg$currPos))) { s2 = input.charAt(peg$currPos); peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c52); } + if (peg$silentFails === 0) { peg$fail(peg$c51); } } if (s2 !== peg$FAILED) { while (s2 !== peg$FAILED) { s1.push(s2); - if (peg$c51.test(input.charAt(peg$currPos))) { + if (peg$c50.test(input.charAt(peg$currPos))) { s2 = input.charAt(peg$currPos); peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c52); } + if (peg$silentFails === 0) { peg$fail(peg$c51); } } } } else { @@ -1022,13 +1018,13 @@ parser = /* } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c53(); + s1 = peg$c52(); } s0 = s1; peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c50); } + if (peg$silentFails === 0) { peg$fail(peg$c49); } } return s0;