diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index 4070ff329..1fb65df40 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 = "2"; public const string Build = "0"; - public const string Revision = "1439"; + public const string Revision = "1442"; 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 6bb89189c..ad42492c0 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ -%COREVERSION%=0 -%REVISION%=1439 %MINOR%=2 +%REVISION%=1442 +%COREVERSION%=0 %MAJOR%=3 diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index 9dee303d1..7022916ed 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.2.0.1439' +!define VERSION '3.2.0.1442' diff --git a/ReleaseGenerators/sect_Core.nsh b/ReleaseGenerators/sect_Core.nsh index eb1f64ee0..7a761b073 100644 --- a/ReleaseGenerators/sect_Core.nsh +++ b/ReleaseGenerators/sect_Core.nsh @@ -12,7 +12,6 @@ File "..\bin\SyntaxTree.dll" File "..\bin\SyntaxTreeConverters.dll" File "..\bin\SyntaxVisitors.dll" - File "..\bin\YieldConversionSyntax.dll" File "..\bin\YieldHelpers.dll" File "..\bin\ICSharpCode.NRefactory.dll" File "..\bin\TreeConverter.dll" @@ -50,7 +49,6 @@ ${AddFile} "SyntaxTreeConverters.dll" ${AddFile} "YieldHelpers.dll" ${AddFile} "SyntaxVisitors.dll" - ${AddFile} "YieldConversionSyntax.dll" ${AddFile} "ICSharpCode.NRefactory.dll" ${AddFile} "TreeConverter.dll" ${AddFile} "OptimizerConversion.dll" @@ -106,6 +104,7 @@ File ..\bin\Lib\ClientServer.pcu File ..\bin\Lib\OpenGL.pcu File ..\bin\Lib\PT4MakerNetX.pcu + File ..\bin\Lib\Speech.pcu File ..\bin\Lib\PABCRtl.dll File ..\bin\Lib\PABCRtl32.dll @@ -153,6 +152,7 @@ ${AddFile} "ClientServer.pcu" ${AddFile} "OpenGL.pcu" ${AddFile} "PT4MakerNetX.pcu" + ${AddFile} "Speech.pcu" ${AddFile} "PABCRtl.dll" ${AddFile} "PABCRtl.pdb" Push "Lib\PABCRtl.dll" @@ -201,6 +201,7 @@ File ..\bin\Lib\ClientServer.pas File ..\bin\Lib\OpenGL.pas File ..\bin\Lib\PT4MakerNetX.pas + File ..\bin\Lib\Speech.pas File ..\bin\Lib\__RedirectIOMode.vb File ..\bin\Lib\VBSystem.vb @@ -247,6 +248,7 @@ ${AddFile} "ClientServer.pas" ${AddFile} "OpenGL.pas" ${AddFile} "PT4MakerNetX.pas" + ${AddFile} "Speech.pas" ${AddFile} "__RedirectIOMode.vb" ${AddFile} "VBSystem.vb" @@ -255,8 +257,6 @@ Call NGEN Push "SyntaxVisitors.dll" Call NGEN - Push "YieldConversionSyntax.dll" - Call NGEN ; SetOutPath "$INSTDIR\Output" SectionEnd diff --git a/SyntaxTree/tree/Tree.cs b/SyntaxTree/tree/Tree.cs index e025a5879..307f9a511 100644 --- a/SyntaxTree/tree/Tree.cs +++ b/SyntaxTree/tree/Tree.cs @@ -43382,7 +43382,7 @@ namespace PascalABCCompiler.SyntaxTree /// - ///узел, не генерирующий кода, но осуществляющий семантические проверки сахарных узлов. stat - это на самом деле statement. stat сделано типа object - чтобы оно автоматически не обходилось + ///Узел, не генерирующий кода, но осуществляющий семантические проверки сахарных узлов. stat - это на самом деле statement. stat сделано типа object - чтобы оно автоматически не обходилось /// [Serializable] public partial class semantic_check_sugared_statement_node : statement diff --git a/SyntaxTree/tree/tree.xml b/SyntaxTree/tree/tree.xml index 8f2347c70..489316378 100644 --- a/SyntaxTree/tree/tree.xml +++ b/SyntaxTree/tree/tree.xml @@ -3826,7 +3826,7 @@ - + diff --git a/bin/Lib/PABCRtl.dll b/bin/Lib/PABCRtl.dll index 04c4646f0..aaffe29ae 100644 Binary files a/bin/Lib/PABCRtl.dll and b/bin/Lib/PABCRtl.dll differ diff --git a/bin/Lib/Speech.pas b/bin/Lib/Speech.pas new file mode 100644 index 000000000..5480dbd84 --- /dev/null +++ b/bin/Lib/Speech.pas @@ -0,0 +1,30 @@ +{$reference System.Speech.dll} +unit Speech; + +interface + +procedure Speak(s: string); + +procedure SpeakAsync(s: string); + +implementation + +uses System.Speech.Synthesis; + +var ss: SpeechSynthesizer; + +procedure Speak(s: string); +begin + ss.Speak(s) +end; + +procedure SpeakAsync(s: string); +begin + ss.SpeakAsync(s) +end; + +begin + ss := new SpeechSynthesizer; + var voices := ss.GetInstalledVoices; + ss.SelectVoice(voices[0].VoiceInfo.Name) +end. \ No newline at end of file