pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

add back F# and C++ Binding

newNRvisualizers
Siegfried Pammer 14 years ago
parent
2003389db9
commit
1d418648b3
9 changed files with 83 additions and 74 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 38
      SharpDevelop.sln
  2. 23
      src/AddIns/BackendBindings/CppBinding/CppBinding/CppAmbience.cs
  3. 17
      src/AddIns/BackendBindings/CppBinding/CppBinding/CppBinding.csproj
  4. 21
      src/AddIns/BackendBindings/CppBinding/CppBinding/CppLanguageProperties.cs
  5. 2
      src/AddIns/BackendBindings/CppBinding/CppBinding/CppProjectBinding.cs
  6. 26
      src/AddIns/BackendBindings/CppBinding/CppBinding/Project/CppProject.cs
  7. 10
      src/AddIns/BackendBindings/FSharpBinding/FSharpBinding.csproj
  8. 4
      src/AddIns/BackendBindings/FSharpBinding/FSharpInteractive.cs
  9. 16
      src/AddIns/BackendBindings/FSharpBinding/FSharpProject.cs

38
SharpDevelop.sln
Unescape View File

@ -111,6 +111,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpBinding", "src\AddIns @@ -111,6 +111,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpBinding", "src\AddIns
{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSharpBinding", "src\AddIns\BackendBindings\FSharpBinding\FSharpBinding.csproj", "{E954F3CB-A446-492F-A664-2B376EBC86E8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CppBinding", "src\AddIns\BackendBindings\CppBinding\CppBinding\CppBinding.csproj", "{70966F84-74C9-4067-A379-0C674A929233}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{F3662720-9EA2-4591-BBC6-97361DCE50A9}"
ProjectSection(SolutionItems) = postProject
EndProjectSection
@ -487,6 +491,38 @@ Global @@ -487,6 +491,38 @@ Global
{64A3E5E6-90BF-47F6-94DF-68C94B62C817}.Release|x86.ActiveCfg = Release|Any CPU
{64A3E5E6-90BF-47F6-94DF-68C94B62C817}.Release|Debug.Build.0 = Release|Any CPU
{64A3E5E6-90BF-47F6-94DF-68C94B62C817}.Release|Debug.ActiveCfg = Release|Any CPU
{E954F3CB-A446-492F-A664-2B376EBC86E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E954F3CB-A446-492F-A664-2B376EBC86E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E954F3CB-A446-492F-A664-2B376EBC86E8}.Debug|Win32.Build.0 = Debug|Any CPU
{E954F3CB-A446-492F-A664-2B376EBC86E8}.Debug|Win32.ActiveCfg = Debug|Any CPU
{E954F3CB-A446-492F-A664-2B376EBC86E8}.Debug|x86.Build.0 = Debug|Any CPU
{E954F3CB-A446-492F-A664-2B376EBC86E8}.Debug|x86.ActiveCfg = Debug|Any CPU
{E954F3CB-A446-492F-A664-2B376EBC86E8}.Debug|Debug.Build.0 = Debug|Any CPU
{E954F3CB-A446-492F-A664-2B376EBC86E8}.Debug|Debug.ActiveCfg = Debug|Any CPU
{E954F3CB-A446-492F-A664-2B376EBC86E8}.Release|Any CPU.Build.0 = Release|Any CPU
{E954F3CB-A446-492F-A664-2B376EBC86E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E954F3CB-A446-492F-A664-2B376EBC86E8}.Release|Win32.Build.0 = Release|Any CPU
{E954F3CB-A446-492F-A664-2B376EBC86E8}.Release|Win32.ActiveCfg = Release|Any CPU
{E954F3CB-A446-492F-A664-2B376EBC86E8}.Release|x86.Build.0 = Release|Any CPU
{E954F3CB-A446-492F-A664-2B376EBC86E8}.Release|x86.ActiveCfg = Release|Any CPU
{E954F3CB-A446-492F-A664-2B376EBC86E8}.Release|Debug.Build.0 = Release|Any CPU
{E954F3CB-A446-492F-A664-2B376EBC86E8}.Release|Debug.ActiveCfg = Release|Any CPU
{70966F84-74C9-4067-A379-0C674A929233}.Debug|Any CPU.Build.0 = Debug|Any CPU
{70966F84-74C9-4067-A379-0C674A929233}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{70966F84-74C9-4067-A379-0C674A929233}.Debug|Win32.Build.0 = Debug|Any CPU
{70966F84-74C9-4067-A379-0C674A929233}.Debug|Win32.ActiveCfg = Debug|Any CPU
{70966F84-74C9-4067-A379-0C674A929233}.Debug|x86.Build.0 = Debug|Any CPU
{70966F84-74C9-4067-A379-0C674A929233}.Debug|x86.ActiveCfg = Debug|Any CPU
{70966F84-74C9-4067-A379-0C674A929233}.Debug|Debug.Build.0 = Debug|Any CPU
{70966F84-74C9-4067-A379-0C674A929233}.Debug|Debug.ActiveCfg = Debug|Any CPU
{70966F84-74C9-4067-A379-0C674A929233}.Release|Any CPU.Build.0 = Release|Any CPU
{70966F84-74C9-4067-A379-0C674A929233}.Release|Any CPU.ActiveCfg = Release|Any CPU
{70966F84-74C9-4067-A379-0C674A929233}.Release|Win32.Build.0 = Release|Any CPU
{70966F84-74C9-4067-A379-0C674A929233}.Release|Win32.ActiveCfg = Release|Any CPU
{70966F84-74C9-4067-A379-0C674A929233}.Release|x86.Build.0 = Release|Any CPU
{70966F84-74C9-4067-A379-0C674A929233}.Release|x86.ActiveCfg = Release|Any CPU
{70966F84-74C9-4067-A379-0C674A929233}.Release|Debug.Build.0 = Release|Any CPU
{70966F84-74C9-4067-A379-0C674A929233}.Release|Debug.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -518,6 +554,8 @@ Global @@ -518,6 +554,8 @@ Global
{83F15BA7-8478-4664-81BB-A82F146D88B3} = {F208FF4F-E5D8-41D5-A7C7-B463976F156E}
{17F4D7E0-6933-4C2E-8714-FD7E98D625D5} = {F208FF4F-E5D8-41D5-A7C7-B463976F156E}
{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A} = {E0646C25-36F2-4524-969F-FA621353AB94}
{E954F3CB-A446-492F-A664-2B376EBC86E8} = {E0646C25-36F2-4524-969F-FA621353AB94}
{70966F84-74C9-4067-A379-0C674A929233} = {E0646C25-36F2-4524-969F-FA621353AB94}
{9196DD8A-B4D4-4780-8742-C5762E547FC2} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
{7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
{4B8F0F98-8BE1-402B-AA8B-C8D548577B38} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}

23
src/AddIns/BackendBindings/CppBinding/CppBinding/CppAmbience.cs
Unescape View File

@ -1,23 +0,0 @@ @@ -1,23 +0,0 @@
// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using ICSharpCode.SharpDevelop.Dom.CSharp;
using ICSharpCode.SharpDevelop.Dom;
//using ICSharpCode.CppBinding.Parser;
namespace ICSharpCode.CppBinding
{
public class CppAmbience : CSharpAmbience
{
public override string Convert(IClass c)
{
// if (c is GlobalMemberContainer)
// return "<global members>";
return base.Convert(c);
}
}
}

17
src/AddIns/BackendBindings/CppBinding/CppBinding/CppBinding.csproj
Unescape View File

@ -68,10 +68,8 @@ @@ -68,10 +68,8 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="CppAmbience.cs" />
<Compile Include="CppFormattingStrategy.cs" />
<Compile Include="CppLanguageBinding.cs" />
<Compile Include="CppLanguageProperties.cs" />
<Compile Include="Project\DependencyRelation.cs" />
<Compile Include="Project\MultiDictionary.cs" />
<Compile Include="Project\ApplicationOptions.cs">
@ -128,6 +126,16 @@ @@ -128,6 +126,16 @@
</Content>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\Libraries\NRefactory\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj">
<Project>{53DCA265-3C3C-42F9-B647-F72BA678122B}</Project>
<Name>ICSharpCode.NRefactory.CSharp</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Libraries\NRefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
<Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
<Name>ICSharpCode.NRefactory</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Main\Base\Project\ICSharpCode.SharpDevelop.csproj">
<Project>{2748AD25-9C63-4E12-877B-4DCE96FBED54}</Project>
<Name>ICSharpCode.SharpDevelop</Name>
@ -138,11 +146,6 @@ @@ -138,11 +146,6 @@
<Name>ICSharpCode.Core</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Main\ICSharpCode.SharpDevelop.Dom\Project\ICSharpCode.SharpDevelop.Dom.csproj">
<Project>{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}</Project>
<Name>ICSharpCode.SharpDevelop.Dom</Name>
<Private>False</Private>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Resources" />

21
src/AddIns/BackendBindings/CppBinding/CppBinding/CppLanguageProperties.cs
Unescape View File

@ -1,21 +0,0 @@ @@ -1,21 +0,0 @@
// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using ICSharpCode.SharpDevelop.Dom;
namespace ICSharpCode.CppBinding
{
public class CppLanguageProperties : LanguageProperties
{
public CppLanguageProperties() : base(StringComparer.Ordinal) { }
public override IAmbience GetAmbience()
{
return new CppAmbience();
}
}
}

2
src/AddIns/BackendBindings/CppBinding/CppBinding/CppProjectBinding.cs
Unescape View File

@ -20,7 +20,7 @@ namespace ICSharpCode.CppBinding @@ -20,7 +20,7 @@ namespace ICSharpCode.CppBinding
}
}
public readonly static CppLanguageProperties LanguageProperties = new CppLanguageProperties();
// public readonly static CppLanguageProperties LanguageProperties = new CppLanguageProperties();
public IProject LoadProject(ProjectLoadInformation info) {
return new CppProject(info);

26
src/AddIns/BackendBindings/CppBinding/CppBinding/Project/CppProject.cs
Unescape View File

@ -5,9 +5,9 @@ using System; @@ -5,9 +5,9 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.Dom;
using ICSharpCode.NRefactory.CSharp;
using ICSharpCode.NRefactory.TypeSystem;
using ICSharpCode.SharpDevelop.Internal.Templates;
using ICSharpCode.SharpDevelop.Project;
using Microsoft.Build.Construction;
@ -39,7 +39,7 @@ namespace ICSharpCode.CppBinding.Project @@ -39,7 +39,7 @@ namespace ICSharpCode.CppBinding.Project
public override IAmbience GetAmbience()
{
return new CppAmbience();
return new CSharpAmbience();
}
public override string Language
@ -47,10 +47,10 @@ namespace ICSharpCode.CppBinding.Project @@ -47,10 +47,10 @@ namespace ICSharpCode.CppBinding.Project
get { return CppProjectBinding.LanguageName; }
}
public override LanguageProperties LanguageProperties
{
get { return CppProjectBinding.LanguageProperties; }
}
// public override LanguageProperties LanguageProperties
// {
// get { return LanguageProperties.; }
// }
public override string OutputAssemblyFullPath
{
@ -187,7 +187,17 @@ namespace ICSharpCode.CppBinding.Project @@ -187,7 +187,17 @@ namespace ICSharpCode.CppBinding.Project
return projectBehavior;
CppProjectBehavior behavior = new CppProjectBehavior(this, new DotNetStartBehavior(this, new DefaultProjectBehavior(this)));
projectBehavior = ProjectBehaviorService.LoadBehaviorsForProject(this, behavior);
return projectBehavior; }
return projectBehavior;
}
public override ICSharpCode.NRefactory.TypeSystem.IProjectContent ProjectContent {
get { return null; }
}
protected override ICSharpCode.NRefactory.TypeSystem.IProjectContent CreateProjectContent()
{
throw new NotSupportedException();
}
}
public class CppProjectBehavior : ProjectBehavior

