readonly ReflectionImporter importer;
readonly CompilationSourceFile source_file;
- public Evaluator (CompilerSettings settings, Report report)
+ public Evaluator (CompilerContext ctx)
{
- ctx = new CompilerContext (settings, report);
+ this.ctx = ctx;
module = new ModuleContainer (ctx);
module.Evaluator = this;
- source_file = new CompilationSourceFile ("{interactive}", "", 1);
- source_file.NamespaceContainer = new NamespaceContainer (null, module, null, source_file);
+ source_file = new CompilationSourceFile (module, null);
+ module.AddTypeContainer (source_file);
startup_files = ctx.SourceFiles.Count;
- ctx.SourceFiles.Add (source_file);
// FIXME: Importer needs this assembly for internalsvisibleto
module.SetDeclaringAssembly (new AssemblyDefinitionDynamic (module, "evaluator"));
Location.Initialize (ctx.SourceFiles);
+ var parser_session = new ParserSession ();
for (int i = 0; i < startup_files; ++i) {
- var sf = ctx.Settings.SourceFiles [i];
- d.Parse (sf, module);
+ var sf = ctx.SourceFiles [i];
+ d.Parse (sf, module, parser_session, ctx.Report);
}
}
bool partial_input;
CSharpParser parser = ParseString (ParseMode.Silent, input, out partial_input);
+
+ // Terse mode, try to provide the trailing semicolon automatically.
if (parser == null && Terse && partial_input){
bool ignore;
- parser = ParseString (ParseMode.Silent, input + ";", out ignore);
+
+ // check if the source would compile with a block, if so, we should not
+ // add the semicolon.
+ var needs_block = ParseString (ParseMode.Silent, input + "{}", out ignore) != null;
+ if (!needs_block)
+ parser = ParseString (ParseMode.Silent, input + ";", out ignore);
}
if (parser == null){
compiled = null;
bool partial_input;
CSharpParser parser = ParseString (ParseMode.GetCompletions, input, out partial_input);
if (parser == null){
- if (CSharpParser.yacc_verbose_flag != 0)
- Console.WriteLine ("DEBUG: No completions available");
return null;
}
module.SetDeclaringAssembly (a);
// Need to setup MemberCache
- parser_result.CreateType ();
- parser_result.NamespaceEntry.Define ();
+ parser_result.CreateContainer ();
- var method = parser_result.Methods[0] as Method;
+ var method = parser_result.Members[0] as Method;
BlockContext bc = new BlockContext (method, method.Block, ctx.BuiltinTypes.Void);
try {
//
InputKind ToplevelOrStatement (SeekableStreamReader seekable)
{
- Tokenizer tokenizer = new Tokenizer (seekable, source_file, ctx);
+ Tokenizer tokenizer = new Tokenizer (seekable, source_file, new ParserSession ());
+ // Prefer contextual block keywords over identifiers
+ tokenizer.parsing_block++;
+
int t = tokenizer.token ();
switch (t){
case Token.EOF:
{
partial_input = false;
Reset ();
- Tokenizer.LocatedToken.Initialize ();
var enc = ctx.Settings.Encoding;
var s = new MemoryStream (enc.GetBytes (input));
}
seekable.Position = 0;
- source_file.NamespaceContainer.DeclarationFound = false;
- CSharpParser parser = new CSharpParser (seekable, source_file);
+ source_file.DeclarationFound = false;
+ CSharpParser parser = new CSharpParser (seekable, source_file, new ParserSession ());
if (kind == InputKind.StatementOrExpression){
parser.Lexer.putback_char = Tokenizer.EvalStatementParserCharacter;
+ parser.Lexer.parsing_block++;
ctx.Settings.StatementMode = true;
} else {
parser.Lexer.putback_char = Tokenizer.EvalCompilationUnitParserCharacter;
parser.Lexer.CompleteOnEOF = true;
ReportPrinter old_printer = null;
- if ((mode == ParseMode.Silent || mode == ParseMode.GetCompletions) && CSharpParser.yacc_verbose_flag == 0)
+ if ((mode == ParseMode.Silent || mode == ParseMode.GetCompletions))
old_printer = ctx.Report.SetPrinter (new StreamReportPrinter (TextWriter.Null));
try {
new TypeExpression (base_class_imported, host.Location)
};
- host.AddBasesForPart (host, baseclass_list);
+ host.AddBasesForPart (baseclass_list);
- host.CreateType ();
- host.DefineType ();
+ host.CreateContainer ();
+ host.DefineContainer ();
host.Define ();
- expression_method = (Method) host.Methods[0];
+ expression_method = (Method) host.Members[0];
} else {
expression_method = null;
}
- module.CreateType ();
+ module.CreateContainer ();
+
+ // Disable module and source file re-definition checks
+ module.EnableRedefinition ();
+ source_file.EnableRedefinition ();
+
module.Define ();
if (Report.Errors != 0){
}
if (host != null){
- host.EmitType ();
+ host.EmitContainer ();
}
- module.Emit ();
+ module.EmitContainer ();
if (Report.Errors != 0){
if (undo != null)
undo.ExecuteUndo ();
return null;
}
- module.CloseType ();
+ module.CloseContainer ();
if (host != null)
- host.CloseType ();
+ host.CloseContainer ();
if (access == AssemblyBuilderAccess.RunAndSave)
assembly.Save ();
var tt = assembly.Builder.GetType (host.TypeBuilder.Name);
var mi = tt.GetMethod (expression_method.MemberName.Name);
- if (host.Fields != null) {
- //
- // We need to then go from FieldBuilder to FieldInfo
- // or reflection gets confused (it basically gets confused, and variables override each
- // other).
- //
- foreach (Field field in host.Fields) {
- var fi = tt.GetField (field.Name);
-
- Tuple<FieldSpec, FieldInfo> old;
-
- // If a previous value was set, nullify it, so that we do
- // not leak memory
- if (fields.TryGetValue (field.Name, out old)) {
- if (old.Item1.MemberType.IsStruct) {
- //
- // TODO: Clear fields for structs
- //
- } else {
- try {
- old.Item2.SetValue (null, null);
- } catch {
- }
+ //
+ // We need to then go from FieldBuilder to FieldInfo
+ // or reflection gets confused (it basically gets confused, and variables override each
+ // other).
+ //
+ foreach (var member in host.Members) {
+ var field = member as Field;
+ if (field == null)
+ continue;
+
+ var fi = tt.GetField (field.Name);
+
+ Tuple<FieldSpec, FieldInfo> old;
+
+ // If a previous value was set, nullify it, so that we do
+ // not leak memory
+ if (fields.TryGetValue (field.Name, out old)) {
+ if (old.Item1.MemberType.IsStruct) {
+ //
+ // TODO: Clear fields for structs
+ //
+ } else {
+ try {
+ old.Item2.SetValue (null, null);
+ } catch {
}
}
-
- fields[field.Name] = Tuple.Create (field.Spec, fi);
}
+
+ fields[field.Name] = Tuple.Create (field.Spec, fi);
}
return (CompiledMethod) System.Delegate.CreateDelegate (typeof (CompiledMethod), mi);
//foreach (object x in ns.using_alias_list)
// sb.AppendFormat ("using {0};\n", x);
- foreach (var ue in source_file.NamespaceContainer.Usings) {
+ foreach (var ue in source_file.Usings) {
sb.AppendFormat ("using {0};", ue.ToString ());
sb.Append (Environment.NewLine);
}
{
var res = new List<string> ();
- foreach (var ue in source_file.NamespaceContainer.Usings) {
+ foreach (var ue in source_file.Usings) {
if (ue.Alias != null || ue.ResolvedExpression == null)
continue;
static public string help {
get {
return "Static methods:\n" +
+#if !NET_2_1
" Describe (object); - Describes the object's type\n" +
+#endif
" LoadPackage (package); - Loads the given Package (like -pkg:FILE)\n" +
" LoadAssembly (assembly); - Loads the given assembly (like -r:ASSEMBLY)\n" +
" ShowVars (); - Shows defined local variables.\n" +
{
}
- public override void EmitSymbolInfo ()
- {
- }
-
protected override FieldExpr GetFieldExpression (EmitContext ec)
{
return new FieldExpr (field, field.Location);
{
}
- public void AddTypeContainer (TypeContainer current_container, TypeContainer tc)
+ public void AddTypeContainer (TypeContainer current_container, TypeDefinition tc)
{
if (current_container == tc){
Console.Error.WriteLine ("Internal error: inserting container into itself");
if (undo_actions == null)
undo_actions = new List<Action> ();
- var existing = current_container.Types.FirstOrDefault (l => l.MemberName.Basename == tc.MemberName.Basename);
+ var existing = current_container.Containers.FirstOrDefault (l => l.Basename == tc.Basename);
if (existing != null) {
- current_container.RemoveTypeContainer (existing);
- existing.NamespaceEntry.SlaveDeclSpace.RemoveTypeContainer (existing);
+ current_container.RemoveContainer (existing);
undo_actions.Add (() => current_container.AddTypeContainer (existing));
}
- undo_actions.Add (() => current_container.RemoveTypeContainer (tc));
+ undo_actions.Add (() => current_container.RemoveContainer (tc));
}
public void ExecuteUndo ()
projects / mono.git / blobdiff