Merge branch 'feature/xSharpCompiler'

Author: RobertvanderHulst

Tests/Applications/C875/Prg/C875.prg

@@ -0,0 +1,9 @@
+// 875. MemVars created inside macros do not continue to exist after macro execution
+// https://github.com/X-Sharp/XSharpPublic/issues/1182
+FUNCTION Start( ) AS VOID
+//PUBLIC somevar // works with that
+//Evaluate('__MemVarDecl("somevar", false)') // also with that
+? Evaluate("somevar := 123")
+? Evaluate("somevar") // XSharp.Error: Variable does not exist
+? somevar // XSharp.Error: Variable does not exist
+

Tests/xSharp Tests.viproj

@@ -116889,6 +116889,120 @@ AppConfig = Release,22222222-2222-2222-2222-222222222222
   ForceX86=0
   Optimize=0
 ENDApplication = R879 - Version attribute looses leading zero
+
+ApplicationGroup = B9CFE839-D401-428D-94E9-E9D21E9F772D
+; ************** APPLICATION C875 - MemVars created inside macros do not continue to exist after macro execution *************
+Application = C875 - MemVars created inside macros do not continue to exist after macro execution
+IDEVersion = 1.06
+GalleryName = 
+GalleryPage = 
+GalleryDefaultName = 
+Target = 0
+Platform = AnyCPU
+Language = XSharp
+Runtime = CLR4
+Dialect = VO
+Folder = %ProjectPath%\Applications\C875\
+PrgSubFolder = \Prg
+ResourcesSubFolder = 
+Description = 
+NameSpace = 
+Assembly = C875
+Extension = 
+ApplicationIcon = 
+OutputFolder = 
+Frameworks = 1
+GUID = D55CDEF3-833B-4F4F-B700-C1112F228638
+IncludeInProjectBuild = 1
+IncludeInProjectSearch = 1
+IncludeInProjectExport = 1
+IncludePath = 
+StdDefsFile = 
+AppToRun = 
+SignAssembly = 0
+KeyFile = 
+
+[ExportOptions]
+ExportResources = 0
+ExportImages = 0
+[C875 - MemVars created inside macros do not continue to exist after macro execution FileGroups]
+[C875 - MemVars created inside macros do not continue to exist after macro execution Files]
+File = %AppPath%\Prg\C875.prg
+FileGUID = 276AAD0C-E555-42A8-9D67-35E5A25D7FCE
+FileType = Code
+CopyToBin = 0
+[C875 - MemVars created inside macros do not continue to exist after macro execution References]
+ReferenceGAC = CLR4,System,1,0,4.0.0.0
+ReferenceGAC = CLR4,XSharp.Core,1,0,2.6.0.0
+ReferenceGAC = CLR4,XSharp.RT,1,0,2.6.0.0
+[C875 - MemVars created inside macros do not continue to exist after macro execution Resources]
+[C875 - MemVars created inside macros do not continue to exist after macro execution Native Resources]
+[C875 - MemVars created inside macros do not continue to exist after macro execution License files]
+[C875 - MemVars created inside macros do not continue to exist after macro execution General Options]
+Switches=
+ZeroArrays=0
+CaseSensitive=0
+ImplicitNamespace=0
+VO1=0
+VO2=0
+VO3=0
+VO4=0
+VO5=0
+VO6=0
+VO7=0
+VO8=0
+VO9=0
+VO10=0
+VO11=0
+VO12=0
+VO13=0
+VO14=0
+VO16=0
+VO17=0
+FOX1=0
+FOX2=0
+XPP1=0
+LateBound=0
+Unsafe=0
+Undeclared=1
+EnforceSelf=0
+EnforceOverride=0
+UseNativeVersion=0
+MemVar=1
+IgnoreStdDefs=0
+Ovf=0
+FOvf=0
+ResponseOnly=0
+[C875 - MemVars created inside macros do not continue to exist after macro execution Configurations]
+AppConfig = Debug,11111111-1111-1111-1111-111111111111
+  Switches=
+  SwitchesCF=
+  CommandLine=
+  CommandLineCF=
+  Debug=1
+  DebugInit=1
+  DefineDebug=1
+  DefineTrace=0
+  SyntaxOnly=0
+  WarningsErrors=0
+  ForceConsole=0
+  ForceX86=0
+  Optimize=0
+AppConfig = Release,22222222-2222-2222-2222-222222222222
+  Switches=
+  SwitchesCF=
+  CommandLine=
+  CommandLineCF=
+  Debug=0
+  DebugInit=0
+  DefineDebug=0
+  DefineTrace=0
+  SyntaxOnly=0
+  WarningsErrors=0
+  ForceConsole=0
+  ForceX86=0
+  Optimize=0
+ENDApplication = C875 - MemVars created inside macros do not continue to exist after macro execution
 [EndApplications]
 
 [Configurations]

