V1.3.0

Analytics/Analytics.csproj

@@ -17,10 +17,6 @@
   </PropertyGroup>
   <!-- ITEM Group for .NET 4.5 Dependencies -->
   <ItemGroup Condition=" '$(Configuration)'=='Debug' Or '$(Configuration)'=='Release' Or '$(Configuration)'=='EI_Debug' Or '$(Configuration)'=='EI_Release'">
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.4.12\lib\net45\NLog.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.DirectoryServices" />
@@ -30,10 +26,6 @@
   </ItemGroup>
   <!-- ITEM Group for .NET 4.0 Dependencies -->
   <ItemGroup Condition=" '$(Configuration)'=='EI_Debug_Net40' Or '$(Configuration)'=='EI_Release_Net40'">
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.4.12\lib\net40\NLog.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.DirectoryServices" />
@@ -70,6 +62,15 @@
       <HintPath>..\packages\Elasticsearch.Net.6.1.0\lib\net45\Elasticsearch.Net.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.4.5.11\lib\net45\NLog.dll</HintPath>
+    </Reference>
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Xml" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

Analytics/packages.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Elasticsearch.Net" version="6.1.0" targetFramework="net45" />
-  <package id="NLog" version="4.4.12" targetFramework="net45" />
+  <package id="NLog" version="4.5.11" targetFramework="net45" />
   <package id="NLog.Config" version="4.4.11" targetFramework="net45" />
   <package id="NLog.Schema" version="4.4.11" targetFramework="net45" />
 </packages>

CLI/src/CLI.cs

