MonoDeveloping mbas

svn path=/trunk/mcs/; revision=23992

diff --git a/mcs/mbas/.cvsignore b/mcs/mbas/.cvsignore
index a5a223aef8ea05314f8f2be4042611593822f091..9f09cd2b7584e47d56762b2f94d01ffc3c6ef09a 100644 (file)
--- a/mcs/mbas/.cvsignore
+++ b/mcs/mbas/.cvsignore
@@ -1,7 +1,6 @@
 mb-parser.cs\r
 y.output\r
 log\r
-mbas.cmbx\r
 mbas.csproj\r
 mbas.csproj.user\r
 mbas.sln\r

diff --git a/mcs/mbas/ecore.cs b/mcs/mbas/ecore.cs
index e2ad63d3cbd313c2c948f5771bc59b025e3deec7..3acc3319ee5ef1c6e9fbc56c1709577e446546a9 100644 (file)
--- a/mcs/mbas/ecore.cs
+++ b/mcs/mbas/ecore.cs
@@ -3708,12 +3708,16 @@ namespace Mono.MonoBASIC {
 
 // #52067 - Start - Trying to solve
 
-                       if (e == null)
-                               foreach(Type type in TypeManager.GetPertinentStandardModules(new string[] {"Microsoft.VisualBasic", ""})) {
+                       if (e == null) {
+                               //TODO: Get Namespaces from SourceBeingCompiled
+                               string[] NamespacesInScope = new string[] {"Microsoft.VisualBasic", ""};
+
+                               foreach(Type type in TypeManager.GetPertinentStandardModules(NamespacesInScope)) {
                                        e = MemberLookup(ec, type, Name, loc);
                                        if (e != null) // FIXME! Must Output Ambiguity Error Messages
                                                break;
                                }
+                       }
 
 // #52067 - End
 

diff --git a/mcs/mbas/mbas.cmbx b/mcs/mbas/mbas.cmbx
new file mode 100644 (file)
index 0000000..4a16021
--- /dev/null
+++ b/mcs/mbas/mbas.cmbx
@@ -0,0 +1,16 @@
+<Combine fileversion="1.0" name="mbas" description="">
+  <StartMode startupentry="mbas" single="True">
+    <Execute entry="mbas" type="None" />
+  </StartMode>
+  <Entries>
+    <Entry filename="./mbas.prjx" />
+  </Entries>
+  <Configurations active="Debug">
+    <Configuration name="Release">
+      <Entry name="mbas" configurationname="Debug" build="False" />
+    </Configuration>
+    <Configuration name="Debug">
+      <Entry name="mbas" configurationname="Debug" build="False" />
+    </Configuration>
+  </Configurations>
+</Combine>
\ No newline at end of file

diff --git a/mcs/mbas/mbas.prjx b/mcs/mbas/mbas.prjx
new file mode 100644 (file)
index 0000000..1c0c65e
--- /dev/null
+++ b/mcs/mbas/mbas.prjx
@@ -0,0 +1,61 @@
+<Project name="mbas" description="MonoBASIC: Mono's VisualBasic.Net compiler" newfilesearch="None" enableviewstate="True" version="1.1" projecttype="C#">
+  <Contents>
+    <File name="./argument.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
+    <File name="./AssemblyInfo.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
+    <File name="./assign.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
+    <File name="./attribute.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
+    <File name="./cfold.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
+    <File name="./class.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
+    <File name="./codegen.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
+    <File name="./constant.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
+    <File name="./const.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
+    <File name="./decl.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
+    <File name="./defaultparserattribute.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
+    <File name="./delegate.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
+    <File name="./driver.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
+    <File name="./ecore.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
+    <File name="./enum.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
+    <File name="./expression.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
+    <File name="./genericparser.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
+    <File name="./interface.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
+    <File name="./literal.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
+    <File name="./location.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
+    <File name="./mb-parser.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
+    <File name="./mb-parser.jay" subtype="Code" buildaction="Nothing" dependson="" data="" />
+    <File name="./mb-tokenizer.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
+    <File name="./modifiers.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
+    <File name="./module.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
+    <File name="./namespace.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
+    <File name="./parameter.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
+    <File name="./pending.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
+    <File name="./report.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
+    <File name="./rootcontext.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
+    <File name="./sourcebeingcompiled.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
+    <File name="./statementCollection.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
+    <File name="./statement.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
+    <File name="./support.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
+    <File name="./tree.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
+    <File name="./typemanager.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
+  </Contents>
+  <References>
+    <Reference type="Gac" refto="/usr/lib/Mono.GetOptions.dll" localcopy="True" />
+  </References>
+  <DeploymentInformation target="" script="" strategy="File" />
+  <Configuration runwithwarnings="False" name="Debug">
+    <CodeGeneration runtime="MsNet" compiler="Csc" warninglevel="4" includedebuginformation="True" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" target="Exe" definesymbols="DEBUG" generatexmldocumentation="False" win32Icon="./mbas.ico" />
+    <Execution commandlineparameters="" consolepause="True" />
+    <Output directory="./" assembly="mbas" executeScript="" executeBeforeBuild="" executeAfterBuild="" />
+  </Configuration>
+  <Configurations active="Debug">
+    <Configuration runwithwarnings="False" name="Debug">
+      <CodeGeneration runtime="MsNet" compiler="Csc" warninglevel="4" includedebuginformation="True" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" target="Exe" definesymbols="DEBUG" generatexmldocumentation="False" win32Icon="./mbas.ico" />
+      <Execution commandlineparameters="" consolepause="True" />
+      <Output directory="./" assembly="mbas" executeScript="" executeBeforeBuild="" executeAfterBuild="" />
+    </Configuration>
+    <Configuration runwithwarnings="False" name="Release">
+      <CodeGeneration runtime="MsNet" compiler="Csc" warninglevel="4" includedebuginformation="True" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" target="Exe" definesymbols="" generatexmldocumentation="False" win32Icon="./mbas.ico" />
+      <Execution commandlineparameters="" consolepause="True" />
+      <Output directory="./" assembly="mbas" executeScript="" executeBeforeBuild="" executeAfterBuild="" />
+    </Configuration>
+  </Configurations>
+</Project>
\ No newline at end of file