XSharp/docs/Topics/VersionHistory.xml

@@ -13,22 +13,33 @@
     </header>
     <para styleclass="Body Text">Note: When an item has a matching GitHub ticket then the ticket number is behind the item in parentheses prefixed with #. You can find these tickets by going to: <br/>https://github.com/X-Sharp/XSharpPublic/issues/<text style="font-weight:bold;">nnn</text> where <text style="font-weight:bold;">nnn</text> is the ticket number.<br/>If you find an issue in X# we recommend that you report it on GitHub. You will be notified of the progress on the work on your issue and the ticket number will be included in the documentation of new builds from now on (April 2021).</para>
     <para styleclass="Body Text"></para>
+    <para styleclass="Heading1">Changes in 2.14.0.2</para>
+    <para styleclass="Heading2">Visual Studio Integration</para>
+    <para styleclass="Heading3">Bug fixes</para>
+    <list id="127" type="ul" listtype="bullet" formatstring="&#183;" format-charset="SYMBOL_CHARSET" levelreset="true" legalstyle="false" startfrom="1" styleclass="Body Text" style="font-family:Symbol; font-size:11pt; color:#000000;">
+      <li styleclass="Body Text">Fixed a problem with indenting after keywords such as IF, DO WHILE etc</li>
+      <li styleclass="Body Text">Fixed a problem with selecting words at the end of a line when debugging</li>
+      <li styleclass="Body Text">Fixed a problem where Format Document could lock up VS</li>
+      <li styleclass="Body Text">Fixed a problem that accessors such as GET and SET were not indented inside the property block</li>
+      <li styleclass="Body Text">Fixed a problem that Format Document was not working for some documents</li>
+      <li styleclass="Body Text">Changed the priority of the background scanner that is responsible for keyword colorization and derived tasks inside VS.</li>
+    </list>
     <para styleclass="Heading1">Changes in 2.14.0.1</para>
     <para styleclass="Heading2">Compiler</para>
     <para styleclass="Heading3">Bug fixes</para>
