Browse Source

fixed tokenhook bug, modified proposed token replacements.

Zeda Thomas 4 years ago
parent
commit
e8e5a4dcbd
1 changed files with 18 additions and 15 deletions
  1. 18 15
      src/tokenhook.z80

+ 18 - 15
src/tokenhook.z80

@@ -25,8 +25,11 @@ TokenHook:
   jr z,TokenSearchLoop
   ld hl,TokenTable_1
 TokenSearchLoop:
-  ld a,e
-  cp (hl)
+  ld a,(hl)
+  and $FE
+;  ld a,e
+;  cp (hl)
+  cp e
   inc hl
   jr z,ChkByte2
 NotTokenMatch:
@@ -56,7 +59,7 @@ NoChange:
 TokenTable:
 TokenTable_0:
 ; .db $02,0,7,"module."
- .db $02,0,1,$F2           ;►DMS (turns into "$")    
+ .db $02,0,1,$F2           ;►DMS (turns into "$")
  .db $04,0,6,$05,"Float"   ;►Dec
  .db $06,0,8,5,"lFactor"   ;►Frac
  .db $28,0,4,"ins "        ;augment
@@ -67,8 +70,8 @@ TokenTable_0:
  .db $44,0,5,"misc "       ;solve(
  .db $58,0,1,5Fh           ;i (turns into "_")
  .db $BE,0,5,"call "       ;prgm
- .db $E6,0,5,"Mode "       ;Fix 
- .db $EC,0,3,"int"         ;Func
+ .db $E6,0,5,"Mode "       ;Fix
+; .db $EC,0,3,"int"         ;Func
  .db 0                     ;End of Table 0
 
 TokenTable_1:
@@ -81,25 +84,25 @@ TokenTable_1:
  .db $62,1,7,"WriteB "     ;int(
  .db $70,1,4,"Inv "        ;not(
  .db $72,1,7,"WriteW "     ;iPart(
- .db $7C,1,3,"jp "         ;ln(
+ .db $7C,1,4,"jmp "        ;ln(
 ; .db $7E,1,2,"2^"         ;²
- .db $A6,1,4,"For "        ;For( 
+ .db $A6,1,4,"For "        ;For(
  .db $B4,1,7,"GetInc "     ;IS>(
  .db $B6,1,7,"GetDec "     ;DS<(
- .db $BC,1,7,"GetBuf "     ;Disp 
+ .db $BC,1,7,"SetBuf "     ;Disp
  .db $BE,1,7,"DispBuf"     ;DispGraph
- .db $C0,1,8,"GetFont "    ;Output(
+ .db $C0,1,8,"SetFont "    ;Output(
  .db $CE,1,8,"MakeVar "    ;Send(
  .db $D0,1,8,"FindVar "    ;Get(
- .db $B4,3,6,"PushVar "    ;►Nom(
+ .db $B4,3,6,"Local "      ;►Nom(
  .db $C2,3,4,"del "        ;sub(
  .db $C8,3,6,"inStr "      ;inString(
  .db $F4,3,5,"Play "       ;conj(
- .db $FE,3,5,"expr "       ;expr(
- .db $00,4,7,"Search "     ;length(
+ .db $FE,3,5,"eval "       ;expr(
+ .db $01,4,7,"Search "     ;length(   ;use 01 instead of 00 (00 indicates the end of the table)
  .db $72,4,4,"gbuf"        ;G-T
- .db $7A,4,4,"Arch "       ;Archive
- .db $7C,4,6,"UnArch "     ;UnArchive
+ .db $7A,4,5,"Arch "       ;Archive
+ .db $7C,4,7,"UnArch "     ;UnArchive
  .db $7E,4,4,"Asm "        ;Asm(
- .db $82,4,4,"Asm$"        ;AsmPrgm
+ .db $82,4,7,"AsmHex "     ;AsmPrgm
  .db 0                     ;End of Table 1