Fix: BASIC disassembler, PRINT preferred to ?

GeorgRottensteiner · GeorgRottensteiner · commit 583f690ea3bc · 2023-04-16T07:30:29.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -312,3 +312,4 @@
 /Sample Projects/MacroTest/macro_ifndef.prg
 /Sample Projects/MacroTest/zone.variable in outline.prg
 /Sample Projects/MacroTest/renumberwithremonly.prg
+/Sample Projects/MacroTest/tsbopenmacro.prg
diff --git a/C64Models/Parser/BASICDialect.cs b/C64Models/Parser/BASICDialect.cs
@@ -79,8 +79,8 @@ static Dialect()
       BASICV2.AddOpcode( "DEF", 0x96, "dE" );
       BASICV2.AddOpcode( "POKE", 0x97, "pO" );
       BASICV2.AddOpcode( "PRINT#", 0x98, "pR" );
-      BASICV2.AddOpcode( "?", 0x99 );
       BASICV2.AddOpcode( "PRINT", 0x99 );
+      BASICV2.AddOpcode( "?", 0x99 );
       BASICV2.AddOpcode( "CONT", 0x9A, "cO" );
       BASICV2.AddOpcode( "LIST", 0x9B, "lI" );
       BASICV2.AddOpcode( "CLR", 0x9C, "cL" );
@@ -157,6 +157,9 @@ public Opcode AddOpcode( string Opcode, int ByteValue )
       {
         OpcodesFromByte[(ushort)ByteValue] = opcode;
       }
+      else
+      {
+      }
 
       return opcode;
     }
@@ -171,6 +174,9 @@ public Opcode AddOpcode( string Opcode, int ByteValue, string ShortCut )
       {
         OpcodesFromByte[(ushort)ByteValue] = opcode;
       }
+      else
+      {
+      }
 
       return opcode;
     }
diff --git a/C64Studio/BASIC Dialects/BASIC 65.txt b/C64Studio/BASIC Dialects/BASIC 65.txt
@@ -155,8 +155,8 @@ POKE;97;
 POLYGON;fe2f;
 POS;b9;
 POT;ce02;
-?;99;
 PRINT;99;
+?;99;
 PRINT#;98;
 RCOLOR;cd;
 RCURSOR;fe42;
diff --git a/C64Studio/BASIC Dialects/BASIC Lightning.txt b/C64Studio/BASIC Dialects/BASIC Lightning.txt
@@ -61,8 +61,8 @@ POKE;97;
 P.;97;
 PRINT#;98;
 PR.;98;
-?;99;
 PRINT;99;
+?;99;
 CONT;9A;
 C.;9A;
 LIST;9B;
diff --git a/C64Studio/BASIC Dialects/BASIC V10.txt b/C64Studio/BASIC Dialects/BASIC V10.txt
@@ -131,8 +131,8 @@ POKE;97;
 POLYGON;fe2f;
 POS;b9;
 POT;ce02;
-?;99;
 PRINT;99;
+?;99;
 PRINT#;98;
 USING;fb;
 PUDEF;dd;
diff --git a/C64Studio/BASIC Dialects/BASIC V2 - X16.txt b/C64Studio/BASIC Dialects/BASIC V2 - X16.txt
@@ -39,8 +39,8 @@ VERIFY;95;vE
 DEF;96;dE
 POKE;97;pO
 PRINT#;98;pR
-?;99;
 PRINT;99;
+?;99;
 CONT;9A;cO
 LIST;9B;lI
 CLR;9C;cL
diff --git a/C64Studio/BASIC Dialects/BASIC V3.5.txt b/C64Studio/BASIC Dialects/BASIC V3.5.txt
@@ -39,8 +39,8 @@ VERIFY;95;vE
 DEF;96;dE
 POKE;97;pO
 PRINT#;98;pR
-?;99;
 PRINT;99;
+?;99;
 CONT;9A;cO
 LIST;9B;lI
 CLR;9C;cL
diff --git a/C64Studio/BASIC Dialects/BASIC V4.5.txt b/C64Studio/BASIC Dialects/BASIC V4.5.txt
@@ -36,8 +36,8 @@ VERIFY;95;vE
 DEF;96;dE
 POKE;97;pO
 PRINT#;98;pR
-?;99;
 PRINT;99;
+?;99;
 CONT;9A;cO
 LIST;9B;lI
 CLR;9C;cL
diff --git a/C64Studio/BASIC Dialects/BASIC V7.0.txt b/C64Studio/BASIC Dialects/BASIC V7.0.txt
@@ -33,8 +33,8 @@ SAVE;94;sA
 VERIFY;95;vE
 DEF;96;dE
 PRINT#;98;pR
-?;99;
 PRINT;99;
+?;99;
 LIST;9B;lI
 CLR;9C;cL
 CMD;9D;cM
