Auto remove quotes of a zone name if it has some

GeorgRottensteiner · Apr 24, 2019 · e54187b · e54187b
1 parent 76897ff
commit e54187b
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -59,3 +59,4 @@
 /Sample Projects/MacroTest/macro_set_var.prg
 /OtherAssemblersDoc/64er_sonderheft_21 (1).pdf
 *.dump
+/Sample Projects/MacroTest/zones_with_quotes.prg
diff --git a/C64Models/Parser/ASMFileParser.cs b/C64Models/Parser/ASMFileParser.cs
@@ -7789,7 +7789,8 @@ private string[] PreProcess( string[] Lines, string ParentFilename, ProjectConfi
                 }
                 else
                 {
-                  m_CurrentZoneName = lineTokenInfos[1].Content;
+                  m_CurrentZoneName = DeQuote( lineTokenInfos[1].Content );
+
                   zoneToken = lineTokenInfos[1];
                 }
                 info.Zone = m_CurrentZoneName;
@@ -8626,6 +8627,19 @@ private string[] PreProcess( string[] Lines, string ParentFilename, ProjectConfi
 
 
 
+    private string DeQuote( string Content )
+    {
+      if ( ( Content.StartsWith( "\"" ) )
+      &&   ( Content.EndsWith( "\"" )
+      &&   ( Content.Length >=  2 ) ) )
+      {
+        return Content.Substring( 1, Content.Length - 2 );
+      }
+      return Content;
+    }
+
+
+
     private bool MatchesMacroByType( string Token, MacroInfo.MacroType Type )
     {
       string    upToken = Token.ToUpper();

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/zones_with_quotes.asm b/Sample Projects/MacroTest/zones_with_quotes.asm
@@ -0,0 +1,8 @@
+* = $0801
+
+
+!zone "start here"
+
+!basic
+
+        rts