administrator/pascalabcnet
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

bug fix #161

Browse source
This commit is contained in:
miks1965 2016-05-21 14:46:52 +03:00
parent 13e42dd529
commit dd460c6ca5
10 changed files with 240 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Configuration/GlobalAssemblyInfo.cs
View file

@ -15,7 +15,7 @@ internal static class RevisionClass
public const string Major = "3"; public const string Major = "3";
public const string Minor = "1"; public const string Minor = "1";
public const string Build = "0"; public const string Build = "0";
public const string Revision = "1241"; public const string Revision = "1243";
public const string MainVersion = Major + "." + Minor; public const string MainVersion = Major + "." + Minor;
public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision; public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;

2
Configuration/Version.defs
View file

@ -1,4 +1,4 @@
%COREVERSION%=0 %COREVERSION%=0
%REVISION%=1241 %REVISION%=1243
%MINOR%=1 %MINOR%=1
%MAJOR%=3 %MAJOR%=3

222
PascalABCNET.axml
View file

@ -524,6 +524,228 @@
</Node> </Node>
</Items> </Items>
</Node> </Node>
<Node Name="PVS Studio Detected">
<Items>
<Node Name="Нужно использовать &amp;&amp; вместо ||">
<FileName>\codecompletion\domconverter.cs</FileName>
<Text>if (pattern != null || pattern != "")</Text>
<OCtx>
<i Type="Method">public SymInfo [ ] GetTypeByPattern ( string pattern , int line , int col , bool all_names , int nest_level )</i>
<i Type="ClassOrNamespace">public class DomConverter</i>
<i Type="ClassOrNamespace">namespace CodeCompletion</i>
<i Type="CS_TreeNode">
</i>
</OCtx>
</Node>
<Node Name="Неиспользуемый результат Replace">
<FileName>\visualplugins\languageconverter\source\textformatter.cs</FileName>
<Text>_word.Replace(specSymbol, "");</Text>
<OCtx>
<i Type="Method">public string FormatWordWithKeyWord ( string _word , object _node )</i>
<i Type="ClassOrNamespace">public class TextFormatter</i>
<i Type="ClassOrNamespace">namespace Converter</i>
<i Type="CS_TreeNode">
</i>
</OCtx>
</Node>
<Node Name="Неиспользуемый результат OrderBy">
<FileName>\visualpascalabcnet\formsdesignerbinding\dependecies\src\main\base\project\src\services\refactoringservice\refactoringservice.cs</FileName>
<Text>result.OrderBy(node =&gt; node.Content.FullyQualifiedName);</Text>
<OCtx>
<i Type="Method">static IEnumerable &lt; ITreeNode &lt; IClass &gt; &gt; FindDerivedClassesTree ( IClass baseClass , IEnumerable &lt; IProjectContent &gt; projectContents , HashSet &lt; IClass &gt; seenClasses )</i>
<i Type="ClassOrNamespace">public static class RefactoringService</i>
<i Type="ClassOrNamespace">namespace ICSharpCode . SharpDevelop . Refactoring</i>
<i Type="CS_TreeNode">
</i>
</OCtx>
</Node>
<Node Name="Одинаковые подвыражения в условии">
<Items>
<Node Name="1">
<FileName>\treeconverter\treeconversion\syntax_tree_visitor.cs</FileName>
<Text>if (_pascal_set_constant.values != null &amp;&amp; _pascal_set_constant.values != null)</Text>
<OCtx>
<i Type="Method">public override void visit ( SyntaxTree . pascal_set_constant _pascal_set_constant )</i>
<i Type="ClassOrNamespace">public class syntax_tree_visitor : SyntaxTree . AbstractVisitor</i>
<i Type="ClassOrNamespace">namespace PascalABCCompiler . TreeConverter</i>
<i Type="CS_TreeNode">
</i>
</OCtx>
</Node>
<Node Name="2">
<FileName>\visualpascalabcnet\workbench\runnermanagerhandlers.cs</FileName>
<Text>if (File.Exists(pdbFileName) &amp;&amp; File.Exists(pdbFileName))</Text>
<OCtx>
<i Type="Method">void WaitCallback_DeleteEXEAndPDB ( object state )</i>
<i Type="ClassOrNamespace">public partial class WorkbenchRunService : VisualPascalABCPlugins . IWorkbenchRunService</i>
<i Type="ClassOrNamespace">namespace VisualPascalABC</i>
<i Type="CS_TreeNode">
</i>
</OCtx>
</Node>
<Node Name="Самая интересная ошибка">
<FileName>\visualpascalabcnet\formsdesignerbinding\dependecies\src\main\base\project\src\editor\codecompletion\nrefactoryinsightwindowhandler.cs</FileName>
<Note>Вот здесь то место, где не учитывается один вариант открывающих скобок
Вместо одного из openBracketToken нужно написать openBracesToken</Note>
<Text>if (token.Kind == openParensToken || token.Kind == openBracketToken || token.Kind == openBracketToken) {</Text>
<OCtx>
<i Type="Method">public void InitializeOpenedInsightWindow ( ITextEditor editor , IInsightWindow insightWindow )</i>
<i Type="ClassOrNamespace">public class NRefactoryInsightWindowHandler : IInsightWindowHandler</i>
<i Type="ClassOrNamespace">namespace ICSharpCode . SharpDevelop . Editor . CodeCompletion</i>
<i Type="CS_TreeNode">
</i>
</OCtx>
</Node>
</Items>
</Node>
<Node Name="Всегда истинные выражения">
<Items>
<Node Name="1">
<FileName>\treeconverter\systemlib\static_executors.cs</FileName>
<Text>if (value &gt;= int.MinValue &amp;&amp; value &lt;= int.MaxValue)</Text>
<OCtx>
<i Type="Method">private static int check_int_overflow ( location loc , int value )</i>
<i Type="ClassOrNamespace">public static class static_executors</i>
<i Type="ClassOrNamespace">namespace PascalABCCompiler . SystemLibrary</i>
<i Type="CS_TreeNode">
</i>
</OCtx>
</Node>
<Node Name="2">
<FileName>\treeconverter\systemlib\static_executors.cs</FileName>
<Text>if (value &gt;= long.MinValue &amp;&amp; value &lt;= long.MaxValue)</Text>
<OCtx>
<i Type="Method">private static long check_long_overflow ( location loc , long value )</i>
<i Type="ClassOrNamespace">public static class static_executors</i>
<i Type="ClassOrNamespace">namespace PascalABCCompiler . SystemLibrary</i>
<i Type="CS_TreeNode">
</i>
</OCtx>
</Node>
<Node Name="3">
<FileName>\NETGenerator\NETGenerator.cs</FileName>
<Text>if (pos &lt;= 255) il.Emit(OpCodes.Starg_S, pos);</Text>
<OCtx>
<i Type="Method">private void ConvertInc ( IExpressionNode e )</i>
<i Type="ClassOrNamespace">public class ILConverter : AbstractVisitor</i>
<i Type="ClassOrNamespace">namespace PascalABCCompiler . NETGenerator</i>
<i Type="CS_TreeNode">
</i>
</OCtx>
</Node>
<Node Name="4">
<FileName>\NETGenerator\NETGenerator.cs</FileName>
<Text>if (pos &lt;= 255) il.Emit(OpCodes.Starg_S, pos);</Text>
<OCtx>
<i Type="Method">private void ConvertDec ( IExpressionNode e )</i>
<i Type="ClassOrNamespace">public class ILConverter : AbstractVisitor</i>
<i Type="ClassOrNamespace">namespace PascalABCCompiler . NETGenerator</i>
<i Type="CS_TreeNode">
</i>
</OCtx>
</Node>
<Node Name="5">
<FileName>\NETGenerator\NETGenerator.cs</FileName>
<Text>if (pos &lt;= 255) il.Emit(OpCodes.Ldarga_S, pos);</Text>
<OCtx>
<i Type="Method">private void AddrOfParameterNode ( ICommonParameterReferenceNode value )</i>
<i Type="ClassOrNamespace">public class ILConverter : AbstractVisitor</i>
<i Type="ClassOrNamespace">namespace PascalABCCompiler . NETGenerator</i>
<i Type="CS_TreeNode">
</i>
</OCtx>
</Node>
</Items>
</Node>
<Node Name="Повторная проверка условия">
<FileName>\codecompletion\findreferences.cs</FileName>
<Note>Двумя строчками ниже
(Здесь сказывается недостаток моего инструмента - если в методе есть две одинаковые строчки - переход осуществляется только на первую, а надо на вторую)</Note>
<Text>if (ret_tn != null)</Text>
<OCtx>
<i Type="Method">public override void visit ( indexer _indexer )</i>
<i Type="ClassOrNamespace">public class ReferenceFinder : AbstractVisitor</i>
<i Type="ClassOrNamespace">namespace CodeCompletion</i>
<i Type="CS_TreeNode">
</i>
</OCtx>
</Node>
<Node Name="Дважды проверяется if (left is int64_const)">
<FileName>\parsertools\syntaxtreevisitors\syntaxtreecomparer.cs</FileName>
<Note>597 и 631 строки в текущей версии</Note>
<Text>else if (left is int64_const)</Text>
<OCtx>
<i Type="Method">public void CompareInternal ( expression left , expression right )</i>
<i Type="ClassOrNamespace">public class SyntaxTreeComparer</i>
<i Type="ClassOrNamespace">namespace PascalABCCompiler . SyntaxTree</i>
<i Type="CS_TreeNode">
</i>
</OCtx>
</Node>
<Node Name="Трижды проверяется if (left is case_node)">
<FileName>\parsertools\syntaxtreevisitors\syntaxtreecomparer.cs</FileName>
<Note>1599
1611
1615 строки</Note>
<Text>else if (left is case_node)</Text>
<OCtx>
<i Type="Method">public void CompareInternal ( statement left , statement right )</i>
<i Type="ClassOrNamespace">public class SyntaxTreeComparer</i>
<i Type="ClassOrNamespace">namespace PascalABCCompiler . SyntaxTree</i>
<i Type="CS_TreeNode">
</i>
</OCtx>
</Node>
</Items>
</Node>
<Node Name="Ошибка read(x,s)">
<Items>
<Node Name="make_read_call вызов">
<FileName>\TreeConverter\TreeConversion\syntax_tree_visitor.cs</FileName>
<Text>expression_node bfcint = make_read_call(si, _method_call.parameters, subloc2);</Text>
<OCtx>
<i Type="Method">internal void visit_method_call ( SyntaxTree . method_call _method_call )</i>
<i Type="ClassOrNamespace">public class syntax_tree_visitor : SyntaxTree . AbstractVisitor</i>
<i Type="ClassOrNamespace">namespace PascalABCCompiler . TreeConverter</i>
<i Type="CS_TreeNode">
</i>
</OCtx>
</Node>
<Node Name="make_read_call - описание">
<FileName>\TreeConverter\TreeConversion\syntax_tree_visitor.cs</FileName>
<OCtx>
<i Type="Method">private expression_node make_read_call ( SymbolInfo si , SyntaxTree . expression_list parameters , location loc )</i>
<i Type="ClassOrNamespace">public class syntax_tree_visitor : SyntaxTree . AbstractVisitor</i>
<i Type="ClassOrNamespace">namespace PascalABCCompiler . TreeConverter</i>
<i Type="CS_TreeNode">
</i>
</OCtx>
</Node>
<Node Name="readln_string_file = true;">
<FileName>\TreeConverter\TreeConversion\syntax_tree_visitor.cs</FileName>
<Note>Это - непонятное место из-за которого происходит ошибка</Note>
<Text>readln_string_file = true;</Text>
<OCtx>
<i Type="Method">private expression_node make_read_call ( SymbolInfo si , SyntaxTree . expression_list parameters , location loc )</i>
<i Type="ClassOrNamespace">public class syntax_tree_visitor : SyntaxTree . AbstractVisitor</i>
<i Type="ClassOrNamespace">namespace PascalABCCompiler . TreeConverter</i>
<i Type="CS_TreeNode">
</i>
</OCtx>
</Node>
<Node Name="!readln_string_file">
<FileName>\TreeConverter\TreeConversion\syntax_tree_visitor.cs</FileName>
<Text>if (!readln_string_file)</Text>
<OCtx>
<i Type="Method">private expression_node make_read_call ( SymbolInfo si , SyntaxTree . expression_list parameters , location loc )</i>
<i Type="ClassOrNamespace">public class syntax_tree_visitor : SyntaxTree . AbstractVisitor</i>
<i Type="ClassOrNamespace">namespace PascalABCCompiler . TreeConverter</i>
<i Type="CS_TreeNode">
</i>
</OCtx>
</Node>
</Items>
</Node>
</Items> </Items>
</Node> </Node>
</AspectFile> </AspectFile>

2
ReleaseGenerators/PascalABCNETConsoleZIP.bat
View file

@ -1,6 +1,6 @@
cd ..\bin cd ..\bin
del ..\Release\PACNETConsole.zip del ..\Release\PACNETConsole.zip
..\utils\pkzipc\pkzipc.exe -add ..\Release\PABCNETC.zip pabcnetc.exe pabcnetcclear.exe Compiler.dll CompilerTools.dll Errors.dll Localization.dll NETGenerator.dll ParserTools.dll ICSharpCode.NRefactory.dll SemanticTree.dll SyntaxTree.dll TreeConverter.dll OptimizerConversion.dll PascalABCParser.dll licence.txt PascalABCNET.chm System.Threading.dll ..\utils\pkzipc\pkzipc.exe -add ..\Release\PABCNETC.zip pabcnetc.exe pabcnetcclear.exe Compiler.dll CompilerTools.dll Errors.dll Localization.dll NETGenerator.dll ParserTools.dll ICSharpCode.NRefactory.dll SemanticTree.dll SyntaxTree.dll TreeConverter.dll OptimizerConversion.dll PascalABCParser.dll licence.txt PascalABCNET.chm System.Threading.dll SyntaxTreeConverters.dll
..\utils\pkzipc\pkzipc.exe -add -nozip -dir ..\Release\PABCNETC.zip Lib\*.pcu ..\utils\pkzipc\pkzipc.exe -add -nozip -dir ..\Release\PABCNETC.zip Lib\*.pcu
..\utils\pkzipc\pkzipc.exe -add -nozip -dir ..\Release\PABCNETC.zip Lng\*.dat ..\utils\pkzipc\pkzipc.exe -add -nozip -dir ..\Release\PABCNETC.zip Lng\*.dat
..\utils\pkzipc\pkzipc.exe -add -nozip -dir ..\Release\PABCNETC.zip Lng\*.LanguageName ..\utils\pkzipc\pkzipc.exe -add -nozip -dir ..\Release\PABCNETC.zip Lng\*.LanguageName

2
ReleaseGenerators/PascalABCNETMonoZIP.bat
View file

@ -1,6 +1,6 @@
cd ..\bin cd ..\bin
del ..\Release\PascalABCNETMono.zip del ..\Release\PascalABCNETMono.zip
..\utils\pkzipc\pkzipc.exe -add ..\Release\PascalABCNETMono.zip PascalABCNETMono.exe pabcnetc.exe pabcnetc PascalABCNET Compiler.dll CompilerTools.dll Errors.dll Localization.dll NETGenerator.dll ParserTools.dll ICSharpCode.NRefactory.dll SemanticTree.dll SyntaxTree.dll TreeConverter.dll OptimizerConversion.dll PascalABCParser.dll licence.txt PascalABCNET.chm System.Threading.dll PluginsSupport.dll InternalErrorReport.dll ICSharpCode.TextEditor.dll ICSharpCode.SharpZipLib.dll CodeCompletion.dll Debugger.Core.dll Mono.Debugger.Soft.dll Mono.Debugging.dll Mono.Debugging.Soft.dll NETXP.Controls.dll NETXP.Controls.Bars.dll NETXP.Library.dll NETXP.Win32.dll WeifenLuo.WinFormsUI.Docking.dll template.pct ..\utils\pkzipc\pkzipc.exe -add ..\Release\PascalABCNETMono.zip PascalABCNETMono.exe pabcnetc.exe pabcnetc PascalABCNET Compiler.dll CompilerTools.dll Errors.dll Localization.dll NETGenerator.dll ParserTools.dll SyntaxTreeConverters.dll ICSharpCode.NRefactory.dll SemanticTree.dll SyntaxTree.dll TreeConverter.dll OptimizerConversion.dll PascalABCParser.dll licence.txt PascalABCNET.chm System.Threading.dll PluginsSupport.dll InternalErrorReport.dll ICSharpCode.TextEditor.dll ICSharpCode.SharpZipLib.dll CodeCompletion.dll Debugger.Core.dll Mono.Debugger.Soft.dll Mono.Debugging.dll Mono.Debugging.Soft.dll NETXP.Controls.dll NETXP.Controls.Bars.dll NETXP.Library.dll NETXP.Win32.dll WeifenLuo.WinFormsUI.Docking.dll template.pct
..\utils\pkzipc\pkzipc.exe -add -nozip -dir ..\Release\PascalABCNETMono.zip Lib\*.pcu ..\utils\pkzipc\pkzipc.exe -add -nozip -dir ..\Release\PascalABCNETMono.zip Lib\*.pcu
..\utils\pkzipc\pkzipc.exe -add -nozip -dir ..\Release\PascalABCNETMono.zip Highlighting\*.xshd ..\utils\pkzipc\pkzipc.exe -add -nozip -dir ..\Release\PascalABCNETMono.zip Highlighting\*.xshd
..\utils\pkzipc\pkzipc.exe -add -nozip -dir ..\Release\PascalABCNETMono.zip Ico\*.ico ..\utils\pkzipc\pkzipc.exe -add -nozip -dir ..\Release\PascalABCNETMono.zip Ico\*.ico

2
ReleaseGenerators/PascalABCNET_version.nsh
View file

@ -1 +1 @@
!define VERSION '3.1.0.1241' !define VERSION '3.1.0.1243'

7
TestSuite/CompilationSamples/readln_int_string.pas Normal file
View file

@ -0,0 +1,7 @@
var
x: real;
s: string;
begin
readln(x, s);
end.

3
TreeConverter/TreeConversion/syntax_tree_visitor.cs
View file

@ -7994,7 +7994,8 @@ namespace PascalABCCompiler.TreeConverter
} }
else else
{ {
if (SystemLibrary.SystemLibInitializer.readln_procedure.Equal(si) && parameters.expressions.Count == 2 && en.type == SystemLibrary.SystemLibrary.string_type) /// SSM 21/05/16 - read_from_text_file && - bug fix #161
if (read_from_text_file && SystemLibrary.SystemLibInitializer.readln_procedure.Equal(si) && parameters.expressions.Count == 2 && en.type == SystemLibrary.SystemLibrary.string_type)
{ {
fn = convertion_data_and_alghoritms.select_function(exl, SystemLibrary.SystemLibInitializer.readln_procedure.SymbolInfo, loc); fn = convertion_data_and_alghoritms.select_function(exl, SystemLibrary.SystemLibInitializer.readln_procedure.SymbolInfo, loc);
readln_string_file = true; readln_string_file = true;

16
VisualPascalABCNET/FormsDesignerBinding/Dependecies/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
View file

@ -537,12 +537,8 @@
<Compile Include="Src\Gui\Pads\ProjectBrowser\Commands\FolderNodeCommands.cs" /> <Compile Include="Src\Gui\Pads\ProjectBrowser\Commands\FolderNodeCommands.cs" />
<Compile Include="Src\Gui\Pads\ProjectBrowser\Commands\ProjectNodeCommands.cs" /> <Compile Include="Src\Gui\Pads\ProjectBrowser\Commands\ProjectNodeCommands.cs" />
<Compile Include="Src\Gui\Pads\ProjectBrowser\Commands\ReferenceFolderNodeCommands.cs" /> <Compile Include="Src\Gui\Pads\ProjectBrowser\Commands\ReferenceFolderNodeCommands.cs" />
<Compile Include="Src\Gui\BrowserDisplayBinding\HtmlViewPane.cs"> <Compile Include="Src\Gui\BrowserDisplayBinding\HtmlViewPane.cs" />
<SubType>UserControl</SubType> <Compile Include="Src\Gui\Components\SideBar\SharpDevelopSideBar.cs" />
</Compile>
<Compile Include="Src\Gui\Components\SideBar\SharpDevelopSideBar.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Src\Gui\Components\SideBar\SharpDevelopSideTabItem.cs" /> <Compile Include="Src\Gui\Components\SideBar\SharpDevelopSideTabItem.cs" />
<Compile Include="Src\Gui\Components\StatusBar\SdStatusBar.cs" /> <Compile Include="Src\Gui\Components\StatusBar\SdStatusBar.cs" />
<Compile Include="Src\Gui\ContentInterfaces\IPrintable.cs" /> <Compile Include="Src\Gui\ContentInterfaces\IPrintable.cs" />
@ -586,9 +582,7 @@
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
<Compile Include="Src\Gui\Dialogs\ReferenceDialog\WebReference.cs" /> <Compile Include="Src\Gui\Dialogs\ReferenceDialog\WebReference.cs" />
<Compile Include="Src\Gui\Pads\FileScout.cs"> <Compile Include="Src\Gui\Pads\FileScout.cs" />
<SubType>Component</SubType>
</Compile>
<Compile Include="Src\Gui\Pads\PropertyPad\PropertyPad.cs" /> <Compile Include="Src\Gui\Pads\PropertyPad\PropertyPad.cs" />
<Compile Include="Src\Gui\XmlForms\SharpDevelopPropertyValueCreator.cs" /> <Compile Include="Src\Gui\XmlForms\SharpDevelopPropertyValueCreator.cs" />
<Compile Include="Src\Gui\XmlForms\SharpDevelopStringValueFilter.cs" /> <Compile Include="Src\Gui\XmlForms\SharpDevelopStringValueFilter.cs" />
@ -782,9 +776,7 @@
<DependentUpon>BuildEvents.xaml</DependentUpon> <DependentUpon>BuildEvents.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="Src\Gui\BrowserDisplayBinding\SchemeExtension.cs" /> <Compile Include="Src\Gui\BrowserDisplayBinding\SchemeExtension.cs" />
<Compile Include="Src\Gui\BrowserDisplayBinding\ExtendedWebBrowser.cs"> <Compile Include="Src\Gui\BrowserDisplayBinding\ExtendedWebBrowser.cs" />
<SubType>Component</SubType>
</Compile>
<Compile Include="Src\Bookmarks\BookmarkConverter.cs" /> <Compile Include="Src\Bookmarks\BookmarkConverter.cs" />
<Compile Include="Src\Bookmarks\ClassMemberBookmark.cs" /> <Compile Include="Src\Bookmarks\ClassMemberBookmark.cs" />
<Compile Include="Src\Services\RefactoringService\RefactoringService.cs" /> <Compile Include="Src\Services\RefactoringService\RefactoringService.cs" />

BIN
bin/Lib/PABCRtl.dll
View file

Binary file not shown.