clean up unparser

Author: thomasjball

assets/progs/happySad.mc

@@ -1,103 +1,84 @@
 Page 1
-press button_A show_image LED_image
+When press button_A Do show_image LED_image
 1 1 . 1 1 
 1 1 . 1 1 
 . . . . . 
 1 . . . 1 
 . 1 1 1 . 
-
  LED_image
 1 1 . 1 1 
 . . . . . 
 1 . . . 1 
 . 1 1 1 . 
 . . . . . 
 
- EOR
 
-press button_A play_sound happy EOR
+When press button_A Do play_sound happy
 
-press button_B show_image LED_image
+When press button_B Do show_image LED_image
 1 1 . 1 1 
 1 1 . 1 1 
 . . . . . 
 . 1 1 1 . 
 1 . . . 1 
-
  LED_image
 1 1 . 1 1 
 1 1 . 1 1 
 . . . . . 
 . . . . . 
 1 1 1 1 1 
 
- EOR
 
-press button_B play_sound sad EOR
+When press button_B Do play_sound sad
 
-EOP
 Page 2
 
-EOP
 Page 3
 
-EOP
 Page 4
 
-EOP
 Page 5
 
-EOP
-
-button-up
 
 Page 1
-press button_A show_image LED_image
+When press button_A Do show_image LED_image
 1 1 . 1 1 
 1 1 . 1 1 
 . . . . . 
 1 . . . 1 
 . 1 1 1 . 
-
  LED_image
 1 1 . 1 1 
 . . . . . 
 1 . . . 1 
 . 1 1 1 . 
 . . . . . 
 
- EOR
 
-press button_A play_sound happy EOR
+When press button_A Do play_sound happy
 
-press button_B show_image LED_image
+When press button_B Do show_image LED_image
 1 1 . 1 1 
 1 1 . 1 1 
 . . . . . 
 . 1 1 1 . 
 1 . . . 1 
-
  LED_image
 1 1 . 1 1 
 1 1 . 1 1 
 . . . . . 
 . . . . . 
 1 1 1 1 1 
 
- EOR
 
-press button_B play_sound sad EOR
+When press button_B Do play_sound sad
 
-EOP
 Page 2
 
-EOP
 Page 3
 
-EOP
 Page 4
 
-EOP
 Page 5
 
-EOP
+

editor.ts

@@ -296,7 +296,8 @@ namespace microcode {
                 this.progdef = ProgramDefn.fromBuffer(new BufferReader(buf))
                 // to string
                 const progAsString = this.progdef.toString()
-                const progFromString = parse(progAsString)
+                console.log(progAsString)
+                // const progFromString = parse(progAsString)
                 // const progAsBuf = progFromString.toBuffer()
                 // // compare buffers
                 // if (buf.length == progAsBuf.length) {

language.ts

@@ -286,26 +286,24 @@ namespace microcode {
                 const tok = toToken(tile)
                 if (tile instanceof ModifierEditor) {
                     const mod = tile as ModifierEditor
-                    return (
-                        tok +
-                        `\n` +
-                        mod.fieldEditor.toString(mod.getField()) +
-                        "\n"
-                    )
+                    const field = mod.fieldEditor.toString(mod.getField())
+                    if (mod instanceof IconEditor) return `${tok}\n${field}`
+                    else return `${tok} ${field}\n`
                 }
                 return tok
             }
             return (
+                "When " +
                 toToken(this.sensor) +
                 " " +
                 this.filters.map(tileToString).join(" ") +
-                " " +
+                " Do " +
                 (this.actuators.length
                     ? toToken(this.actuators[0]) +
                       " " +
                       this.modifiers.map(tileToString).join(" ")
                     : "") +
-                " EOR\n"
+                "\n"
             )
         }
     }
@@ -417,7 +415,7 @@ namespace microcode {
 
         public toString() {
             const res = this.pages.map(page => page.toString())
-            return res.map((ps, i) => `Page ${i + 1}\n${ps}\nEOP`).join("\n")
+            return res.map((ps, i) => `Page ${i + 1}\n${ps}`).join("\n")
         }
     }
 

mcparser.ts

@@ -28,7 +28,7 @@ namespace microcode {
         for (let i = 0; i < lines.length; i++) {
             if (currTile && currTile instanceof IconEditor) {
                 const all5 = lines.slice(i, i + 5).join("\n")
-                console.log(`get the image? ${all5}`)
+                console.log(`get the image?\n${all5}`)
                 currTile.field = currTile.fieldEditor.fromString(all5)
                 currTile = undefined
                 i = i + 4 // loop count adds one more
@@ -42,13 +42,11 @@ namespace microcode {
             } else if (tokens[0] == "EOP") {
                 prog.pages.push(currPage)
                 currPage = undefined
-            } else if (tokens[0] == "EOR") {
-                console.log("EOR")
-                currPage.rules.push(currRule)
-                currRule = undefined
+            } else if (tokens[0] == "When") {
+                if (currRule) currPage.rules.push(currRule)
+                currRule = new RuleDefn()
             } else {
                 if (!currRule) {
-                    currRule = new RuleDefn()
                     currRule.sensors.push(token2tile(tokens[0]) as number)
                     tokens.shift()
                 }