Version 2.4.3.5

Author: informedcitizenry

Core6502DotNet.sln

@@ -33,7 +33,7 @@ Global
 		SolutionGuid = {9BE7575F-6E99-4243-AEAA-4D1E1064DA97}
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
-		version = 2.4.3.4
+		version = 2.4.3.5
 		Policies = $0
 		$0.VersionControlPolicy = $1
 		$1.CommitMessageStyle = $2

Core6502DotNet/Core6502DotNet.csproj

@@ -4,7 +4,7 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <PackageId>6502.Net</PackageId>
-    <Version>2.4.3.4</Version>
+    <Version>2.4.3.5</Version>
     <Authors>informedcitizenry</Authors>
     <Company>informedcitizenry</Company>
     <Product>6502.Net</Product>
@@ -13,8 +13,8 @@
     <ReleaseVersion>2.4.1</ReleaseVersion>
     <StartupObject>Core6502DotNet.Program</StartupObject>
     <AssemblyName>6502.Net</AssemblyName>
-    <AssemblyVersion>2.4.3.4</AssemblyVersion>
-    <FileVersion>2.4.3.4</FileVersion>
+    <AssemblyVersion>2.4.3.5</AssemblyVersion>
+    <FileVersion>2.4.3.5</FileVersion>
     <SignAssembly>false</SignAssembly>
   </PropertyGroup>
 

Core6502DotNet/Syntax Highlighters/Notepad++/Core6502DotNet.xml

@@ -28,7 +28,7 @@
             <Keywords name="Keywords2">.assert .auto .bank .binclude .break .case .comment .continue .cpu .default .dp .dsection .echo .encoding .end .endrelocate .eor .error .errorif .equ .forcepass .format .goto .include .initmem .invoke .let .m8 .m16 .manual .map .mx8 .mx16 .org .proff .pron .relocate .return .section .format .target .unmap .warn .warnif .x8 .x16</Keywords>
             <Keywords name="Keywords3">.addr .align .binary .bstring .byte .cbmflt .cbmfltp .char .cstring .dint .dword .fill .hstring .lint .long .lstring .nstring .pstring .rta .sbyte .short .sint .string .word</Keywords>
             <Keywords name="Keywords4">.</Keywords>
-            <Keywords name="Keywords5">abs acos atan byte cmbflt cbmfltp cbrt ceil cos cosh deg dword exp float floor format frac hypot len ln log log10 long peek poke pow rad random round section sgn sin sinh sqrt tan tanh word</Keywords>
+            <Keywords name="Keywords5">abs acos atan byte cbmflt cbmfltp cbrt ceil char cos cosh deg dword exp float floor format frac hypot len ln log log10 long peek poke pow rad random round section sgn sin sinh sqrt tan tanh word</Keywords>
             <Keywords name="Keywords6">\</Keywords>
             <Keywords name="Keywords7">a s sp x y z false MATH_PI MATH_E INT8_MAX INT8_MIN INT16_MAX INT16_MIN INT32_MAX INT32_MIN true UINT8_MAX UINT8_MIN UINT16_MAX UINT16_MIN UINT32_MAX UINT32_MIN</Keywords>
             <Keywords name="Keywords8"></Keywords>

Core6502DotNet/Syntax Highlighters/Notepad++/Core6502DotNetZ80.xml

@@ -28,7 +28,7 @@
             <Keywords name="Keywords2">.assert .bank .binclude .break .case .comment .continue .cpu .default .dsection .echo .encoding .end .endrelocate .eor .error .errorif .equ .forcepass .format .goto .include .initmem .invoke .let .map .org .proff .pron .relocate .return .section .format .target .unmap .warn .warnif</Keywords>
             <Keywords name="Keywords3">.addr .align .binary .bstring .byte .cbmflt .cbmfltp .char .cstring .dint .dword .fill .hstring .lint .long .lstring .nstring .pstring .rta .sbyte .short .sint .string .word</Keywords>
             <Keywords name="Keywords4">.</Keywords>