10
src/AddIns/BackendBindings/FSharpBinding/FSharpBinding.csproj
Unescape View File

@ -78,6 +78,11 @@ @@ -78,6 +78,11 @@
</None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Libraries\NRefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
<Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
<Name>ICSharpCode.NRefactory</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\Main\Base\Project\ICSharpCode.SharpDevelop.csproj">
<Project>{2748AD25-9C63-4E12-877B-4DCE96FBED54}</Project>
<Name>ICSharpCode.SharpDevelop</Name>
@ -88,10 +93,5 @@ @@ -88,10 +93,5 @@
<Name>ICSharpCode.Core</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\Main\ICSharpCode.SharpDevelop.Dom\Project\ICSharpCode.SharpDevelop.Dom.csproj">
<Project>{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}</Project>
<Name>ICSharpCode.SharpDevelop.Dom</Name>
<Private>False</Private>
</ProjectReference>
</ItemGroup>
</Project>

4
src/AddIns/BackendBindings/FSharpBinding/FSharpInteractive.cs
Unescape View File

@ -148,8 +148,8 @@ namespace FSharpBinding @@ -148,8 +148,8 @@ namespace FSharpBinding
if (textEditor.SelectionLength > 0) {
fsharpInteractive.fsiProcess.StandardInput.WriteLine(textEditor.SelectedText);
} else {
var line = textEditor.Document.GetLine(textEditor.Caret.Line);
fsharpInteractive.fsiProcess.StandardInput.WriteLine(line.Text);
var line = textEditor.Document.GetLineByNumber(textEditor.Caret.Line);
fsharpInteractive.fsiProcess.StandardInput.WriteLine(textEditor.Document.GetText(line));
}
fsharpInteractive.fsiProcess.StandardInput.WriteLine(";;");
}