diff --git a/C64Studio/BASIC Dialects/Laser BASIC.txt b/C64Studio/BASIC Dialects/Laser BASIC.txt
@@ -62,8 +62,8 @@ POKE;97;
 P.;97;
 PRINT#;98;
 PR.;98;
-?;99;
 PRINT;99;
+?;99;
 CONT;9A;
 C.;9A;
 LIST;9B;
diff --git a/C64Studio/BASIC Dialects/Simons' BASIC.txt b/C64Studio/BASIC Dialects/Simons' BASIC.txt
@@ -41,8 +41,8 @@ VERIFY;95;vE
 DEF;96;dE
 POKE;97;pO
 PRINT#;98;pR
-?;99;
 PRINT;99;
+?;99;
 CONT;9A;cO
 LIST;9B;lI
 CLR;9C;cL
diff --git a/C64Studio/BASIC Dialects/Tuned Simons' BASIC.txt b/C64Studio/BASIC Dialects/Tuned Simons' BASIC.txt
@@ -44,8 +44,8 @@ VERIFY;95;vE
 DEF;96;
 POKE;97;poK
 PRINT#;98;prI
-?;99;
 PRINT;99;
+?;99;
 CONT;9A;coN
 LIST;9B;liS
 CLR;9C;cL
diff --git a/C64Studio/Documents/LabelExplorer.cs b/C64Studio/Documents/LabelExplorer.cs
@@ -173,6 +173,12 @@ private void RefreshNodes()
       treeProject.BeginUpdate();
       NodeRoot.Nodes.Clear();
 
