fix parser

Author: thomasjball

assets/progs/happySad.mc

@@ -1,84 +0,0 @@
-Page 1
-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 . 
-. . . . . 
-
-
-When press button_A Do play_sound happy
-
-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 
-
-
-When press button_B Do play_sound sad
-
-Page 2
-
-Page 3
-
-Page 4
-
-Page 5
-
-
-Page 1
-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 . 
-. . . . . 
-
-
-When press button_A Do play_sound happy
-
-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 
-
-
-When press button_B Do play_sound sad
-
-Page 2
-
-Page 3
-
-Page 4
-
-Page 5
-
-

editor.ts

@@ -296,9 +296,14 @@ namespace microcode {
                 this.progdef = ProgramDefn.fromBuffer(new BufferReader(buf))
 
                 progToString(this.progdef)
-                const progAsString = progToStringRet
-                parseProg(progAsString)
+                const pas1 = progToStringRet
+                console.log(`PAS1\n${pas1}`)
+                parseProg(pas1)
                 const progFromString = parseProgRet
+                progToString(progFromString)
+                const pas2 = progToStringRet
+                console.log("PAS2")
+                console.log(pas2)
                 // check the programs are the same
             }
             this.configureP1Keys()

fieldeditors.ts

@@ -184,15 +184,15 @@ namespace microcode {
             return img
         }
         toString(img: Bitmap) {
-            let ret = "`"
+            let ret = ""
             for (let row = 0; row < 5; row++) {
                 for (let col = 0; col < 5; col++) {
                     ret += img.getPixel(col, row) ? `1` : `.`
                     if (col < 4) ret += " "
                 }
                 ret += `\n`
             }
-            return ret + "`"
+            return ret + ""
         }
         fromTokens(tokens: string[]): Bitmap {
             let ret = bitmaps.create(5, 5)
@@ -235,12 +235,12 @@ namespace microcode {
 
     export function melodyToNotes(melody: Melody) {
         const notes = melody.notes.split("")
-        let result = "`"
+        let result = ""
         for (const n of notes) {
             if (n == ".") result += "- "
             else result += noteNames[parseInt(n)] + " "
         }
-        return result + "`"
+        return result + ""
     }
 
     function notesToMelody(tokens: string[]) {

mcparser.ts

@@ -13,8 +13,10 @@ namespace microcode {
                 if (tile instanceof ModifierEditor) {
                     const mod = tile as ModifierEditor
                     const field = mod.fieldEditor.toString(mod.getField())
-                    if (mod instanceof IconEditor) return `${tok}\n${field}`
-                    if (mod instanceof MelodyEditor) return `${tok} ${field}\n`
+                    if (mod instanceof IconEditor)
+                        return `${tok} \`\n${field}\`\n`
+                    if (mod instanceof MelodyEditor)
+                        return `${tok} \`${field}\`\n`
                     else return `${tok} ${field}`
                 }
                 return tok
@@ -55,19 +57,20 @@ namespace microcode {
                 return tid
             }
         }
-        const addTile = (tile: Tile, rule: RuleDefn) => {
+        const addTile = (rule: RuleDefn, tile: Tile) => {
             control.assert(rule != undefined, `No Rule definition`)
             const tid = getTid(tile)
             if (isSensor(tid)) rule.push(tile, "sensors", false)
             if (isFilter(tid)) rule.push(tile, "filters", false)
             else if (isModifier(tid)) rule.push(tile, "modifiers", false)
             else rule.push(tile, "actuators", false)
         }
+        // tokenizer
         let cursor = 0
-        const whiteSpace = (s: string) => {
-            return s == " " || s == "\n" || s == "\t"
-        }
         const getToken = () => {
+            const whiteSpace = (s: string) => {
+                return s == " " || s == "\n" || s == "\t"
+            }
             let prev = cursor
             let gotToken = false
             while (cursor < str.length) {
@@ -95,26 +98,25 @@ namespace microcode {
         let currTile: Tile = undefined
         let tok: string = undefined
         while ((tok = getToken())) {
-            // console.log(`tok1 = ${tok}`)
-            if (currTile) {
+            // console.log(`tok = ${tok}`)
+            if (currTile && currTile instanceof ModifierEditor) {
                 if (
                     currTile instanceof IconEditor ||
                     currTile instanceof MelodyEditor
                 ) {
                     const thisTile = currTile as ModifierEditor
                     control.assert(tok == "`", `expected \`, got ${tok}`)
                     let tokens = []
-                    while ((tok = getToken()) == "." || tok == "1") {
+                    while ((tok = getToken()) != "`") {
                         tokens.push(tok)
                     }
-                    control.assert(
-                        tok == "`",
-                        `expected {0, 1, \`}, got ${tok}`
-                    )
+                    //console.log(`got tokens = ${tokens.join(":")}`)
+                    control.assert(tok == "`", `expected \`, got ${tok}`)
                     currTile.field = thisTile.fieldEditor.fromTokens(tokens)
                 } else if (currTile instanceof DigitEditor) {
                     currTile.field = currTile.fieldEditor.fromTokens([tok])
                 }
+                currTile = undefined
                 continue
             }
             currTile = undefined
@@ -126,7 +128,6 @@ namespace microcode {
                 }
                 currPage = new PageDefn()
                 getToken() // consume page #
-                continue
             } else if (tok == "When") {
                 control.assert(currPage != undefined, `No Page defined`)
                 if (currRule) currPage.rules.push(currRule)
@@ -135,7 +136,7 @@ namespace microcode {
                 control.assert(currRule != undefined, `No When defined`)
             } else {
                 currTile = token2tile(tok)
-                addTile(currTile, currRule)
+                addTile(currRule, currTile)
             }
         }
         if (currRule) currPage.rules.push(currRule)