Skip to content

Commit 374db5b

Browse files
committed
fix up silliness
1 parent 2bee7b5 commit 374db5b

File tree

3 files changed

+13
-14
lines changed

3 files changed

+13
-14
lines changed

editor.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,8 +305,10 @@ namespace microcode {
305305
// console.log("PAS2")
306306
// console.log(pas2)
307307
// check the programs are the same
308-
console.log(pas1)
309-
// control.assert(pas1 == pas2, "progs not the same")
308+
control.assert(
309+
pas1 == pas2,
310+
`progs not the same ${pas1} \n---\n ${pas2}`
311+
)
310312
}
311313
this.configureP1Keys()
312314
}

mcparser.ts

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ namespace microcode {
4444
}
4545

4646
enum Phase {
47-
Sensor,
47+
Sensor = 1,
4848
Filter,
4949
Actuator,
5050
Modifier,
@@ -64,16 +64,17 @@ namespace microcode {
6464
return tid
6565
}
6666
}
67-
let phase: Phase = Phase.Sensor
68-
const addTile = (rule: RuleDefn, tile: Tile, phase: Phase) => {
67+
let phase = Phase.Sensor
68+
const addTile = (rule: RuleDefn, tile: Tile) => {
6969
control.assert(rule != undefined, `No Rule definition`)
7070
if (phase == Phase.Sensor) {
7171
rule.push(tile, "sensors", false)
7272
phase = Phase.Filter
73-
} else if (phase == Phase.Filter) rule.push(tile, "filters", false)
74-
else if (phase == Phase.Modifier)
73+
} else if (phase == Phase.Filter) {
74+
rule.push(tile, "filters", false)
75+
} else if (phase == Phase.Modifier) {
7576
rule.push(tile, "modifiers", false)
76-
else {
77+
} else {
7778
rule.push(tile, "actuators", false)
7879
phase = Phase.Modifier
7980
}
@@ -151,7 +152,7 @@ namespace microcode {
151152
phase = Phase.Actuator
152153
} else {
153154
currTile = token2tile(tok)
154-
addTile(currRule, currTile, phase)
155+
addTile(currRule, currTile)
155156
}
156157
}
157158
if (currRule) currPage.rules.push(currRule)

tiles.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -734,11 +734,7 @@ namespace microcode {
734734
if (isEmoji(tid)) return "sound_emoji"
735735
if (isComparisonOperator(tid)) return "comparison"
736736
if (isMathOperator(tid)) return "maths"
737-
if (
738-
// isFilterConstant(tid) ||
739-
isVariable(tid)
740-
)
741-
return "variable"
737+
if (isVariable(tid)) return "variable"
742738
if (isPage(tid)) return "page"
743739
if (isCarModifier(tid)) return "car"
744740
if (isLedModifier(tid)) return "rgb_led"

0 commit comments

Comments
 (0)