-            <Keywords name="Keywords5">abs acos atan byte cmbflt cbmfltp cbrt ceil cos cosh deg dword exp float floor format frac hypot len ln log log10 long peek poke pow rad random round section sgn sin sinh sqrt tan tanh word</Keywords>
+            <Keywords name="Keywords5">abs acos atan byte cbmflt cbmfltp cbrt ceil char cos cosh deg dword exp float floor format frac hypot len ln log log10 long peek poke pow rad random round section sgn sin sinh sqrt tan tanh word</Keywords>
             <Keywords name="Keywords6">\</Keywords>
             <Keywords name="Keywords7">a af b bc c d de e h hl i ix ixh ixl iy iyh iyl l m nc nz p pe po r sp z false MATH_PI MATH_E INT8_MAX INT8_MIN INT16_MAX INT16_MIN INT32_MAX INT32_MIN true UINT8_MAX UINT8_MIN UINT16_MAX UINT16_MIN UINT32_MAX UINT32_MIN</Keywords>
             <Keywords name="Keywords8"></Keywords>

Core6502DotNet/Syntax Highlighters/Notepad++/Core6502DotNetm68.xml

@@ -28,7 +28,7 @@
             <Keywords name="Keywords2">.assert .bank .binclude .break .case .comment .continue .cpu .default .dp .dsection .echo .encoding .end .endrelocate .eor .error .errorif .equ .forcepass .format .goto .include .initmem .invoke .let .map .org .proff .pron .relocate .return .section .format .target .tfradp .tfrbdp .unmap .warn .warnif</Keywords>
             <Keywords name="Keywords3">.addr .align .binary .bstring .byte .cbmflt .cbmfltp .char .cstring .dint .dword .fill .hstring .lint .long .lstring .nstring .pstring .rta .sbyte .short .sint .string .word</Keywords>
             <Keywords name="Keywords4">.</Keywords>
-            <Keywords name="Keywords5">abs acos atan byte cmbflt cbmfltp cbrt ceil cos cosh deg dword exp float floor format frac hypot len ln log log10 long peek poke pow rad random round section sgn sin sinh sqrt tan tanh word</Keywords>
+            <Keywords name="Keywords5">abs acos atan byte cbmflt cbmfltp cbrt ceil char cos cosh deg dword exp float floor format frac hypot len ln log log10 long peek poke pow rad random round section sgn sin sinh sqrt tan tanh word</Keywords>
             <Keywords name="Keywords6">\</Keywords>
             <Keywords name="Keywords7">a b cc d dp pc s u x y false MATH_PI MATH_E INT8_MAX INT8_MIN INT16_MAX INT16_MIN INT32_MAX INT32_MIN true UINT8_MAX UINT8_MIN UINT16_MAX UINT16_MIN UINT32_MAX UINT32_MIN</Keywords>
             <Keywords name="Keywords8"></Keywords>

Core6502DotNet/Syntax Highlighters/VSCode/informedcitizenry.core-6502-dot-net-1.0.1/syntaxes/core-6502-dot-net_65xx.tmLanguage.json