16
src/AddIns/BackendBindings/FSharpBinding/FSharpProject.cs
Unescape View File

@ -2,7 +2,6 @@ @@ -2,7 +2,6 @@
// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
using System;
using ICSharpCode.SharpDevelop.Dom;
using ICSharpCode.SharpDevelop.Internal.Templates;
using ICSharpCode.SharpDevelop.Project;
using Microsoft.Build.Exceptions;
@ -38,12 +37,6 @@ namespace FSharpBinding @@ -38,12 +37,6 @@ namespace FSharpBinding
}
}
public override LanguageProperties LanguageProperties {
get {
return LanguageProperties.None;
}
}
protected override ProjectBehavior GetOrCreateBehavior()
{
if (projectBehavior != null)
@ -52,6 +45,15 @@ namespace FSharpBinding @@ -52,6 +45,15 @@ namespace FSharpBinding
projectBehavior = ProjectBehaviorService.LoadBehaviorsForProject(this, behavior);
return projectBehavior;
}
public override ICSharpCode.NRefactory.TypeSystem.IProjectContent ProjectContent {
get { return null; }
}
protected override ICSharpCode.NRefactory.TypeSystem.IProjectContent CreateProjectContent()
{
throw new NotSupportedException();
}
}
public class FSharpProjectBehavior : ProjectBehavior

Write Preview
Loading…
Cancel
Save