[Monodevelop-patches-list] r2178 - in trunk/MonoDevelop/Core/src/AddIns/BackendBindings: CSharpBinding CSharpBinding/FormattingStrategy CSharpBinding/Parser ILAsmBinding NemerleBinding NemerleBinding/Gui VBNetBinding VBNetBinding/Gui VBNetBinding/Parser
commit-watcher at mono-cvs.ximian.com
commit-watcher at mono-cvs.ximian.com
Thu Jan 27 03:28:38 EST 2005
Author: jluke
Date: 2005-01-27 03:28:38 -0500 (Thu, 27 Jan 2005)
New Revision: 2178
Modified:
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingCompilerManager.cs
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/ChangeLog
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/FormattingStrategy/CSharpFormattingStrategy.cs
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/Parser/CSharpVisitor.cs
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/Parser/Resolver.cs
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/ILAsmBinding/ChangeLog
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/ILAsmBinding/ILAsmCompilerManager.cs
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/ChangeLog
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Gui/CodeGenerationPanel.cs
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Nemerle.glade
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/NemerleBindingCompilerServices.cs
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/ChangeLog
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Gui/CodeGenerationPanel.cs
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Parser/Resolver.cs
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Parser/VBNetVisitor.cs
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/VB.glade
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/VBBindingCompilerServices.cs
Log:
fix a bunch of warnings in these
Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingCompilerManager.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingCompilerManager.cs 2005-01-27 07:45:41 UTC (rev 2177)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingCompilerManager.cs 2005-01-27 08:28:38 UTC (rev 2178)
@@ -183,7 +183,7 @@
TempFileCollection tf = new TempFileCollection();
- StreamReader t = File.OpenText(responseFileName);
+ //StreamReader t = File.OpenText(responseFileName);
//Executor.ExecWaitWithCapture(outstr, tf, ref output, ref error);
DoCompilation(outstr, tf, ref output, ref error);
@@ -264,7 +264,7 @@
assembly_references.Add (Path.Combine (rel_path_to, Path.GetFileName (assembly_fileName)));
break;
case ReferenceType.Project:
- string project_fileName = lib.GetReferencedFileName ();
+ //string project_fileName = lib.GetReferencedFileName ();
IProjectService prjService = (IProjectService)ServiceManager.GetService (typeof (IProjectService));
CombineEntryCollection allProjects = prjService.CurrentOpenCombine.GetAllProjects();
@@ -481,8 +481,8 @@
CompilerResults cr = new CompilerResults(tf);
// we have 2 formats for the error output the csc gives :
- Regex normalError = new Regex(@"(?<file>.*)\((?<line>\d+),(?<column>\d+)\):\s+(?<error>\w+)\s+(?<number>[\d\w]+):\s+(?<message>.*)", RegexOptions.Compiled);
- Regex generalError = new Regex(@"(?<error>.+)\s+(?<number>[\d\w]+):\s+(?<message>.*)", RegexOptions.Compiled);
+ //Regex normalError = new Regex(@"(?<file>.*)\((?<line>\d+),(?<column>\d+)\):\s+(?<error>\w+)\s+(?<number>[\d\w]+):\s+(?<message>.*)", RegexOptions.Compiled);
+ //Regex generalError = new Regex(@"(?<error>.+)\s+(?<number>[\d\w]+):\s+(?<message>.*)", RegexOptions.Compiled);
foreach (string s in new string[] { stdout, stderr }) {
StreamReader sr = File.OpenText (s);
Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/ChangeLog 2005-01-27 07:45:41 UTC (rev 2177)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/ChangeLog 2005-01-27 08:28:38 UTC (rev 2178)
@@ -1,5 +1,13 @@
2005-01-27 John Luke <john.luke at gmail.com>
+ * CSharpBindingCompilerManager.cs:
+ * Parser/CSharpVisitor.cs:
+ * Parser/Resolver.cs:
+ * FormattingStrategy/CSharpFormattingStrategy.cs: comment out
+ some unused lines that produced warnings
+
+2005-01-27 John Luke <john.luke at gmail.com>
+
* CSharp.glade: update to new glade format
* Gui/CodeGenerationPanel.cs:
* CSharp.glade: use ComboBox instead of OptionMenu
Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/FormattingStrategy/CSharpFormattingStrategy.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/FormattingStrategy/CSharpFormattingStrategy.cs 2005-01-27 07:45:41 UTC (rev 2177)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/FormattingStrategy/CSharpFormattingStrategy.cs 2005-01-27 08:28:38 UTC (rev 2178)
@@ -277,7 +277,7 @@
}
}
- string lineAboveText = d.GetLineAsString (lineNr - 1);
+ //string lineAboveText = d.GetLineAsString (lineNr - 1);
#if NON_PORTABLE_CODE
Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/Parser/CSharpVisitor.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/Parser/CSharpVisitor.cs 2005-01-27 07:45:41 UTC (rev 2177)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/Parser/CSharpVisitor.cs 2005-01-27 08:28:38 UTC (rev 2178)
@@ -53,16 +53,16 @@
AttributeSectionCollection VisitAttributes(ArrayList attributes)
{
// TODO Expressions???
- AttributeSectionCollection result = new AttributeSectionCollection();
+ //AttributeSectionCollection result = new AttributeSectionCollection();
foreach (AST.AttributeSection section in attributes) {
- AttributeCollection resultAttributes = new AttributeCollection();
+ //AttributeCollection resultAttributes = new AttributeCollection();
foreach (AST.Attribute attribute in section.Attributes) {
IAttribute a = new ASTAttribute(attribute.Name, new ArrayList(attribute.PositionalArguments), new SortedList());
foreach (AST.NamedArgument n in attribute.NamedArguments) {
a.NamedArguments[n.Name] = n.Expr;
}
}
- IAttributeSection s = new AttributeSection((AttributeTarget)Enum.Parse(typeof (AttributeTarget), section.AttributeTarget), resultAttributes);
+ //IAttributeSection s = new AttributeSection((AttributeTarget)Enum.Parse(typeof (AttributeTarget), section.AttributeTarget), resultAttributes);
}
return null;
}
Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/Parser/Resolver.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/Parser/Resolver.cs 2005-01-27 07:45:41 UTC (rev 2177)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/Parser/Resolver.cs 2005-01-27 08:28:38 UTC (rev 2178)
@@ -617,7 +617,6 @@
// Console.WriteLine("No static member found");
// try if there exists a static member in outer classes named typeName
- ClassCollection classes = GetOuterClasses();
foreach (IClass c in GetOuterClasses()) {
t = SearchMember(callingClass == null ? null : new ReturnType(c.FullyQualifiedName), typeName);
if (t != null) {
Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/ILAsmBinding/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/ILAsmBinding/ChangeLog 2005-01-27 07:45:41 UTC (rev 2177)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/ILAsmBinding/ChangeLog 2005-01-27 08:28:38 UTC (rev 2178)
@@ -1,3 +1,7 @@
+2005-01-24 John Luke <john.luke at gmail.com>
+
+ * ILAsmCompilerManager.cs: remove unused lines and fix 2 warnings
+
2005-01-24 Lluis Sanchez Gual <lluis at novell.com>
* ILAsmLanguageBinding.cs:
Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/ILAsmBinding/ILAsmCompilerManager.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/ILAsmBinding/ILAsmCompilerManager.cs 2005-01-27 07:45:41 UTC (rev 2177)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/ILAsmBinding/ILAsmCompilerManager.cs 2005-01-27 08:28:38 UTC (rev 2178)
@@ -129,10 +129,6 @@
CompilerResults cr = new CompilerResults(tf);
- // we have 2 formats for the error output the csc gives :
- Regex normalError = new Regex(@"(?<file>.*)\((?<line>\d+),(?<column>\d+)\):\s+(?<error>\w+)\s+(?<number>[\d\w]+):\s+(?<message>.*)", RegexOptions.Compiled);
- Regex generalError = new Regex(@"(?<error>.+)\s+(?<number>[\d\w]+):\s+(?<message>.*)", RegexOptions.Compiled);
-
while (true) {
string curLine = sr.ReadLine();
compilerOutput.Append(curLine);
Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/ChangeLog 2005-01-27 07:45:41 UTC (rev 2177)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/ChangeLog 2005-01-27 08:28:38 UTC (rev 2178)
@@ -1,3 +1,10 @@
+2005-01-27 John Luke <john.luke at gmail.com>
+
+ * Nemerle.glade:
+ * Gui/CodeGenerationPanel.cs:
+ * NemerleBindingCompilerServices.cs: fix some warnings,
+ use ComboBox instead of OptionMenu
+
2005-01-24 Lluis Sanchez Gual <lluis at novell.com>
* NemerleBindingCompilerServices.cs:
Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Gui/CodeGenerationPanel.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Gui/CodeGenerationPanel.cs 2005-01-27 07:45:41 UTC (rev 2177)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Gui/CodeGenerationPanel.cs 2005-01-27 08:28:38 UTC (rev 2178)
@@ -18,7 +18,7 @@
{
class CodeGenerationPanelWidget : GladeWidgetExtract
{
- [Glade.Widget] OptionMenu target;
+ [Glade.Widget] ComboBox target;
[Glade.Widget] CheckButton nostdmacros;
[Glade.Widget] CheckButton nostdlib;
[Glade.Widget] CheckButton ignorewarnings;
@@ -35,7 +35,7 @@
configuration = (DotNetProjectConfiguration) ((IProperties)CustomizationObject).GetProperty("Config");
compilerParameters = (NemerleParameters) configuration.CompilationParameters;
- target.SetHistory ( (uint) configuration.CompileTarget);
+ target.Active = (int) configuration.CompileTarget;
nostdmacros.Active = compilerParameters.Nostdmacros;
nostdlib.Active = compilerParameters.Nostdlib;
@@ -48,7 +48,7 @@
public bool Store ()
{
- configuration.CompileTarget = (CompileTarget)target.History;
+ configuration.CompileTarget = (CompileTarget) target.Active;
compilerParameters.Nostdmacros = nostdmacros.Active;
compilerParameters.Nostdlib = nostdlib.Active;
configuration.RunWithWarnings = ignorewarnings.Active;
Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Nemerle.glade
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Nemerle.glade 2005-01-27 07:45:41 UTC (rev 2177)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Nemerle.glade 2005-01-27 08:28:38 UTC (rev 2178)
@@ -112,39 +112,17 @@
</child>
<child>
- <widget class="GtkOptionMenu" id="target">
+ <widget class="GtkComboBox" id="target">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="history">0</property>
-
- <child>
- <widget class="GtkMenu" id="menu1">
-
- <child>
- <widget class="GtkMenuItem" id="Executable">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Executable</property>
- <property name="use_underline">True</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="Library">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Library</property>
- <property name="use_underline">True</property>
- </widget>
- </child>
- </widget>
- </child>
+ <property name="items" translatable="yes">Executable
+Library</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">0</property>
<property name="bottom_attach">1</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
+ <property name="y_options">fill</property>
</packing>
</child>
</widget>
Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/NemerleBindingCompilerServices.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/NemerleBindingCompilerServices.cs 2005-01-27 07:45:41 UTC (rev 2177)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/NemerleBindingCompilerServices.cs 2005-01-27 08:28:38 UTC (rev 2178)
@@ -230,7 +230,6 @@
assembly_references.Add (Path.Combine (rel_path_to, Path.GetFileName (assembly_fileName)));
break;
case ReferenceType.Project:
- string project_fileName = lib.GetReferencedFileName ();
IProjectService prjService = (IProjectService)ServiceManager.GetService (typeof (IProjectService));
CombineEntryCollection allProjects = prjService.CurrentOpenCombine.GetAllProjects();
Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/ChangeLog 2005-01-27 07:45:41 UTC (rev 2177)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/ChangeLog 2005-01-27 08:28:38 UTC (rev 2178)
@@ -2,6 +2,13 @@
* VB.glade: update to new glade format
+ * VB.glade:
+ * Gui/CodeGenerationPanel.cs:
+ * Parser/VBNetVisitor.cs:
+ * Parser/Resolver.cs:
+ * VBBindingCompilerServices.cs: fix some warnings,
+ use ComboBox instead of OptionMenu
+
2005-01-24 Lluis Sanchez Gual <lluis at novell.com>
* VBBindingCompilerServices.cs:
Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Gui/CodeGenerationPanel.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Gui/CodeGenerationPanel.cs 2005-01-27 07:45:41 UTC (rev 2177)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Gui/CodeGenerationPanel.cs 2005-01-27 08:28:38 UTC (rev 2178)
@@ -1,218 +1,213 @@
-// <file>
-// <copyright see="prj:///doc/copyright.txt"/>
-// <license see="prj:///doc/license.txt"/>
-// <owner name="Markus Palme" email="MarkusPalme at gmx.de"/>
-// <version value="$version"/>
-// </file>
-
-using System;
-using System.IO;
-using System.Drawing;
-
-using MonoDevelop.Internal.Project;
-using MonoDevelop.Internal.ExternalTool;
-using MonoDevelop.Gui.Dialogs;
-using MonoDevelop.Core.Services;
-using MonoDevelop.Core.Properties;
-using MonoDevelop.Core.AddIns.Codons;
-
+// <file>
+// <copyright see="prj:///doc/copyright.txt"/>
+// <license see="prj:///doc/license.txt"/>
+// <owner name="Markus Palme" email="MarkusPalme at gmx.de"/>
+// <version value="$version"/>
+// </file>
+
+using System;
+using System.IO;
+using System.Drawing;
+
+using MonoDevelop.Internal.Project;
+using MonoDevelop.Internal.ExternalTool;
+using MonoDevelop.Gui.Dialogs;
+using MonoDevelop.Core.Services;
+using MonoDevelop.Core.Properties;
+using MonoDevelop.Core.AddIns.Codons;
+
using Gtk;
-using MonoDevelop.Gui.Widgets;
+using MonoDevelop.Gui.Widgets;
using MonoDevelop.Services;
-namespace VBBinding
-{
- public class CodeGenerationPanel : AbstractOptionPanel
- {
+namespace VBBinding
+{
+ public class CodeGenerationPanel : AbstractOptionPanel
+ {
VBCompilerParameters compilerParameters = null;
- DotNetProjectConfiguration configuration;
+ DotNetProjectConfiguration configuration;
- /*
-
- ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
- static FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
-
- public override bool ReceiveDialogMessage(DialogMessage message)
- {
- if (message == DialogMessage.OK) {
- if (compilerParameters == null) {
- return true;
- }
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
-
-
- compilerParameters.DefineSymbols = ControlDictionary["symbolsTextBox"].Text;
- compilerParameters.MainClass = ControlDictionary["mainClassTextBox"].Text;
- compilerParameters.Imports = ControlDictionary["importsTextBox"].Text;
- compilerParameters.RootNamespace = ControlDictionary["RootNamespaceTextBox"].Text;
-
- compilerParameters.Debugmode = ((CheckBox)ControlDictionary["generateDebugInformationCheckBox"]).Checked;
- compilerParameters.Optimize = ((CheckBox)ControlDictionary["enableOptimizationCheckBox"]).Checked;
- compilerParameters.GenerateOverflowChecks = ((CheckBox)ControlDictionary["generateOverflowChecksCheckBox"]).Checked;
- compilerParameters.TreatWarningsAsErrors = ((CheckBox)ControlDictionary["warningsAsErrorsCheckBox"]).Checked;
-
- compilerParameters.OptionExplicit = ((CheckBox)ControlDictionary["optionExplicitCheckBox"]).Checked ;
- compilerParameters.OptionStrict = ((CheckBox)ControlDictionary["optionStrictCheckBox"]).Checked;
- }
- return true;
- }
-
- void SetValues(object sender, EventArgs e)
- {
- this.compilerParameters = (VBCompilerParameters)((IProperties)CustomizationObject).GetProperty("Config");
-
- ControlDictionary["symbolsTextBox"].Text = compilerParameters.DefineSymbols;
- ControlDictionary["mainClassTextBox"].Text = compilerParameters.MainClass;
- ControlDictionary["importsTextBox"].Text = compilerParameters.Imports;
- ControlDictionary["RootNamespaceTextBox"].Text = compilerParameters.RootNamespace;
-
-
- ((CheckBox)ControlDictionary["generateDebugInformationCheckBox"]).Checked = compilerParameters.Debugmode;
- ((CheckBox)ControlDictionary["enableOptimizationCheckBox"]).Checked = compilerParameters.Optimize;
- ((CheckBox)ControlDictionary["generateOverflowChecksCheckBox"]).Checked = compilerParameters.GenerateOverflowChecks;
- ((CheckBox)ControlDictionary["warningsAsErrorsCheckBox"]).Checked = compilerParameters.TreatWarningsAsErrors;
-
- ((CheckBox)ControlDictionary["optionExplicitCheckBox"]).Checked = compilerParameters.OptionExplicit;
- ((CheckBox)ControlDictionary["optionStrictCheckBox"]).Checked = compilerParameters.OptionStrict;
- }
-
- static PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
+ /*
+
+ ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
+ static FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
+
+ public override bool ReceiveDialogMessage(DialogMessage message)
+ {
+ if (message == DialogMessage.OK) {
+ if (compilerParameters == null) {
+ return true;
+ }
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
+
+
+ compilerParameters.DefineSymbols = ControlDictionary["symbolsTextBox"].Text;
+ compilerParameters.MainClass = ControlDictionary["mainClassTextBox"].Text;
+ compilerParameters.Imports = ControlDictionary["importsTextBox"].Text;
+ compilerParameters.RootNamespace = ControlDictionary["RootNamespaceTextBox"].Text;
+
+ compilerParameters.Debugmode = ((CheckBox)ControlDictionary["generateDebugInformationCheckBox"]).Checked;
+ compilerParameters.Optimize = ((CheckBox)ControlDictionary["enableOptimizationCheckBox"]).Checked;
+ compilerParameters.GenerateOverflowChecks = ((CheckBox)ControlDictionary["generateOverflowChecksCheckBox"]).Checked;
+ compilerParameters.TreatWarningsAsErrors = ((CheckBox)ControlDictionary["warningsAsErrorsCheckBox"]).Checked;
+
+ compilerParameters.OptionExplicit = ((CheckBox)ControlDictionary["optionExplicitCheckBox"]).Checked ;
+ compilerParameters.OptionStrict = ((CheckBox)ControlDictionary["optionStrictCheckBox"]).Checked;
+ }
+ return true;
+ }
+
+ void SetValues(object sender, EventArgs e)
+ {
+ this.compilerParameters = (VBCompilerParameters)((IProperties)CustomizationObject).GetProperty("Config");
+
+ ControlDictionary["symbolsTextBox"].Text = compilerParameters.DefineSymbols;
+ ControlDictionary["mainClassTextBox"].Text = compilerParameters.MainClass;
+ ControlDictionary["importsTextBox"].Text = compilerParameters.Imports;
+ ControlDictionary["RootNamespaceTextBox"].Text = compilerParameters.RootNamespace;
+
+
+ ((CheckBox)ControlDictionary["generateDebugInformationCheckBox"]).Checked = compilerParameters.Debugmode;
+ ((CheckBox)ControlDictionary["enableOptimizationCheckBox"]).Checked = compilerParameters.Optimize;
+ ((CheckBox)ControlDictionary["generateOverflowChecksCheckBox"]).Checked = compilerParameters.GenerateOverflowChecks;
+ ((CheckBox)ControlDictionary["warningsAsErrorsCheckBox"]).Checked = compilerParameters.TreatWarningsAsErrors;
+
+ ((CheckBox)ControlDictionary["optionExplicitCheckBox"]).Checked = compilerParameters.OptionExplicit;
+ ((CheckBox)ControlDictionary["optionStrictCheckBox"]).Checked = compilerParameters.OptionStrict;
+ }
+
+ static PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
public CodeGenerationPanel() : base(propertyService.DataDirectory + @"\resources\panels\ProjectOptions\VBNetCodeGenerationPanel.xfrm")
- {
- CustomizationObjectChanged += new EventHandler(SetValues);
-
+ {
+ CustomizationObjectChanged += new EventHandler(SetValues);
+
}
*/
- /* public override bool ReceiveDialogMessage(DialogMessage message)
- {
- if (message == DialogMessage.OK) {
- return widget.Store();
- }
- return true;
- }
-
+ /* public override bool ReceiveDialogMessage(DialogMessage message)
+ {
+ if (message == DialogMessage.OK) {
+ return widget.Store();
+ }
+ return true;
+ }
+
void SetValues(object sender, EventArgs e){
LoadPanelContents();
}
public CodeGenerationPanel() : base()
- {
- CustomizationObjectChanged += new EventHandler(SetValues);
+ {
+ CustomizationObjectChanged += new EventHandler(SetValues);
} */
-
+
- class CodeGenerationPanelWidget : GladeWidgetExtract
- {
- //
- // Gtk Controls
- //
- [Glade.Widget] Entry symbolsEntry;
- [Glade.Widget] Entry mainClassEntry;
- [Glade.Widget] OptionMenu CompileTargetOptionMenu;
- [Glade.Widget] CheckButton generateOverflowChecksCheckButton;
- [Glade.Widget] CheckButton allowUnsafeCodeCheckButton;
- [Glade.Widget] CheckButton enableOptimizationCheckButton;
- [Glade.Widget] CheckButton warningsAsErrorsCheckButton;
-// [Glade.Widget] CheckButton generateDebugInformationCheckButton;
- [Glade.Widget] CheckButton generateXmlOutputCheckButton;
- [Glade.Widget] SpinButton warningLevelSpinButton;
-
- //
- // services needed
- //
- StringParserService StringParserService = (StringParserService)ServiceManager.GetService (
- typeof (StringParserService));
-
- DotNetProjectConfiguration configuration;
+ class CodeGenerationPanelWidget : GladeWidgetExtract
+ {
+ //
+ // Gtk Controls
+ //
+ [Glade.Widget] Entry symbolsEntry;
+ [Glade.Widget] Entry mainClassEntry;
+ [Glade.Widget] ComboBox compileTargetCombo;
+ [Glade.Widget] CheckButton generateOverflowChecksCheckButton;
+ [Glade.Widget] CheckButton allowUnsafeCodeCheckButton;
+ [Glade.Widget] CheckButton enableOptimizationCheckButton;
+ [Glade.Widget] CheckButton warningsAsErrorsCheckButton;
+// [Glade.Widget] CheckButton generateDebugInformationCheckButton;
+ [Glade.Widget] CheckButton generateXmlOutputCheckButton;
+ [Glade.Widget] SpinButton warningLevelSpinButton;
+
+ //
+ // services needed
+ //
+ StringParserService StringParserService = (StringParserService)ServiceManager.GetService (
+ typeof (StringParserService));
+
+ DotNetProjectConfiguration configuration;
VBCompilerParameters compilerParameters = null;
//static PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
-
- public CodeGenerationPanelWidget(IProperties CustomizationObject) : base ("VB.glade", "CodeGenerationPanel")
+
+ public CodeGenerationPanelWidget(IProperties CustomizationObject) : base ("VB.glade", "CodeGenerationPanel")
{
- configuration = (DotNetProjectConfiguration)((IProperties)CustomizationObject).GetProperty("Config");
- compilerParameters = (VBCompilerParameters) configuration.CompilationParameters;
+ configuration = (DotNetProjectConfiguration)((IProperties)CustomizationObject).GetProperty("Config");
+ compilerParameters = (VBCompilerParameters) configuration.CompilationParameters;
SetValues();
- //CustomizationObjectChanged += new EventHandler(SetValues);
+ //CustomizationObjectChanged += new EventHandler(SetValues);
}
public void SetValues(){
- //this.compilerParameters = (VBCompilerParameters)((IProperties)CustomizationObject).GetProperty("Config");
-
- // FIXME: Enable when mbas has this feature
+ //this.compilerParameters = (VBCompilerParameters)((IProperties)CustomizationObject).GetProperty("Config");
+
+ // FIXME: Enable when mbas has this feature
generateXmlOutputCheckButton.Sensitive = false;
-
+
+ ListStore store = new ListStore (typeof (string));
+ store.AppendValues (GettextCatalog.GetString ("Executable"));
+ store.AppendValues (GettextCatalog.GetString ("WinEXE"));
+ store.AppendValues (GettextCatalog.GetString ("Library"));
+ store.AppendValues (GettextCatalog.GetString ("Module"));
- //string[] compileTargets=new string[]{GettextCatalog.GetString ("Executable"),GettextCatalog.GetString("WinEXE"), GettextCatalog.GetString ("Library"),GettextCatalog.GetString ("Module")};
-
- Menu CompileTargetMenu = new Menu ();
- CompileTargetMenu.Add(new MenuItem(GettextCatalog.GetString ("Executable")));
- CompileTargetMenu.Add(new MenuItem(GettextCatalog.GetString("WinEXE")));
- CompileTargetMenu.Add(new MenuItem(GettextCatalog.GetString ("Library")));
- CompileTargetMenu.Add(new MenuItem(GettextCatalog.GetString ("Module")));
- // FIXME commented until the Module capability is ported
-// CompileTargetMenu.Append(new MenuItem(
-// StringParserService.Parse(
-// "${res:Dialog.Options.PrjOptions.Configuration.CompileTarget.Module}")));
+ compileTargetCombo.Model = store;
+ CellRendererText cr = new CellRendererText ();
+ compileTargetCombo.PackStart (cr, true);
+ compileTargetCombo.AddAttribute (cr, "text", 0);
+ compileTargetCombo.Active = (int) configuration.CompileTarget;
- CompileTargetOptionMenu.Menu=CompileTargetMenu;
- CompileTargetOptionMenu.SetHistory ( (uint) configuration.CompileTarget);
- //CompileTargetOptionMenu.Active=(int)compilerParameters.CompileTarget;
-
- symbolsEntry.Text = compilerParameters.DefineSymbols;
- mainClassEntry.Text = compilerParameters.MainClass;
-
-// generateDebugInformationCheckButton.Active = compilerParameters.Debugmode;
- generateXmlOutputCheckButton.Active = compilerParameters.GenerateXmlDocumentation;
- enableOptimizationCheckButton.Active = compilerParameters.Optimize;
- allowUnsafeCodeCheckButton.Active = compilerParameters.UnsafeCode;
- generateOverflowChecksCheckButton.Active = compilerParameters.GenerateOverflowChecks;
- warningsAsErrorsCheckButton.Active = ! configuration.RunWithWarnings;
+ symbolsEntry.Text = compilerParameters.DefineSymbols;
+ mainClassEntry.Text = compilerParameters.MainClass;
+
+// generateDebugInformationCheckButton.Active = compilerParameters.Debugmode;
+ generateXmlOutputCheckButton.Active = compilerParameters.GenerateXmlDocumentation;
+ enableOptimizationCheckButton.Active = compilerParameters.Optimize;
+ allowUnsafeCodeCheckButton.Active = compilerParameters.UnsafeCode;
+ generateOverflowChecksCheckButton.Active = compilerParameters.GenerateOverflowChecks;
+ warningsAsErrorsCheckButton.Active = ! configuration.RunWithWarnings;
warningLevelSpinButton.Value = compilerParameters.WarningLevel;
- }
-
-
- public bool Store ()
- {
+ }
+
+
+ public bool Store ()
+ {
if (compilerParameters == null) {
- System.Console.WriteLine("NULL compiler parameters for VBNet!");
- return true;
- }
- //compilerParameters.CompileTarget = (CompileTarget) CompileTargetOptionMenu.History;
- configuration.CompileTarget=(CompileTarget)CompileTargetOptionMenu.History;
- compilerParameters.DefineSymbols = symbolsEntry.Text;
- compilerParameters.MainClass = mainClassEntry.Text;
-
-// compilerParameters.Debugmode = generateDebugInformationCheckButton.Active;
- compilerParameters.GenerateXmlDocumentation = generateXmlOutputCheckButton.Active;
- compilerParameters.Optimize = enableOptimizationCheckButton.Active;
- compilerParameters.UnsafeCode = allowUnsafeCodeCheckButton.Active;
- compilerParameters.GenerateOverflowChecks = generateOverflowChecksCheckButton.Active;
- configuration.RunWithWarnings = ! warningsAsErrorsCheckButton.Active;
-
- compilerParameters.WarningLevel = warningLevelSpinButton.ValueAsInt;
-
- return true;
- }
+ System.Console.WriteLine("NULL compiler parameters for VBNet!");
+ return true;
+ }
+ //compilerParameters.CompileTarget = (CompileTarget) compileTargetCombo.Active;
+ configuration.CompileTarget = (CompileTarget) compileTargetCombo.Active;
+ compilerParameters.DefineSymbols = symbolsEntry.Text;
+ compilerParameters.MainClass = mainClassEntry.Text;
+
+// compilerParameters.Debugmode = generateDebugInformationCheckButton.Active;
+ compilerParameters.GenerateXmlDocumentation = generateXmlOutputCheckButton.Active;
+ compilerParameters.Optimize = enableOptimizationCheckButton.Active;
+ compilerParameters.UnsafeCode = allowUnsafeCodeCheckButton.Active;
+ compilerParameters.GenerateOverflowChecks = generateOverflowChecksCheckButton.Active;
+ configuration.RunWithWarnings = ! warningsAsErrorsCheckButton.Active;
+
+ compilerParameters.WarningLevel = warningLevelSpinButton.ValueAsInt;
+
+ return true;
+ }
}//CodeGenerationPanelWidget
- CodeGenerationPanelWidget widget;
-
- public override void LoadPanelContents()
- {
- Add (widget = new CodeGenerationPanelWidget ((IProperties) CustomizationObject));
- }
-
- public override bool StorePanelContents()
- {
- bool result = true;
- result = widget.Store ();
- return result;
+ CodeGenerationPanelWidget widget;
+
+ public override void LoadPanelContents()
+ {
+ Add (widget = new CodeGenerationPanelWidget ((IProperties) CustomizationObject));
}
-
- }
-}
+
+ public override bool StorePanelContents()
+ {
+ bool result = true;
+ result = widget.Store ();
+ return result;
+ }
+
+ }
+}
Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Parser/Resolver.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Parser/Resolver.cs 2005-01-27 07:45:41 UTC (rev 2177)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Parser/Resolver.cs 2005-01-27 08:28:38 UTC (rev 2178)
@@ -693,7 +693,7 @@
ArrayList SearchMethod(ArrayList methods, IClass curType, string memberName)
{
- bool isClassInInheritanceTree = IsClassInInheritanceTree(curType, callingClass);
+ //bool isClassInInheritanceTree = IsClassInInheritanceTree(curType, callingClass);
foreach (IMethod m in curType.Methods) {
if (m.Name.ToLower() == memberName.ToLower() &&
@@ -721,7 +721,7 @@
public ArrayList SearchIndexer(ArrayList indexer, IClass curType)
{
- bool isClassInInheritanceTree =IsClassInInheritanceTree(curType, callingClass);
+ //bool isClassInInheritanceTree =IsClassInInheritanceTree(curType, callingClass);
foreach (IIndexer i in curType.Indexer) {
if (MustBeShown(curType, i) /* , callingClass, showStatic, isClassInInheritanceTree) */
&& !((i.Modifiers & ModifierEnum.Override) == ModifierEnum.Override)) {
@@ -744,7 +744,7 @@
}
// Console.WriteLine("searching member {0} in {1}", memberName, type.Name);
IClass curType = SearchType(type.FullyQualifiedName, callingClass, cu);
- bool isClassInInheritanceTree =IsClassInInheritanceTree(curType, callingClass);
+ //bool isClassInInheritanceTree =IsClassInInheritanceTree(curType, callingClass);
if (curType == null) {
// Console.WriteLine("Type not found in SearchMember");
Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Parser/VBNetVisitor.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Parser/VBNetVisitor.cs 2005-01-27 07:45:41 UTC (rev 2177)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Parser/VBNetVisitor.cs 2005-01-27 08:28:38 UTC (rev 2178)
@@ -53,16 +53,16 @@
AttributeSectionCollection VisitAttributes(ArrayList attributes)
{
// TODO Expressions???
- AttributeSectionCollection result = new AttributeSectionCollection();
+ //AttributeSectionCollection result = new AttributeSectionCollection();
foreach (AST.AttributeSection section in attributes) {
- AttributeCollection resultAttributes = new AttributeCollection();
+ //AttributeCollection resultAttributes = new AttributeCollection();
foreach (AST.Attribute attribute in section.Attributes) {
IAttribute a = new ASTAttribute(attribute.Name, new ArrayList(attribute.PositionalArguments), new SortedList());
foreach (AST.NamedArgumentExpression n in attribute.NamedArguments) {
a.NamedArguments[n.Parametername] = n.Expression;
}
}
- IAttributeSection s = new AttributeSection((AttributeTarget)Enum.Parse(typeof (AttributeTarget), section.AttributeTarget), resultAttributes);
+ //IAttributeSection s = new AttributeSection((AttributeTarget)Enum.Parse(typeof (AttributeTarget), section.AttributeTarget), resultAttributes);
}
return null;
}
Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/VB.glade
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/VB.glade 2005-01-27 07:45:41 UTC (rev 2177)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/VB.glade 2005-01-27 08:28:38 UTC (rev 2178)
@@ -100,7 +100,6 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
- <property name="mnemonic_widget">CompileTargetOptionMenu</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -205,10 +204,8 @@
</child>
<child>
- <widget class="GtkOptionMenu" id="CompileTargetOptionMenu">
+ <widget class="GtkComboBox" id="compileTargetCombo">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="history">-1</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -216,7 +213,7 @@
<property name="top_attach">0</property>
<property name="bottom_attach">1</property>
<property name="x_options">fill</property>
- <property name="y_options"></property>
+ <property name="y_options">fill</property>
</packing>
</child>
</widget>
Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/VBBindingCompilerServices.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/VBBindingCompilerServices.cs 2005-01-27 07:45:41 UTC (rev 2177)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/VBBindingCompilerServices.cs 2005-01-27 08:28:38 UTC (rev 2178)
@@ -125,7 +125,7 @@
string exe = configuration.CompiledOutputName;
string responseFileName = Path.GetTempFileName();
- string stdResponseFileName = String.Concat(propertyService.DataDirectory, Path.DirectorySeparatorChar, "vb.rsp");
+ //string stdResponseFileName = String.Concat(propertyService.DataDirectory, Path.DirectorySeparatorChar, "vb.rsp");
StreamWriter writer = new StreamWriter(responseFileName);
//Console.WriteLine(GenerateOptions(compilerparameters,exe));
@@ -292,8 +292,8 @@
CompilerResults cr = new CompilerResults(tf);
// we have 2 formats for the error output the csc gives :
- Regex normalError = new Regex(@"(?<file>.*)\((?<line>\d+),(?<column>\d+)\):\s+(?<error>\w+)\s+(?<number>[\d\w]+):\s+(?<message>.*)", RegexOptions.Compiled);
- Regex generalError = new Regex(@"(?<error>.+)\s+(?<number>[\d\w]+):\s+(?<message>.*)", RegexOptions.Compiled);
+ //Regex normalError = new Regex(@"(?<file>.*)\((?<line>\d+),(?<column>\d+)\):\s+(?<error>\w+)\s+(?<number>[\d\w]+):\s+(?<message>.*)", RegexOptions.Compiled);
+ //Regex generalError = new Regex(@"(?<error>.+)\s+(?<number>[\d\w]+):\s+(?<message>.*)", RegexOptions.Compiled);
while (true) {
string curLine = sr.ReadLine();
@@ -412,7 +412,6 @@
assembly_references.Add (Path.Combine (rel_path_to, Path.GetFileName (assembly_fileName)));
break;
case ReferenceType.Project:
- string project_fileName = lib.GetReferencedFileName ();
IProjectService prjService = (IProjectService)ServiceManager.GetService (typeof (IProjectService));
CombineEntryCollection allProjects = prjService.CurrentOpenCombine.GetAllProjects();
More information about the Monodevelop-patches-list
mailing list