diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index dcf5a5034..fbbf0d296 100644 --- a/Configuration/GlobalAssemblyInfo.cs +++ b/Configuration/GlobalAssemblyInfo.cs @@ -15,7 +15,7 @@ internal static class RevisionClass public const string Major = "3"; public const string Minor = "4"; public const string Build = "2"; - public const string Revision = "1805"; + public const string Revision = "1806"; public const string MainVersion = Major + "." + Minor; public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision; diff --git a/Configuration/Version.defs b/Configuration/Version.defs index 258956731..c3c841a0b 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ -%COREVERSION%=2 -%REVISION%=1805 %MINOR%=4 +%REVISION%=1806 +%COREVERSION%=2 %MAJOR%=3 diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index 2104d888c..756624d09 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.4.2.1805' +!define VERSION '3.4.2.1806' diff --git a/SyntaxVisitors/SugarVisitors/QuestionPointDesugarVisitor.cs b/SyntaxVisitors/SugarVisitors/QuestionPointDesugarVisitor.cs index c5bab6dda..b297499a2 100644 --- a/SyntaxVisitors/SugarVisitors/QuestionPointDesugarVisitor.cs +++ b/SyntaxVisitors/SugarVisitors/QuestionPointDesugarVisitor.cs @@ -169,7 +169,8 @@ namespace SyntaxVisitors.SugarVisitors var qce = ConvertToQCE1(dqn, tname); var sug = sugared_addressed_value.NewP(dqn, qce, dqn.source_context); - ReplaceUsingParent(dqn, sug); + //ReplaceUsingParent(dqn, sug); + Replace(dqn, sug); // SSM 30/09/18 visit(qce); ReplaceStatementUsingParent(st as statement, l); diff --git a/TestSuite/questionpoint1.pas b/TestSuite/questionpoint1.pas new file mode 100644 index 000000000..c582fceca --- /dev/null +++ b/TestSuite/questionpoint1.pas @@ -0,0 +1,11 @@ +type + t1=class + o: object; + + property p1: System.Type read o?.GetType; + end; + +begin + var t := new t1; + Assert(t.p1=nil); +end. \ No newline at end of file