@@ -179,41 +179,21 @@ private static ReturnCode runOnce2(TypeCobolConfiguration config, AbstractErrorW
                 {
                     if (!string.IsNullOrEmpty(config.ReportCopyMoveInitializeFilePath))
                     {
-                        if (config.UseAntlrProgramParsing)
-                        {
-                            Compiler.Parser.NodeDispatcher<Antlr4.Runtime.ParserRuleContext>.RegisterStaticNodeListenerFactory(
-                                () => {
-                                    var report = new Compiler.Report.CopyMoveInitializeReport<Antlr4.Runtime.ParserRuleContext>(config.ReportCopyMoveInitializeFilePath);
-                                    reports.Add(report); return report;
-                                });
-                        }
-                        else
-                        {
-                            Compiler.Parser.NodeDispatcher<Compiler.CodeElements.CodeElement>.RegisterStaticNodeListenerFactory(
-                                () => {
-                                    var report = new Compiler.Report.CopyMoveInitializeReport<Compiler.CodeElements.CodeElement>(config.ReportCopyMoveInitializeFilePath);
-                                    reports.Add(report); return report;
-                                });
-                        }
+                        Compiler.Parser.NodeDispatcher.RegisterStaticNodeListenerFactory(
+                            () => {
+                                var report = new Compiler.Report.CopyMoveInitializeReport(config.ReportCopyMoveInitializeFilePath);
+                                reports.Add(report); return report;
+                            });
+
                     }
                     if (!string.IsNullOrEmpty(config.ReportZCallFilePath))
                     {
-                        if (config.UseAntlrProgramParsing)
-                        {
-                            Compiler.Parser.NodeDispatcher<Antlr4.Runtime.ParserRuleContext>.RegisterStaticNodeListenerFactory(
-                                () => {
-                                    var report = new Compiler.Report.ZCallPgmReport<Antlr4.Runtime.ParserRuleContext>(config.ReportZCallFilePath);
-                                    reports.Add(report); return report;
-                                });
-                        }
-                        else
-                        {
-                            Compiler.Parser.NodeDispatcher<Compiler.CodeElements.CodeElement>.RegisterStaticNodeListenerFactory(
-                                () => {
-                                    var report = new Compiler.Report.ZCallPgmReport<Compiler.CodeElements.CodeElement>(config.ReportZCallFilePath);
-                                    reports.Add(report); return report;
-                                });
-                        }
+                        Compiler.Parser.NodeDispatcher.RegisterStaticNodeListenerFactory(
+                            () => {
+                                var report = new Compiler.Report.ZCallPgmReport(config.ReportZCallFilePath);
+                                reports.Add(report); return report;
+                            });
+
                     }
                 }
                 #endregion
@@ -300,7 +280,7 @@ private static ReturnCode runOnce2(TypeCobolConfiguration config, AbstractErrorW
                     {
                         StringBuilder generatedCobolStringBuilder = new StringBuilder();
                         var generator = GeneratorFactoryManager.Instance.Create(TypeCobol.Tools.Options_Config.OutputFormat.ExpandingCopy.ToString(),
-                            parser.Results, generatedCobolStringBuilder, null, null);
+                            parser.Results, generatedCobolStringBuilder, null, null, false);
                         var streamWriter =  new StreamWriter(config.ExpandingCopyFilePath);
                         generator.Generate(parser.Results, ColumnsLayout.CobolReferenceFormat);
                         streamWriter.Write(generatedCobolStringBuilder);
@@ -389,10 +369,11 @@ private static ReturnCode runOnce2(TypeCobolConfiguration config, AbstractErrorW
                             }
 
                             var sb = new StringBuilder();
+                            bool bNeedLineMap = config.LineMapFiles.Count > fileIndex;
                             //Get Generator from specified config.OutputFormat
                             var generator = GeneratorFactoryManager.Instance.Create(config.OutputFormat.ToString(),
                                 parser.Results,
-                                sb, skeletons, AnalyticsWrapper.Telemetry.TypeCobolVersion);
+                                sb, skeletons, AnalyticsWrapper.Telemetry.TypeCobolVersion, bNeedLineMap);
 
                             if (generator == null)
                             {
@@ -420,6 +401,26 @@ private static ReturnCode runOnce2(TypeCobolConfiguration config, AbstractErrorW
                             }
                             else
                             {
+                                //Output Line Map Data.
+                                if (bNeedLineMap && generator.HasLineMapData)
+                                {
+                                    using (var fstream = new FileStream(config.LineMapFiles[fileIndex], FileMode.Create))
+                                    {
+                                        try
+                                        {
+                                            generator.GenerateLineMapFile(fstream);
+                                        }
+                                        catch (Exception e)
+                                        {
+                                            //Fail to generate Line Map File
+                                            System.Console.WriteLine(string.Format("Fail to generate Line Mapping File {0} : {1}", config.LineMapFiles[fileIndex],  e.Message));
+                                        }
+                                        finally
+                                        {
+                                            fstream.Close();
+                                        }
+                                    }
+                                }
                                 var lockWriter = new StreamWriter(lockFilePath);
                                 lockWriter.Flush();
                                 lockWriter.Close();

CLI/src/CLI.csproj

@@ -57,7 +57,11 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="config\*">
+    <None Include="config\skeletons.xml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <SubType>Designer</SubType>
+    </None>
+    <None Include="config\TCIntrinsic-SampleDate.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
   </ItemGroup>

CLI/src/Daemon.cs

@@ -39,7 +39,7 @@ static int Main(string[] argv)
             var pipename = "TypeCobol.Server";
 
 
-            var p = TypeCobolOptionSet.GetCommonTypeCobolOptions(config);
+            var p = new OptionSet();
 
             //Add custom options for CLI
             p.Add(string.Format("USAGE\n {0} [OPTIONS]... [PIPENAME]\n VERSION:\n {1} \n DESCRIPTION: \n Run the TypeCObol parser server", PROGNAME, PROGVERSION));
@@ -61,6 +61,7 @@ static int Main(string[] argv)
             p.Add("h|help", "Output a usage message and exit.", v => help = (v != null));
             p.Add("V|version", "Output the version number of " + PROGNAME + " and exit.", v => version = (v != null));
 
+            p.AddRange(TypeCobolOptionSet.GetCommonTypeCobolOptions(config));
 
             //Add DefaultCopies to running session
             var folder = Path.GetDirectoryName(Process.GetCurrentProcess().MainModule.FileName);
@@ -70,15 +71,15 @@ static int Main(string[] argv)
             {
                 var errors = TypeCobolOptionSet.InitializeCobolOptions(config, argv, p);
 
-                if (!errors.IsNullOrEmpty())
-                    return exit(errors);
-
                 if (help)
                 {
                     p.WriteOptionDescriptions(Console.Out);
                     return 0;
                 }
 
+                if (!errors.IsNullOrEmpty())
+                    return exit(errors);
+
                 if (version)
                 {
                     Console.WriteLine(PROGVERSION);