+      if ( ActiveASMFileInfo == null )
+      {
+        treeProject.EndUpdate();
+        return;
+      }
+
       if ( !_ExpandedNodesPerProject.ContainsKey( ActiveASMFileInfo ) )
       {
         _ExpandedNodesPerProject.Add( ActiveASMFileInfo, new GR.Collections.Map<string, bool>() );
diff --git a/C64Studio/Tasks/TaskCompile.cs b/C64Studio/Tasks/TaskCompile.cs
@@ -297,7 +297,8 @@ protected bool DebugCompiledFile( DocumentInfo DocumentToDebug, DocumentInfo Doc
       Core.MainForm.SetGUIForWaitOnExternalTool( true );
 
       if ( ( toolRun.IsInternal )
-      ||   ( Core.Executing.RunProcess.Start() ) )
+      ||   ( ( Core.Executing.RunProcess != null )
+      &&     ( Core.Executing.RunProcess.Start() ) ) )
       {
         DateTime    current = DateTime.Now;
         int   numConnectionAttempts = 1;
diff --git a/C64StudioRelease/shared content/BASIC Dialects/BASIC 65.txt b/C64StudioRelease/shared content/BASIC Dialects/BASIC 65.txt
@@ -155,8 +155,8 @@ POKE;97;
 POLYGON;fe2f;
 POS;b9;
 POT;ce02;
-?;99;
 PRINT;99;
+?;99;
 PRINT#;98;
 RCOLOR;cd;
 RCURSOR;fe42;
diff --git a/C64StudioRelease/shared content/BASIC Dialects/BASIC Lightning.txt b/C64StudioRelease/shared content/BASIC Dialects/BASIC Lightning.txt
@@ -61,8 +61,8 @@ POKE;97;
 P.;97;
 PRINT#;98;
 PR.;98;
-?;99;
 PRINT;99;
+?;99;
 CONT;9A;
 C.;9A;
 LIST;9B;
diff --git a/C64StudioRelease/shared content/BASIC Dialects/BASIC V10.txt b/C64StudioRelease/shared content/BASIC Dialects/BASIC V10.txt
@@ -131,8 +131,8 @@ POKE;97;
 POLYGON;fe2f;
 POS;b9;
 POT;ce02;
-?;99;
 PRINT;99;
+?;99;
 PRINT#;98;
 USING;fb;
 PUDEF;dd;
diff --git a/C64StudioRelease/shared content/BASIC Dialects/BASIC V2 - X16.txt b/C64StudioRelease/shared content/BASIC Dialects/BASIC V2 - X16.txt
@@ -39,8 +39,8 @@ VERIFY;95;vE
 DEF;96;dE
 POKE;97;pO
 PRINT#;98;pR
-?;99;
 PRINT;99;
+?;99;
 CONT;9A;cO
 LIST;9B;lI
 CLR;9C;cL
diff --git a/C64StudioRelease/shared content/BASIC Dialects/BASIC V3.5.txt b/C64StudioRelease/shared content/BASIC Dialects/BASIC V3.5.txt
@@ -39,8 +39,8 @@ VERIFY;95;vE
 DEF;96;dE
 POKE;97;pO
 PRINT#;98;pR
-?;99;
 PRINT;99;
+?;99;
 CONT;9A;cO
 LIST;9B;lI
 CLR;9C;cL
diff --git a/C64StudioRelease/shared content/BASIC Dialects/BASIC V4.5.txt b/C64StudioRelease/shared content/BASIC Dialects/BASIC V4.5.txt
@@ -36,8 +36,8 @@ VERIFY;95;vE
 DEF;96;dE
 POKE;97;pO
 PRINT#;98;pR
-?;99;
 PRINT;99;
+?;99;
 CONT;9A;cO
 LIST;9B;lI
 CLR;9C;cL
diff --git a/C64StudioRelease/shared content/BASIC Dialects/BASIC V7.0.txt b/C64StudioRelease/shared content/BASIC Dialects/BASIC V7.0.txt
@@ -33,8 +33,8 @@ SAVE;94;sA
 VERIFY;95;vE
 DEF;96;dE
 PRINT#;98;pR
-?;99;
 PRINT;99;
+?;99;
 LIST;9B;lI
 CLR;9C;cL
 CMD;9D;cM
diff --git a/C64StudioRelease/shared content/BASIC Dialects/Laser BASIC.txt b/C64StudioRelease/shared content/BASIC Dialects/Laser BASIC.txt
@@ -62,8 +62,8 @@ POKE;97;
 P.;97;
 PRINT#;98;
 PR.;98;
-?;99;
 PRINT;99;
+?;99;
 CONT;9A;
 C.;9A;
 LIST;9B;
diff --git a/C64StudioRelease/shared content/BASIC Dialects/Simons' BASIC.txt b/C64StudioRelease/shared content/BASIC Dialects/Simons' BASIC.txt
@@ -41,8 +41,8 @@ VERIFY;95;vE
 DEF;96;dE
 POKE;97;pO
 PRINT#;98;pR
-?;99;
 PRINT;99;
+?;99;
 CONT;9A;cO
 LIST;9B;lI
 CLR;9C;cL
diff --git a/C64StudioRelease/shared content/BASIC Dialects/Tuned Simons' BASIC.txt b/C64StudioRelease/shared content/BASIC Dialects/Tuned Simons' BASIC.txt
@@ -44,8 +44,8 @@ VERIFY;95;vE
 DEF;96;
 POKE;97;poK
 PRINT#;98;prI
-?;99;
 PRINT;99;
+?;99;
 CONT;9A;coN
 LIST;9B;liS
 CLR;9C;cL
diff --git a/Sample Projects/MacroTest/MacroTest.c64 b/Sample Projects/MacroTest/MacroTest.c64
diff --git a/Sample Projects/MacroTest/MacroTest.s64 b/Sample Projects/MacroTest/MacroTest.s64
diff --git a/Sample Projects/MacroTest/testopenmacro.bas b/Sample Projects/MacroTest/testopenmacro.bas
@@ -0,0 +1,2 @@
+#RetroDevStudio.MetaData.BASIC:2049,BASIC V2
+10PRINT""
diff --git a/Sample Projects/MacroTest/tsbopenmacro.bas b/Sample Projects/MacroTest/tsbopenmacro.bas
@@ -0,0 +1,2 @@
+#RetroDevStudio.MetaData.BASIC:2049,Tuned Simons' BASIC,lowercase
+10PRINT""

Original file line number	Diff line number	Diff line change
`@@ -79,8 +79,8 @@ static Dialect()`
`79`	`79`	`BASICV2.AddOpcode( "DEF", 0x96, "dE" );`
`80`	`80`	`BASICV2.AddOpcode( "POKE", 0x97, "pO" );`
`81`	`81`	`BASICV2.AddOpcode( "PRINT#", 0x98, "pR" );`
`82`		`- BASICV2.AddOpcode( "?", 0x99 );`
`83`	`82`	`BASICV2.AddOpcode( "PRINT", 0x99 );`
	`83`	`+ BASICV2.AddOpcode( "?", 0x99 );`
`84`	`84`	`BASICV2.AddOpcode( "CONT", 0x9A, "cO" );`
`85`	`85`	`BASICV2.AddOpcode( "LIST", 0x9B, "lI" );`
`86`	`86`	`BASICV2.AddOpcode( "CLR", 0x9C, "cL" );`
`@@ -157,6 +157,9 @@ public Opcode AddOpcode( string Opcode, int ByteValue )`
`157`	`157`	`{`
`158`	`158`	`OpcodesFromByte[(ushort)ByteValue] = opcode;`
`159`	`159`	`}`
	`160`	`+ else`
	`161`	`+ {`
	`162`	`+ }`
`160`	`163`
`161`	`164`	`return opcode;`
`162`	`165`	`}`
`@@ -171,6 +174,9 @@ public Opcode AddOpcode( string Opcode, int ByteValue, string ShortCut )`
`171`	`174`	`{`
`172`	`175`	`OpcodesFromByte[(ushort)ByteValue] = opcode;`
`173`	`176`	`}`
	`177`	`+ else`
	`178`	`+ {`
	`179`	`+ }`
`174`	`180`
`175`	`181`	`return opcode;`
`176`	`182`	`}`