@@ -33,7 +33,7 @@
         },
         {
           "name": "keyword.control.directive.core6502_net_65xx",
-          "match": "(?i)(^|\\s)(\\.(assert|auto|bank|binclude|block|break|case|continue|comment|cpu|default|dp|dsection|echo|elseifndef|elseifdef|else|elseif|encoding|end|endblock|endfunction|endif|endmacro|endpage|endrepeat|endrelocate|endswitch|endwhile|eor|equ|error|errorif|for|forcepass|foreach|format|function|global|goto|if|ifdef|ifndef|include|initmem|invoke|let|m8|m16|macro|manual|map|mx8|mx16|next|org|page|proff|pron|pseudopc|realpc|relocate|repeat|return|section|switch|target|unmap|warn|warnif|while|x8|x16))\\b"
+          "match": "(?i)(^|\\s)(\\.(assert|auto|bank|binclude|block|break|case|continue|comment|cpu|default|dp|dsection|echo|elseifndef|elseifdef|else|elseif|encoding|end|endblock|endfunction|endif|endmacro|endnamespace|endpage|endrepeat|endrelocate|endswitch|endwhile|eor|equ|error|errorif|for|forcepass|foreach|format|function|global|goto|if|ifdef|ifndef|include|initmem|invoke|let|m8|m16|macro|manual|map|mx8|mx16|namespace|next|org|page|proff|pron|pseudopc|realpc|relocate|repeat|return|section|switch|target|unmap|warn|warnif|while|x8|x16))\\b"
         },
         {
           "name": "keyword.other.mnemonic.core6502_net_65xx",
@@ -45,7 +45,7 @@
         },
         {
           "name": "keyword.function.core6502_net_65xx",
-          "match": "(?i)\\b(abs|acos|atan|byte|cmbflt|cbmfltp|cbrt|ceil|cos|cosh|deg|dword|exp|float|floor|format|frac|hypot|len|ln|log|log10|long|peek|poke|pow|rad|random|round|section|sgn|sin|sinh|sqrt|tan|tanh|word)\\b"
+          "match": "(?i)\\b(abs|acos|atan|byte|cbmflt|cbmfltp|cbrt|ceil|char|cos|cosh|deg|dword|exp|float|floor|format|frac|hypot|len|ln|log|log10|long|peek|poke|pow|rad|random|round|section|sgn|sin|sinh|sqrt|tan|tanh|word)\\b"
         },
         {
           "name": "keyword.define.core6502_net_65xx",

Core6502DotNet/Syntax Highlighters/VSCode/informedcitizenry.core-6502-dot-net-1.0.1/syntaxes/core-6502-dot-net_m680x.tmLanguage.json

@@ -33,7 +33,7 @@
         },
         {
           "name": "keyword.control.directive.core6502_net_m680x",
-          "match": "(?i)(^|\\s)(\\.(assert|bank|binclude|block|break|case|continue|comment|cpu|default|dp|dsection|echo|elseifndef|elseifdef|else|elseif|encoding|end|endblock|endfunction|endif|endmacro|endpage|endrepeat|endrelocate|endswitch|endwhile|eor|equ|error|errorif|for|forcepass|foreach|format|function|global|goto|if|ifdef|ifndef|include|initmem|invoke|let|macro|map|next|org|page|pseudopc|proff|pron|realpc|relocate|repeat|return|section|switch|target|tfradp|tfrbdp|unmap|warn|warnif|while))\\b"
+          "match": "(?i)(^|\\s)(\\.(assert|bank|binclude|block|break|case|continue|comment|cpu|default|dp|dsection|echo|elseifndef|elseifdef|else|elseif|encoding|end|endblock|endfunction|endif|endmacro|endnamespace|endpage|endrepeat|endrelocate|endswitch|endwhile|eor|equ|error|errorif|for|forcepass|foreach|format|function|global|goto|if|ifdef|ifndef|include|initmem|invoke|let|macro|map|namespace|next|org|page|pseudopc|proff|pron|realpc|relocate|repeat|return|section|switch|target|tfradp|tfrbdp|unmap|warn|warnif|while))\\b"
         },
         {
           "name": "keyword.other.mnemonic.core6502_net_m680x",
@@ -45,7 +45,7 @@
         },
         {
           "name": "keyword.function.core6502_net_m680x",
-          "match": "(?i)\\b(abs|acos|atan|byte|cmbflt|cbmfltp|cbrt|ceil|cos|cosh|deg|dword|exp|float|floor|format|frac|hypot|len|ln|log|log10|long|peek|poke|pow|rad|random|round|section|sgn|sin|sinh|sqrt|tan|tanh|word)\\b"
+          "match": "(?i)\\b(abs|acos|atan|byte|cbmflt|cbmfltp|cbrt|ceil|char|cos|cosh|deg|dword|exp|float|floor|format|frac|hypot|len|ln|log|log10|long|peek|poke|pow|rad|random|round|section|sgn|sin|sinh|sqrt|tan|tanh|word)\\b"
         },
         {
           "name": "keyword.define",

Core6502DotNet/Syntax Highlighters/VSCode/informedcitizenry.core-6502-dot-net-1.0.1/syntaxes/core-6502-dot-net_z80.tmLanguage.json

@@ -33,7 +33,7 @@
         },
         {
           "name": "keyword.control.directive.core6502_net_z80",
-          "match": "(?i)(^|\\s)(\\.(assert|bank|binclude|block|break|case|continue|comment|cpu|default|dsection|echo|elseifndef|elseifdef|else|elseif|encoding|end|endblock|endfunction|endif|endmacro|endpage|endrepeat|endrelocate|endswitch|endwhile|eor|equ|error|errorif|for|forcepass|foreach|format|function|global|goto|if|ifdef|ifndef|include|initmem|invoke|let|macro|map|next|org|page|proff|pron|pseudopc|realpc|relocate|repeat|return|section|switch|target|unmap|warn|warnif|while))\\b"
+          "match": "(?i)(^|\\s)(\\.(assert|bank|binclude|block|break|case|continue|comment|cpu|default|dsection|echo|elseifndef|elseifdef|else|elseif|encoding|end|endblock|endfunction|endif|endmacro|endnamespace|endpage|endrepeat|endrelocate|endswitch|endwhile|eor|equ|error|errorif|for|forcepass|foreach|format|function|global|goto|if|ifdef|ifndef|include|initmem|invoke|let|macro|map|namespace|next|org|page|proff|pron|pseudopc|realpc|relocate|repeat|return|section|switch|target|unmap|warn|warnif|while))\\b"
         },
         {
           "name": "keyword.other.mnemonic.core6502_net_z80",
@@ -45,7 +45,7 @@
         },
         {
           "name": "keyword.function.core6502_net_z80",
-          "match": "(?i)\\b(abs|acos|atan|byte|cmbflt|cbmfltp|cbrt|ceil|cos|cosh|deg|dword|exp|float|floor|format|frac|hypot|len|ln|log|log10|long|peek|poke|pow|rad|random|round|section|sgn|sin|sinh|sqrt|tan|tanh|word)\\b"
+          "match": "(?i)\\b(abs|acos|atan|byte|cbmflt|cbmfltp|cbrt|ceil|char|cos|cosh|deg|dword|exp|float|floor|format|frac|hypot|len|ln|log|log10|long|peek|poke|pow|rad|random|round|section|sgn|sin|sinh|sqrt|tan|tanh|word)\\b"
         },
         {
           "name": "keyword.define",

Core6502DotNet/Syntax Highlighters/VSCode/informedcitizenry.core-6502-dot-net-1.0.1/themes/dark-color-theme.json

@@ -13,7 +13,7 @@
       "name": "Block Comment",
       "scope": "comment.block",
       "settings": {
-        "foreground": "#d1c6c6",
+        "foreground": "#e3bcbc",
         "fontStyle": "italic"
       }
     },