-    <list id="254" type="ul" listtype="bullet" formatstring="&#183;" format-charset="SYMBOL_CHARSET" levelreset="true" legalstyle="false" startfrom="1" styleclass="Body Text" style="font-family:Symbol; font-size:11pt; color:#000000;">
+    <list id="127" type="ul" listtype="bullet" formatstring="&#183;" format-charset="SYMBOL_CHARSET" levelreset="true" legalstyle="false" startfrom="1" styleclass="Body Text" style="font-family:Symbol; font-size:11pt; color:#000000;">
       <li styleclass="Body Text">Fixed a problem with date literals resulting in a message about an unknown alias &quot;gloal&quot; (#1178)</li>
       <li styleclass="Body Text">Fixed a problem that leading 0 characters in AssemblyFileVersion and AssemblyInformationalVersion were lost. If the attribute does not have the wildcard &apos;*&apos; then these leading zeros are preserved (#1179)</li>
     </list>
     <para styleclass="Heading2">Runtime</para>
     <para styleclass="Heading3">Bug fixes</para>
-    <list id="254" type="ul" listtype="bullet" formatstring="&#183;" format-charset="SYMBOL_CHARSET" levelreset="true" legalstyle="false" startfrom="1" styleclass="Body Text" style="font-family:Symbol; font-size:11pt; color:#000000;">
+    <list id="127" type="ul" listtype="bullet" formatstring="&#183;" format-charset="SYMBOL_CHARSET" levelreset="true" legalstyle="false" startfrom="1" styleclass="Body Text" style="font-family:Symbol; font-size:11pt; color:#000000;">
       <li styleclass="Body Text">The runtime DLLs for 2.14.0.0 were marked with the TargetFramework Attribute. This caused problems. The attribute is no longer set on the runtime DLLs (#1177)</li>
     </list>
     <para styleclass="Heading1">Changes in 2.14.0.0</para>
     <para styleclass="Heading2">Compiler</para>
     <para styleclass="Heading3">Bug fixes</para>
-    <list id="254" type="ul" listtype="bullet" formatstring="&#183;" format-charset="SYMBOL_CHARSET" levelreset="true" legalstyle="false" startfrom="1" styleclass="Body Text" style="font-family:Symbol; font-size:11pt; color:#000000;">
+    <list id="127" type="ul" listtype="bullet" formatstring="&#183;" format-charset="SYMBOL_CHARSET" levelreset="true" legalstyle="false" startfrom="1" styleclass="Body Text" style="font-family:Symbol; font-size:11pt; color:#000000;">
       <li styleclass="Body Text">Fixed a problem resolving methods when a type &#160;and a local have the same name (#922)</li>
       <li styleclass="Body Text">Improved XML doc messages for methods implicitly generated by the compiler (INITs, implicit constructors) (#1128)</li>
       <li styleclass="Body Text">Fixed an internal compiler error with DELEGATEs with default parameter values (#1129)</li>

XSharp/docs/XSHelp.hmxp

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<helpproject xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="helpproject.xsd" version="2.0" isskin="false" isrepository="false">
+<helpproject xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="helpproject.xsd" version="2.2" isskin="false" isrepository="false">
   <config>
     <namespaces/>
     <export-task-groups>
@@ -19,7 +19,7 @@
               <task-config-value name="outputfile">..\artifacts\Help\HTML\index.html</task-config-value>
               <task-config-value name="skin">XSharp_WebHelp.hmskin</task-config-value>
               <task-config-value name="make3include">HTML</task-config-value>
-              <task-config-value name="make3includeskin">OPT_PARENTHOME,OPT_TOPICFOOTER</task-config-value>
+              <task-config-value name="make3includeskin">OPT_PARENTHOME,OPT_TOPICFOOTER,OPT_WEBFONTS</task-config-value>
               <task-config-value name="make3status">*</task-config-value>
             </task-config-group>
           </export-task>
@@ -49,7 +49,7 @@
     <helpwindows>
       <helpwindow name="Main" left="86" top="51" width="800" height="600">
         <caption translate="true">(X#) XSharp Runtime Documentation</caption>
-        <window-options-chm navigation="true" navigationwidth="220" search="true" favorite="true" saveregistry="true" buttons="14462">
+        <window-options-chm navigation="true" navigationwidth="220" index="true" search="true" favorite="true" saveregistry="true" buttons="14462">
           <user-button name="jump1">
             <caption translate="true">jump1</caption>
           </user-button>
@@ -153,6 +153,7 @@
       <tablestyleclass name="Default">
         <style-set media="screen">width:auto; cell-padding:5px; cell-spacing:0px; page-break-inside:auto; border-width:0px; border-spacing:0px; cell-border-width:0px; border-style:none; background-color:none; head-row-background-color:#c0c0c0; alt-row-background-color:#ccffff;</style-set>
       </tablestyleclass>
+      <imagestyleclass name="Default"/>
     </styleclasses>
     <config-group name="project">
       <config-value name="title" translate="true">XSharp</config-value>
@@ -189,7 +190,7 @@
       <config-value name="make3status">*</config-value>
       <config-value name="tidyxml">1</config-value>
       <config-value name="contents">XSharp</config-value>
-      <config-value name="make3includeskin">OPT_PARENTHOME,OPT_TOPICFOOTER</config-value>
+      <config-value name="make3includeskin">OPT_PARENTHOME,OPT_TOPICFOOTER,OPT_WEBFONTS</config-value>
       <config-value name="make5include">PRINT</config-value>
       <config-value name="make5status">*</config-value>
     </config-group>
@@ -641,7 +642,7 @@
     <config-group name="user">
       <config-group name="robert">
         <config-group name="project">
-          <config-value name="lastexport">0</config-value>
+          <config-value name="lastexport">3</config-value>
         </config-group>
         <config-group name="report">
           <config-value name="type">6</config-value>

XSharp/docs/helpproject.xsl

@@ -321,6 +321,12 @@ Snippet: <b><xsl:value-of select="@src"/></b>
 &#160;&#160;&#160;&#160;&#160;
 </xsl:template>
 
+<xsl:template match="linklist">
+<div style="width:100%;text-align:center;padding:4px;background-color:#E2E2E2;border:1px dashed #000000">
+Linklist: <b><xsl:value-of select="@type"/></b>
+</div>
+</xsl:template>
+
 <xsl:template match="embedded-image">
 <span style="border:2px dashed #000000;padding:2px;font-weight:bold;color:#FFFFFF;background-color:#FF0000">Embedded image</span>
 </xsl:template>
@@ -329,6 +335,10 @@ Snippet: <b><xsl:value-of select="@src"/></b>
 <span style="border:2px dashed #000000;padding:2px;font-weight:bold;color:#FFFFFF;background-color:#FF0000">Embedded OLE control</span>
 </xsl:template>
 
+<xsl:template match="equation">
+<span style="border:2px dashed #000000;padding:2px;font-weight:bold;color:#FFFFFF;background-color:#FF0000">Equation object</span>
+</xsl:template>
+
 <xsl:template match="toggle">
   <xsl:variable name="caption">
     <xsl:copy-of select="./caption"/>

XSharp/eng/Versions.props

@@ -14,7 +14,7 @@ See License.txt in the project root for license information.
     <MajorVersion>2</MajorVersion>
     <MinorVersion>14</MinorVersion>
     <PatchVersion>0</PatchVersion>
-    <PreReleaseVersionLabel>0</PreReleaseVersionLabel>
+    <PreReleaseVersionLabel>2</PreReleaseVersionLabel>
     <VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
     <!--
       By default the assembly version in official builds is "$(MajorVersion).$(MinorVersion).0.0".

XSharp/src/Common/BuildNumber.h

@@ -13,13 +13,13 @@
 #ifdef RUNTIME
     #define VERSION_NUMBER     "2.6.0.0"
 #else
-    #define VERSION_NUMBER     "2.14.0.1"
+    #define VERSION_NUMBER     "2.14.0.2"
 #endif
 
     // This is the file version number, which is ignored by .NET but used by Windows installer to determine
     // whether one file is newer than another.
     // This typically would change if we're generating a patch, otherwise it should be the same as VERSION_NUMBER
-    #define FILEVERSION_NUMBER   "2.14.0.1"
+    #define FILEVERSION_NUMBER   "2.14.0.2"
     #define INFORMATIONAL_NUMBER  "2.14 GA"
 
     #ifdef __DEBUG__

XSharp/src/Common/Constants.cs

@@ -16,9 +16,9 @@ internal class Constants
 #if RUNTIME
         internal const string Version = "2.6.0.0";
 #else
-        internal const string Version = "2.14.0.1";
+        internal const string Version = "2.14.0.2";
 #endif
-        internal const string FileVersion = "2.14.0.1";
+        internal const string FileVersion = "2.14.0.2";
         internal const string ProductVersion = "2.14 GA";
         internal const string PublicKey = "ed555a0467764586";
         internal const string Copyright = "Copyright © XSharp BV 2015-2022";

XSharp/src/Compiler/XSharpBuildTask/Xsc.cs

@@ -746,6 +746,10 @@ internal void AddVOCompatibilityCommands(XSharpCommandLineBuilder commandline)
 
             if (NS)     // Add Default Namespace
             {
+                if (this.RootNameSpace.Contains(" "))
+                {
+                    this.RootNameSpace = '"' + this.RootNameSpace + '"';
+                }
                 commandline.AppendSwitch("/ns:" + this.RootNameSpace);
             }
             commandline.AppendPlusOrMinusSwitch("/allowdot", _store, nameof(AllowDot));

XSharp/src/Compiler/XSharpCodeAnalysis/Binder/Binder_Symbols.cs

@@ -84,15 +84,17 @@ internal Symbol XSharpResolveEqualSymbols(Symbol first, Symbol second, Immutable
 
             CSDiagnosticInfo GenerateWarning(Symbol s1, Symbol s2)
             {
+                var asm1 = s1.ContainingAssembly?.Name ?? "Unknown";
+                var asm2 = s2.ContainingAssembly?.Name ?? "Unknown";
                 return new CSDiagnosticInfo(ErrorCode.WRN_XSharpAmbiguous, originalSymbols,
                 new object[] {
                         where,
                         s1.Kind.ToString(),
                         new FormattedSymbol(s1, SymbolDisplayFormat.CSharpErrorMessageFormat),
-                        s1.ContainingAssembly.Name,
+                        asm1,
                         s2.Kind.ToString(),
                         new FormattedSymbol(s2, SymbolDisplayFormat.CSharpErrorMessageFormat),
-                        s2.ContainingAssembly.Name
+                        asm2
                 });
 
             }

XSharp/src/Compiler/XSharpCodeAnalysis/CommandLine/XSharpCommandLineParser.cs

@@ -143,6 +143,8 @@ internal bool ParseXSharpArgument(ref string name, ref string value, string arg,
                     }
                     else
                     {
+                        if (value.StartsWith("\"") && value.EndsWith("\""))
+                            value = value.Substring(1, value.Length - 2).Replace(' ', '_');
                         options.NameSpace = value;
                     }
                     break;

XSharp/src/Compiler/XSharpCodeAnalysis/Parser/XSharpTreeTransformationRT.cs

@@ -139,7 +139,7 @@ public override string GetGlobalClassName(XSharpTargetDLL targetDLL)
             {
                 string filename = PathUtilities.GetFileName(name);
                 filename = PathUtilities.RemoveExtension(filename);
-                filename = filename.Replace('.', '_');
+                filename = filename.Replace('.', '_').Replace(' ', '_');
                 if (_options.CommandLineArguments?.CompilationOptions.OutputKind.IsApplication() == true)
                     name = filename + XSharpSpecialNames.VOExeFunctionsClass;
                 else