Tolerate ANY NUMERIC and ANY LENGTH; include f_name in VARIABLE_STRING

cobcd-st/cobst.vcxproj.user

 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LocalDebuggerCommandArguments>-f C:\Users\Bob\repos\cbl-gdb-samples\ref_test_2\rtest C:\Users\Bob\repos\cbl-gdb-samples\ref_test_2\rtest.cbl</LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments>-f C:\Users\Bob\repos\cbl-gdb-samples\ref_test_9\rtest C:\Users\Bob\repos\cbl-gdb-samples\ref_test_9\rtest.cbl</LocalDebuggerCommandArguments>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LocalDebuggerCommandArguments>-f C:\Users\Bob\repos\cbl-gdb-samples\ref_test_2\rtest C:\Users\Bob\repos\cbl-gdb-samples\ref_test_2\rtest.cbl</LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments>-f C:\Users\Bob\repos\cbl-gdb-samples\ref_test_9\rtest C:\Users\Bob\repos\cbl-gdb-samples\ref_test_9\rtest.cbl</LocalDebuggerCommandArguments>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LocalDebuggerCommandArguments>-f C:\Users\Bob\repos\cbl-gdb-samples\ref_test_2\rtest C:\Users\Bob\repos\cbl-gdb-samples\ref_test_2\rtest.cbl</LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments>-f C:\Users\Bob\repos\cbl-gdb-samples\ref_test_9\rtest C:\Users\Bob\repos\cbl-gdb-samples\ref_test_9\rtest.cbl</LocalDebuggerCommandArguments>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LocalDebuggerCommandArguments>-f C:\Users\Bob\repos\cbl-gdb-samples\ref_test_2\rtest C:\Users\Bob\repos\cbl-gdb-samples\ref_test_2\rtest.cbl</LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments>-f C:\Users\Bob\repos\cbl-gdb-samples\ref_test_9\rtest C:\Users\Bob\repos\cbl-gdb-samples\ref_test_9\rtest.cbl</LocalDebuggerCommandArguments>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>
 </Project>
\ No newline at end of file

cobcd-st/vartree.cpp

@@ -359,6 +359,28 @@ VARIABLE_TREE::ReadFromFile(std::ifstream &ifs)
             continue;
         }
 
+        // I'm getting bored with some of this nonsense.
+        // But as we run more and more code through this program, we keep
+        // coming up with stuff that needs to be skipped over
+
+        size_t nfound = input.find("ANY LENGTH");
+        if( nfound != string::npos )
+            {
+            input.replace(nfound,10,"          ");
+            }
+
+        nfound = input.find("ANY NUMERIC");
+        if( nfound != string::npos )
+            {
+            input.replace(nfound,11,"          ");
+            }
+
+        nfound = input.find("ALIGNED");
+        if( nfound != string::npos )
+            {
+            input.replace(nfound,7,"       ");
+            }
+
         vector<string>tokens = Split(input," \t");
         if(tokens.size() EQ 0) {
             // Ignore blank lines
@@ -1131,6 +1153,7 @@ VARIABLE_TREE::FormatVariablesInfo(stringstream &ss,
         ss << node->section.substr(0,2) << "|";
         ss << ZeroIsNull(node->level) << "|" ;
         ss << node->canonical_name << "|" ;
+        ss << node->f_name << "|" ;
         ss << node->b_name << "|" ;
         ss << ZeroIsNull(node->offset) << "|" ;
         ss << node->type.substr(0,1) << "|" ;