Core6502DotNet/src/Block Processors/BlockProcessorBase.cs

@@ -33,6 +33,12 @@ public BlockClosureException(string blockType)
     /// </summary>
     public abstract class BlockProcessorBase : AssemblerBase
     {
+        #region Members
+
+        bool _createScope;
+
+        #endregion
+
         #region Constructors
 
         /// <summary>
@@ -56,7 +62,8 @@ protected BlockProcessorBase(AssemblyServices services, int index, bool createSc
             : base(services)
         {
             Index = index;
-            if (createScope)
+            _createScope = createScope;
+            if (_createScope)
                 services.SymbolManager.PushScope(Index.ToString());
         }
 
@@ -68,16 +75,18 @@ protected BlockProcessorBase(AssemblyServices services, int index, bool createSc
         /// Executes the block directive. This method must be inherited.
         /// </summary>
         /// <param name="iterator">The source line iterator.</param>
+        /// <exception cref="SyntaxException"></exception>
         public abstract void ExecuteDirective(RandomAccessIterator<SourceLine> iterator);
 
         /// <summary>
         /// Cleanup the current block's scope.
         /// </summary>
         /// <param name="iterator">The source line iterator.</param>
-        public virtual void PopScope(RandomAccessIterator<SourceLine> iterator)
+        public void PopScope(RandomAccessIterator<SourceLine> iterator)
         {
             SeekBlockEnd(iterator);
-            Services.SymbolManager.PopScope();
+            if (_createScope)
+                Services.SymbolManager.PopScope();
         }
 
         /// <summary>
@@ -89,7 +98,7 @@ public virtual void PopScope(RandomAccessIterator<SourceLine> iterator)
         protected void SeekBlockDirectives(RandomAccessIterator<SourceLine> iterator, StringView[] directives)
         {
             var line = iterator.Current;
-            if (!directives.Contains(line.Instruction.Name, Services.StringViewComparer))
+            if (!line.Instruction.Name.Equals(BlockClosure, Services.StringComparison))
             {
                 var blockClose = BlockClosure;