X-Git-Url: https://git.kengrimes.com/?p=watForth.git;a=blobdiff_plain;f=forth.js;h=57aac39ba44d4e295354fd2c869c1a0fc9a7c65c;hp=c05d444d08215e8daf4bc804fbab3454fd29830e;hb=63e17ddc993a5a04cc6ae55bad8420b61c37d1bf;hpb=b9be17929d350bf4ab9c747e29ae6c1203035111

diff --git a/forth.js b/forth.js
index c05d444..57aac39 100644
--- a/forth.js
+++ b/forth.js
@@ -12,96 +12,95 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 'use strict'
 const initialize = Promise.all([
-  fetch('forth.forth').then((re) => re.text()),
-  fetch('forth.wasm').then(re => re.arrayBuffer())
+  fetch('forth.forth', {credentials: 'include', headers:{'content-type':'text/plain'}}).then((re) => re.text()),
+  fetch('forth.wasm', {credentials: 'include', headers:{'content-type':'application/wasm'}}).then(re => re.arrayBuffer())
 ])
 window.onload = () => {
+  const simstack = []
+  const rstack = []
+
   let forthdiv = document.getElementById("forth")
   if (forthdiv === null) {
     forthdiv = document.createElement("div")
-    forthdiv.setAttribute("style","height:400px;")
+    forthdiv.setAttribute("style","height:100%;margin:auto;width:100%;overflow-x:hidden;")
     document.body.appendChild(forthdiv)
   }
   const outframe = document.createElement("div")
-  outframe.setAttribute("style", "overflow-y:hidden;height:40%;")
+  outframe.setAttribute("style", "background-color:black;padding-left:6px;padding-right:6px;color:chartreuse;height:256px;resize:vertical;display:flex;align-items:flex-end;flex-flow:row")
+  const stackview = document.createElement("pre")
+  stackview.setAttribute("style", "white-space:pre-wrap;flex:0 0 8%;")
+  outframe.appendChild(stackview)
   const txtoutput = document.createElement("pre")
-  txtoutput.setAttribute("style", "white-space:pre-wrap;")
-  const txtinput = document.createElement("textarea")
-  let txtinputrows = "1"
-  txtinput.setAttribute("autofocus", "true")  
-  txtinput.setAttribute("cols", "60")
-  txtinput.setAttribute("rows", txtinputrows)
+  txtoutput.setAttribute("style", "white-space:pre-wrap;overflow-y:scroll;flex:1 0 342px;")
   outframe.appendChild(txtoutput)
+  const rstackview = document.createElement("pre")
+  rstackview.setAttribute("style", "white-space:pre-wrap;flex:0 1 8%;")
+  outframe.appendChild(rstackview)
+  const memview = document.createElement("pre")
+  memview.setAttribute("style", "white-space:pre-wrap;flex:0 0 8%;")
+  outframe.appendChild(memview)
+  const txtinput = document.createElement("textarea")
+  txtinput.setAttribute("autofocus", "true")
+  txtinput.setAttribute("wrap", "hard")
+  txtinput.setAttribute("style", "resize:none;white-space:pre;margin-left:8%;width:60%;")
+  txtinput.oninput = () => txtinput.rows = (txtinput.value.match(/[\n]/g) || [1]).length + 1;
+  txtinput.oninput()
   forthdiv.appendChild(outframe)
   forthdiv.appendChild(txtinput)
-  const output = {
-    print: (string) => txtoutput.textContent += string
-  }
   let wasmMem
   let forth
-
+  const output = {
+    print: (string) => txtoutput.textContent += `\\\ => ${string} \n`
+  }
+  const updateViews = () => {
+    stackview.textContent = simstack.join('\n')
+    rstackview.textContent = rstack.join('\n')
+    let cnt = 0;
+    const maxBytes = 12
+    let here = new DataView(wasmMem.buffer, 14340 /* here */, 4).getUint32(0,true)
+    memview.textContent = Array.from(new Uint8Array(wasmMem.buffer, here - maxBytes, maxBytes), (v) => {
+      cnt++;
+      v = ('0' + (v & 0xFF).toString(16)).slice(-2)
+      if (cnt === maxBytes)
+        return v
+      if ((cnt % 4) === 0)
+        return v + '\n==\n'
+      return v + '\n'
+    }).join('')
+    outframe.scrollTop = outframe.scrollHeight
+  }
   /* Input capture */
   let stdin = ""
   txtinput.addEventListener('keydown', (event) => {
     switch (event.key) {
     case "Enter":
       if (event.ctrlKey) {
-        txtinput.value += '\n'
-        txtinputrows = (Number.parseInt(txtinputrows, 10) + 1).toString()
-        txtinput.setAttribute("rows", txtinputrows)
+        const endPos = txtinput.selectionStart + 1
+        txtinput.value =
+          txtinput.value.substring(0, txtinput.selectionStart) +
+          '\n' +
+          txtinput.value.substring(txtinput.selectionEnd, txtinput.value.length)
+        txtinput.setSelectionRange(endPos, endPos)
+        txtinput.oninput()
       }
       else {
         stdin += txtinput.value
-        txtoutput.textContent += txtinput.value + '\n'
+        txtoutput.textContent += txtinput.value
+        if (!/\s/.test(txtinput.value.slice(-1)))
+          txtoutput.textContent += " "
         txtinput.value = ""
-        txtinputrows = "1"
-        txtinput.setAttribute("rows", txtinputrows)
         event.preventDefault()
         event.stopPropagation()
         forth()
-        txtoutput.textContent += " _ok.\n"
-        outframe.scrollTop = outframe.scrollHeight;
+        updateViews()
       }
       break
     case "Backspace":
-      if (txtinput.value.charCodeAt(txtinput.value.length - 1) === 10) {
-        txtinputrows = (Number.parseInt(txtinputrows, 10) - 1).toString()
-        txtinput.setAttribute("rows", txtinputrows)
-      }
       break
     default:
       break
     }
   })
-/*  document.addEventListener('keydown', (event) => {
-    //console.log(`keydown: ${event.key}`)
-    if (event.key != "F5") {
-      event.preventDefault()
-      event.stopPropagation()
-      switch (event.key) {
-      case "Enter":
-        txtoutput.textContent += '\n'
-        stdin += '\n'
-        forth()
-        output.print(" _ok.")
-        outframe.scrollTop = outframe.scrollHeight;
-        txtoutput.textContent += '\n'
-        break
-      case "Backspace":
-        stdin = stdin.substring(0, stdin.length - 1)
-        txtoutput.textContent = txtoutput.textContent.substring(0, txtoutput.textContent.length - 1)
-        break
-      default:
-        if (event.key.length == 1) {
-          const input = event.ctrlKey ? ` \\\^${event.key} ` : event.key
-          stdin += input
-          output.print(input)
-        }
-        break
-      }
-    }
-  })*/
-
   const channels = [{
     read: (writeAddr, maxBytes) => {
       const maxChars = maxBytes >> 1
@@ -118,56 +117,10 @@ window.onload = () => {
         new Uint16Array(wasmMem.buffer, readAddr, maxBytes >> 1)
       ))
   }]
-  const simstack = []
-  const rstack = []
   const dictionary = {
-    ';': 1,
-    'LIT': 2,
-    RINIT: 3,
-    WORD: 16500,
-    KEY: 5,
-    DUP: 6,
-    '+': 7,
-    'NOOP2': 8,
-    '.': 9,
-    '@': 10,
-    '!': 11,
-    EXECUTE: 12,
-    NOOP: 13,
-    'JZ:': 14,
-    'JNZ:': 15,
-    DROP: 16,
-    'WS?': 17,
-    'JMP:': 18,
-    'WPUTC': 19,
-    'WB0': 20,
-    'FIND': 21,
-    'NUMBER': 22,
-    'W!LEN': 23,
-    'J-1:': 24,
-    'BYE': 25,
-    'SWAP': 26,
-    'WORDS': 27,
-    'HERE': 28,
-    'DEFINE': 29,
-    '2DUP': 30,
-    'ROT': 31,
-    '2DROP': 32,
-    ',': 33,
-    '-': 34,
-    'CHANNEL!': 35,
-    'HERE!': 36,
-    '=?': 37,
-    '.S': 38,
-    'STRING-START': 39,
-    'STRING-PUT': 40,
-    'STRING-END': 41,
-    ':': 16800,
-    'MODE': 14336,
-    'EXECUTE-MODE': 16680,
-    'QUIT': 16384,
-    'INTERPRET': 16400
+    EXECUTE: 12
   }
+  const doesDictionary = {}
   const wasmImport = {
     env: {
       pop: () => simstack.pop(),
@@ -216,6 +169,8 @@ window.onload = () => {
         dictionary[word.toUpperCase()] = num
         return 0
       },
+      does_get: (u) => doesDictionary[u] || 0,
+      does_set: (u, v) => doesDictionary[u] = v,
       is_whitespace: (key) => /\s/.test(String.fromCharCode(key)),
       sys_stack: () => console.log(`[${simstack}]`),
       sys_parsenum: (addr, u, base) => {
@@ -241,6 +196,7 @@ window.onload = () => {
       forth = module.instance.exports.main
       console.log('wasm loaded')
       forth()
+      updateViews()
     })
   })
 }