Skip to content

Commit 5284421

Browse files
thomasjballthomasjball
committed
refactoring for unique tokens
1 parent 9de1c3a commit 5284421

File tree

4 files changed

+30
-31
lines changed

4 files changed

+30
-31
lines changed

‎assets.ts‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,7 @@ namespace microcode {
103103

104104
// math
105105
if (typeof name == "number") {
106-
if (
107-
microcode.isModifierConstant(name) ||
108-
microcode.isFilterConstant(name)
109-
) {
106+
if (microcode.isConstant(name)) {
110107
return icondb.numberToImage(getParam(name))
111108
}
112109
}

‎language.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,7 @@ namespace microcode {
264264
defn.actuators.push(actuatorEnum)
265265
assert(!br.eof())
266266
while (isModifier(br.peekByte())) {
267+
// TODO: convert old coin and old var
267268
handleFieldEditor("modifiers")
268269
assert(!br.eof())
269270
}

‎mcparser.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
// When [Event] Do [Action] [Loop]
55

66
// TODO: need to make tokens have unique tids (filter/mod replication)
7+
// TID_MODIFIER_CUP_X_READ...
8+
// TID_MODIFIER_COIN_1...
9+
// translate
710
// TODO: scripts reverse the tooltip
811

912
namespace microcode {

‎tiles.ts‎

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,11 @@ namespace microcode {
129129
TID_MODIFIER_PAGE_4 = 153,
130130
TID_MODIFIER_PAGE_5 = 154,
131131
//
132-
TID_MODIFIER_COIN_1 = 155,
133-
TID_MODIFIER_COIN_2 = 156,
134-
TID_MODIFIER_COIN_3 = 157,
135-
TID_MODIFIER_COIN_4 = 158,
136-
TID_MODIFIER_COIN_5 = 159,
132+
TID_MODIFIER_COIN_1 = 155, // deprecate
133+
TID_MODIFIER_COIN_2 = 156, // ""
134+
TID_MODIFIER_COIN_3 = 157, // ""
135+
TID_MODIFIER_COIN_4 = 158, // ""
136+
TID_MODIFIER_COIN_5 = 159, // ""
137137
//
138138
TID_MODIFIER_ICON_EDITOR = 160,
139139
TID_MODIFIER_COLOR_RED = 161,
@@ -153,9 +153,9 @@ namespace microcode {
153153
TID_MODIFIER_EMOJI_YAWN = 172,
154154
EMOJI_END = 172,
155155
//
156-
TID_MODIFIER_CUP_X_READ = 173,
157-
TID_MODIFIER_CUP_Y_READ = 174,
158-
TID_MODIFIER_CUP_Z_READ = 175,
156+
TID_MODIFIER_CUP_X_READ = 173, // deprecate
157+
TID_MODIFIER_CUP_Y_READ = 174, // ""
158+
TID_MODIFIER_CUP_Z_READ = 175, // ""
159159
TID_MODIFIER_RADIO_READ = 176,
160160
TID_MODIFIER_RANDOM_TOSS = 177,
161161
TID_MODIFIER_LOOP = 178,
@@ -254,6 +254,8 @@ namespace microcode {
254254
export function isModifier(tid: Tid) {
255255
return (
256256
(tid >= Tid.MODIFIER_START && tid <= Tid.MODIFER_END) ||
257+
isConstant(tid) ||
258+
isVariable(tid) ||
257259
isMathOperator(tid) ||
258260
tid == Tid.TID_DECIMAL_EDITOR ||
259261
tid == Tid.TID_POS_INT_EDITOR
@@ -300,27 +302,27 @@ namespace microcode {
300302
return Tid.LINE_START <= tidEnum && tidEnum <= Tid.LINE_END
301303
}
302304

303-
export function isFilterConstant(tidEnum: Tid) {
305+
export function isConstant(tidEnum: Tid) {
304306
return (
305307
Tid.TID_FILTER_COIN_1 <= tidEnum && tidEnum <= Tid.TID_FILTER_COIN_5
306308
)
307309
}
308310

309-
function isFilterVariable(tidEnum: Tid) {
311+
function isVariable(tidEnum: Tid) {
310312
return (
311313
Tid.TID_FILTER_CUP_X_READ <= tidEnum &&
312314
tidEnum <= Tid.TID_FILTER_CUP_Z_READ
313315
)
314316
}
315317

316-
export function isModifierConstant(tidEnum: Tid) {
318+
export function isOldModifierCoin(tidEnum: Tid) {
317319
return (
318320
Tid.TID_MODIFIER_COIN_1 <= tidEnum &&
319321
tidEnum <= Tid.TID_MODIFIER_COIN_5
320322
)
321323
}
322324

323-
function isModifierVariable(tidEnum: Tid) {
325+
export function isOldModifierVar(tidEnum: Tid) {
324326
return (
325327
Tid.TID_MODIFIER_CUP_X_READ <= tidEnum &&
326328
tidEnum <= Tid.TID_MODIFIER_CUP_Z_READ
@@ -394,9 +396,9 @@ namespace microcode {
394396
if (!isFilter(tid)) return false
395397
// the following filters are not terminal
396398
if (
397-
isFilterConstant(tid) ||
399+
isConstant(tid) ||
398400
isTimespan(tid) ||
399-
isFilterVariable(tid) ||
401+
isVariable(tid) ||
400402
isMathOperator(tid) ||
401403
isComparisonOperator(tid) ||
402404
tid == Tid.TID_DECIMAL_EDITOR
@@ -469,7 +471,7 @@ namespace microcode {
469471
if (isSensorEvent(tid)) return isSensorEvent(tid)
470472
if (isFilter(tid)) {
471473
// TODO: if event, put it last
472-
if (isFilterConstant(tid)) return getParam(tid)
474+
if (isConstant(tid)) return getParam(tid)
473475
if (isLineEvent(tid)) {
474476
if (tid == Tid.TID_FILTER_LINE_BOTH) return 101
475477
else return tid
@@ -600,7 +602,7 @@ namespace microcode {
600602
]
601603

602604
const filterMath: (string | number)[] = [
603-
"value_in",
605+
"variable",
604606
"comparison",
605607
"maths",
606608
"decimal_editor",
@@ -694,8 +696,8 @@ namespace microcode {
694696
case Tid.TID_ACTUATOR_CUP_Z_ASSIGN:
695697
return {
696698
only: microcodeClassic
697-
? ["value_out", "constant"]
698-
: ["value_out", "maths", "decimal_editor"],
699+
? ["variable", "constant"]
700+
: ["variable", "maths", "decimal_editor"],
699701
}
700702
case Tid.TID_ACTUATOR_RGB_LED:
701703
return { only: ["rgb_led", "loop"] }
@@ -732,11 +734,9 @@ namespace microcode {
732734
if (isMathOperator(tid)) return "maths"
733735
if (
734736
// isFilterConstant(tid) ||
735-
isFilterVariable(tid)
737+
isVariable(tid)
736738
)
737-
return "value_in"
738-
if (isModifierConstant(tid)) return "constant"
739-
if (isModifierVariable(tid)) return "value_out"
739+
return "variable"
740740
if (isPage(tid)) return "page"
741741
if (isCarModifier(tid)) return "car"
742742
if (isLedModifier(tid)) return "rgb_led"
@@ -772,7 +772,7 @@ namespace microcode {
772772
case Tid.TID_MODIFIER_MIC_READ:
773773
case Tid.TID_MODIFIER_LIGHT_READ:
774774
case Tid.TID_MODIFIER_MAGNET_READ:
775-
return "value_out"
775+
return "variable"
776776
case Tid.TID_OPERATOR_DIVIDE:
777777
case Tid.TID_OPERATOR_MINUS:
778778
case Tid.TID_OPERATOR_MULTIPLY:
@@ -794,8 +794,7 @@ namespace microcode {
794794

795795
export function getKindTid(tid: number): TileKind {
796796
if (
797-
isFilterConstant(tid) ||
798-
isModifierConstant(tid) ||
797+
isConstant(tid) ||
799798
tid == Tid.TID_DECIMAL_EDITOR ||
800799
tid == Tid.TID_POS_INT_EDITOR
801800
)
@@ -858,8 +857,7 @@ namespace microcode {
858857

859858
export function getParam(tile: Tile): any {
860859
const tid = getTid(tile)
861-
if (isModifierConstant(tid)) return tid - Tid.TID_MODIFIER_COIN_1 + 1
862-
if (isFilterConstant(tid)) return tid - Tid.TID_FILTER_COIN_1 + 1
860+
if (isConstant(tid)) return tid - Tid.TID_FILTER_COIN_1 + 1
863861
if (isPage(tid)) return tid - Tid.TID_MODIFIER_PAGE_1 + 1
864862
if (isAccelerometerEvent(tid) || isPressReleaseEvent(tid)) return tid
865863
switch (tid) {

0 commit comments

Comments
 (0)